brettlangdon
/
git-vendor
mirror of https://github.com/brettlangdon/git-vendor.git
1
0
Fork 0
Code Issues 0 Projects 0 Releases 8 Wiki Activity
Browse Source

Add git-vendor remove and cleanup some code

pull/3/head
Brett Langdon 10 years ago
parent
ab86ee469d
commit
b536c912a8
4 changed files with 116 additions and 214 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +79
    -35
      bin/git-vendor
  2. +25
    -3
      man/git-vendor.1
  3. +0
    -174
      man/git-vendor.html
  4. +12
    -2
      man/git-vendor.md

+ 79
- 35
bin/git-vendor View File

@ -11,6 +11,7 @@ Usage:
git vendor --help git vendor --help
git vendor add [--prefix <dir>] <name> <repository> [<ref>] git vendor add [--prefix <dir>] <name> <repository> [<ref>]
git vendor list [<name>] git vendor list [<name>]
git vendor remove <name>
git vendor update <name> [<ref>] git vendor update <name> [<ref>]
EOF EOF
} }
@ -26,7 +27,7 @@ esac
command="$1" command="$1"
shift shift
case "$command" in case "$command" in
"add"|"list"|"update") ;;
"add"|"list"|"remove"|"update") ;;
*) >&2 echo "error: unknown command \"$command\"" && _usage && exit 1 ;; *) >&2 echo "error: unknown command \"$command\"" && _usage && exit 1 ;;
esac esac
@ -40,22 +41,35 @@ fi
vendor_names_from_log() vendor_names_from_log()
{ {
name= name=
dir=
git log --grep="^git-vendor-name: .*\$" \ git log --grep="^git-vendor-name: .*\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD | --pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
while read a b junk; do while read a b junk; do
case "$a" in case "$a" in
START) ;; START) ;;
git-vendor-name:) name="$b" ;; git-vendor-name:) name="$b" ;;
git-vendor-dir:) dir="$b" ;;
END) END)
echo "$name"
# Only consider dependencies which still exist on disk
if [ -d "$dir" ]; then
echo "$name"
fi
name= name=
dir=
;; ;;
esac esac
done
done | sort -u
}
vendor_git_log_first()
{
name="$1"
git log -1 --grep="^git-vendor-name: $name\$" --pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD
} }
cmd_add() cmd_add()
{ {
require_clean_work_tree
name="$1" name="$1"
repository="$2" repository="$2"
ref="master" ref="master"
@ -83,45 +97,45 @@ git-vendor-ref: $ref
cmd_list() cmd_list()
{ {
showOnly="$1" showOnly="$1"
vendorNames=($(vendor_names_from_log | sort -u))
vendorNames=$(vendor_names_from_log)
for name in "${vendorNames[@]}"; for name in "${vendorNames[@]}";
do do
git log -1 --grep="^git-vendor-name: $name\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
while read a b junk; do
case "$a" in
START) commit="$b" ;;
git-vendor-name:) name="$b" ;;
git-vendor-dir:) dir="$b" ;;
git-vendor-ref:) ref="$b" ;;
git-vendor-repository:) repository="$b" ;;
END)
if [[ ! -z "$repository" ]];
then
if [[ -z "$showOnly" ]] || [ "$showOnly" == "$name" ]; then
echo "$name@$ref:"
echo "\tname:\t$name"
echo "\tdir:\t$dir"
echo "\trepo:\t$repository"
echo "\tref:\t$ref"
echo "\tcommit:\t$commit"
echo ""
vendor_git_log_first "$name" |
while read a b junk; do
case "$a" in
START) commit="$b" ;;
git-vendor-name:) name="$b" ;;
git-vendor-dir:) dir="$b" ;;
git-vendor-ref:) ref="$b" ;;
git-vendor-repository:) repository="$b" ;;
END)
if [[ ! -z "$repository" ]];
then
if [[ -z "$showOnly" ]] || [ "$showOnly" == "$name" ]; then
echo "$name@$ref:"
echo "\tname:\t$name"
echo "\tdir:\t$dir"
echo "\trepo:\t$repository"
echo "\tref:\t$ref"
echo "\tcommit:\t$commit"
echo ""
fi
fi fi
fi
name=
dir=
ref=
commit=
repository=
;;
esac
done
name=
dir=
ref=
commit=
repository=
;;
esac
done
done; done;
} }
cmd_update() cmd_update()
{ {
require_clean_work_tree
name="$1" name="$1"
ref="master" ref="master"
if [ "$2" != "" ]; then if [ "$2" != "" ]; then
@ -130,14 +144,18 @@ cmd_update()
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
die "Incorrect options provided: git vendor update <name> [<ref>]" die "Incorrect options provided: git vendor update <name> [<ref>]"
fi fi
git log -1 --grep="^git-vendor-name: $name\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD |
vendor_git_log_first "$name" |
while read a b junk; do while read a b junk; do
case "$a" in case "$a" in
START) ;; START) ;;
git-vendor-dir:) dir="$b" ;; git-vendor-dir:) dir="$b" ;;
git-vendor-repository:) repository="$b" ;; git-vendor-repository:) repository="$b" ;;
END) END)
# Make sure the dependency exists on disk
if [ ! -d "$dir" ]; then
die "Dependency \"$1\" is missing from \"$dir\""
fi
if [[ ! -z "$repository" ]]; if [[ ! -z "$repository" ]];
then then
message="\ message="\
@ -156,4 +174,30 @@ git-vendor-ref: $ref
done done
} }
cmd_remove()
{
require_clean_work_tree
name="$1"
if [ $# -lt 1 ]; then
die "Incorrect options provided: git vendor remove <name>"
fi
vendor_git_log_first "$name" |
while read a b junk; do
case "$a" in
START) ;;
git-vendor-dir:) dir="$b" ;;
END)
# Make sure the dependency exists
if [ ! -d "$dir" ]; then
die "Dependency \"$1\" is missing from \"$dir\""
fi
git rm -rf "$dir"
git commit --message "Removing \"$name\" from \"$dir\""
break
;;
esac
done
}
# Run the command
"cmd_$command" "$@" "cmd_$command" "$@"

