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.

Sign up for GitHub

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

Jump to bottom

don't use docmanager reload when opening gitignore #759

Merged
merged 5 commits into from
Sep 3, 2020
Merged

don't use docmanager reload when opening gitignore #759

merged 5 commits into from
Sep 3, 2020

Conversation

ianhi
Copy link
Collaborator

@ianhi ianhi commented Aug 31, 2020

fixes: #758

This makes sure that the displayed gitignore file is up to date without running the risk of overwriting unsaved changes in open notebooks.

gitignore-unsaved-changes-fixed

@ianhi
don't use docmanager reload when opening gitignore
a165aa2 
this would affect all open widgets, not just the gitignore
editor and could result in unsaved changes being lost
@fcollonval
Copy link
Member

/binder

@github-actions
Copy link

github-actions bot commented Sep 1, 2020

Binder 👈 Launch a binder JupyterLab on this branch

@fcollonval
Copy link
Member

Hey @ianhi as you moved opening the gitignore file to the model to access docManager. I propose to simplify the workflow by opening the gitignore file once the server request is done.

If it is ok for you. Happy to merge and release.

@ianhi
Copy link
Collaborator Author

ianhi commented Sep 3, 2020 •
edited
Loading

I propose to simplify the workflow by opening the gitignore file once the server request is done.

great!

Happy to merge and release

I pushed a fix for the failing tests. With that I'm all for merging and releasing - Hooray for github actions!

fcollonval
fcollonval approved these changes Sep 3, 2020
View reviewed changes
Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks @ianhi

@fcollonval fcollonval merged commit 9affcd1 into jupyterlab:master Sep 3, 2020
@ianhi ianhi deleted the reloading branch September 3, 2020 18:17
@fcollonval
Copy link
Member

@meeseeksdev backport to 0.11.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 3, 2020

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 0.11.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 9affcd15f1910938205b2987a48fd2514ed00e7a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am "Backport PR #759: don't use docmanager reload when opening gitignore"
  1. Push to a named branch :
git push YOURFORK 0.11.x:auto-backport-of-pr-759-on-0.11.x
  1. Create a PR against branch 0.11.x, I would have named this PR:

"Backport PR #759 on branch 0.11.x"

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 Sep 3, 2020
@ianhi @fcollonval
don't use docmanager reload when opening gitignore (jupyterlab#759)
b659c81 
* don't use docmanager reload when opening gitignore

this would affect all open widgets, not just the gitignore
editor and could result in unsaved changes being lost

* Debug binder

* Turn off minimization

* All actions handle by the model

* remove unused import

Co-authored-by: Frédéric Collonval <fcollonval@gmail.com>
fcollonval added a commit that referenced this pull request Sep 5, 2020
@fcollonval
Merge pull request #761 from fcollonval/auto-backport-of-pr-759-on-0.…
7ffee10 
…11.x

Backport PR #759 on branch 0.11.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fcollonval fcollonval fcollonval approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Adding any file to gitignore prompts to reload any notebook with unsaved changes
2 participants
@ianhi @fcollonval