[TopGit PATCH] tg redepend: New command.

[TopGit PATCH] tg redepend: New command.

[Jan Nieuwenhuizen]

As discussed previously

    http://kerneltrap.org/mailarchive/git/2008/8/13/2925144

Change a topgit branch's dependencies by doing a rebase-by-merge.


Signed-off-by: Jan Nieuwenhuizen <janneke@gnu.org>
---
 Makefile       |    2 +-
 README         |    5 ++
 tg-redepend.sh |  154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+), 1 deletions(-)
 create mode 100644 tg-redepend.sh

diff --git a/Makefile b/Makefile
index ea6489e..3988251 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ sharedir = $(prefix)/share/topgit
 hooksdir = $(cmddir)/hooks
 
 
-commands_in = tg-create.sh tg-delete.sh tg-export.sh tg-info.sh tg-patch.sh tg-summary.sh tg-update.sh
+commands_in = tg-create.sh tg-delete.sh tg-export.sh tg-info.sh tg-patch.sh tg-redepend.sh tg-summary.sh tg-update.sh
 hooks_in = hooks/pre-commit.sh
 
 commands_out = $(patsubst %.sh,%,$(commands_in))
diff --git a/README b/README
index b58a1b4..3528602 100644
--- a/README
+++ b/README
@@ -330,6 +330,11 @@ tg export
 	TODO: Make stripping of [PATCH] and other prefixes configurable
 	TODO: --mbox option for other mode of operation
 
+tg redepend
+~~~~~~~~~~~
+	Change the current topic branch's list of dependencies
+	by doing a rebase-by-merge onto the new dependencies.
+
 tg update
 ~~~~~~~~~
 	Update the current topic branch wrt. changes in the branches
