3 fail () { echo >&2 "$0: $*"; exit 1; }
5 play=.git/tartree-edit-work
10 *.edit) fail "bad idea to run gitfetchinfo into a .edit tree!" ;;
16 gitfetchdiff_list () {
17 git for-each-ref --format '%(refname) %(objectname)' \
19 | sed 's/^refs\/remotes\/[^\/]*\///' \
29 rrab=refs/remotes/"$a+$b"
32 "delete refs/remotes/$a/%l
33 delete refs/remotes/$b/%l
37 git for-each-ref --format 'delete %(refname)' $rrab \
38 | git update-ref --stdin
46 fail "internal error bad how ($how)"
50 gitfetchdiff_list "$a" a
51 gitfetchdiff_list "$b" b
53 diff --old-line-format='' --new-line-format='' \
54 --unchanged-line-format="$ulf" \
55 $play/a $play/b >$play/updates \
58 git update-ref --stdin <$play/updates
63 2.edit|2.done) mode="$1"; arg="$2" ;;
64 3.gitfetchinfo) mode="$1"; arg="$2"; remote="$3" ;;
65 3.gitfetchinfo-diff) gitfetchdiff diff "$2" "$3" ;;
66 3.gitfetchinfo-merge) gitfetchdiff merge "$2" "$3" ;;
67 ?.-*) fail "no options understood" ;;
69 tartree-edit edit|done DIRECTORY|TARBALL
70 tartree-edit gitfetchinfo DIRECTORY|TARBALL REMOTE" ;;
74 *.tar) base=${arg%.tar} ;;
75 *.edit) base=${arg%.edit} ;;
82 if test -f "$b.tar" && test -f "$b.edit"; then
83 echo "$b.edit exists, deleting possibly-obsolete $b.tar"
90 if test -d "$b.edit"; then
91 echo "$b.edit already exists"
94 if test -f "$b.tar"; then
96 (set -e; cd "$b.tmp"; tar xf "$b.tar")
104 gitfetchinfo_perhaps_commit () {
107 git diff --cached --quiet --exit-code HEAD
112 1) git commit --allow-empty --author='tartree-edit <>' -m "$m" ;;
113 *) fail "git diff failed ($rc)" ;;
117 tryat_gitfetchinfo () {
120 if test -d "$b.edit"; then
121 cp -a "$b.edit"/. "$play"/.
124 tar -C $play -f - <&3 -x
128 local innerwd="$(echo $play/*)"
130 git for-each-ref --format='%(refname)' refs/remotes >$play/l
135 next unless m#^refs/remotes/([^/]+)/#;
139 my @ab = split /\+/, $ab;
140 next unless @ab == 2;
141 next unless (grep { $_ eq "'"$remote"'" } @ab) == 1;
143 print "update refs/remotes/$_/$rhs $old\n" or die $! foreach @ab;
144 print "delete $old\n" or die $!;
146 open REMERGE, ">&3" or die $!;
147 print REMERGE "$_\n" or die $! foreach sort keys %remerge;
148 close REMERGE or die $!;
150 ' <$play/l >$play/unmerge 3>$play/remerge
151 git update-ref --stdin <$play/unmerge
153 git remote remove "$remote" 2>/dev/null ||:
154 git remote add "$remote" $innerwd
155 git fetch --no-tags -p "$remote" \
156 +"HEAD:refs/remotes/$remote/TT-HEAD"
158 GIT_AUTHOR_DATE=$(git log -n1 --pretty=format:'%ai')
159 GIT_COMMITTER_DATE=$GIT_AUTHOR_DATE
160 export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
161 git checkout -b WORKTREE
162 gitfetchinfo_perhaps_commit 'UNCOMMITTED INDEX'
164 gitfetchinfo_perhaps_commit 'UNCOMMITTED WORKING TREE'
166 git fetch --no-tags "$remote" --refmap \
167 +"refs/*:refs/remotes/$remote/*" \
168 +"refs/*:refs/remotes/$remote/*"
171 # $play will be destroyed by what follows, but we have
172 # an fd open onto remerge, so this will work
173 while read <&3 a b; do
174 echo "Updating gitfetchinfo-merge $a $b"
175 "$0" gitfetchinfo-merge $a $b
183 if test -d "$b.edit"; then
184 (set -e; cd "$b.edit"; tar cf "$b.tmp" *)
186 mv "$b.edit" "$b.tmp"
188 echo "$b.tar regenerated"
191 if test -f "$b.tar"; then
192 echo "$b.tar already exists and $b.edit doesn't"
199 if ! test -f "$b.tar" && ! test -d "$b.edit"; then
204 fail "unexpected situation in $b.*"
213 tryat "$pwd/git-srcs/$base"
214 tryat "$pwd/tests/git-srcs/$base"
215 fail "could not find $base..."