Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show diff in entry preview when conflicts are resolved #9534

Open
koppor opened this issue Jan 5, 2023 · 9 comments
Open

Show diff in entry preview when conflicts are resolved #9534

koppor opened this issue Jan 5, 2023 · 9 comments

Comments

@koppor
Copy link
Member

koppor commented Jan 5, 2023

  1. Entry is modified externally
  2. JabRef shows "modified" notification
    image
  3. "Review changes" brings up "External Changes Resolver"
    image

Following issues:

  • The entry preview shows the new entry only - the old one is not shown
  • The entry preview does not show a diff

I would like to see the additions marked in green, the deletions marked in red

Similar as we have in the Merge Dialog

image

It would be nice if this was possible in the preview. If not, maybe the "Merge Entries" dialog can be displayed -- showing the rows with differences only!

@HoussemNasri
Copy link
Member

It's already possible to see diffs in the three-way-merge dialog. Just click "merge..."

@Siedlerchr
Copy link
Member

Siedlerchr commented Jan 6, 2023

  • Show diff in preview
  • Show only those fields that differ in the merge dialog

For the moment I would suggest we first implement the second one. The first one seems a bit more complicated.

@HoussemNasri
Copy link
Member

Maybe we should add an option to "show only different fields" in this header to the three-way-merge dialog. And enable the option by default when the dialog is opened from the external change resolver.

@koppor
Copy link
Member Author

koppor commented Jan 6, 2023

I think, I had following case in mind: JabRef notifies me that the library was changed externally. I think: WTF and want to get back to work as fast as possible. Thus, I open the dialog and want quickly to see the changes. Thus, I don't want to click an additional button opening another dialog 😇

The second point, the user-button-configurable "Show only those fields that differ in the merge dialog" is good! 👍

@Siedlerchr
Copy link
Member

Siedlerchr commented Jan 6, 2023

In principle the showing only the changed rows works. Only problem as I set them with "managed" the style or column constraints are not reapplied...

Refs https://github.com/JabRef/jabref/pull/9533/files#diff-fe83eaf6bb2edc0cfce71bdaf73c8997794d0016ac3540da82e7bfe5884a340eR167-R190

Bildschirm­foto 2023-01-06 um 20 21 54

Bildschirm­foto 2023-01-06 um 20 22 01

@HoussemNasri
Copy link
Member

Got it working by removing and adding nodes from the GridPane, but the code is so ugly...

@Siedlerchr
Copy link
Member

Remaning issue:
Show diff in preview

@koppor
Copy link
Member Author

koppor commented Apr 26, 2023

Another example:

image

image

When taking a closer look, date was added with trash content. Hard to see.

@koppor
Copy link
Member Author

koppor commented Apr 26, 2023

I still have to learn that I have to click "Merge..." 😅

@koppor koppor moved this from Normal priority to Low priority in Features & Enhancements Apr 26, 2023
@github-project-automation github-project-automation bot moved this to Normal priority in Prioritization Nov 13, 2024
@calixtus calixtus moved this from Normal priority to Low priority in Prioritization Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Low priority
Development

No branches or pull requests

4 participants