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

git diff (aka open changes) has to be issued twice to work (.ipynb) #4101

Closed
giammi56 opened this issue Dec 3, 2020 · 6 comments
Closed
Labels
bug Issue identified by VS Code Team member as probable bug

Comments

@giammi56
Copy link

giammi56 commented Dec 3, 2020

Environment data

Version: 1.51.1 (user setup)
Commit: e5a624b788d92b8d34d1392e4c4d9789406efe8f
Date: 2020-11-10T23:34:32.027Z
Electron: 9.3.3
Chrome: 83.0.4103.122
Node.js: 12.14.1
V8: 8.3.110.13-electron.0
OS: Windows_NT x64 10.0.19042
ipython 7.19.0 py38hc5df569_0 conda-forge
ipython_genutils 0.2.0 py_1 conda-forge
Type of virtual environment used: conda
Jupyter server running: Local

Expected behaviour

Display directly the index of the differences

Actual behaviour

the first issue goes empty, one has to click twice on "Open Changes" to display the changes. Two tabs are open: one is empty (sometimes continuously loading), the other correctly displays the changes

Steps to reproduce:

  1. stage a change
  2. right click, open changes
  3. right click, open changes (second time)

Logs

NOTE: I have this packet install to strip the jupyter outputs
https://github.com/kynan/nbstripout (latest version)

@giammi56 giammi56 added the bug Issue identified by VS Code Team member as probable bug label Dec 3, 2020
@DonJayamanne
Copy link
Contributor

DonJayamanne commented Dec 3, 2020

Hmm, I'm unable to repro this issue at my end.

the first issue goes empty... Two tabs are open: one is empty (sometimes continuously loading), the other correctly displays the changes

  • Please could you provide a screenshot so i have a better idea what this means.
  • Also, when the empty tab opens, please click on that empty tab * then
    • Go into your command palette and select the command Develoepr: OPen Webview Developer Tools (NOT Toggle Developer Tools)
    • Go into the console window & if there are any errors, please paste them here in the issue.

Thanks

@giammi56
Copy link
Author

giammi56 commented Dec 3, 2020

image

Sorry, I cant' find how to copy the text: second screenshot :)

image

@DonJayamanne
Copy link
Contributor

Thanks for the screenshot.
Will look into this further.

@DonJayamanne
Copy link
Contributor

Thanks for the screenshot.
Will look into this further.

In the mean time, if this is a serious issue that affects your workflow, please consider using the new Native Notebook editor (use VS Code Insiders).
That has better support for diffing (its being worked on, but significantly better).

@giammi56
Copy link
Author

well, diff now is not working any more..

@greazer
Copy link
Member

greazer commented Jun 6, 2021

Thanks for your feedback. This issue will be addressed once VS Code adds native support for editing notebooks. Please see microsoft/vscode#91987. You can experiment by using VS Code insiders, which defaults to the new notebook experience.

@greazer greazer closed this as completed Jun 6, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Issue identified by VS Code Team member as probable bug
Projects
None yet
Development

No branches or pull requests

3 participants