moving linefilter behind match similar lines
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
> For many cases this will help allready
You forgot to mention how this change helps? What is the advantage?
> CMergeDoc::TestFilter()
Change the method name. This method has nothing to do with testing of anything. Perhaps "ApplyFilters()" would be better.
These bugs will be covered:
ID: 2864981 Line filter issue -
ID: 2796768 Line filters not working if "Match similar lines" enabled
In bug 2796768 had given you to go this way.
If the option is legal, many are already diffs decomposed into smaller blocks.
If only then the filter is applied, they can be marked simply as trivial.
However, I think it is necessary to some diffs still partitioned into smaller units (rows).
This is what I've been using the patch ID: 2800613 Line Filter acceped for a single line inside a diffblock" made.
The identifier of such with the patch can dismantled diffs ID: 2949354 "show correct diffnumbers in GUI".
Now you can decide which course of action is better.
Both have their advantages: the ID: 2800613 depends on faster and not of other options.
This can also align similar lines and then filter. Slower, but potentially better with the result.
move linefilter
> Still I think we need again a diff spliting to single lines
Create GUI for it and I can consider. Otherwise you are just wasting time.
WinMerge is about GUI. Handling splitted diffs is big GUI challenge and I haven't seen even any ideas how to do it. If we don't have the GUI we can't have the feature.
Moved lines feature already does diff splitting and it just does not work for the user. I've always confused what is happening when I see such splitted diff.
2949354 show correct diffnumbers in GUI
is that not good for that?
>Moved lines feature already does diff splitting and it just does not work
>for the user.
yes, as it's not splitting to single lines if needed for filtering.
I don't care a bit if it is single lines or multiple lines. I care about how user handles differences from the GUI. And THAT does not work. For example splitted diffs look very much like normal diffs and many times you can't see the difference.
ID 2949354
shows the diffs und subdiffnumer in statusbar.
like 'Difference 6.2 of 15'.
Later we can handle that in an other key combination as one diff also.