Generalize branch renaming

[stgit] / stgit / commands / branch.py

diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index 27a2e98d59847929dc942767f3fc16eab3cd47e5..8997e2078f90a61783c0fc54110c72d878d72472 100644 (file)
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -49,8 +49,14 @@ options = [make_option('-c', '--create',
            make_option('-l', '--list',
                        help = 'list branches contained in this repository',
                        action = 'store_true'),
+           make_option('-p', '--protect',
+                       help = 'prevent "stg pull" from modifying this branch',
+                       action = 'store_true'),
            make_option('-r', '--rename',
                        help = 'rename an existing development branch',
+                       action = 'store_true'),
+           make_option('-u', '--unprotect',
+                       help = 'allow "stg pull" to modify this branch',
                        action = 'store_true')]
 
 
@@ -60,45 +66,35 @@ def is_current_branch(branch_name):
 def print_branch(branch_name):
     initialized = ' '
     current = ' '
-    if os.path.isdir(os.path.join(git.base_dir, 'patches', branch_name)):
+    protected = ' '
+
+    branch = stack.Series(branch_name)
+
+    if branch.is_initialised():
         initialized = 's'
     if is_current_branch(branch_name):
         current = '>'
-    print '%s %s\t%s' % (current, initialized, branch_name)
+    if branch.get_protected():
+        protected = 'p'
+    print '%s %s%s\t%s\t%s' % (current, initialized, protected, branch_name, \
+                               branch.get_description())
 
 def delete_branch(doomed_name, force = False):
+    doomed = stack.Series(doomed_name)
+
+    if doomed.get_protected():
+        raise CmdException, 'This branch is protected. Delete is not permitted'
+
     if is_current_branch(doomed_name) and doomed_name != 'master':
         git.switch_branch('master')
 
-    stack.Series(doomed_name).delete(force)
+    doomed.delete(force)
 
     if doomed_name != 'master':
         git.delete_branch(doomed_name)
 
     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:
@@ -135,15 +131,62 @@ def func(parser, options, args):
             print_branch(i)
         return
 
+    elif options.protect:
+
+        if len(args) == 0:
+            branch_name = git.get_head_file()
+        elif len(args) == 1:
+            branch_name = args[0]
+        else:
+            parser.error('incorrect number of arguments')
+        branch = stack.Series(branch_name)
+
+        if not branch.is_initialised():
+            raise CmdException, 'Branch "%s" is not controlled by StGit' % branch_name
+
+        print 'Protecting branch "%s"...' % branch_name,
+        sys.stdout.flush()
+        branch.protect()
+        print 'done'
+
+        return
+
     elif options.rename:
 
         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_name = git.get_head_file()
+        elif len(args) == 1:
+            branch_name = args[0]
+        else:
+            parser.error('incorrect number of arguments')
+        branch = stack.Series(branch_name)
+
+        if not branch.is_initialised():
+            raise CmdException, 'Branch "%s" is not controlled by StGit' % branch_name
+
+        print 'Unprotecting branch "%s"...' % branch_name,
+        sys.stdout.flush()
+        branch.unprotect()
+        print 'done'
+
         return
 
     elif len(args) == 1:
 
+        if args[0] == git.get_head_file():
+            raise CmdException, 'Branch "%s" is already the current branch' % args[0]
+
         print 'Switching to branch "%s"...' % args[0],
         sys.stdout.flush()