~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allows extraction of information about remotes.
[stgit]
/
stgit
/
commands
/
branch.py
diff --git
a/stgit/commands/branch.py
b/stgit/commands/branch.py
index
6a551e4
..
d348409
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.commands.common import *
from stgit.utils import *
-from stgit import stack, git
+from stgit import stack, git
, basedir
help = 'manage development branches'
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('--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'),
make_option('--delete',
help = 'delete an existing development branch',
action = 'store_true'),
@@
-121,10
+124,9
@@
def func(parser, options, args):
tree_id = None
if len(args) == 2:
tree_id = None
if len(args) == 2:
- tree_id = args[1]
-
- git.create_branch(args[0], tree_id)
- stack.Series(args[0]).init()
+ tree_id = git_id(args[1])
+
+ stack.Series(args[0]).init(create_at = tree_id)
print 'Branch "%s" created.' % args[0]
return
print 'Branch "%s" created.' % args[0]
return
@@
-150,6
+152,14
@@
def func(parser, options, args):
return
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:
elif options.delete:
if len(args) != 1:
@@
-162,13
+172,19
@@
def func(parser, options, args):
if len(args) != 0:
parser.error('incorrect number of arguments')
if len(args) != 0:
parser.error('incorrect number of arguments')
- branches = os.listdir(os.path.join(git.get_base_dir(), 'refs', 'heads'))
+ branches = []
+ basepath = os.path.join(basedir.get(), 'refs', 'heads')
+ for path, files, dirs in walk_tree(basepath):
+ branches += [os.path.join(path, f) for f in files]
branches.sort()
branches.sort()
- max_len = max([len(i) for i in branches])
- print 'Available branches:'
- for i in branches:
- __print_branch(i, max_len)
+ if branches:
+ print 'Available branches:'
+ max_len = max([len(i) for i in branches])
+ for i in branches:
+ __print_branch(i, max_len)
+ else:
+ print 'No branches'
return
elif options.protect:
return
elif options.protect: