22 comments

just want to say: GREAT!!!


The new and improved Diff is really good :)
Yeah !

Guillaume


0

It's getting better, but I currently still prefer Araxis Merge. However,
there no longer seems to be a way to use an external diff tool. Where did
that setting go, or was I imagining things?

"Guillaume Laforge" <glaforge@reflexe.fr> wrote in message
news:bcum2a$cq3$1@is.intellij.net...

just want to say: GREAT!!!

>

The new and improved Diff is really good :)
Yeah !

>

Guillaume

>
>


0

I don't think there ever was a way to configure external diff.
Some Perforce plugins offer that, however. Perhaps you saw it there?

r.


Chris Miller wrote:

It's getting better, but I currently still prefer Araxis Merge. However,
there no longer seems to be a way to use an external diff tool. Where did
that setting go, or was I imagining things?

"Guillaume Laforge" <glaforge@reflexe.fr> wrote in message
news:bcum2a$cq3$1@is.intellij.net...

>>>just want to say: GREAT!!!
>>
>>The new and improved Diff is really good :)
>>Yeah !
>>
>>Guillaume
>>
>>



0

Can you describe what makes you prefer Araxis (except ability to merge)?
Sample files or concepts or something like "in case XXX Idea's diff is bad"?

--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com


"Chris Miller" <chris_overseas@hotmail.c0m> wrote in message
news:bcuobn$hud$1@is.intellij.net...

It's getting better, but I currently still prefer Araxis Merge. However,
there no longer seems to be a way to use an external diff tool. Where did
that setting go, or was I imagining things?

>

"Guillaume Laforge" <glaforge@reflexe.fr> wrote in message
news:bcum2a$cq3$1@is.intellij.net...

just want to say: GREAT!!!

>

The new and improved Diff is really good :)
Yeah !

>

Guillaume

>
>

>
>


0

It's a little thing, but...

I would really prefer if IDEAs diff was in a frame rather than a dialog. I
almost always want this window maximised (and sometimes want to minimise it
as well).

Cheers,
Vil.

Dmitry Peshehonov wrote:

Can you describe what makes you prefer Araxis (except ability to merge)?
Sample files or concepts or something like "in case XXX Idea's diff is bad"?

--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com


"Chris Miller" <chris_overseas@hotmail.c0m> wrote in message
news:bcuobn$hud$1@is.intellij.net...

>>It's getting better, but I currently still prefer Araxis Merge. However,
>>there no longer seems to be a way to use an external diff tool. Where did
>>that setting go, or was I imagining things?
>>
>>"Guillaume Laforge" <glaforge@reflexe.fr> wrote in message
>>news:bcum2a$cq3$1@is.intellij.net...
>>
>>>>just want to say: GREAT!!!
>>>
>>>The new and improved Diff is really good :)
>>>Yeah !
>>>
>>>Guillaume
>>>
>>>
>>
>>



--
Vilya Harvey, Consultant
vilya.harvey@digitalsteps.com / digital steps /
(W) +44 (0)1483 469 480
(M) +44 (0)7816 678 457 http://www.digitalsteps.com/

Disclaimer

This e-mail and any attachments may be confidential and/or legally
privileged. If you have received this email and you are not a named
addressee, please inform the sender at Digital Steps Ltd by phone on
+44 (0)1483 469 480 or by reply email and then delete the email from
your system. If you are not a named addressee you must not use,
disclose, distribute, copy, print or rely on this email. Although
Digital Steps Ltd routinely screens for viruses, addressees should
check this email and any attachments for viruses. Digital Steps Ltd
makes no representation or warranty as to the absence of viruses in this
email or any attachments.

0

OK... The merge feature is obviously a key point, but there are some other
things too:

- My number one gripe: IDEA doesn't have any indication down the margins
showing what parts of the document are different! For large files, this is a
must to see at a glance what/how parts of the file have changed. Currently
to find any differences I have to scroll down and hope I spot them on the
way past. (On the upside, you guys DO do this in the editor now with the CVS
integration - the coloured highlights down the margin in the same place as
the error/warning highlighting goes is fantastic, I love it! Something
similar in the diff view would be great).
- IDEA highlights all the way to the end of the row even though it's all
non-existant whitespace (if that makes sense?), whereas araxis only
highlights characters that have actually changed. To me, Araxis is more
intuitive.
- If a block of text is missing from one file, the other file has a single
character highlighted even though that character is actually present in both
files. Araxis shows a "highlighted insertion point/cursor", which again is
more intuitive to me.
- The highlighting of modifications/additions/deletions doesn't seem to be
as accurate as with Araxis. eg you guys seem to be breaking the highlighting
on word boundaries or something - Araxis highlights individual characters
and, overall, seems to do a better job of providing accurate highlighting.
- It would be great to have icons/keyboard shortcuts that allow navigation
to the next/previous difference. Especially handy when there are only one or
two differences in a large file.
- The ability to refresh the comparison if the file is changed externally
(or maybe IDEA already does this? I haven't actually checked!)

That's it off the top of my head, if you manage to implement all that I'm
sure I'll be able to think of a few more things ;) Seriously though, take
a good look at Araxis Merge, it has quite a lot of nice little touches that
I realise I can't live without.

Can you describe what makes you prefer Araxis (except ability to merge)?
Sample files or concepts or something like "in case XXX Idea's diff is

bad"?
>

--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com



0

"Chris Miller" <chris_overseas@hotmail.c0m> wrote in message
news:bcvah1$ea4$1@is.intellij.net...

OK... The merge feature is obviously a key point, but there are some other
things too:

>

- My number one gripe: IDEA doesn't have any indication down the margins
showing what parts of the document are different! For large files, this is

a

must to see at a glance what/how parts of the file have changed. Currently
to find any differences I have to scroll down and hope I spot them on the
way past. (On the upside, you guys DO do this in the editor now with the

CVS

integration - the coloured highlights down the margin in the same place as
the error/warning highlighting goes is fantastic, I love it! Something
similar in the diff view would be great).


http://www.intellij.net/tracker/idea/viewSCR?publicId=4956
Is planned for Aurora, just not done yet.
However there are next/previous diff buttons (disabled iff there is no more
in its direction).

- IDEA highlights all the way to the end of the row even though it's all
non-existant whitespace (if that makes sense?), whereas araxis only
highlights characters that have actually changed. To me, Araxis is more
intuitive.


We've not worked on it yet. Thanx that you noticed it.

- If a block of text is missing from one file, the other file has a single
character highlighted even though that character is actually present in

both

files. Araxis shows a "highlighted insertion point/cursor", which again is
more intuitive to me.


It will be implemented in some way, but now we have internal problems.

- The highlighting of modifications/additions/deletions doesn't seem to be
as accurate as with Araxis. eg you guys seem to be breaking the

highlighting

on word boundaries or something - Araxis highlights individual characters
and, overall, seems to do a better job of providing accurate highlighting.


Yes, we compare whole words not characters, we think it gives better
results, at least for programming languages.
(try 'component x' vs 'protected x' with araxis, we think we have to avoid
it)
More over we "glue" some changed fragments to make result less variegated.
We think that changed character in identifier or keyword has no sense.
(Assuming that you compare syntactically correct code fragments)
In spite of code contains strings and comments which are written with
natural language when you compare two versions/fragments you are looking for
changed/same code.

- It would be great to have icons/keyboard shortcuts that allow navigation
to the next/previous difference. Especially handy when there are only one

or

two differences in a large file.


Old next/previous diff are still working they go to changed lines blocks.
We plan to add shortcuts for next/previous "in-line" diff (use same as for
line blocks seems a bad idea).

- The ability to refresh the comparison if the file is changed externally
(or maybe IDEA already does this? I haven't actually checked!)


No it doesn't implemented and not planned. But we are going to implement
merge.
Is there any reason to change file externally if you be able to merge it
with Idea?

>

That's it off the top of my head, if you manage to implement all that I'm
sure I'll be able to think of a few more things ;) Seriously though,

take

a good look at Araxis Merge, it has quite a lot of nice little touches

that

I realise I can't live without.

>
Writing this replay I look at araxis once again (and now I likely understand
how it works). But we going to implement "code-oriented" diff, not "general
purpose".


--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com


0

Thanks Dmitry for your detailed comments. It looks like all I need is a
little bit of patience and virtually everything I'm after will be
implemented - once again it seems you guys have everything under control!
:) I'm very pleased to see you have merging planned to; you're right, the
refreshing of the comparison will not be needed once you support merging. I
can understand that a code-oriented diff will generally be more useful than
a general purpose one in most cases too.

Looking forward to the finished product!

Cheers,
Chris


0

We use beyond compare for 2 main reasons.

1. you can export the difference to an html file. we use this for doing code reviews

2. you can ignore "unimportant difference" so things like comments ect won't show up. Of course you have to tell it that you are using java.

0

- IDEA highlights all the way to the end of the row even though it's all
non-existant whitespace (if that makes sense?), whereas araxis only
highlights characters that have actually changed. To me, Araxis is more
intuitive.

>

We've not worked on it yet. Thanx that you noticed it.

>

I've think of it a bit and now I why it happends.
We decide to allow several lines match different number of other side lines
(in this case 'match' means that difference should be investigated further).
Unlike araxis, it shows inline diffs only for lines which have one-by-one
correspondence. This decision seems good for comparing restyled code:

 b) return a;
]]>

