SlickEdit Community

SlickEdit Product Discussion => SlickEdit® => Features and/or Improvements => Topic started by: Graeme on September 06, 2017, 11:14:58 am

Title: Undo doesn't work after diff
Post by: Graeme on September 06, 2017, 11:14:58 am
This happens in V21.0.3 as well as in beta 3.

Make a change to a buffer, right click on a file tab and select diff.  After the diff window opens, close it and do Ctrl-Z undo.  Slick moves the cursor to the bottom of the buffer and says "cursor movement undone".  Do ctrl-Z again and slick says "nothing to undo".
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 06, 2017, 12:58:57 pm
I raised the same issue, see:

https://community.slickedit.com/index.php/topic,15495.0.html
Title: Re: Undo doesn't work after diff
Post by: Dan on September 06, 2017, 01:00:44 pm
I explained in another thread, it's always been this way.  We will be changing it in the future.
Title: Re: Undo doesn't work after diff
Post by: jporkkahtc on September 06, 2017, 06:26:08 pm
So Dan, how many times has this "bug" been reported?
 :)
Title: Re: Undo doesn't work after diff
Post by: Dan on September 06, 2017, 06:39:56 pm
Well, it is a "bug" in quotes.  It was a design decision made in 1996 when all the parameters of what the diff should handle were different.  Why we didn't decide to use a separate buffer at the time, I honestly don't remember.  But we also wanted the diff to perform really well on 1996 hardware, and I do remember we wanted the diff to handle a 10 megabyte file.  So if we copied that into a separate buffer, diffed it, and then took whatever changes were made and put them back, it was going to have a lot more noticeable effect on performance then.  Also, if memory serves, in 1996 a lot of products only had a few undo steps.  So we knew it wouldn't be missed as much.

Honestly, it's been roughly 21 years since the diff was put in the product, and it has come up less than you think.  I would say more in the last few years, probably because most editor controls have multiple undo steps.  I think this is the first time I remember it being reported in a beta.
Title: Re: Undo doesn't work after diff
Post by: mwb1100 on September 06, 2017, 08:55:33 pm
Just as an FYI: I've been messing around with the macro in https://community.slickedit.com/index.php/topic,9424.0.html (because I wasn't aware of the context menu item to diff the buffer against the underlying file).  That macro doesn't have the problem of clearing the undo stack.  It may have other problems that I'm not aware of.

Title: Re: Undo doesn't work after diff
Post by: Dan on September 06, 2017, 08:59:20 pm
That runs an external program, so there's no chance of the issues with undo I mentioned in this thread https://community.slickedit.com/index.php/topic,15495.0.html.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 06, 2017, 09:02:24 pm
Thanks mwb1100! I think this will work for me - I will need to try it sometime when I have more time. I prefer Beyond Compare as my diff tool anyway.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 02:08:47 pm
Thanks mwb1100! I think this will work for me - I will need to try it sometime when I have more time. I prefer Beyond Compare as my diff tool anyway.

Hi... If you prefer BC, that's obviously your choice, but SlickEdit has a lot of options that BC doesn't because it's integrated with SlickEdit's context tagging.  So if you can tell me a few things you like better, maybe I could use that to improver DIFFzilla.  You could PM me if you want.
Title: Re: Undo doesn't work after diff
Post by: jporkkahtc on September 12, 2017, 03:14:55 pm
I still use Windiff sometimes - that really ancient Microsoft dev kit tool.
Things I like about it:
#1: Zebra stripes instead of side by side: This is sometimes easier to read - depends on the situation.
Ideally, DZ could toggle between side by side and zebra stripes.

#2: Allows me to change a lot of options during the diff - show same lines, show different lines, etc...
DZ makes it too hard to adjust options

#3: Commenting - I used to use this a lot of code reviews -- you can add comments during a multifile diff, then copy or save them into a plain text readable form well suited for email.
Slick Annotations could possibly do this if they worked during a diff, but there is no way to export them into a readable form.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 03:19:50 pm
#3: Commenting - I used to use this a lot of code reviews -- you can add comments during a multifile diff, then copy or save them into a plain text readable form well suited for email.
Slick Annotations could possibly do this if they worked during a diff, but there is no way to export them into a readable form.
Quote

So the comments aren't actually in the file?  We let you type in the file, and when I review before a big check in, I often add comments then.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 03:20:30 pm
#3: Commenting - I used to use this a lot of code reviews -- you can add comments during a multifile diff, then copy or save them into a plain text readable form well suited for email.
Slick Annotations could possibly do this if they worked during a diff, but there is no way to export them into a readable form.
So the comments aren't actually in the file?  We let you type in the file, and when I review before a big check in, I often add comments then.
Title: Re: Undo doesn't work after diff
Post by: jporkkahtc on September 12, 2017, 05:44:52 pm
Right, the comments are separate.
An example of text produced from commenting is below.

If slick where to produce readable comments they should be paired with a regex in ErrorParsing of course.

Quote
==============================
File:.\rehangtext.txt : .\rehangtext2.txt, Total comments:2
==============================
Comment #1, L10 of left file<9>
Reviewer comment:
    This is my comment
Source line:
    1>  i:\programming\dirlist\dirlist\dirlist.cpp(1030): note: while trying to match the argument list '(char)'
----------------------------------------------
Comment #2, L9 of right file<39>
Reviewer comment:
    This is another comment
Source line:
   
----------------------------------------------

You need version 6 or later (Windows 7 sdk I think) for this feature.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 05:56:07 pm
I tried this out.  It is interesting.  Is this just WinDiff's format?
Title: Re: Undo doesn't work after diff
Post by: jporkkahtc on September 12, 2017, 06:04:05 pm
Yeah as far as I know.
I've never seen this done in any other diff tool.
Its a shame, as it is really useful - if just a bit old school.

gitlab merge requests support something really similar (commenting on diffs), but it is all web based and must be part of a merge -- it isn't done as a standalone diffing tool.
If your team is using gitlab, then its great of course.