diff --git a/tg-redepend.sh b/tg-redepend.sh
new file mode 100644
index 0000000..e1612ea
--- /dev/null
+++ b/tg-redepend.sh
@@ -0,0 +1,154 @@
+#! /bin/sh
+# TopGit - A different patch queue manager
+# (c) 2008  Jan Nieuwenhuizen <janneke@gnu.org>
+# GNU GPL version 2
+
+add=
+remove=
+redeps=
+restarted=
+
+## Parse options
+
+while [ -n "$1" ]; do
+	arg="$1"; shift
+	case "$arg" in
+		--add)
+			[ -z "$redeps" ] || die "already specified new list of dependencies ($redeps)"
+			[ -z "$remove" ] || die "already specified dependencies to remove ($remove)"
+			add="$add "
+			;;
+		-h|--help)
+			echo "Usage: tg [--add|--remove] DEPENDENCY..." >&2
+			;;
+		--remove)
+			[ -z "$redeps" ] || die "already specified new list of dependencies ($redeps)"
+			[ -z "$add" ] || die "already specified dependencies to add ($add)"
+			remove="$remove "
+			;;
+		*)
+			[ -z "$add" ] || add="$add$arg "
+			[ -z "$remove" ] || remove="$remove$arg "
+			[ ! -z "$add$remove" ] || redeps="$redeps$arg "
+	esac
+done
+
+if [ -n "$add" ]; then
+	add="${add/# }"
+	add="${add//  / }"
+	dupes=$(grep -E "^${add// /|}/\$" "$root_dir/.topdeps" | tr '\n' ' ')
+	[ -z "$dupes" ] || die "already depend on: $dupes"
+	redeps=$(echo "$add" | cat "$root_dir/.topdeps" - | tr '\n' ' ' | sed -e 's/ \+$//')
+elif [ -n "$remove" ]; then
+	remove="${remove//  / }"
+	remove="${remove/# }"
+	avail=$(grep -E "^${remove// /|}/\$" "$root_dir/.topdeps" | sort | tr '\n' ' ')
+	remove_sorted=$(echo "$remove" | tr ' ' '\n' | grep -v '^$' | sort | tr '\n' ' ')
+	[ "$avail" = "$remove_sorted" ] || die "not depending on some of: $remove"
+	redeps=$(grep -vE "^${remove// /|}/\$" "$root_dir/.topdeps" | tr '\n' ' ')
+fi
+
+redeps="${redeps/# }"
+redeps="${redeps/# }"
+
+if [ -z "$redeps" ]; then
+	if [ -s "$git_dir/top-name" -a -s "$git_dir/top-redeps" -a -f "$git_dir/top-rebase" ]; then
+		restarted=rebase
+	elif [ -s "$git_dir/top-name" -a -s "$git_dir/top-redeps" -a -f "$git_dir/top-merge" ]; then
+		restarted=merge
+	else
+		echo "Usage: tg [--add|--remove] DEPENDENCY..." >&2
+		exit 2
+	fi
+fi
+
+function fail () {
+	info "Please resolve conflicts and call: tg redepend"
+	info "It is also safe to abort this operation using:"
+	info "tg delete $b_; git reset --hard some_branch"
+	echo "$p" > "$git_dir/top-name"
+	echo "$redeps" > "$git_dir/top-redeps"
+	touch "$git_dir/top-$1"
+	exit 1
+}
+
+# See http://kerneltrap.org/mailarchive/git/2008/8/13/2925144
+#
+# B -- (some mess) -- P
+#
+# Do "git rebase --onto B' B P" while preserving history to get
+#
+# B -- (some mess) -- old P -- P
+#                             /
+#                           B'
+
+if [ -z "$restarted" ]; then
+	info "New list of dependencies: $redeps."
+	p=$(git symbolic-ref HEAD | cut -b 12-)
+else
+	p="$(cat "$git_dir/top-name")"
+	redeps="$(cat "$git_dir/top-redeps")"
+fi
+
+# Clean up any restart stuff
+rm -f "$git_dir/top-name" "$git_dir/top-redeps" "$git_dir/top-rebase" "$git_dir/top-merge"
+
+b="$(git rev-parse --short --verify "refs/top-bases/$p" 2>/dev/null)" \
+	|| die "not a TopGit-controlled branch"
+p_=tg-redepend/tmp/${p}_
+b_=tg-redepend/tmp/$p.base_
+
+# Create new base B' -- does not have to be a topgit branch, but that's easiest
+if [ -z "$restarted" ]; then
+	git branch -D $p_  > /dev/null 2>&1 || :
+
+	tg create $b_ $redeps
+	git commit -m 'tg redepend: add TopGit .top* info.'
+
+# Do "git rebase --onto B' B P" while preserving history
+	git checkout -b $p_ $p
+
+	if ! git rebase --onto $b_ $b; then
+		fail rebase
+	fi
+elif [ "$restarted" = "rebase" ]; then
+	[ ! -d "$git_dir/rebase-apply" ] || git add "$root_dir"
+	[ ! -d "$git_dir/rebase-apply" ] || git add -u "$root_dir"
+	[ ! -d "$git_dir/rebase-apply" ] || if ! git rebase --continue; then
+		fail rebase
+	fi
+	rm -f "$git_dir/top-name" "$git_dir/top-redeps"
+	restarted=
+fi
+
+if [ "$restarted" != "merge" ]; then
+	git checkout $(git rev-parse $p)
+	if ! git merge --no-ff --no-commit $b_; then
+		touch "$git_dir/top-merge"
+		fail merge
+	fi
+elif ! git status | grep 'nothing to commit' > /dev/null; then
+	git add "$root_dir"
+	git add -u "$root_dir"
+	git commit -m 'tg redepend: resolve merge.' > /dev/null 2>&1
+fi
+git read-tree -m -u $(git rev-parse $p_)
+
+echo "$redeps" | tr ' ' '\n' > "$root_dir/.topdeps"
+
+git add "$root_dir"
+git add -u "$root_dir"
+
+git commit -m "Rebased-using-merge onto new dependencies: $redeps."  > /dev/null 2>&1
+
+git branch -f $p
+git checkout $p
+
+tg delete $b_  > /dev/null 2>&1
+git branch -D $p_
+
+info "Rebased-using-merge onto new dependencies: $redeps."
+
+# Local Variables:
+# sh-basic-offset:8
+# End:
-- 
1.6.0.rc0.44.g67270


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org

Re: [TopGit PATCH] tg redepend: New command.

[Bert Wesarg]

On Fri, Aug 15, 2008 at 15:53, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
Why don't you call this command 'depend', as per README TODO?

