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

Clean up git menu #699

Merged
merged 5 commits into from
Jul 24, 2020
Merged

Clean up git menu #699

merged 5 commits into from
Jul 24, 2020

Conversation

mlucool
Copy link
Contributor

@mlucool mlucool commented Jul 21, 2020

Fixes #456

Not in a git repo:
image

In a git repo:
image

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.

Thank you for this @mlucool.

Three comments:

  • Could you use isEnabled rather than isVisible? In JupyterLab it is preferred to not hide element but to disable them when they are not available.
  • Could you rephrase Init and Clone to be more verbose for inexperienced users? Taking the same wording than for the buttons (
    Initialize a Repository
    ) for instance would be good.
  • Could you add the commands:
    • Add remote repository
    • Push to remote
    • Pull to remote

For the two latest, this means creating new commands. But the code is available:

private _onPullClick = (): void => {

Note: change the linked code above to call the new commands rather than the code directly - to ensure behavior homogeneity

@mlucool
Copy link
Contributor Author

mlucool commented Jul 23, 2020

Happy to add more commands/expand wording.

Is there written documentation on the visible vs. enable choice?

@mlucool
Copy link
Contributor Author

mlucool commented Jul 23, 2020

Updated Screen Shots:
image

image

@mlucool mlucool requested a review from fcollonval July 23, 2020 16:11
telamonian
telamonian previously approved these changes Jul 23, 2020
Copy link
Member

@telamonian telamonian left a comment

Choose a reason for hiding this comment

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

I like it. @mlucool Nice cleanup and improvement

fcollonval
fcollonval previously approved these changes Jul 24, 2020
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.

Thanks a lot @mlucool

This is really nice indeed. I'm working on a fix for the unit test. Then it will be good to go.

@fcollonval fcollonval dismissed stale reviews from telamonian and themself via c391b47 July 24, 2020 08:34
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.

Unit tests fixed!

@fcollonval fcollonval merged commit 4e464ea into jupyterlab:master Jul 24, 2020
@fcollonval fcollonval added this to the 0.21.0 milestone Jul 24, 2020
@fcollonval
Copy link
Member

@meeseeksdev backport to 0.11.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jul 24, 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 4e464ea09277d78b1fe6f7cea2593c34387c63d7
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #699: Clean up git menu'
  1. Push to a named branch :
git push YOURFORK 0.11.x:auto-backport-of-pr-699-on-0.11.x
  1. Create a PR against branch 0.11.x, I would have named this PR:

"Backport PR #699 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 Jul 24, 2020
fcollonval added a commit that referenced this pull request Jul 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reorganize menu items
3 participants