The thing I hate about gitlab / git diffing in general is their insistence on only showing the diffs, which leaves out so much context that it can be hard to make sense of things. Sometimes the compact listing is nice, but for a good code review you really need to see the context.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 06:28:00 pm
I agree.  We may one day add an option to collapse matching sections (since you can edit in the diff in our product it gets a little harder), but personally I won't use it, I like to see what surrounds it.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 12, 2017, 08:39:21 pm
Dan: Thanks for asking!

The attached 2 png files illustrate some of the things that I like better about BC vs DIFFzilla:

1. BC can show a left/right line one on top of the other while highlighting differences, DIFFZilla does not do this.

2. BC has "Minor" button, to allow me to ignore or not ignore unimportant differences (like comments or spacing differences), so that when I click "previous"/"next", I only go to the next non-commented code change.

3. BC was able to align lines 1254 and 1347, but DIFFZilla did not align them.

4. BC has swap button to allow to swap left/right sides.

5. BC has "Diffs" and "Same" button, so that we can see on the screen only the different lines, or only the same lines.

6. The way BC handles "imaginary buffer line" is more visually pleasing.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 12, 2017, 08:53:10 pm
Another thing BC does is I can point it to 2 directories and it will scan both directories and find which files are different. Then I can double click on each different one and inspect it. See attached screenshot.

Not sure if DIFFZilla does that as it is mainly in the context of an editor.

I use this directory diff all the time, so then I get used to the BC user interface. If I used BC for directory diff (and then drill into files), but only use DIFFZilla for file diff, then I have to get used to the User interface of 2 different tools.

BC also does 3 way merge which is useful when I am updating my working version of source code. Not sure DIFFZilla supports 3 way merge.

So since I use BC for directory diff and 3 way merge, which I'm not sure DIFFZilla supports, not sure it is worth it for me to learn the UI of another tool.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 08:59:26 pm
Dan: Thanks for asking!

The attached 2 png files illustrate some of the things that I like better about BC vs DIFFzilla:

1. BC can show a left/right line one on top of the other while highlighting differences, DIFFZilla does not do this.

Let me say from the start, of the standalone diff products I've seen out there, I thing BC is really good.

I suppose we could add something like that.  I think a long time ago, BC didn't let you edit in place, so that was why they had those text boxes at the bottom.  Nobody ever asked for this just as a visual.

2. BC has "Minor" button, to allow me to ignore or not ignore unimportant differences (like comments or spacing differences), so that when I click "previous"/"next", I only go to the next non-commented code change.

Have you tried SlickEdit's Source Diff?  It is different, you have to turn it on before you run the diff, and there is a different option to skip comments.

3. BC was able to align lines 1254 and 1347, but DIFFZilla did not align them.

You can right click and use align-with... but this is probably a difference in how the diff algorithm has been tweaked in each product.  There may be a place where we did a better job (or maybe there isn't, but it's probably just a tweak to the algorithm).

4. BC has swap button to allow to swap left/right sides.

Nobody ever asked for this.  It's something we can consider if there's a big draw for it.

5. BC has "Diffs" and "Same" button, so that we can see on the screen only the different lines, or only the same lines.

This is something we can add and I see the value in it.  Myself, I like to see the context around the difference, and just use next and prev difference, but this is something we've talked about adding.

6. The way BC handles "imaginary buffer line" is more visually pleasing.

It is.  We were talking about this earlier.

We also want to add buttons in the margins copy blocks back and forth.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 12, 2017, 09:13:33 pm
Attached is another difference showing how BC shows "unimportant" (comments and spacing) as "blue", while it shows "important" (like code) in red.

Also, I see that DIFFZilla does have a directory compare, but BC allows me to save "sessions", where I can specify file patterns and directory patterns to ignore. This is real important because the build can put many files into the directory structure that I don't want showing up. Does DIFFZilla directory compare allow to ignore file/directory patterns and to save these into a "diff session"?
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 09:14:53 pm
Another thing BC does is I can point it to 2 directories and it will scan both directories and find which files are different. Then I can double click on each different one and inspect it. See attached screenshot.

Not sure if DIFFZilla does that as it is mainly in the context of an editor.

I use this directory diff all the time, so then I get used to the BC user interface. If I used BC for directory diff (and then drill into files), but only use DIFFZilla for file diff, then I have to get used to the User interface of 2 different tools.

BC also does 3 way merge which is useful when I am updating my working version of source code. Not sure DIFFZilla supports 3 way merge.

So since I use BC for directory diff and 3 way merge, which I'm not sure DIFFZilla supports, not sure it is worth it for me to learn the UI of another tool.

It does, you just choose "Compare Two Folders" and give the paths, filespecs, and exclude filespecs.  You can also use a file list.  Also, for source files, you can expand the file and see which functions have changed.  Double clicking on the file will diff those two files.  Double clicking on a function will diff just that function, and if you make changes it will overlay them inside the file.  I don't believe any other product does this, because it uses SlickEdit's context tagging.

(http://multiFilePic.png)

Also we do have a three way merge, Tools>File Merge.

Also, both diff and merge have command line programs in the SlickEdit\win directory.

https://www.youtube.com/watch?v=XhoZT0qyW0w
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 12, 2017, 09:20:20 pm
Quote
1. BC can show a left/right line one on top of the other while highlighting differences, DIFFZilla does not do this.
Quote
Let me say from the start, of the standalone diff products I've seen out there, I thing BC is really good.

I suppose we could add something like that.  I think a long time ago, BC didn't let you edit in place, so that was why they had those text boxes at the bottom.  Nobody ever asked for this just as a visual.

I find it really helpful as a visual, it is probably the main reason I like BC over DIFFZilla.

Quote
2. BC has "Minor" button, to allow me to ignore or not ignore unimportant differences (like comments or spacing differences), so that when I click "previous"/"next", I only go to the next non-commented code change.
Quote
Have you tried SlickEdit's Source Diff?  It is different, you have to turn it on before you run the diff, and there is a different option to skip comments.

I haven't explored it much yet, but the dialog asking to turn on/off source diff confuses me. In BC I can just use the "minor" button.

Quote
BC has swap button to allow to swap left/right sides.
Quote
Nobody ever asked for this.  It's something we can consider if there's a big draw for it.

Actually I do remember it being asked for here ;) : https://community.slickedit.com/index.php/topic,14830.msg58540.html#msg58540

