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

Add push/pull actions #246

Closed
2 tasks done
weihwang opened this issue Oct 15, 2018 · 10 comments
Closed
2 tasks done

Add push/pull actions #246

weihwang opened this issue Oct 15, 2018 · 10 comments
Assignees
Projects
Milestone

Comments

@weihwang
Copy link

weihwang commented Oct 15, 2018

Proposals to add push/pull actions to the plugin.
https://www.figma.com/file/UyNpeQNuTj6Uv74MoEJDh3ji/Git-extension?node-id=507%3A1156

Pre-requisite
#244 - Surface target branch to inform users before they make a pull/push action.

Option 1
Push/pull actions embedded in a history tab #245 (more overview info for history) to provide context to these actions.
image

Option 2
Push/pull actions at a high level (icons TBD) to allow push pull with history view, or working environment view.
image

TASK BREAKDOWN

  • Backend for Pull
  • Backend for Push
  • [] Frontend for Pull
  • [] Frontend for Push
@neelamgehlot neelamgehlot added this to the 0.5 milestone Oct 17, 2018
@jaipreet-s
Copy link
Member

@weihwang

  1. Is there an issue for moving the up and trash icons to the right of the main panel?
  2. What is the state of the push/pull actions when there is a merge conflict?
  3. What is the state of th push/pull actions when there is no upstream defined?

@weihwang
Copy link
Author

@jaipreet-s

  1. Style of file list #227 is the issue for commit change list styling.
  2. Do you know if merge conflicts we can show in the extension? If so, push/pull can be disabled as long as we have a persistent notification of why push/pull is disabled.
  3. If we're not supporting creating remote branch/tracking, I think we may need to disable. Otherwise, on pull/push we need to show the terminal for more actions to take.

@tgeorgeux
Copy link
Contributor

Out of the two options above I prefer keeping the push/pull actions exposed as in #2. I don't think it makes sense to make somebody view their git log in order to update their remotes and pull.

@weihwang
Copy link
Author

Agree on #2.

@jaipreet-s
Copy link
Member

Regarding #2, I would making the push/pull button visible, but disabled, and adding a tooltip to show why they are disabled. There should also be a way to switch to the terminal quickly to see the actual merge conflicts

Regarding #3, @weihwang do we have any mockups which show the state of the push/pull UX in that scenario?

Thanks!

@jaipreet-s jaipreet-s self-assigned this Oct 19, 2018
@tgeorgeux
Copy link
Contributor

The final frame of this is showing a fly-out window for details. Do we also have an option that would expand in the sidebar? We don't currently have any fly-out interactions with out sidebars at this point in JupyterLab.

@weihwang
Copy link
Author

@tgeorgeux added an inline option. Is there any styling for links, or guidance for icon based actions vs. text?

@brylie
Copy link

brylie commented Nov 14, 2018

I like the high-level push/pull buttons. This would be similar to an IDE, showing frequently used Git commands. E.g. Atom Git integration:
screenshot_20181114_124309

@jaipreet-s jaipreet-s added this to To do in 0.5 Nov 20, 2018
@jaipreet-s jaipreet-s moved this from To do to In progress in 0.5 Nov 21, 2018
@jaipreet-s
Copy link
Member

jaipreet-s commented Nov 21, 2018

  • Backend for Pull
  • Backend for Push
  • Frontend for Pull
  • Frontend for Push

@jaipreet-s jaipreet-s moved this from In progress to Done in 0.5 Nov 27, 2018
@jaipreet-s
Copy link
Member

Released in 0.5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
0.5
  
Done
Development

No branches or pull requests

5 participants