cli: new --base option for git-* commands
#419
Merged
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
tiborsimko
force-pushed
the
git-command-base-branch
branch
from
6f25cb7
to
b4ddc50
Compare
diegodelemos
reviewed
Oct 5, 2020
reana/reana_dev/git.py
Outdated
| default="master", | ||
| help="Against which git base branch are we working? [master]", | ||
| ) | ||
| def git_create_release_commit(component, base, next_version=None): |
There was a problem hiding this comment.
Is there a reason to add a click decorator to a normal function? I expected the following without decorator:
Suggested change
| def git_create_release_commit(component, base, next_version=None): | |
| def git_create_release_commit(component, base="master", next_version=None): |
reana/reana_dev/git.py
Outdated
| @@ -569,12 +638,17 @@ def git_checkout(branch, fetch): # noqa: D301 | |||
| @click.option( | |||
| "--branch", "-b", nargs=2, multiple=True, help="Which PR? [component PR#]" | |||
| ) | |||
| @click.option( | |||
There was a problem hiding this comment.
What do you think about centralising this option like add_workflow_option in REANA-Client?
Do you think it would make sense to add the default branch value to config? I don't see why we would change it ever.. but at least it would be centralised.
There was a problem hiding this comment.
All updated. I have also improved reporting in case base branch does not exist in origin/upstream. Example:
$ reana-dev git-status -c r-a-vomsproxy -s --base maint-0.7
ERROR: Branch upstream/maint-0.7 does not exist.
reana-auth-vomsproxy @ master @ a315022 release: v1.0.0
tiborsimko
force-pushed
the
git-command-base-branch
branch
from
b4ddc50
to
45ff4e3
Compare
reana/reana_dev/utils.py
Outdated
| def is_feature_branch(component): | ||
| """Check whether component current branch is different from master.""" | ||
| return get_current_branch(get_srcdir(component)) != "master" | ||
| def is_feature_branch(component, base="master"): |
There was a problem hiding this comment.
Suggested change
| def is_feature_branch(component, base="master"): | |
| def is_feature_branch(component, base=GIT_DEFAULT_BASE_BRANCH): |
tiborsimko
force-pushed
the
git-command-base-branch
branch
2 times, most recently
from
ad4ebbd
to
1c22b37
Compare
Adds new `--base` option to all `git-*` commands to facilitate working against different git base branch, such as `maint-0.7`. Adds new command `git-checkout` that allows to switch branches in many components at one ago. Renames old `git-checkout` to `git-checkout-pr` accordingly. Fixes some parallel flake8-discovered warnings. Closes reanahub#413. Signed-off-by: Tibor Šimko <tibor.simko@cern.ch>
tiborsimko
force-pushed
the
git-command-base-branch
branch
from
1c22b37
to
cda0a84
Compare
diegodelemos
approved these changes
Oct 15, 2020
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.
Adds new
--baseoption to allgit-*commands to facilitate workingagainst different git base branch, such as
maint-0.7.Adds new command
git-checkoutthat allows to switch branches in manycomponents at one ago.
Renames old
git-checkouttogit-checkout-praccordingly.Fixes some parallel flake8-discovered warnings.
Closes #413.
Signed-off-by: Tibor Šimko tibor.simko@cern.ch