Quote
BC has "Diffs" and "Same" button, so that we can see on the screen only the different lines, or only the same lines.
Quote
This is something we can add and I see the value in it.  Myself, I like to see the context around the difference, and just use next and prev difference, but this is something we've talked about adding.

BC has a "context" button, looks like you can configure it to specify how much context you want around (how many lines before/after). I don't use this feature much though, I generally like to look at the whole file.

Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 09:20:23 pm
Attached is another difference showing how BC shows "unimportant" (comments and spacing) as "blue", while it shows "important" (like code) in red.
Have you tried SlickEdit's Source Diff?  It has an option to not compare comments.  It also has options to map one token to another.  This can come in handy in certain cases.

Also, I see that DIFFZilla does have a directory compare, but BC allows me to save "sessions", where I can specify file patterns and directory patterns to ignore. This is real important because the build can put many files into the directory structure that I don't want showing up. Does DIFFZilla directory compare allow to ignore file/directory patterns and to save these into a "diff session"?

Also, SlickEdit saves named and unnamed sessions for both regular and multi-file diffs.  I highlighted it in red on the screenshot.  This is just the editor I'm using, so I don't have any named ones.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 09:39:19 pm
Since we're talking about diff features, I thought I'd throw out some that people might not know about.  Some of these only SlickEdit has because they use SlickEdit's context tagging engine.

Title: Re: Undo doesn't work after diff
Post by: Dan on September 12, 2017, 09:44:46 pm
Quote
1. BC can show a left/right line one on top of the other while highlighting differences, DIFFZilla does not do this.
Quote
Let me say from the start, of the standalone diff products I've seen out there, I thing BC is really good.

I suppose we could add something like that.  I think a long time ago, BC didn't let you edit in place, so that was why they had those text boxes at the bottom.  Nobody ever asked for this just as a visual.

I find it really helpful as a visual, it is probably the main reason I like BC over DIFFZilla.

Quote
2. BC has "Minor" button, to allow me to ignore or not ignore unimportant differences (like comments or spacing differences), so that when I click "previous"/"next", I only go to the next non-commented code change.
Quote
Have you tried SlickEdit's Source Diff?  It is different, you have to turn it on before you run the diff, and there is a different option to skip comments.

I haven't explored it much yet, but the dialog asking to turn on/off source diff confuses me. In BC I can just use the "minor" button.

Quote
BC has swap button to allow to swap left/right sides.
Quote
Nobody ever asked for this.  It's something we can consider if there's a big draw for it.

Actually I do remember it being asked for here ;) : https://community.slickedit.com/index.php/topic,14830.msg58540.html#msg58540

Quote
BC has "Diffs" and "Same" button, so that we can see on the screen only the different lines, or only the same lines.
Quote
This is something we can add and I see the value in it.  Myself, I like to see the context around the difference, and just use next and prev difference, but this is something we've talked about adding.

BC has a "context" button, looks like you can configure it to specify how much context you want around (how many lines before/after). I don't use this feature much though, I generally like to look at the whole file.

What does Minor skip over?  It looks like it affects the whole file, but I don't understand what it skips.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 02:02:09 am
In DIFFZilla, you have the "Next Diff" and "Prev Diff" buttons. In BC the equivalent are buttons on the main toolbar: "Next Section" and "Prev Section". "Skipping" means that when pressing "Next Diff", it will skip any of the "unimportant" blocks to go to the next important difference section.

In BC, with "Minor" off, sections that have unimportant diffs (comments and spacing) are marked in blue. Sections that have important diffs are marked in pink - I like the different colored sections. The equivalent in DIFFZilla of "Minor" set to "off" is to not use Sourcediff, in this case, both important and unimportant sections are both marked in the same color (red), with no differentiation. I like that I can see the difference in BC. Only with Sourcediff set to ON in DIFFZilla will I see the unimportant sections marked in a different color (green), then they will get "skipped" in "next/prev diff".

With "Minor" off, when I click on BC's equivalent of "Next Diff" or "Prev Diff", I go to the next diffed section, no matter whether it is blue (unimportant) or pink (important).

With "Minor" on, the unimportant sections are not shown, so instead of blue, BC doesn't highlight that it is different at all. So when clicking on "Next Diff", it will skip past the blue (unimportant) sections.

For example, if diff section 1 is important (pink), diff section 2 is un-important (blue), diff section 3 is important (pink), if I'm currently at section 1 then if "Minor" is "off", clicking "Next section" will take me to section 2. But if "minor" is "on", clicking "Next section" will take me to section 3, as diff section 2 is no longer highlighted, so diff section 2 is "skipped" - this is what I meant by the skipping.

With DIFFZilla, if I want to do the equivalent of pressing the "Minor" button in BC, I have to close my diff and restart it with source diff the opposite way. But with BC I can just click on the "Minor" button, don't need to close and reopen my diff session.

Also with DIFFZilla, I get a confusing message about having a read only copy of file 2 in order to get source diff. So this means I can't edit file 2 then in DIFFZilla with sourcediff turned on? In BC I can edit file 2 with "Minor" on or off.

In DIFFZilla, with source diff turned on, I still see a highlight (in green) that the "unimportant" section is changed, although it does get skipped with "Next Diff". But in BC with "Minor" set to "off", there is no highlight marking it anymore, so I'm not distracted by unimportant sections when I don't want to be. I don't want unimportant sections highlighted when doing the equivalent of "Minor" set to "off".

Also in BC, the red and blue markings use the background color of the entire text section, and the actual text differences are highlighted in a different color. In DIFFZilla, only the text characters that are different are highlighted, not the background color.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 02:14:15 am
Ok, I understand the convenience of what they've done.  Keep in mind that source diff works for every language we support.

Also, you can click a button at the bottom to toggle source diff and line diff.  This isn't a perfect solution.

