-
Notifications
You must be signed in to change notification settings - Fork 326
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
Simplify the staging UI to make it easier for git beginners #448
Simplify the staging UI to make it easier for git beginners #448
Conversation
…r in jupyterlab#438 too much stuff has changed to make a rebase/merge worthwhile, so I've started a new branch and am cherry picking lines from the previous work in jupyterlab#437
676c4e2
to
4a87a37
Compare
stil don't actually do anything
This is now fully functional and ready for review. Here's the current state of the simple staging UI: Now, with the
|
Wishlist for future PRs:
|
Tested this locally. As far as I can tell, the proposed functionality of a simplified staging area works. One thing I think could be improved is the polling duration. Currently, the Git status is refreshed every Otherwise, as a user, I experience a significant lag between when I save my changes and when I see those changes appear in the staging area, and experience a similar lag when I go to commit my changes and still see the file appearing as "changed" in the staging panel. There may be some concern regarding having too high a polling rate. On the client side this is less of a concern due to the event loop; on the server, we may need to transition the Tornado HTTP handlers to use coroutines and the Git methods to use Your thoughts @fcollonval (as I believe you last touched the code which sets the default refresh interval)? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thx for this really nice new feature. It works as advertised.
I left small comments.
As mentioned in the discussion #448 (comment), I think the pooling interval is too large; I let you decide what would be a better value.
Let's not handle the polling thing here, since it's an issue independent of whether simple staging is on or not. Since the jlab settings editor remains a bit impenetrable, I just now added an item to the "Git" menu that toggle simple staging on/off. The "Git" menu is in need of a reorg (we definitely don't need a menu item that clicks the sidebar button for the user, and a menu item that opens a new terminal and |
I'm sorry I did not catch what you mean by that. What is the problem you would like to address? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM thx
fixes committing more than one file at a time in simple staging mode
followup #448: fix git add multiple files
This is a resumption of the work from #437 following the major refactor that was done in #438. I've cherry picked various lines from #437 to get this started. Here's the info from the old PR: