Skip to content

new push parameters: --tag / --tag-refresh #337

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

new push parameters: --tag / --tag-refresh #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e453646
Added --tag and --tag-refresh options to push command + Fixed some po…
oboukili Jan 19, 2018
0d09575
restored the push commit behaviour, even in the case of a tag refresh…
oboukili Jan 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions doc/git-subrepo.swim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ the same arguments. Keep reading…
The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--force`,
`--message=`, `--remote=` and `--update` options.

- `git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]`
- `git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N] [-t] [-T]`

Push a properly merged subrepo branch back upstream.

Expand All @@ -216,8 +216,16 @@ the same arguments. Keep reading…
discouraged. Only use this option if you fully understand it. (The `--force`
option will NOT check for a proper merge. ANY branch will be force pushed!)

The `--tag` option will apply a given (non-annotated) tag to the specified
subrepos' upstream HEAD, provided that they were staged for changes, leaving
the parent repository unchanged.

The `--tag-refresh` will apply the given tag (with `--tag`) to all specified
Copy link
Collaborator

Choose a reason for hiding this comment

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

The way I read this, it would be the equivalent to git subrepo push --tag --all --force. Am I correct? If so I prefer calling out all the parameters to --tag-refresh.

subrepos' upstream HEAD even if they were not staged for changes.

The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--force`,
`--merge`, `--rebase`, `--remote=`, `--squash` and `--update` options.
`--merge`, `--rebase`, `--remote=`, `--squash`, `--tag`, `--tag-refresh` and
`--update` options.

- `git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]`

Expand Down
87 changes: 70 additions & 17 deletions lib/git-subrepo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ else
fi
bash+:import :std can

VERSION=0.4.0
VERSION=0.4.1
REQUIRED_GIT_VERSION=2.7.0
GIT_TMP=.git/tmp

Expand Down Expand Up @@ -71,6 +71,8 @@ M,method= Method when you join, valid options are 'merge' or 'rebase'
m,message= Specify a commit message
r,remote= Specify the upstream remote to push/pull/fetch
s,squash Squash commits on push
t,tag= Push a tag to subrepos
T,tag-refresh Push the provided tag to all subrepos even when there was no commit changes.
u,update Add the --branch and/or --remote overrides to .gitrepo