Always determining what is unimportant (source diff, and having a toggle button whether or not to skip those lines) would have an effect on performance.  You may find our diff is faster.  Although in my testings, sometimes source diff was actually faster.  Also, they're "unimportant"  logic may be less intense than what we do for source diff. Does it do a whitespace, or just comments?
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 02:15:57 am
BCs unimportant logic is both spacing and comments. I find it to be very very fast, I have no issues with BCs performance.

Also, attached is a picture illustrating the differences from my last post.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 02:19:39 am
Another minor detail about something I like in BC, for the equivalent of DIFFZilla "Block>>", "Line>>" buttons, in BC I right click on a line and I get a menu of these options. I prefer this a little more because its closer on the screen to where I'm actually working.

I see the button to toggle source diff on and off now. Just tried it and while it does the job, the diff briefly flashes off the screen and then flashes back on, like you are closing/reoping the diff. Toggling "minor" in BC is much smoother.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 02:21:28 am
Also, in BC if I have a section with say 3 changed lines, if I only want to copy 2 of those lines to the other side, I just highlight those 2 lines out of the 3, right click and select "Copy line to right". I don't see how I can do a subsection in DIFFZilla.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 02:25:13 am
BCs unimportant logic is both spacing and comments. I find it to be very very fast, I have no issues with BCs performance.

Also, attached is a picture illustrating the differences from my last post.

Coloring the line pink and the actual line red I'm not a fan of, I'd rather see the language's natural color coding.

We felt it was important to show what was changed for source diff.  If it gets skipped, I guess I don't see what difference it makes.

I'll have to look in the morning to see the timings. Performance is very important to us, always has been in fact there is work going on right now that should speed up he diff quite a bit, especially with large files.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 02:27:49 am
There is a <<Line button in DIFFzilla. You have to click the line.  I'm not sure how it works in BC.  Also, in DIFFzilla you could copy/paste the lines, you may be able to in BC too, I don't know.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 02:42:08 am
In DIFFZilla, the <<Line button only does 1 line. In BC, the equivalent of <<Line will do the (multiple) lines that I highlight.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 02:45:22 am
Quote
Coloring the line pink and the actual line red I'm not a fan of, I'd rather see the language's natural color coding.

I am a fan of it. Seeing the language's natural color coding is not that important to me when diffing. I'd rather have the background color change without the language's natural color coding, don't really need the language's natural color coding when diffing, and it may even be a distraction.

Quote
We felt it was important to show what was changed for source diff.  If it gets skipped, I guess I don't see what difference it makes.

Because when I don't want to see unimportant differences, I don't want to be distracted by them getting highlighted. I can always see this by turning off "minor".
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 02:50:02 am
What time zone are you in? I'm in bed and should be sleeping except there's a baseball game on  ;). We love that we have passionate customers who give ideas for the product. We can't implement all of them, but a lot of them are really good ideas.

SlickEdit supports multiple cursors, so we should be able to change this.  You would press Ctrl+click on each line, then the line copy button.  Probably can't do this for 22.0.0. A lot of diff things I hope I can deal with for 22.0.1, but it will depend how things go, I have some other responsibilities.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 03:06:12 am
I'm eastern time zone (New Jersey) and will be going to bed now too.

Just one more comment about the natural language color coding while diffing. When editing, the color coding is great, but when I'm diffing, I only want differences highlighted, so I find the natural color coding a big distraction as I want to zoom in on differences, but even in the same window there are different colors due to the color coding.

As for implementing all these things in the diff tool - I'd much rather you worked on my issue for the "Date modified" with my project of 31,000 files. I'm fully set using Beyond Compare for now - although I was happy to give you my feedback. But solving the performance issue with "Date Modified" in Smart open would make me much happier ;). This issue: https://community.slickedit.com/index.php/topic,15505.msg59309.html#msg59309
Title: Re: Undo doesn't work after diff
Post by: Graeme on September 13, 2017, 11:59:40 am
Since we're talking about diff features, I thought I'd throw out some that people might not know about.  Some of these only SlickEdit has because they use SlickEdit's context tagging engine.

  • Diff With command that will find the file you are diffing with a file in another directory, but will find it in the other directory - https://www.youtube.com/watch?v=6ooPncH-BUQ
  • Diff Symbols - this is different from the one in multi-file diff posted above - https://www.youtube.com/watch?v=QFHRn-Oqzc8
  • Current Context in DIFFzilla - We got so used to having this in the editor, we had to put it in the diff - https://www.youtube.com/watch?v=uUhDzBRQYxg
  • Source Diff - We talked about this one in this thread already, but I thought I'd throw the video in - https://www.youtube.com/watch?v=v6v4eL8aI0A

Maybe you could add "diff a range of lines" to this list.  I use the xcompare_diff_region I posted here quite a lot.  I would be happy if you added these to slickedit.  I know you can do it through the diff dialog but it's quite laborious.
https://community.slickedit.com/index.php/topic,11186.msg47177.html#msg47177 (https://community.slickedit.com/index.php/topic,11186.msg47177.html#msg47177)

"History diff" needs a "save" button.  If you change the code directly in diffzilla, there's no indication that you changed anything and the only way to do a save is Ctrl-S or exit the diff and use the exit prompt.

Well, I noticed some problems in beta3 while writing this so here they are. 
1) Diff the current file with a version from backup history, make a change to the file inside diffzilla, then use Ctrl-Z repeatedly  - the result is a bit weird.
2) Make a change to the current file without saving it, then diff two files, one of which is the file you just changed - and using "compare symbols all".  The buffer you had open loses the changes you made and gets some green highlighting in the places you had changed.  Now do it again but this time, save the buffer before you run the diff.  Diffzilla says "no differences" and the buffer somehow loses the changes you just made and saved  - it does on my machine anyway.
3) When you diff two files and select "compare symbols all" for path one, for path two you can't select "compare symbols all".  I'm not sure why path two even has a dropdown list for this ??.
4) Diff two files on disk one of which is open, diffzilla pro opens with the file on the right (the one that is open) marked as read only (why?).  When you right click in the right hand pane and select "edit file", slick ignores you and keeps diffzilla open.


Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 02:12:16 pm
Maybe you could add "diff a range of lines" to this list.  I use the xcompare_diff_region I posted here quite a lot.  I would be happy if you added these to slickedit.  I know you can do it through the diff dialog but it's quite laborious.
https://community.slickedit.com/index.php/topic,11186.msg47177.html#msg47177 (https://community.slickedit.com/index.php/topic,11186.msg47177.html#msg47177)
The problem here is that there can only be one selection in SlickEdit.  So you can't select two different line ranges then diff.  Have you tried the drop down? It will bring up the file for you to select.

