Create stgit/basedir.py for determining the .git directory

[stgit] / stgit / commands / branch.py

diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index 6a551e4..c4b5945 100644 (file)
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -23,7 +23,7 @@ from optparse import OptionParser, make_option
 
 from stgit.commands.common import *
 from stgit.utils import *
-from stgit import stack, git
+from stgit import stack, git, basedir
 
 
 help = 'manage development branches'
@@ -45,6 +45,9 @@ options = [make_option('-c', '--create',
            make_option('--clone',
                        help = 'clone the contents of the current branch',
                        action = 'store_true'),
+           make_option('--convert',
+                       help = 'switch between old and new format branches',
+                       action = 'store_true'),
            make_option('--delete',
                        help = 'delete an existing development branch',
                        action = 'store_true'),
@@ -121,7 +124,7 @@ def func(parser, options, args):
 
         tree_id = None
         if len(args) == 2:
-            tree_id = args[1]
+            tree_id = git_id(args[1])
 
         git.create_branch(args[0], tree_id)
         stack.Series(args[0]).init()
@@ -150,6 +153,14 @@ def func(parser, options, args):
 
         return
 
+    elif options.convert:
+
+        if len(args) != 0:
+            parser.error('incorrect number of arguments')
+
+        crt_series.convert()
+        return
+
     elif options.delete:
 
         if len(args) != 1:
@@ -162,7 +173,7 @@ def func(parser, options, args):
         if len(args) != 0:
             parser.error('incorrect number of arguments')
 
-        branches = os.listdir(os.path.join(git.get_base_dir(), 'refs', 'heads'))
+        branches = os.listdir(os.path.join(basedir.get(), 'refs', 'heads'))
         branches.sort()
         max_len = max([len(i) for i in branches])