chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TOPGIT] implement linearize export method
[topgit.git]
/
tg.sh
diff --git
a/tg.sh
b/tg.sh
index 1fe01155a27bc7e1bfff1de04d68e1dd62ab01ad..5bb2d0cd123f09b1b038b04ed3b9a17bc4495a5d 100644
(file)
--- a/
tg.sh
+++ b/
tg.sh
@@
-63,8
+63,8
@@
measure_branch()
_bname="$1"; _base="$2"
[ -n "$_base" ] || _base="refs/top-bases/$_bname"
# The caller should've verified $name is valid
_bname="$1"; _base="$2"
[ -n "$_base" ] || _base="refs/top-bases/$_bname"
# The caller should've verified $name is valid
- _commits="$(git rev-list "$_bname" ^"$_base" | wc -l)"
- _nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" | wc -l)"
+ _commits="$(git rev-list "$_bname" ^"$_base"
--
| wc -l)"
+ _nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base"
--
| wc -l)"
if [ $_commits -gt 1 ]; then
_suffix="commits"
else
if [ $_commits -gt 1 ]; then
_suffix="commits"
else
@@
-77,7
+77,7
@@
measure_branch()
# Whether B1 is a superset of B2.
branch_contains()
{
# Whether B1 is a superset of B2.
branch_contains()
{
- [ -z "$(git rev-list ^"$1" "$2" --)" ]
+ [ -z "$(git rev-list
--max-count=1
^"$1" "$2" --)" ]
}
# ref_exists REF
}
# ref_exists REF
@@
-94,6
+94,16
@@
has_remote()
[ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
}
[ -n "$base_remote" ] && ref_exists "remotes/$base_remote/$1"
}
+branch_annihilated()
+{
+ _name="$1";
+
+ # use the merge base in case the base is ahead.
+ mb="$(git merge-base "refs/top-bases/$_name" "$_name")";
+
+ test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$_name^{tree}")";
+}
+
# recurse_deps CMD NAME [BRANCHPATH...]
# Recursively eval CMD on all dependencies of NAME.
# CMD can refer to $_name for queried branch name,
# recurse_deps CMD NAME [BRANCHPATH...]
# Recursively eval CMD on all dependencies of NAME.
# CMD can refer to $_name for queried branch name,
@@
-116,7
+126,12
@@
recurse_deps()
if has_remote "top-bases/$_name"; then
echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
fi
if has_remote "top-bases/$_name"; then
echo "refs/remotes/$base_remote/top-bases/$_name" >>"$_depsfile"
fi
- git cat-file blob "$_name:.topdeps" >>"$_depsfile"
+
+ # if the branch was annihilated, there exists no .topdeps file
+ if ! branch_annihilated "$_name"; then
+ #TODO: handle nonexisting .topdeps?
+ git cat-file blob "$_name:.topdeps" >>"$_depsfile";
+ fi;
_ret=0
while read _dep; do
_ret=0
while read _dep; do
@@
-298,3
+313,5
@@
help|--help|-h)
}
. "@cmddir@"/tg-$cmd;;
esac
}
. "@cmddir@"/tg-$cmd;;
esac
+
+# vim:noet