Conversation
The unified diff only handled a comparison of a single file, so comparing folders, a project or two commits always fell back to the classic compare editor. Such comparisons now open their changed files one at a time in a single editor. A "File 2 of 3" selector on the diff toolbar lists the files, and Next and Previous continue into the neighbouring file following the existing end-of-element preference and dialog, which TextMergeViewer and the unified diff now share. Finishing all diffs of a file moves on to the next one, and binary files are left out. Assisted-by: multiple AI agents and layers of automated tooling 🤖
|
@tobiasmelcher WDYT? I personally would prefer a Github like display of all changes in one page but I think that would require significant changes. Example sc |
|
Hi Lars, I tested it on my machine by comparing two entries from the git history. It works quite well and the UI flow is easy to understand. The "End Reached. What would you like to do?" popup is already familiar from the traditional two-way compare and behaves as expected. I vote for this feature, great work. Thanks a lot. During my tests I ran into the following exception. Is a null check missing in class AnnotationModel? Exception in thread "Thread-40" java.lang.NullPointerException: Cannot invoke Regarding your preference to have all diffs on a single page: this is related to what Denis is trying to achieve in #2946 (comment). I also see, however, that it would require a complete re-implementation of the current unified diff, since line-header code minings are only supported in text editors, not in the plain SourceViewers used by the traditional two-way CompareEditor. Let's see how far Denis gets; maybe he finds a good solution to embed the unified diff in the CompareEditor. With best regards, |
Thanks I check later.
My understanding of the issue was that he wants to combine old compare and new in one editor for one file. But as the PR description is not concise, I have problems extracting the gist from it without spending to much time (which I currently do not have). I also think both possible approaches will be very difficult to archive. |
2 participants
The unified diff only handled a comparison of a single file, so comparing folders, a project or two commits, for example from the EGit History view, always fell back to the classic compare editor. Such comparisons now open their changed files one at a time in a single editor, with a "File 2 of 3" selector on the diff toolbar to jump between them. Next and Previous continue into the neighbouring file according to the existing end-of-element preference, reusing the dialog of the classic editor, which now shares that code with the unified diff. Finishing all diffs of a file moves on to the next one, binary files stay out of the list, and editors the unified diff opened are closed when it moves on, while editors the user already had open are kept.