q,quiet Show minimal output
Expand All @@ -92,6 +94,9 @@ main() {
local all_wanted=false # Apply command to all subrepos
local ALL_wanted=false # Apply command to all subrepos and subsubrepos
local force_wanted=false # Force certain operations
local tagrefresh_wanted=false # Push the tag to all remote subrepos HEAD,
# regardless of commit changes

local fetch_wanted=false # Fetch requested before a command
local squash_wanted=false # Squash commits on push
local update_wanted=false # Update .gitrepo with --branch and/or --remote
Expand All @@ -105,6 +110,7 @@ main() {
local gitrepo= # Path to .gitrepo file
local worktree= # Worktree created by 'git worktree'
local start_pwd=$(pwd) # Store the original directory
local tag= # Tag to push to subrepos

local original_head_commit= # HEAD commit id at start of command
local original_head_branch= # HEAD ref at start of command
Expand Down Expand Up @@ -241,6 +247,13 @@ command:push() {
command-setup +subdir branch

subrepo:push
if [[ OK && -n $CODE ]]; then
if [[ $CODE -eq -3 ]]; then
say "Subrepo '$subdir' tag '$tag' pushed to '$subrepo_remote'."
return 0
fi
fi

if OK; then
say "Subrepo '$subdir' pushed to '$subrepo_remote' ($subrepo_branch)."
elif [[ $CODE -eq -2 ]]; then
Expand Down Expand Up @@ -573,7 +586,6 @@ subrepo:pull() {
subrepo:push() {
local branch_name="$branch"
local new_upstream=false
local branch_created=false

if [[ -z $branch_name ]]; then
FAIL=false OUT=false CALL subrepo:fetch
Expand Down Expand Up @@ -637,9 +649,13 @@ subrepo:push() {
new_upstream_head_commit="$(git rev-parse "$branch_name")"
if ! $new_upstream; then
if [[ $upstream_head_commit == $new_upstream_head_commit ]]; then
OK=false
CODE=-2
return
if [[ -z $tag || $tagrefresh_wanted == false ]]; then
CODE=-2
OK=false
return
else
CODE=-3
fi
fi
fi

Expand All @@ -651,25 +667,34 @@ subrepo:push() {
fi
fi

local tags=''
if [[ -n $tag ]]; then
tags=' --tags'
git:check-worktree "$branch_name" && git:create-worktree "$branch_name"
cd "$worktree";
CALL subrepo:tag-head "$tag"
cd "$start_pwd";
fi

local force=''
"$force_wanted" && force=' --force'

o "Push$force branch '$branch_name' to '$subrepo_remote' ($subrepo_branch)."
RUN git push$force "$subrepo_remote" "$branch_name":"$subrepo_branch"
RUN git push$force$tags "$subrepo_remote" "$branch_name":"$subrepo_branch"

if [[ -n $tag ]]; then
git:delete-tag "$tag"
fi

o "Create ref '$refs_subrepo_push' for branch '$branch_name'."
git:make-ref "$refs_subrepo_push" "$branch_name"

if $branch_created; then
o "Remove branch '$branch_name'."
git:delete-branch "$branch_name"
fi

o "Put updates into '$subdir/.gitrepo' file."
upstream_head_commit="$new_upstream_head_commit"
subrepo_commit_ref="$upstream_head_commit"
update-gitrepo-file
RUN git commit -m "$(get-commit-message)"

}

# Fetch the subrepo's remote branch content:
Expand All @@ -693,8 +718,8 @@ subrepo:fetch() {
# Create a subrepo branch containing all changes
subrepo:branch() {
local branch="${1:-"subrepo/$subref"}"
o "Check if the '$branch' branch already exists."
git:branch-exists "$branch" && return
o "Check if the '$branch' branch already exists with its associated worktree."
git:branch-exists "$branch" && git:check-worktree "$branch" && return

local last_gitrepo_commit=
local first_gitrepo_commit=
Expand Down Expand Up @@ -805,6 +830,17 @@ subrepo:branch() {
git:make-ref "$refs_subrepo_branch" "$branch"
}

# Apply a tag to the head of a merged subrepo branch:
subrepo:tag-head() {
o "Check that tag '$tag' does not already exist."
if (git --no-pager tag | grep -x "$tag"); then
error "Tag '$tag' already exists."
fi

o "Tag '$tag' to HEAD"
RUN git tag "$tag"
}

# Commit a merged subrepo branch:
subrepo:commit() {
o "Check that '$subrepo_commit_ref' exists."
Expand Down Expand Up @@ -1012,13 +1048,14 @@ get-command-options() {
shift;;
-M) join_method="$1"
shift;;
-M) join_method="$1"
shift;;
-r) subrepo_remote="$1"
override_remote="$1"
commit_msg_args+=("--remote=$1")
shift ;;
-s) squash_wanted=true ;;
-t) tag="$1"
shift ;;
-T) tagrefresh_wanted=true ;;
-u) update_wanted=true
commit_msg_args+=("--update") ;;
-q) quiet_wanted=true ;;
Expand Down Expand Up @@ -1047,7 +1084,7 @@ get-command-options() {
fi
commit_msg_args+=("${command_arguments[@]}")

for option in all ALL edit fetch force squash; do
for option in all ALL edit fetch force tagrefresh squash; do
var="${option}_wanted"
if ${!var}; then
check_option $option
Expand All @@ -1060,6 +1097,9 @@ get-command-options() {
if [[ -n $override_remote ]]; then
check_option remote
fi
if [[ -n $tag ]]; then
check_option tag
fi
if [[ -n $wanted_commit_message ]]; then
check_option message
fi
Expand All @@ -1080,7 +1120,7 @@ options_commit='edit fetch force message'
options_fetch='all branch remote'
options_init='branch remote method'
options_pull='all branch edit force message remote update'
options_push='all branch force remote squash update'
options_push='all branch force remote squash tag tagrefresh update'
options_status='ALL all fetch'
check_option() {
local var="options_${command//-/_}"
Expand Down Expand Up @@ -1755,9 +1795,17 @@ git:is_merge_commit() {
git show --summary "$commit" | grep -q ^Merge:
}

git:check-worktree() {
local branch="$1"
worktree="$GIT_TMP/$branch"
o "Check worktree '$worktree' existence."
RUN git worktree list --porcelain|grep "$worktree" > /dev/null
}

git:create-worktree() {
local branch="$1"
worktree="$GIT_TMP/$branch"
o "Create worktree '$worktree' pointing to branch '$branch'"
RUN git worktree add "$worktree" "$branch"
}

Expand All @@ -1777,12 +1825,17 @@ git:remove-worktree() {

git:delete-branch() {
local branch="$1"
worktree="$GIT_TMP/$branch"
o "Deleting old '$branch' branch."
# Remove worktree first, otherwise you can't delete the branch
git:remove-worktree
FAIL=false RUN git branch -D "$branch"
}

git:delete-tag() {
local tag="$1"
RUN git tag -d "$tag"
}

#------------------------------------------------------------------------------
# Low level sugar commands:
Expand Down