"History diff" needs a "save" button.  If you change the code directly in diffzilla, there's no indication that you changed anything and the only way to do a save is Ctrl-S or exit the diff and use the exit prompt.

You're right, this probably needs a save button.  I don't know if I will be able to do it for 22.0.0

Well, I noticed some problems in beta3 while writing this so here they are. 
1) Diff the current file with a version from backup history, make a change to the file inside diffzilla, then use Ctrl-Z repeatedly  - the result is a bit weird.

We do the best we can with the undo in DIFFzilla, but it is possible to get it out of sync from time to time.  There's a possible way to improve this, but I need a feature from somebody else.

2) Make a change to the current file without saving it, then diff two files, one of which is the file you just changed - and using "compare symbols all".  The buffer you had open loses the changes you made and gets some green highlighting in the places you had changed.  Now do it again but this time, save the buffer before you run the diff.  Diffzilla says "no differences" and the buffer somehow loses the changes you just made and saved  - it does on my machine anyway.

I can't reproduce this one.  Did you actually diff a symbol?  Were you diffing two files, or diffing with version control?

3) When you diff two files and select "compare symbols all" for path one, for path two you can't select "compare symbols all".  I'm not sure why path two even has a dropdown list for this ??.

When you select "Compare Symbols: All", that's what it's going to do, so it just doesn't care what you pick in the second combobox.

4) Diff two files on disk one of which is open, diffzilla pro opens with the file on the right (the one that is open) marked as read only (why?).  When you right click in the right hand pane and select "edit file", slick ignores you and keeps diffzilla open.

Are you running vsdiff externally?
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 02:45:53 pm
With regards to the copy line discussion last night, you can do copy line multiple consecutive times, so this should be as good as doing it on a selections, right?
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 02:52:10 pm
With regards to "Minor" vs Source Diff, while Minor is a very clever feature, it doesn't handle everything.  Here are two screenshots that shows where Source Diff sort of shines.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 02:53:44 pm
I could do copy line multiple times, but lets say I have a much larger selection, copy line multiple times would get tedious and more prone to error.

I decided to try out the 3 way merge this morning, as I was already doing 3 way merges. Attached are some screenshots with my feedback.
Title: Re: Undo doesn't work after diff
Post by: Clark on September 13, 2017, 03:16:10 pm
With regards to "Minor" vs Source Diff, while Minor is a very clever feature, it doesn't handle everything.  Here are two screenshots that shows where Source Diff sort of shines.

If you beautify a C++ file and change some brace style, BC can't detect that there are no changes. Source Diff does.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 04:16:27 pm
I just tried using directory compare, but it has a severe limitation that BC doesn't have.

DZ only allows to specify include/exclude filespecs. But BC also allows to specify include/exclude directory specs.

See attached screenshot for what I have configured in one of my BC directory compare sessions.

In my diff, I want to:

1) Only include 2 subdirectories (from the top level) in the diff:
     a) dir1/dir2/dir3
     b) dir1/dir4
2) Within those 2 subdirectories and their tree, I want all files: *.*
3) Under those dir trees, there are certain files I want to exclude, and certain directories I want to exclude, these are listed in the "Exclude Files" and "Exclude folders". For the dirs typed into "Exclude folders" for example "obj", it would exclude any directory "obj" no matter what its level in the directory tree. But if there is a file called "obj", I don't want it excluded, I only want "obj" excluded if it is a directory.

How to do this with DZ?
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 04:19:19 pm
SlickEdit supports Ant style matching, so you should be able to get what you want with the filespec.
Title: Re: Undo doesn't work after diff
Post by: Clark on September 13, 2017, 08:34:04 pm
To exclude any directory named foo, use "foo/". This is a short hand for "**/foo/**". You can get fancy though and only exclude foo if it's under some parent hierarchy (ie "**/parent/foo/**" or "**/backup*/foo/**/*.cpp").
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 09:00:15 pm
I tried using an ant pattern to do a folder diff in my clearcase remote file system for a small subfolder. Using the same include spec in BC vs DZ, BC did the job in a few seconds, while I'm still waiting for DZ to finish (its been minutes now).

I recorded it in a video. In support.slickedit.com, find bc_vs_dz_folder_compare_performance.txt, and inside that text file is a link to the video (uploading the video to support.slickedit.com failed).

I think it is a similar performance issue to another thread: https://community.slickedit.com/index.php/topic,15505.msg59309.html#msg59309 where SE is scanning many many more directories than needed, whereas BC is only scanning the needed directories.

In this video, I also demonstrate that even though BC is not finished scanning all the directories, you can start looking at the diffs of some files while BC still scans the remaining directories.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 09:03:23 pm
I see from DZ's progress that is scanning directories that it should not be scanning. basically under /view/<viewname> is the entire file system (like an alias), so DZ is basically scanning my entire file system when it should only be looking for a few directories.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 09:08:47 pm
I'll have to try this, but it will be a little while before I get a chance.

Does it make any difference if you do this on a local file system?
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 09:12:02 pm
It is not easy for me to do this on a local file system. There are over 30000 files I would need to transfer.

Additionally, I found a circular dependency. The way the clearcase file system works, if I do:

ls /view/<viewname>

I basically see the same thing as

ls /

So it means that under /view/<viewname> will be a directory /view/<viewname>/view/<viewname>, so I think DZ's scan will never end!

Also, BC has no problems with this remote file system and finishes the job in seconds, while DZ is still spinning.

Check that DZ is only scanning the required directories, I think you will see that if you have:

dir1/dir2/dir3
dir1/dir4

