Skip to content

Conversation

@fcollonval
Copy link
Member

@fcollonval fcollonval commented Mar 14, 2021

Fixes #666

The diff components are back to pure Lumino widget. This suppresses the current complexity of putting non-react code (nbdime and codemirror) in react in lumino panel. And reduce code duplication with nbdime for easier maintenance.

The new structure use really the diff provider registry. And implementing file comparison with the new widget is easy (new internal command gitShowDiff that takes a DiffModel as argument).

TODO

  • Fix styles
  • [x] Connect settings and code mirror in plain text diff
  • Add endpoint to compute nbdiff from two notebook content
  • Implement refresh logic

This PR addresses also:

@github-actions
Copy link

Binder 👈 Launch a binder notebook on branch fcollonval/jupyterlab-git/fcollonval/issue666

@fcollonval fcollonval marked this pull request as ready for review March 27, 2021 15:51
@fcollonval fcollonval marked this pull request as draft March 27, 2021 16:29
@fcollonval fcollonval force-pushed the fcollonval/issue666 branch 2 times, most recently from 0b17051 to 8ad6e6a Compare March 28, 2021 15:30
@fcollonval fcollonval force-pushed the fcollonval/issue666 branch from 45afb08 to 2d12d07 Compare March 28, 2021 16:39
@fcollonval fcollonval marked this pull request as ready for review March 31, 2021 17:43
@fcollonval fcollonval merged commit 5a8df57 into jupyterlab:master Apr 1, 2021
@fcollonval fcollonval deleted the fcollonval/issue666 branch April 1, 2021 04:53
@ianhi
Copy link
Collaborator

ianhi commented Apr 1, 2021

❤️ 🚀

@fcollonval
Copy link
Member Author

@meeseeksdev backport to jlab-2

@lumberbot-app
Copy link

lumberbot-app bot commented Apr 1, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout jlab-2
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 5a8df57afc360955ded077c9c078970feb1202fe
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #900: Improve Diff'
  1. Push to a named branch :
git push YOURFORK jlab-2:auto-backport-of-pr-900-on-jlab-2
  1. Create a PR against branch jlab-2, I would have named this PR:

"Backport PR #900 on branch jlab-2"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

fcollonval added a commit to fcollonval/jupyterlab-git that referenced this pull request Apr 1, 2021
fcollonval added a commit that referenced this pull request Apr 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

2 participants