ooo-build r13525 - in trunk: . bin git

[jannieuw svn gnome org]

Author: jannieuw
Date: Tue Aug 12 13:27:13 2008
New Revision: 13525
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13525&view=rev

Log:
2008-08-12  Jan Nieuwenhuizen  <janneke gnu org>

	* git/tg-create.diff: Add --force option to tg-create.

	* bin/gob (Git.apply_patch): Use it to auto-resolve .top*
	merge problems.  Remove previous in-gob conflict resolving.


Added:
   trunk/git/tg-create.diff
Modified:
   trunk/ChangeLog
   trunk/bin/gob

Modified: trunk/bin/gob
==============================================================================
--- trunk/bin/gob	(original)
+++ trunk/bin/gob	Tue Aug 12 13:27:13 2008
@@ -523,16 +523,7 @@
                     self.system ('git rebase %(dependency)s' % locals ())
             else:
                 depend_str = ' '.join (dependencies)
-                error = self.system ('tg create %(branch)s %(depend_str)s' % locals (), raise_on_error=False)
-                print 'error', error
-                while error:
-                    # tg create is allowed to fail by design, currently
-                    # FIXME: move this to tg-create --auto-merge
-                    self.system ('date > .topmsg')
-                    self.system ('mv .topdeps .topdeps~ && grep -Ev "(<|>|=){7}" .topdeps~ > .topdeps && rm .topdeps~')
-                    self.system ('git add .topdeps .topmsg')
-                    self.system ('git commit -am "auto-resolve topgit .top* merge failure"' % locals ())
-                    error = self.system ('tg create', raise_on_error=False)
+                self.system ('tg create --force %(branch)s %(depend_str)s' % locals ())
                 self.system ('git commit -am "topgit branch info %(branch)s"' % locals ())
         else:
             self.checkout (branch)
@@ -546,9 +537,6 @@
         self.system ('git push . %(scratch)s:%(patched)s' % self.__dict__)
         self.checkout (self.patched)
         self.system ('git branch -D %(scratch)s' % self.__dict__)
-        if False and options.topgit and self.system ('git branch', raise_on_error=False):
-            # tg create failed, lost our HEAD, get new one
-            self.system ('git reset --hard HEAD')
     def pick_patch (self, patch, commit):
         branch = patch_get_branch (patch)
         print >> sys.stderr, 'Picking patch[%(branch)s]:' % locals (), patch.name

Added: trunk/git/tg-create.diff
==============================================================================
--- (empty file)
+++ trunk/git/tg-create.diff	Tue Aug 12 13:27:13 2008
@@ -0,0 +1,47 @@
+From 4dfc33d1a1390290f126d8ef829e415a8b25f686 Mon Sep 17 00:00:00 2001
+From: Jan Nieuwenhuizen <janneke gnu org>
+Date: Tue, 12 Aug 2008 14:51:14 +0200
+Subject: [PATCH] tg create: add --force option to resolve merge dependencies.
+
+
+Signed-off-by: Jan Nieuwenhuizen <janneke gnu org>
+---
+ tg-create.sh |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/tg-create.sh b/tg-create.sh
+index 6cce7ed..0c83460 100644
+--- a/tg-create.sh
++++ b/tg-create.sh
+@@ -14,6 +14,8 @@ name=
+ while [ -n "$1" ]; do
+ 	arg="$1"; shift
+ 	case "$arg" in
++	--force)
++		force=1;;
+ 	-*)
+ 		echo "Usage: tg create NAME [DEPS...]" >&2
+ 		exit 1;;
+@@ -82,6 +84,11 @@ while [ -n "$merge" ]; do
+ 	info "Merging $name base with $branch..."
+ 
+ 	if ! git merge "$branch"; then
++	    if test "$force" = "1"; then
++                mv .topdeps .topdeps~ && grep -Ev '(<|>|=){7}' .topdeps~ > .topdeps && rm .topdeps~
++                git add .topdeps .topmsg
++                git commit -am 'Auto-resolve topgit .top* merge failure.'
++	    else
+ 		info "Please commit merge resolution and call: tg create"
+ 		info "It is also safe to abort this operation using \`git reset --hard\`"
+ 		info "but please remember you are on the base branch now;"
+@@ -89,6 +96,7 @@ while [ -n "$merge" ]; do
+ 		echo "$deps" >"$git_dir/top-deps"
+ 		echo "$merge" >"$git_dir/top-merge"
+ 		exit 2
++	    fi
+ 	fi
+ done
+ 
+-- 
+1.6.0.rc0.44.g67270
+