Visual diff for Notebook files #384
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
dleen
reviewed
Jul 17, 2019
dleen
previously approved these changes
Jul 19, 2019
added 4 commits
July 31, 2019 14:07
This change introduces the feature to be able to diff ipynb from various points inside the Git experience. The currently supported points are the Changed, Staged areas, and the History panel. The <Diff /> component maintains a registry of DiffProvider components and delegates to each provider based on the file extension. Note * This change is off the pre 1.0 version of the Git extension because NBDime isn't upgraded to 1.0
Additionally, * Remove the conditional logic while adding the commands in the File list.
added 2 commits
July 31, 2019 21:44
* The update to nbdime5.x lost us some styles. This change adds them back and also makes some minor UI tweaks to the collapse/expand button. * Add back conditionally adding the commands since adding the commands more than once leads to errors when the file panel is re-rendered. * Update tests based on the latest changes in the NBDime API.
|
@saulshanabrook @dleen Added a couple of commits 1f1ebd1 3343c7f that
|
dleen
approved these changes
Aug 1, 2019
|
Hi @saulshanabrook , I'm going to merge this in since this is also needed for https://github.com/jupyterlab/pull-requests . LMK if you have any feedback and I'll address that in a follow-up PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change introduces the feature to be able to diff ipynb from various points inside the Git experience. The currently supported points are the Changed, Staged areas, and the History panel.
The
<Diff />component maintains a registry of DiffProvider components and delegates to each provider based on the file extension.Note
Addresses #252 #268
TODOs
ReactWidgetinterface