That if you give an ant pattern dir1/dir2/**

That DZ will still scan dir1/dir4 when it doesn't need to.

Since I have so many other directories, and there is a circular nature to them, DZ never stops.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 13, 2017, 09:13:17 pm
And I think it is a similar issue with the "Date modified" in the smart open. I think it is scanning the entire workspace instead of just the files in the smart open window - anyway you can look at my latest post there for what I think is going on, I think it is very similar. I'm much more interested in you solving the "Date modified" issue than the diff issues.  https://community.slickedit.com/index.php/topic,15505.msg59309.html#msg59309
Title: Re: Undo doesn't work after diff
Post by: Dan on September 13, 2017, 09:16:41 pm
I'll have to double check tomorrow, but if it's happening when you're double clicking to open a file, I don't think it's scanning the entire workspace.  I'll check though.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 14, 2017, 12:33:10 pm
A feature BC has in directory compare that is I think missing in DZ - sometimes when I do the directory compare, many files show up that I would like to ignore. In BC, I can modify the exclusion list while the directory tree is showing, and it will remove the newly excluded filespecs from the tree comparison. In DZ, it looks like the only opportunity to specify the exclusion list is before the diff, as when I click on "Options" while the tree is showing, the "Files" tab is greyed out so doesn't allow me to modify exclusion list.
Title: Re: Undo doesn't work after diff
Post by: Clark on September 14, 2017, 04:25:01 pm
I see from DZ's progress that is scanning directories that it should not be scanning. basically under /view/<viewname> is the entire file system (like an alias), so DZ is basically scanning my entire file system when it should only be looking for a few directories.
I've been investigating how excluding directories works. Multi-file diff doesn't seem optimize directory exclusions (it traverses all directories no matter what). This will be something we will look into optimizing but it likely won't make v22. Multi file find directory exclusions are optimized but only sometimes (I think we can fix this). For example, if you specify an exclusion of "path1/" or "path1/path2" then the directory exclusions are optimized. However, if you specify an exclusion of "path1/**/*" or "path1/**/*.*" (windows), then the path1 directory will be traversed even though it is unnecessary.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 14, 2017, 05:27:55 pm
OK - thanks for looking. Just to clarify, in my case I am specifying inclusions and not exclusions.