> +
> +# Local Variables:
> +# sh-basic-offset:8
> +# End:
This would be the first file in this project with such editor infos.
IMHO this shouldn't belong to a patch.

Regards
Bert

Re: [TopGit PATCH] tg redepend: New command.

[Jonathan Nieder]

Hi,

Jan Nieuwenhuizen wrote:

> As discussed previously
> 
>     http://kerneltrap.org/mailarchive/git/2008/8/13/2925144
> 
> Change a topgit branch's dependencies by doing a rebase-by-merge.
> 
> Signed-off-by: Jan Nieuwenhuizen <janneke@gnu.org>
> ---
>  Makefile       |    2 +-
>  README         |    5 ++
>  tg-redepend.sh |  154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 160 insertions(+), 1 deletions(-)
>  create mode 100644 tg-redepend.sh

[...]
> +		-h|--help)
> +			echo "Usage: tg [--add|--remove] DEPENDENCY..." >&2

s/tg/tg redepend/?

[...]
> +# Create new base B' -- does not have to be a topgit branch, but that's easiest
> +if [ -z "$restarted" ]; then
> +	git branch -D $p_  > /dev/null 2>&1 || :
> +
> +	tg create $b_ $redeps

Why not move the base-creation code in tg-create.sh to a new
function in tg.sh to use here?

[...]
> +if [ "$restarted" != "merge" ]; then
> +	git checkout $(git rev-parse $p)
> +	if ! git merge --no-ff --no-commit $b_; then
> +		touch "$git_dir/top-merge"
> +		fail merge
> +	fi
[snip continuing-a-merge case]
> +fi
> +git read-tree -m -u $(git rev-parse $p_)
[snip topdeps juggling]
> +git commit -m "Rebased-using-merge onto new dependencies: $redeps."  > /dev/null 2>&1

