Generalize branch renaming

[stgit] / stgit / commands / branch.py

diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index 8420ec6393b0071383946993c8ec06fd49d7c630..8997e2078f90a61783c0fc54110c72d878d72472 100644 (file)
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -70,7 +70,7 @@ def print_branch(branch_name):
 
     branch = stack.Series(branch_name)
 
-    if os.path.isdir(os.path.join(git.base_dir, 'patches', branch_name)):
+    if branch.is_initialised():
         initialized = 's'
     if is_current_branch(branch_name):
         current = '>'
@@ -95,28 +95,6 @@ def delete_branch(doomed_name, force = False):
 
     print 'Branch "%s" has been deleted.' % doomed_name
 
-def rename_branch(from_name, to_name):
-    if from_name == 'master':
-        raise CmdException, 'Renaming the master branch is not allowed'
-
-    to_patchdir = os.path.join(git.base_dir, 'patches', to_name)
-    if os.path.isdir(to_patchdir):
-        raise CmdException, '"%s" already exists' % to_patchdir
-    to_base = os.path.join(git.base_dir, 'refs', 'bases', to_name)
-    if os.path.isfile(to_base):
-        raise CmdException, '"%s" already exists' % to_base
-
-    git.rename_branch(from_name, to_name)
-
-    from_patchdir = os.path.join(git.base_dir, 'patches', from_name)
-    if os.path.isdir(from_patchdir):
-        os.rename(from_patchdir, to_patchdir)
-    from_base = os.path.join(git.base_dir, 'refs', 'bases', from_name)
-    if os.path.isfile(from_base):
-        os.rename(from_base, to_base)
-
-    print 'Renamed branch "%s" as "%s".' % (from_name, to_name)
-
 def func(parser, options, args):
 
     if options.create:
@@ -156,19 +134,19 @@ def func(parser, options, args):
     elif options.protect:
 
         if len(args) == 0:
-            branch = git.get_head_file()
+            branch_name = git.get_head_file()
         elif len(args) == 1:
-            branch = args[0]
+            branch_name = args[0]
         else:
             parser.error('incorrect number of arguments')
+        branch = stack.Series(branch_name)
 
-        base = os.path.join(git.base_dir, 'refs', 'bases', branch)
-        if not os.path.isfile(base):
-            raise CmdException, 'Branch "%s" is not controlled by StGit' % branch
+        if not branch.is_initialised():
+            raise CmdException, 'Branch "%s" is not controlled by StGit' % branch_name
 
-        print 'Protecting branch "%s"...' % branch,
+        print 'Protecting branch "%s"...' % branch_name,
         sys.stdout.flush()
-        stack.Series(branch).protect()
+        branch.protect()
         print 'done'
 
         return
@@ -177,25 +155,29 @@ def func(parser, options, args):
 
         if len(args) != 2:
             parser.error('incorrect number of arguments')
-        rename_branch(args[0], args[1])
+
+        stack.Series(args[0]).rename(args[1])
+
+        print 'Renamed branch "%s" as "%s".' % (args[0], args[1])
+
         return
 
     elif options.unprotect:
 
         if len(args) == 0:
-            branch = git.get_head_file()
+            branch_name = git.get_head_file()
         elif len(args) == 1:
-            branch = args[0]
+            branch_name = args[0]
         else:
             parser.error('incorrect number of arguments')
+        branch = stack.Series(branch_name)
 
-        base = os.path.join(git.base_dir, 'refs', 'bases', branch)
-        if not os.path.isfile(base):
-            raise CmdException, 'Branch "%s" is not controlled by StGit' % branch
+        if not branch.is_initialised():
+            raise CmdException, 'Branch "%s" is not controlled by StGit' % branch_name
 
-        print 'Unprotecting branch "%s"...' % branch,
+        print 'Unprotecting branch "%s"...' % branch_name,
         sys.stdout.flush()
-        stack.Series(branch).unprotect()
+        branch.unprotect()
         print 'done'
 
         return