ooo-build r13501 - in trunk: . bin

[jannieuw svn gnome org]

Author: jannieuw
Date: Fri Aug  8 14:35:17 2008
New Revision: 13501
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13501&view=rev

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

	* bin/gob: New option: --topgit adds preliminary topgit support.


Modified:
   trunk/ChangeLog
   trunk/bin/gob

Modified: trunk/bin/gob
==============================================================================
--- trunk/bin/gob	(original)
+++ trunk/bin/gob	Fri Aug  8 14:35:17 2008
@@ -515,10 +515,15 @@
         else:
             dependencies = branch_get_dependencies_with_override (branches, patches, branch)
         if not self.has_branch (branch):
-            base_depend = dependencies[0]
-            self.system ('git checkout -b %(branch)s %(base_depend)s' % locals ())
-            for dependency in dependencies[1:]:
-                self.system ('git rebase %(dependency)s' % locals ())
+            if not options.topgit:
+                base_depend = dependencies[0]
+                self.system ('git checkout -b %(branch)s %(base_depend)s' % locals ())
+                for dependency in dependencies[1:]:
+                    self.system ('git rebase %(dependency)s' % locals ())
+            else:
+                depend_str = ' '.join (dependencies)
+                self.system ('tg create %(branch)s %(depend_str)s' % locals ())
+                self.system ('git commit -am "topgit branch info %(branch)s"' % locals ())
         else:
             self.checkout (branch)
         log = self.get_log (patched)
@@ -918,6 +923,7 @@
                   metavar='INT',
                   help='use FUZZ as fuzz factor for patch overlap')
     p.add_option ('--force', action='store_true', dest='force', default=False)
+    p.add_option ('--topgit', action='store_true', dest='topgit', default=False)
     p.add_option ('-v', '--verbose', action='count', dest='verbose', default=1)
     p.add_option ('-q', '--quiet', action='count', dest='quiet', default=0)
     return p