I know I suggested that code before, but the merge with B' is wasted, so
perhaps

	git checkout P
	head=$(git rev-parse --verify HEAD^0)
	result_tree=$(git log -1 --pretty=format:%T P')
	result_commit=$(git commit-tree "$result_tree" -p P -p B')
	git update-ref -m "commit (merge): tg-redepend" HEAD \
			"$result_commit" "$head" || ... (fail)
	test -x "$GIT_DIR/hooks/post-merge" && $GIT_DIR/hooks/post-merge 0

I'm not sure.  Is there some more porcelain-ish way to do this (create a
merge commit when you already know the resulting and parents)?

But with that change the entire restarted=merge branch would go away,
so I hope there is a nice way to do it.  I'll think more.

Hope that helps,
Jonathan

> +
> +git branch -f $p
> +git checkout $p
> +
> +tg delete $b_  > /dev/null 2>&1
> +git branch -D $p_
> +
> +info "Rebased-using-merge onto new dependencies: $redeps."
> +
> +# Local Variables:
> +# sh-basic-offset:8
> +# End:
> 

Re: [TopGit PATCH] tg redepend: New command.

[Jan Nieuwenhuizen]

On vr, 2008-08-15 at 13:20 -0500, Jonathan Nieder wrote:

Hi,

> s/tg/tg redepend/?

Yes.

> Why not move the base-creation code in tg-create.sh to a new
> function in tg.sh to use here?

Yes, that's better.
 
> I know I suggested that code before, but the merge with B' is wasted, so
> perhaps
> 
> 	git checkout P
> 	head=$(git rev-parse --verify HEAD^0)
> 	result_tree=$(git log -1 --pretty=format:%T P')
> 	result_commit=$(git commit-tree "$result_tree" -p P -p B')
> 	git update-ref -m "commit (merge): tg-redepend" HEAD \
> 			"$result_commit" "$head" || ... (fail)
> 	test -x "$GIT_DIR/hooks/post-merge" && $GIT_DIR/hooks/post-merge 0
> 
> I'm not sure.  Is there some more porcelain-ish way to do this (create a
> merge commit when you already know the resulting and parents)?
> 
> But with that change the entire restarted=merge branch would go away,
> so I hope there is a nice way to do it.  I'll think more.

Yes, the user should get a nice chance to resolve any conflicts...

Thanks!
Jan.

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org

Re: [TopGit PATCH] tg redepend: New command.

[Bert Wesarg]

Hi,

On Fri, Aug 15, 2008 at 15:53, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
> As discussed previously
>
>    http://kerneltrap.org/mailarchive/git/2008/8/13/2925144
>
> Change a topgit branch's dependencies by doing a rebase-by-merge.
>
>
is this script in use by you, or is it abandoned in favor of another idea?

Anyway, I have tried it today but it looks like the top-bases wasn't
updated to the new deps. It points still to the old base. Second, I
got an empty line in my .topdeps file.

> +
> +if [ -n "$add" ]; then
> +       add="${add/# }"
> +       add="${add//  / }"
> +       dupes=$(grep -E "^${add// /|}/\$" "$root_dir/.topdeps" | tr '\n' ' ')
> +       [ -z "$dupes" ] || die "already depend on: $dupes"
> +       redeps=$(echo "$add" | cat "$root_dir/.topdeps" - | tr '\n' ' ' | sed -e 's/ \+$//')
> +elif [ -n "$remove" ]; then
> +       remove="${remove//  / }"
> +       remove="${remove/# }"
> +       avail=$(grep -E "^${remove// /|}/\$" "$root_dir/.topdeps" | sort | tr '\n' ' ')
> +       remove_sorted=$(echo "$remove" | tr ' ' '\n' | grep -v '^$' | sort | tr '\n' ' ')
> +       [ "$avail" = "$remove_sorted" ] || die "not depending on some of: $remove"
> +       redeps=$(grep -vE "^${remove// /|}/\$" "$root_dir/.topdeps" | tr '\n' ' ')
> +fi
IMHO all these "| tr '\n' ' '" aren't needed. bash do the right thing here.

Bert

Re: [TopGit PATCH] tg redepend: New command.

[Jan Nieuwenhuizen]

On ma, 2008-09-01 at 11:31 +0200, Bert Wesarg wrote:

Hi Bert,

> 
> On Fri, Aug 15, 2008 at 15:53, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
> > As discussed previously
> >
> >    http://kerneltrap.org/mailarchive/git/2008/8/13/2925144
> >
> > Change a topgit branch's dependencies by doing a rebase-by-merge.
> >
> >
> is this script in use by you, or is it abandoned in favor of another idea?

I haven't had the time to digest the several new takes on this, esp.
http://kerneltrap.org/mailarchive/git/2008/8/15/2954214 and combining
my previous attempt's use of git revert and git cherry-pick with git
read-tree to make for a much faster adding or removal of
dependencies.

> Anyway, I have tried it today but it looks like the top-bases wasn't
> updated to the new deps.

How odd.  It also looks like "redeps" contains the new set of
dependencies, which is written to .topdeps.  I guess that most of
this script will be abandoned anyway, but a nice bug report ie: how to
reproduce this error never hurts ;-)

> IMHO all these "| tr '\n' ' '" aren't needed. bash do the right thing
> here.

Thanks, I'll have a look.  You did try --add, --remove and "new dep
list" right? 

Greetings,
Jan.

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org

Re: [TopGit PATCH] tg redepend: New command.

[Bert Wesarg]

[-- Attachment #1: Type: text/plain, Size: 1876 bytes --]

On Mon, Sep 1, 2008 at 12:11, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
> On ma, 2008-09-01 at 11:31 +0200, Bert Wesarg wrote:
>
> Hi Bert,
>
>>
>> On Fri, Aug 15, 2008 at 15:53, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
>> > As discussed previously
>> >
>> >    http://kerneltrap.org/mailarchive/git/2008/8/13/2925144
>> >
>> > Change a topgit branch's dependencies by doing a rebase-by-merge.
>> >
>> >
>> is this script in use by you, or is it abandoned in favor of another idea?
>
> I haven't had the time to digest the several new takes on this, esp.
> http://kerneltrap.org/mailarchive/git/2008/8/15/2954214 and combining
> my previous attempt's use of git revert and git cherry-pick with git
> read-tree to make for a much faster adding or removal of
> dependencies.
>
>> Anyway, I have tried it today but it looks like the top-bases wasn't
>> updated to the new deps.
>
> How odd.  It also looks like "redeps" contains the new set of
> dependencies, which is written to .topdeps.  I guess that most of
> this script will be abandoned anyway, but a nice bug report ie: how to
> reproduce this error never hurts ;-)
Yeah, sorry, here comes part two:

I have tried to switch the order of two topics, which are the only two
in this 'series'. T1 depdens on master, and T2 on T1 with definitive
merge conflicts.

first step was to redepend T2 to master:
$ tg redepend master

after that, I saw the above odds, i.e.:
 * the refs/top-bases/T2 points still to T1 not master
 * (NEW) the .topmsg is lost (which I discovered after step two)
 * a trailing empty line is in .topdeps

(NEW) step two was to redpend T1 on T2:
$ git checkout T2
$ tg redepend T2

after that, my T1 changes were lost, i.e. the worktree is in state of T2.

I have attached the log of this session (slightly edited).

Thanks anyway for working on this.

Regards
Bert

> Greetings,
> Jan.

[-- Attachment #2: tg-redpend-log --]
[-- Type: application/octet-stream, Size: 3218 bytes --]

T2@git $ tg redepend master
tg: New list of dependencies: master .
tg: Creating tg-redepend/tmp/T2.base_ base from master...
Switched to a new branch "tg-redepend/tmp/T2.base_"
tg: Topic branch tg-redepend/tmp/T2.base_ set up. Please fill .topmsg now and make initial commit.
tg: To abort: git rm -f .top* && git checkout master && tg delete tg-redepend/tmp/T2.base_
Created commit 1992ce5: tg redepend: add TopGit .top* info.
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 .topdeps
 create mode 100644 .topmsg
Switched to a new branch "tg-redepend/tmp/T2_"
First, rewinding head to replay your work on top of it...
Applying: ALLOC_GROW
error: patch failed: .topmsg:1
error: .topmsg: patch does not apply
error: patch failed: builtin-for-each-ref.c:82
error: builtin-for-each-ref.c: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged .topmsg
Auto-merged builtin-for-each-ref.c
CONFLICT (content): Merge conflict in builtin-for-each-ref.c
Failed to merge in the changes.
Patch failed at 0001.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

tg: Please resolve conflicts and call: tg redepend
tg: It is also safe to abort this operation using:
tg: tg delete tg-redepend/tmp/T2.base_; git reset --hard some_branch
1992ce5...@git $ nc builtin-for-each-ref.c 
1992ce5...@git $ git gui
4694b94...@git $ tg redepend 
Applying: ALLOC_GROW
Note: moving to "8e8586c0fa4089499498aa1bb362900193c34902" which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
  git checkout -b <new_branch_name>
HEAD is now at 8e8586c... ALLOC_GROW
Auto-merged .topdeps
Auto-merged .topmsg
Automatic merge went well; stopped before committing as requested
Switched to branch "T2"
Deleted branch tg-redepend/tmp/T2_.
tg: Rebased-using-merge onto new dependencies: master .
T1@git $ tg redepend T2
tg: New list of dependencies: T2 .
tg: Creating tg-redepend/tmp/T1.base_ base from T2...
Switched to a new branch "tg-redepend/tmp/T1.base_"
tg: Topic branch tg-redepend/tmp/T1.base_ set up. Please fill .topmsg now and make initial commit.
tg: To abort: git rm -f .top* && git checkout T2 && tg delete tg-redepend/tmp/T1.base_
Created commit b07e51b: tg redepend: add TopGit .top* info.
 2 files changed, 2 insertions(+), 2 deletions(-)
Switched to a new branch "tg-redepend/tmp/T1_"
First, rewinding head to replay your work on top of it...
Fast-forwarded tg-redepend/tmp/T1_ to tg-redepend/tmp/T1.base_.
Note: moving to "46cda6dc9ed929f73725821fe98dbcceaa94e459" which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
  git checkout -b <new_branch_name>
HEAD is now at 46cda6d... doit
Automatic merge went well; stopped before committing as requested
Switched to branch "T1"
Deleted branch tg-redepend/tmp/T1_.
tg: Rebased-using-merge onto new dependencies: T2 .