Make branch creation atomic

This patch adds an optional create_at parameter to Series.init(), to
pass a git.branch_create() parameter if we want it to be called.  This
parameter can be None, so the test for False has to be explicit.

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index be501a814688d98840cd0a15a06c1cd5d450d9fb..c7561a82e83f193241daabfe7a6f030e3ac52bb5 100644 (file)
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -125,12 +125,8 @@ def func(parser, options, args):
         tree_id = None
         if len(args) == 2:
             tree_id = git_id(args[1])
         tree_id = None
         if len(args) == 2:
             tree_id = git_id(args[1])

-
-        if git.branch_exists(args[0]):
-            raise CmdException, 'Branch "%s" already exists' % args[0]

         
         

-        stack.Series(args[0]).init()
-        git.create_branch(args[0], tree_id)
+        stack.Series(args[0]).init(create_at = tree_id)

 
         print 'Branch "%s" created.' % args[0]
         return
 
         print 'Branch "%s" created.' % args[0]
         return

diff --git a/stgit/stack.py b/stgit/stack.py
index c14e029125096925cf3137fe9874a125d053203f..19bb62abc57cc14b1f782ec8f2584af93343117d 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -426,7 +426,7 @@ class Series:
         """
         return os.path.isdir(self.__patch_dir)
 
         """
         return os.path.isdir(self.__patch_dir)
 

-    def init(self):
+    def init(self, create_at=False):

         """Initialises the stgit series
         """
         bases_dir = os.path.join(self.__base_dir, 'refs', 'bases')
         """Initialises the stgit series
         """
         bases_dir = os.path.join(self.__base_dir, 'refs', 'bases')


@@ -438,6 +438,9 @@ class Series:
         if os.path.exists(self.__base_file):
             raise StackException, self.__base_file + ' already exists'
 
         if os.path.exists(self.__base_file):
             raise StackException, self.__base_file + ' already exists'
 

+        if (create_at!=False):
+            git.create_branch(self.__name, create_at)
+

         os.makedirs(self.__patch_dir)
 
         if not os.path.isdir(bases_dir):
         os.makedirs(self.__patch_dir)
 
         if not os.path.isdir(bases_dir):


@@ -509,8 +512,7 @@ class Series:
         """Clones a series
         """
         base = read_string(self.get_base_file())
         """Clones a series
         """
         base = read_string(self.get_base_file())

-        git.create_branch(target_series, tree_id = base)
-        Series(target_series).init()
+        Series(target_series).init(create_at = base)

         new_series = Series(target_series)
 
         # generate an artificial description file
         new_series = Series(target_series)
 
         # generate an artificial description file