+ 25
- 3
man/git-vendor.1 View File

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "GIT\-VENDOR" "1" "January 2016" "" "Git Vendor"
.TH "GIT\-VENDOR" "1" "February 2016" "" "Git Vendor"
. .
.SH "NAME" .SH "NAME"
\fBgit\-vendor\fR \- manage vendored dependency subtrees \fBgit\-vendor\fR \- manage vendored dependency subtrees
@ -13,6 +13,9 @@
\fBgit\-vendor list [<name>]\fR \fBgit\-vendor list [<name>]\fR
. .
.P .P
\fBgit\-vendor remove <name>\fR
.
.P
\fBgit\-vendor update <name> [<ref>]\fR \fBgit\-vendor update <name> [<ref>]\fR
. .
.SH "DESCRIPTION" .SH "DESCRIPTION"
@ -31,16 +34,22 @@ add [\-\-prefix <dir>] <name> <repository> [<ref>]
Add a new vendored dependency Add a new vendored dependency
. .
.P .P
list [\fIname\fR]
list [<name>]
. .
.P .P
List all existing vendored dependencies and their current version\. Limit show dependency to \fB<name>\fR if provided\. List all existing vendored dependencies and their current version\. Limit show dependency to \fB<name>\fR if provided\.
. .
.P .P
remove <name>
.
.P
Remove the named vendored dependency\.
.
.P
update <dir> <ref> update <dir> <ref>
. .
.P .P
Update the vendored dependency to a different version
Update the vendored dependency to a different version\.
. .
.SH "OPTIONS" .SH "OPTIONS"
\-\-prefix <dir> \-\-prefix <dir>
@ -119,6 +128,19 @@ $ git vendor update forge
.IP "" 0 .IP "" 0
. .
.P .P
Removing a dependency:
.
.IP "" 4
.
.nf
$ git vendor remove forge
.
.fi
.
.IP "" 0
.
.P
List all existing dependencies: List all existing dependencies:
. .
.IP "" 4 .IP "" 4


+ 0
- 174
man/git-vendor.html View File

