Browse Source

add push command

pull/23/head
Nissim Bendanan 4 years ago
parent
commit
48cdd10a58
5 changed files with 96 additions and 5 deletions
  1. +1
    -0
      README.md
  2. +42
    -1
      bin/git-vendor
  3. +1
    -1
      etc/bash_completion.sh
  4. +36
    -1
      man/git-vendor.1
  5. +16
    -2
      man/git-vendor.md

+ 1
- 0
README.md View File

@ -18,6 +18,7 @@ See https://brettlangdon.github.io/git-vendor for the current MAN page documenta
* `git vendor add [--prefix <dir>] <name> <repository> [<ref>]` - add a new vendored dependency.
* `git vendor list [<name>]` - list current vendored dependencies, their source, and current vendored ref.
* `git vendor update <name> [<ref>]` - update a vendored dependency.
* `git vendor push <name> [<ref>]` - push vendored dependency.
## Installation
Manually:


+ 42
- 1
bin/git-vendor View File

@ -13,6 +13,7 @@ Usage:
git vendor list [<name>]
git vendor remove <name>
git vendor update <name> [<ref>]
git vendor push <name> [<ref>]
EOF
}
@ -27,7 +28,7 @@ require_work_tree
command="$1"
shift
case "$command" in
"add"|"list"|"remove"|"update") ;;
"add"|"list"|"remove"|"update"|"push") ;;
*) >&2 echo "error: unknown command \"$command\"" && _usage && exit 1 ;;
esac
@ -207,6 +208,46 @@ git-vendor-ref: $ref
done
}
cmd_push()
{
require_clean_work_tree
name="$1"
ref="master"
if [ "$2" != "" ]; then
ref="$2"
fi
if [ $# -lt 1 ]; then
die "Incorrect options provided: git vendor push <name> [<ref>]"
fi
vendor_git_log_from_name "$name" |
while read a b junk; do
case "$a" in
START) ;;
git-vendor-dir:) dir="$b" ;;
git-vendor-repository:) repository="$b" ;;
git-vendor-ref:) curr_ref="$b" ;;
END)
# Make sure the dependency exists on disk
if [ ! -d "$dir" ]; then
die "Dependency \"$1\" is missing from \"$dir\""
fi
# And hasn't been renamed
logname=$(vendor_name_from_dir "$dir")
if [ "$name" != "$logname" ]; then
die "Dependency \"$1\" was renamed \"$logname\""
fi
if [ ! -z "$repository" ];
then
git subtree push --prefix "$dir" "$repository" "$ref"
break
fi
;;
esac
done
}
cmd_remove()
{
require_clean_work_tree


+ 1
- 1
etc/bash_completion.sh View File

@ -1,4 +1,4 @@
_git_vendor()
{
__gitcomp "add list update"
__gitcomp "add list update push"
}

+ 36
- 1
man/git-vendor.1 View File

@ -18,6 +18,9 @@
.P
\fBgit\-vendor update <name> [<ref>]\fR
.
.P
\fBgit\-vendor push <name> [<ref>]\fR
.
.SH "DESCRIPTION"
Manage any repository dependencies with \fBgit\-subtree\fR\.
.
@ -25,7 +28,7 @@ Manage any repository dependencies with \fBgit\-subtree\fR\.
\fBgit\-vendor\fR follows the same vendoring pattern that is used in the Go community\. Dependencies are stored under \fBvendor/<repository_uri>\fR\. For example, the dependency of \fBhttps://github\.com/brettlangdon/forge\.git\fR will be stored under \fBvendor/github\.com/brettlangdon/forge\fR by default\.
.
.P
\fBgit\-vendor\fR is unable to \fBlist\fR or \fBupdate\fR any dependencies it has not added, the reason is that \fBgit\-vendor\fR adds special commit messages so that it can track existing dependencies\.
\fBgit\-vendor\fR is unable to \fBlist\fR, \fBupdate\fR or \fBpush\fR any dependencies it has not added, the reason is that \fBgit\-vendor\fR adds special commit messages so that it can track existing dependencies\.
.
.SH "COMMANDS"
add [\-\-prefix <dir>] <name> <repository> [<ref>]
@ -51,6 +54,12 @@ update <dir> <ref>
.P
Update the vendored dependency to a different version\.
.
.P
push <dir> <ref>
.
.P
Push the vendored dependency changes to the source repository\.
.
.SH "OPTIONS"
\-\-prefix <dir>
.
@ -128,6 +137,32 @@ $ git vendor update forge
.IP "" 0
.
.P
Pushing changes to the source repository to a (new) branch \fBmy_changes\fR:
.
.IP "" 4
.
.nf
$ git vendor push forge my_changes
.
.fi
.
.IP "" 0
.
.P
Pushing changes to the source repository to \fBmaster\fR:
.
.IP "" 4
.
.nf
$ git vendor push forge
.
.fi
.
.IP "" 0
.
.P
Removing a dependency:
.
.IP "" 4


+ 16
- 2
man/git-vendor.md View File

@ -11,13 +11,15 @@ git-vendor(1) -- manage vendored dependency subtrees
`git-vendor update <name> [<ref>]`
`git-vendor push <name> [<ref>]`
## DESCRIPTION
Manage any repository dependencies with `git-subtree`.
`git-vendor` follows the same vendoring pattern that is used in the Go community. Dependencies are stored under `vendor/<repository_uri>`. For example, the dependency of `https://github.com/brettlangdon/forge.git` will be stored under `vendor/github.com/brettlangdon/forge` by default.
`git-vendor` is unable to `list` or `update` any dependencies it has not added, the reason is that `git-vendor` adds special commit messages so that it can track existing dependencies.
`git-vendor` is unable to `list`, `update` or `push` any dependencies it has not added, the reason is that `git-vendor` adds special commit messages so that it can track existing dependencies.
## COMMANDS
@ -37,6 +39,10 @@ git-vendor(1) -- manage vendored dependency subtrees
Update the vendored dependency to a different version.
push &lt;dir&gt; &lt;ref&gt;
Push the vendored dependency changes to the source repository.
## OPTIONS
@ -46,7 +52,7 @@ git-vendor(1) -- manage vendored dependency subtrees
&lt;name&gt;
A name to provide the vendored dependency to use when listing/updating.
A name to provide the vendored dependency to use when listing/updating/pushing.
&lt;repository&gt;
@ -74,6 +80,14 @@ git-vendor(1) -- manage vendored dependency subtrees
$ git vendor update forge
Pushing changes to the source repository to `master`:
$ git vendor push forge
Pushing changes to the source repository to a (new) branch my_changes:
$ git vendor push forge my_changes
Removing a dependency:
$ git vendor remove forge


Loading…
Cancel
Save