vs

 b)
  return a;
]]>

Actually there is no change in this fragments except insertion of newLine
followed by two spaces. However when both line blocks are full of changes
such approach leads to less intuitive results, we are working on it.

--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com


0

I have submitted a request for this here.
http://www.intellij.net/tracker/idea/viewSCR?publicId=12473

Please vote for it.

This is a bug. There is no reason why a diff needs to be in a modal dialog. The IDEA diff is fantastic, but putting it in a modal dialog cripples it.

0

Is there plans to allow diff to do merging visually?

TIA.

0

Writing this replay I look at araxis once again (and now I likely understand
how it works). But we going to implement "code-oriented" diff, not "general
purpose".


This is the one tool that keeps me developing on windows. Once you
implemente merge, I'm free to move to linux!!

0


Dmitry Peshehonov wrote:

...
Actually there is no change in this fragments except insertion of newLine
followed by two spaces. However when both line blocks are full of changes
such approach leads to less intuitive results, we are working on it.


Since it is a code diff/merge tool: It would be nice if there was some
kind of indication as to whether the change as a syntatic (eg, reformat)
or semantic (eg, name change).

0

"simplicity" <no_mail@jetbrains.com> wrote in message
news:1604936.1056333583849.JavaMail.jrun@is.intellij.net...

Is there plans to allow diff to do merging visually?

>
If you mean associating actions with fragments (e.g. Insert for deleted,
Remove for inserted, ...) then yes, we are thinking about what and how it
can be made.

--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com


0

"Barry Kaplan" <bkaplan@abwg.com> wrote in message
news:bd6shf$5om$2@is.intellij.net...
>
>

Dmitry Peshehonov wrote:

...
Actually there is no change in this fragments except insertion of

newLine

followed by two spaces. However when both line blocks are full of

changes

such approach leads to less intuitive results, we are working on it.

>

Since it is a code diff/merge tool: It would be nice if there was some
kind of indication as to whether the change as a syntatic (eg, reformat)
or semantic (eg, name change).

>

There is Ignore Whitespace combobox, we are moving ignore-formattings there.
There is a problem: the only way to show changed whitespace is to use
different background colour, so more colours are needed to show difference
between 'syntatic' and 'semantic' changes that seems not good. On the other
hand it seems quite reasonable to let you choose what kind of changes are
you interested in. We are going to change the way IDEA detects changes to
make it possible ignore inserted/deleted newLines. And treat

and

as same fragment, but they still be different from

At least for a while.

--
Best regards,
Dmitry Peshehonov
JetBrains, Inc, http://www.intellij.com


0

You could configure the old cvs integration to use an external diff.

0

Reading this one:

- If a block of text is missing from one file, the
other file has a single
character highlighted even though that character is
actually present in both
files. Araxis shows a "highlighted insertion
point/cursor", which again is
more intuitive to me.


Seems like IntelliJ need to implement some kind of marker that shows up between characters. This could also be used to mark aspect joinpoints where there's an advice. This would be better than the nasty green underlining...

0

Speaking of Araxis, here's a diff-merge program implemented in Java:
http://www.guiffy.com/

0

On Mon, 23 Jun 2003 21:14:30 -0700, Chris Graham wrote:

Speaking of Araxis, here's a diff-merge program implemented in Java:
http://www.guiffy.com/


guiffy is darn good - excellent product. One thing that IDEA lacks is a
merge function ( per delta ), and possible a nice conflict editor...

--
...turn to the light - don't be frightened by the shadows it creates,
...turn to the light - turning away could be a terrible mistake
...dream theater - the great debate


0

Try also KDiff3.

Tom

0

Kompare is also allright... but my #1 favorite is BeyondCompare... too bad they don't have a Linux version... I'll just have to wait until JetBrains take off on the diff ;o)

My top requests for the future development of the diff viewer would be (in no particular order):
1) Have the diff viewer "floatable" and non-modal.
2) Have the version of the file that you have on your disk (your local file) editable in the diff viewer. (Combined with #1 this will demand that a notification mechanism exists and that the diff is updated if the file is changed in the IDEA editor).
3) Teach it Java. Make it differentiate between changes in comments and changes in code. Basically implement http://www.intellij.net/tracker/idea/viewSCR?publicId=11430.

0

Please sign in to leave a comment.