@ -1,174 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv='content-type' value='text/html;charset=utf8'>
<meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
<title>git-vendor(1) - manage vendored dependency subtrees</title>
<style type='text/css' media='all'>
/* style: man */
body#manpage {margin:0}
.mp {max-width:100ex;padding:0 9ex 1ex 4ex}
.mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
.mp h2 {margin:10px 0 0 0}
.mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
.mp h3 {margin:0 0 0 4ex}
.mp dt {margin:0;clear:left}
.mp dt.flush {float:left;width:8ex}
.mp dd {margin:0 0 0 9ex}
.mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
.mp pre {margin-bottom:20px}
.mp pre+h2,.mp pre+h3 {margin-top:22px}
.mp h2+pre,.mp h3+pre {margin-top:5px}
.mp img {display:block;margin:auto}
.mp h1.man-title {display:none}
.mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
.mp h2 {font-size:16px;line-height:1.25}
.mp h1 {font-size:20px;line-height:2}
.mp {text-align:justify;background:#fff}
.mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
.mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
.mp u {text-decoration:underline}
.mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
.mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
.mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
.mp b.man-ref {font-weight:normal;color:#434241}
.mp pre {padding:0 4ex}
.mp pre code {font-weight:normal;color:#434241}
.mp h2+pre,h3+pre {padding-left:0}
ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
ol.man-decor {width:100%}
ol.man-decor li.tl {text-align:left}
ol.man-decor li.tc {text-align:center;letter-spacing:4px}
ol.man-decor li.tr {text-align:right;float:right}
</style>
</head>
<!--
The following styles are deprecated and will be removed at some point:
div#man, div#man ol.man, div#man ol.head, div#man ol.man.
The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
.man-navigation should be used instead.
-->
<body id='manpage'>
<div class='mp' id='man'>
<div class='man-navigation' style='display:none'>
<a href="#NAME">NAME</a>
<a href="#SYNOPSIS">SYNOPSIS</a>
<a href="#DESCRIPTION">DESCRIPTION</a>
<a href="#COMMANDS">COMMANDS</a>
<a href="#OPTIONS">OPTIONS</a>
<a href="#EXAMPLES">EXAMPLES</a>
<a href="#AUTHOR">AUTHOR</a>
<a href="#REPORTING-BUGS">REPORTING BUGS</a>
<a href="#SEE-ALSO">SEE ALSO</a>
</div>
<ol class='man-decor man-head man head'>
<li class='tl'>git-vendor(1)</li>
<li class='tc'>Git Vendor</li>
<li class='tr'>git-vendor(1)</li>
</ol>
<h2 id="NAME">NAME</h2>
<p class="man-name">
<code>git-vendor</code> - <span class="man-whatis">manage vendored dependency subtrees</span>
</p>
<h2 id="SYNOPSIS">SYNOPSIS</h2>
<p><code>git-vendor add [--prefix &lt;dir&gt;] &lt;name> &lt;repository> [&lt;ref>]</code></p>
<p><code>git-vendor list [&lt;name>]</code></p>
<p><code>git-vendor update &lt;name> [&lt;ref>]</code></p>
<h2 id="DESCRIPTION">DESCRIPTION</h2>
<p> Manage any repository dependencies with <code>git-subtree</code>.</p>
<p> <code>git-vendor</code> follows the same vendoring pattern that is used in the Go community. Dependencies are stored under <code>vendor/&lt;repository_uri></code>. For example, the dependency of <code>https://github.com/brettlangdon/forge.git</code> will be stored under <code>vendor/github.com/brettlangdon/forge</code> by default.</p>
<p> <code>git-vendor</code> is unable to <code>list</code> or <code>update</code> any dependencies it has not added, the reason is that <code>git-vendor</code> adds special commit messages so that it can track existing dependencies.</p>
<h2 id="COMMANDS">COMMANDS</h2>
<p> add [--prefix &lt;dir&gt;] &lt;name&gt; &lt;repository&gt; [&lt;ref&gt;]</p>
<p> Add a new vendored dependency</p>
<p> list [<var>name</var>]</p>
<p> List all existing vendored dependencies and their current version. Limit show dependency to <code>&lt;name></code> if provided.</p>
<p> update &lt;dir&gt; &lt;ref&gt;</p>
<p> Update the vendored dependency to a different version</p>
<h2 id="OPTIONS">OPTIONS</h2>
<p> --prefix &lt;dir&gt;</p>
<p> Directory to pull dependencies in under (e.g. <code>vendor</code> or <code>third_party</code>, etc). [default: <code>vendor</code>]</p>
<p> &lt;name&gt;</p>
<p> A name to provide the vendored dependency to use when listing/updating.</p>
<p> &lt;repository&gt;</p>
<p> The repository url to vendor. e.g. <code>https://github.com/&lt;username>/&lt;repo-name></code> (supports <code>http://</code>, <code>https://</code> <code>git://</code> and <code>git@</code> protocols).</p>
<p> &lt;ref&gt;</p>
<p> The ref to vendor. e.g. <code>master</code>, <code>v1.0.2</code>, etc. [default: <code>master</code>]</p>
<h2 id="EXAMPLES">EXAMPLES</h2>
<p> Adding a new dependency at a specific git tagged version:</p>
<pre><code>$ git vendor add forge https://github.com/brettlangdon/forge v0.1.4
</code></pre>
<p> Adding a new dependency under a different directory than <code>vendor/</code>:</p>
<pre><code>$ git vendor add --prefix third_party forge https://github.com/brettlangdon/forge
</code></pre>
<p> Updating an existing dependency to a specific git tagged version:</p>
<pre><code>$ git vendor update forge v0.1.7
</code></pre>
<p> Updating a dependency to <code>master</code>:</p>
<pre><code>$ git vendor update forge
</code></pre>
<p> List all existing dependencies:</p>
<pre><code>$ git vendor list
</code></pre>
<h2 id="AUTHOR">AUTHOR</h2>
<p>Written by Brett Langdon <a href="&#109;&#x61;&#x69;&#108;&#x74;&#111;&#58;&#x6d;&#101;&#64;&#98;&#x72;&#101;&#116;&#x74;&#x2e;&#105;&#115;" data-bare-link="true">&#109;&#x65;&#64;&#x62;&#114;&#x65;&#x74;&#x74;&#x2e;&#105;&#x73;</a></p>
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
<p>&lt;<a href="https://github.com/brettlangdon/git-vendor/issues" data-bare-link="true">https://github.com/brettlangdon/git-vendor/issues</a>&gt;</p>
<h2 id="SEE-ALSO">SEE ALSO</h2>
<p>&lt;<a href="https://github.com/brettlangdon/git-vendor" data-bare-link="true">https://github.com/brettlangdon/git-vendor</a>&gt;</p>
<ol class='man-decor man-foot man foot'>
<li class='tl'></li>
<li class='tc'>January 2016</li>
<li class='tr'>git-vendor(1)</li>
</ol>
</div>
</body>
</html>

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

@ -7,6 +7,8 @@ git-vendor(1) -- manage vendored dependency subtrees
`git-vendor list [<name>]` `git-vendor list [<name>]`
`git-vendor remove <name>`
`git-vendor update <name> [<ref>]` `git-vendor update <name> [<ref>]`
## DESCRIPTION ## DESCRIPTION
@ -23,13 +25,17 @@ git-vendor(1) -- manage vendored dependency subtrees
Add a new vendored dependency Add a new vendored dependency
list [<name>]
list [&lt;name&gt;]
List all existing vendored dependencies and their current version. Limit show dependency to `<name>` if provided. List all existing vendored dependencies and their current version. Limit show dependency to `<name>` if provided.
remove &lt;name&gt;
Remove the named vendored dependency.
update &lt;dir&gt; &lt;ref&gt; update &lt;dir&gt; &lt;ref&gt;
Update the vendored dependency to a different version
Update the vendored dependency to a different version.
## OPTIONS ## OPTIONS
@ -68,6 +74,10 @@ git-vendor(1) -- manage vendored dependency subtrees
$ git vendor update forge $ git vendor update forge
Removing a dependency:
$ git vendor remove forge
List all existing dependencies: List all existing dependencies:
$ git vendor list $ git vendor list


Write Preview
Loading…
Cancel
Save