So when I put path1/** and path2/** into INCLUSIONS (not exclusions), then I don't expect path3/**, path4/**, etc to be scanned. If only path1/** and path2/** are in the inclusions, then only path1 and path2 should be scanned, and no other paths should be scanned.

Title: Re: Undo doesn't work after diff
Post by: Clark on September 14, 2017, 07:31:07 pm
If you haven't specified any exclusions, DZ isn't smart enough to automate that for you if your inclusion specifies all paths (i.e. "path1/*.cpp" and "path2/*.cpp"). This would also be a very useful optimization for DZ. The only work around I know is to run diffzilla twice. This would be a pain if you have more than two paths you want to diff against and it's obviously not as convenient as being able to specify everything in one shot.

The multi-file find dialog has the same issue but you can work around it by specifying multiple wildcards for "Look in:"  (i.e  .../path1/*.cpp;.../path2/*.txt).
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 14, 2017, 07:58:02 pm
OK, well please put it on the wish list for further optimizations. I use this exactly for the reason that I don't want to run the compare tool twice, and BC handles it well. Hopefully DZ can handle this in a future revision.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 14, 2017, 08:03:56 pm
Since we have gone well beyond the scope of the undo issue in this 4 page thread, after the beta this thread will be moved to the Features and/or Improvements forum (probably with a different name) since there are some pretty good ideas in here.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 14, 2017, 08:23:15 pm
I posted some diff videos the other day, but I forgot we have a whole playlist.  There are a ton of obscure diff features, many of them tied into version control.  So, here are both. 

Here is an obscure example:  If you use the version control history dialog, and scroll down to the bottom of the bottom pane, and click on the link "See List of Changed Symbols".  It will then expand into a series of links, one for each symbol that changed between the currently selected version and previous version.  Clicking one of these links will diff that symbol.

Diff: https://www.youtube.com/watch?v=QFHRn-Oqzc8&list=PLAfxJLNu8RF8DJcJKu9Zejbbi_8PaFpWa
Version Control: https://www.youtube.com/watch?v=JO6k8Yz5fDY&list=PLAfxJLNu8RF9dWBrsIhhqhRkJf-CFQZaO
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 14, 2017, 08:27:04 pm
Clark: You said: "If you haven't specified any exclusions", but along with the 2 included paths I do specify a bunch of exclusions, mostly for file specs (without directories such as *.log), but some with pure directory names I want to exclude (like "obj") and other more in-depth paths that I want to exclude such as exclude everything under dir1/direxclude1/direxclude2. Just to put this out there for future reference.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 14, 2017, 09:20:47 pm
I want to point out that the language color coding and the way you highlight the diffs without changing the background color of the whole line is growing on me.

Still, I'd like to see different colors highlighting unimportant vs important diffs, even when not using source diff.
And when using source diff, having something like the "Minor" button to turn on/off the highlighting of unimportant changes and allowing to skip/not skip over them could be useful.

I did run into a situation today where I wanted to modify file 2 with code from file 1 during source diff, but it was read only, so had to switch to line diff and I lost focus on that. One small idea is that instead of making file 2 read only, how about an option to make file 1 read only instead, as usually file 1 is the "old" and "baseline" file that I don't want to change and I want it on the left side. Then I can modify the "new" file on the right side which is "file 2".
Title: Re: Undo doesn't work after diff
Post by: Clark on September 14, 2017, 10:04:28 pm
OK, well please put it on the wish list for further optimizations. I use this exactly for the reason that I don't want to run the compare tool twice, and BC handles it well. Hopefully DZ can handle this in a future revision.

Sorry everyone. I goofed badly with my post. multi-file find can ALREADY do exactly what this user wants. You must turn off recursive. Here's how to get the job done doing a multi-file find.

Look in:  c:\    -- Yep this is what I tested
File types: temp\**\junk.txt    -- probably want something like * or *.cpp here.
uncheck "Look in subfolders" and "Look in zip/word/excel files".

I tried doing something similar with DZ and it almost worked. The problem is the result tree is obviously confused as to where files are. It did reduce the search time but well...didn't work right though. Nothing needs to be optimized. DZ needs to be fixed to support this.

NOTE:  Here's where I went wrong with my thoughts in my previous post on this. For a recursive search, when you specify "path1\**\*.txt" it is converted to "**\path1\**\*.txt". It's supposed to do that. Because of this intent it CANT be optimized the way I was thinking. When you specify a non-recursive search, no "**\" is prepended to the front. HOWEVER, "path1\**\*.txt" still specifies a recursive search.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:06:04 pm
Clark: This is working for me, thanks! Not intuitive to not use recursive though - even for you who is probably the biggest expert on SE!

Now that I'm in the directory tree, I'm missing the "Expand All" and "Collapse All" buttons that BC gives me to entirely collapse or expand the directory tree.

Also, being able to update the exclusions while the tree is showing - I'm really missing this. BC has 2 different kinds of "refresh" - a "fast" refresh where it updates the files "in place" - so I think it means if you add an exclusion that instead of rescanning the whole tree it deals with what it already has, and non-fast refresh that rescans everything again. You may want to consider adding this to DZ.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 02:09:13 pm
Right click on the part of what you want to collapse and choose "Hide".
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:15:27 pm
A few other things.

I tried using "goto-parent" command and got error "Command 'goto-parent' currently not allowed in Diff mode. I have a huge switch/case statement and I wanted to quickly go to the enclosing "switch", so would have been nice to have this - it would have been something BC could not do!

Then I thought maybe I could have the file opened in SE at the correct line so I could run "goto-parent", so I right clicked and saw "Edit file(will close this dialog)" - but I'd rather not the dialog was closed. Now I did run vsdiff from the command line while SE was already running, but maybe a way to see the file in SE while running vsdiff would be nice.

I haven't tried scanning my full tree yet, just a few subdirs, the full one requires 12 minutes from BC (as it is remote file system), probably will take as long with DZ. But at least with BC it updates the tree as it goes along, within the first minute I'll see some of the files that have diffs, and I can be reviewing those while the rest of the files are scanned. Would be great if DZ can do this. You can see a demo of this towards the last half of the video I previously uploaded to support.slickedit.com under "bc_vs_dz_folder_compare_performance.txt". BC also prints out the amount of time it took to scan the whole tree, but I don't see this info in the "Report" button on DZ tree comparison.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:17:43 pm
Just tried this "hide", but not doing what I want. "Expand all" will expand every level of the tree in BC, and collapse all collapses every level. Hide is not doing this.

While I was looking at the diff of one file in the tree, I wanted to see a second file, but the window with the tree was gone. In BC I can have multiple tabs, one showing the tree and another showing the file I'm diffing. So if I want to see a second file, I can go back to the tab with the directory tree and click on a second file. With DZ it looks like I can look at only 1 diff at a time.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 02:18:44 pm
I can put goto-parent in the allowed diff commands for you.  It's a little trickier than it sounds, because you have to get the undo right.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:19:25 pm
In addition to tabs, DZ also allows to use different windows, or to keep in tabs. I can right click on a tab and choose "Move tab to new window". Not sure if BC allows me to put a window back into another window's tab though.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:24:41 pm
Thanks about "goto-parent". Another one that would be useful but is also not allowed is: "context-prev-tag" which I use in order to see the enclosing function.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 02:27:18 pm
Thanks about "goto-parent". Another one that would be useful but is also not allowed is: "context-prev-tag" which I use in order to see the enclosing function.

It's right above the window.

If I forget about goto-parent in remind me.  It can be added in a hotfix.  You have to balance the undo steps, but it's all macro work.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:37:09 pm
Above the window for me it states "no current context".

Now I ran vsdiff from the command line and not from SE, don't know if this makes a difference or not.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:40:01 pm
copy-buf-name would also be useful. I just tried to use it to copy/paste the full path to the file on the left, so I could run DZ from inside SE if that would make a difference, but it said 'copy-buf-name' not allowed in diff mode.

Others:
buf-dir-to-clipboard

Additionally, how to type a command into DZ? I was using keybindings to run my commands, but you took over Alt-N (which I use to copy/paste the name portion of a file), so I wanted to run my command manually but if I press "esc" it closes the DZ window.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 02:43:19 pm
Why don't you PM me a list of commands?  Some I can do, some I won't be able to.  I also probably can't get them all into 22.0.0, but like I said they're things that can go into hotfixes, so they won't have to wait for a major release.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 02:44:48 pm
Above the window for me it states "no current context".

Now I ran vsdiff from the command line and not from SE, don't know if this makes a difference or not.

This is broken if you run vsdiff from the command line.  I don't know why.  It works from the editor, but all the tagging engine is still there.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 02:48:29 pm
Hard to know all the macros that I'll need, but attached is my macros file.

My key bindings are assigned in the "custom-init" function.

These functions I use often that could be useful in a diff window:

   custom_bind_key("context-prev-tag","C-A-F");
   custom_bind_key("goto-parent","C-A-P");
   custom_bind_key("softwrap-toggle","A-W");
   custom_bind_key("copy-buf-name","A-Q");
   custom_bind_key("buf-dir-to-clipboard","A-D");
   custom_bind_key("copy-buf-name-only","A-N");
   custom_bind_key("inc-font","C-A-0");
   custom_bind_key("dec-font","C-A-9");
   custom_bind_key("rdef-font","C-A-8");
   custom_bind_key("rdef2-font","C-A-7");
   custom_bind_key("rSelectDisplay","C-A-S");

custom_bind_key will bind a function to a key. Some of these functions are direct SE macros, but others are my own custom macros that you can dig into in my .e file.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 03:09:17 pm
Quote
While I was looking at the diff of one file in the tree, I wanted to see a second file, but the window with the tree was gone. In BC I can have multiple tabs, one showing the tree and another showing the file I'm diffing. So if I want to see a second file, I can go back to the tab with the directory tree and click on a second file. With DZ it looks like I can look at only 1 diff at a time.

If I launch the diff from SE instead of the command line, then I can have multiple windows (but tabs would be a nice wish).

Quote
Above the window for me it states "no current context".

Now I ran vsdiff from the command line and not from SE, don't know if this makes a difference or not.
Quote
This is broken if you run vsdiff from the command line.  I don't know why.  It works from the editor, but all the tagging engine is still there.

Confirmed, I do see the context if I launch from SE itself. Lesson learned.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 03:11:01 pm
When having multiple DZ windows (a tree and 2 files), the windows on my KDE taskbar have titled "DIFFzilla(R) Pro", would be nice if the title in the KDE taskbar would show the file name that I'm diffing.

BC shows: "<filename> - Text Compare - Beyond Compare"
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 03:17:11 pm
I think at some point showing the context when launching vsdiff/vsmerge would be useful, because I would eventually have my source code control launch vsmerge when I'm updating my source code to latest trunk, so would not have the luxury of running it from SE.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 03:23:35 pm
Quote
While I was looking at the diff of one file in the tree, I wanted to see a second file, but the window with the tree was gone. In BC I can have multiple tabs, one showing the tree and another showing the file I'm diffing. So if I want to see a second file, I can go back to the tab with the directory tree and click on a second file. With DZ it looks like I can look at only 1 diff at a time.

If I launch the diff from SE instead of the command line, then I can have multiple windows (but tabs would be a nice wish).

Quote
Above the window for me it states "no current context".

Now I ran vsdiff from the command line and not from SE, don't know if this makes a difference or not.
Quote
This is broken if you run vsdiff from the command line.  I don't know why.  It works from the editor, but all the tagging engine is still there.

Confirmed, I do see the context if I launch from SE itself. Lesson learned.

You can launch vsdiff.exe multiple times.  You want to be able to launch another from the same instance, in another tab?

Or what if there was a "Diff..." button that launched the diff setup dialog and you could just launch it in another window?
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 03:35:05 pm
When I'm doing directory compare, I want to double click on the file in the file tree to launch vsdiff. It would be more tedious to launch vsdiff from command line as I would have to provide file names again.

So if doing directory compare when launching vsdiff from command line, if I double click on a file in the directory compare, the directory compare window is replaced with file compare, and I only get the directory compare back when I close the file compare.

I'd like to still have access to the directory compare window so I could double-click on another file in the tree. Sure I could go to the command line again, but this is much more typing, requires to get the paths to the files again.

In BC or in DZ when launched from SE, the directory compare window stays up while I'm comparing so that I can go back to it and double-click a 2nd file.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 03:38:42 pm
It's still there.  It might drop behind something, but it's still there and you can still diff files from it.
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 03:40:24 pm
I think at some point showing the context when launching vsdiff/vsmerge would be useful, because I would eventually have my source code control launch vsmerge when I'm updating my source code to latest trunk, so would not have the luxury of running it from SE.

Yes, this a bug and needs to be fixed.  At this point I'm getting a little overloaded and can't swear to get to it for 22.0.0, but will get to it.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 03:41:56 pm
OK, I see it is still there, BUT, there is no tab on the KDE taskbar for it, so that is why I didn't think it was there.

When launching form SE, there is still a tab on the KDE taskbar for the tree, and when double-clicking on a file there is a new tab in the KDE taskbar for the file.

But when launching from command line, there is only 1 tab on the KDE taskbar instead of 2 (tree and file).
Title: Re: Undo doesn't work after diff
Post by: Dan on September 15, 2017, 03:44:30 pm
OK.  I'm not sure what I can do about that, but I'll check.

I'm going to check out of this thread for a little while to try to get some stuff done.  Keep posting, I'll just read later.  Don't feel you're being ignored, you're not.

There's lots of good ideas here, and we appreciate all of them.  If we don't get ideas from our users, we'll keep adding what seem like great ideas to us... which sometimes prove not to be what our users want.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on September 15, 2017, 07:34:47 pm
Just want to point out that when I launch DZ from SE, that there is a KDE tab for the directory tree and each file that I'm diffing. So there most likely something that can be done to make this work when DZ is launched from the command line because it works when DZ is launched from SE.
Title: Re: Undo doesn't work after diff
Post by: rowbearto on October 01, 2017, 08:46:47 pm
Another nice feature would be to be able to show files in hex mode. I have a binary file that I'm diffing and when I try to switch to hex mode, DZ says: "Command 'hex' currently not allowed in Diff mode". BC is able to compare binary files in hex mode.
Title: Re: Undo doesn't work after diff
Post by: Clark on October 02, 2017, 12:52:13 am
I think supporting hex mode is doable. There are quite a few other features I think DZ needs first though. This thread has been helpful.
Title: Re: Undo doesn't work after diff
Post by: jporkkahtc on October 02, 2017, 06:31:26 pm
Oh boy ... more features in hex mode would be really nice (besides diff).

Hex mode should have features like a good debugger Memory view window.
Title: Re: Undo doesn't work after diff
Post by: Dan on October 02, 2017, 06:36:57 pm
Oh boy ... more features in hex mode would be really nice (besides diff).

Hex mode should have features like a good debugger Memory view window.

You might want to put this in the Features and/or Improvements forum so it does not get lost... but this thread will move there when the beta closes because there's so many good diff ideas here.
Title: Re: Undo doesn't work after diff
Post by: rgloden on February 11, 2018, 08:37:01 pm
DiffZilla and BC both have their places ...but for the hard merges I seem to gravitate to BC.

A few things in BC that would also be nice in DiffZilla:
Title: Re: Undo doesn't work after diff
Post by: rowbearto on February 11, 2018, 11:03:36 pm
I agree with everything rgloden wrote. These are all features in BC that I find extremely useful.

Regarding the visual provided in BC, comparing the left/right lines at the bottom and showing them one on top of the other, BC also allows you to show this in hex in addition to text, I find myself using the hex feature in this visual often as well - so please add that to the list.
Title: Re: Undo doesn't work after diff
Post by: Dan on February 12, 2018, 02:37:31 pm
These are all nice features.  I can't promise how many I can do for 2018.