Allow sno switch to switch to new local branch tracking remote branch
#292
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
craigds
approved these changes
Oct 29, 2020
sno/checkout.py
Outdated
| @@ -178,27 +208,65 @@ def switch(ctx, create, force_create, discard_changes, refish): | |||
| # Switch to existing branch | |||
| # | |||
| # refish could be: | |||
| # - branch name | |||
| # - local branch name eg 'master' | |||
| # - remote branch name eg 'master' (if do_guess is True) | |||
There was a problem hiding this comment.
Suggested change
| # - remote branch name eg 'master' (if do_guess is True) | |
| # - local branch name (eg 'master') that only exists on remote (if do_guess is True) |
sno/checkout.py
Outdated
| head_ref = branch.name | ||
|
|
||
| reset_wc_if_needed(repo, commit, discard_changes=discard_changes) | ||
|
|
||
| repo.set_head(head_ref) | ||
|
|
||
|
|
||
| def _find_remote_by_name(repo, name): |
There was a problem hiding this comment.
I'd suggest calling this _find_remote_branch_by_name, since it finds a branch rather than a remote
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
sno switch xswitches to x if x is a local branch - as before.sno switch origin/xfails as before: you cannot switch to a remote branchBut,
sno switch xwhere x is not yet a local branch but is the name of a remote branch, creates a local branch x that tracksorigin/x. (Just as it does in git)sno checkout behave similarly, but note that with sno checkout, you CAN
sno checkout origin/x- this refish is resolved to a particular commit, and that commit is checked out as a "detached HEAD".Related links:
Fixes #259
Checklist: