Add first draft of "Show diff"(Help me pls!)

[Asalle]

Fixes #633

Hello,
i wanted to add a simple window that shows diff between local notebook and remote one if a merge confict occurs (see issue). This is an early draft of what could it look like. I could find a way to display diff inside a window, could somebody help me with this?

[nevenz]

I don't think this should be git-specific, but available for any repository type. That would require keeping the synced files around (which is probably a good idea anyway) and using them to generate the diff. Maybe using something like https://github.com/java-diff-utils/java-diff-utils ?

[Asalle]

Thank you for the feedback, I'll review it and will get back to you.

…

On Mon, Feb 3, 2020, 11:50 AM Neven ***@***.***> wrote: I don't think this should be git-specific, but available for any repository type. That would require keeping the synced files around (which is probably a good idea anyway) and using them to generate the diff. Maybe using something like https://github.com/java-diff-utils/java-diff-utils ? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#657?email_source=notifications&email_token=ABF6TYUWNH7THBBBG6GD4RDRA7ZI7A5CNFSM4KIOBHG2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEKTL3QQ#issuecomment-581352898>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABF6TYT2K6NACH24DVQKOS3RA7ZI7ANCNFSM4KIOBHGQ> .

[Asalle]

@nevenz that is true, i should implement it for all repos, not just git, I myself don't use git 😅
Can anybody provide any mentoring on this? Right now I'm planning to do this:

1. Add function StoreBooks to SyncRepo interface and use it to download all remote books to some local folder
2. Find a place where the sync happens (working on this rn) and instead of syncing with remote, fetch the remote notebooks first and then sync them. If any merge conficts appear - show diff.

[nevenz]

I don't think there's a need for changing the interface. As you suggest in #2, we can simply keep already used notebooks files around. See the creation and deletion of temporary files in loadBookFromRepo and saveBookToRepo.

[Asalle]

@nevenz on latest upsteam/master I cannot sync with dropbox, only webdav and directory, am I doing something wrong?

[nevenz]

on latest upsteam/master I cannot sync with dropbox, only webdav and directory, am I doing something wrong?

Check the build variant you're using. Perhaps it's one of the fdroid* ?

[Asalle]

yup, that was the reason. Thanks!

[yamsu]

This would be a really useful addition to the feature set. Syncing issues are very common when using dropbox integration, as sync has to be manually activated.

Looking forward to this merge.

[Asalle]

damn, I don't remember closing this!

[Asalle]

damn, I might have accidentally overwritten my master branch (who even does work on master, jeesh!)
Trying to work on it, living ALL THESE YEARS without diff is hard... Any help welcome!

[berteh]

+1
this feature would be most useful. thanks for working on this!