~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
StGIT bash completion
[stgit]
/
stgit
/
commands
/
branch.py
diff --git
a/stgit/commands/branch.py
b/stgit/commands/branch.py
index
8997e20
..
d348409
100644
(file)
--- a/
stgit/commands/branch.py
+++ b/
stgit/commands/branch.py
@@
-18,28
+18,36
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import sys, os
+import sys, os
, time
from optparse import OptionParser, make_option
from stgit.commands.common import *
from stgit.utils import *
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'
usage = """%prog [options] branch-name [commit-id]
help = 'manage development branches'
usage = """%prog [options] branch-name [commit-id]
-Create,
list
, switch between, rename, or delete development branches
+Create,
clone
, switch between, rename, or delete development branches
within a git repository. By default, a single branch called 'master'
is always created in a new repository. This subcommand allows you to
within a git repository. By default, a single branch called 'master'
is always created in a new repository. This subcommand allows you to
-manage several patch series in the same repository.
+manage several patch series in the same repository
via GIT branches
.
When displaying the branches, the names can be prefixed with
When displaying the branches, the names can be prefixed with
-'s' (StGIT managed) or 'p' (protected)."""
+'s' (StGIT managed) or 'p' (protected).
+
+If not given any options, switch to the named branch."""
options = [make_option('-c', '--create',
help = 'create a new development branch',
action = 'store_true'),
options = [make_option('-c', '--create',
help = 'create a new development 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'),
@@
-60,10
+68,10
@@
options = [make_option('-c', '--create',
action = 'store_true')]
action = 'store_true')]
-def is_current_branch(branch_name):
- return
git.get_head_file
() == branch_name
+def
__
is_current_branch(branch_name):
+ return
crt_series.get_branch
() == branch_name
-def
print_branch(branch_name
):
+def
__print_branch(branch_name, length
):
initialized = ' '
current = ' '
protected = ' '
initialized = ' '
current = ' '
protected = ' '
@@
-72,28
+80,36
@@
def print_branch(branch_name):
if branch.is_initialised():
initialized = 's'
if branch.is_initialised():
initialized = 's'
- if is_current_branch(branch_name):
+ if
__
is_current_branch(branch_name):
current = '>'
if branch.get_protected():
protected = 'p'
current = '>'
if branch.get_protected():
protected = 'p'
- print
'%s %s%s\t%s\t%s' % (current, initialized, protected, branch_name,
\
-
branch.get_description()
)
+ print
current + ' ' + initialized + protected + '\t' +
\
+
branch_name.ljust(length) + ' | ' + branch.get_description(
)
-def delete_branch(doomed_name, force = False):
+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'
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')
+ print 'Deleting branch "%s"...' % doomed_name,
+ sys.stdout.flush()
+
+ if __is_current_branch(doomed_name):
+ check_local_changes()
+ check_conflicts()
+ check_head_top_equal()
+
+ if doomed_name != 'master':
+ git.switch_branch('master')
doomed.delete(force)
if doomed_name != 'master':
git.delete_branch(doomed_name)
doomed.delete(force)
if doomed_name != 'master':
git.delete_branch(doomed_name)
- print '
Branch "%s" has been deleted.' % doomed_name
+ print '
done'
def func(parser, options, args):
def func(parser, options, args):
@@
-101,21
+117,54
@@
def func(parser, options, args):
if len(args) == 0 or len(args) > 2:
parser.error('incorrect number of arguments')
if len(args) == 0 or len(args) > 2:
parser.error('incorrect number of arguments')
+
+ check_local_changes()
+ check_conflicts()
+ check_head_top_equal()
+
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
+ elif options.clone:
+
+ if len(args) == 0:
+ clone = crt_series.get_branch() + \
+ time.strftime('-%C%y%m%d-%H%M%S')
+ elif len(args) == 1:
+ clone = args[0]
+ else:
+ parser.error('incorrect number of arguments')
+
+ check_local_changes()
+ check_conflicts()
+ check_head_top_equal()
+
+ print 'Cloning current branch to "%s"...' % clone,
+ sys.stdout.flush()
+ crt_series.clone(clone)
+ print 'done'
+
+ 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:
parser.error('incorrect number of arguments')
elif options.delete:
if len(args) != 1:
parser.error('incorrect number of arguments')
- delete_branch(args[0], options.force)
+
__
delete_branch(args[0], options.force)
return
elif options.list:
return
elif options.list:
@@
-123,18
+172,25
@@
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.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()
- print 'Available branches:'
- for i in branches:
- print_branch(i)
+ 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:
if len(args) == 0:
return
elif options.protect:
if len(args) == 0:
- branch_name =
git.get_head_file
()
+ branch_name =
crt_series.get_branch
()
elif len(args) == 1:
branch_name = args[0]
else:
elif len(args) == 1:
branch_name = args[0]
else:
@@
-142,7
+198,8
@@
def func(parser, options, args):
branch = stack.Series(branch_name)
if not branch.is_initialised():
branch = stack.Series(branch_name)
if not branch.is_initialised():
- raise CmdException, 'Branch "%s" is not controlled by StGit' % branch_name
+ raise CmdException, 'Branch "%s" is not controlled by StGIT' \
+ % branch_name
print 'Protecting branch "%s"...' % branch_name,
sys.stdout.flush()
print 'Protecting branch "%s"...' % branch_name,
sys.stdout.flush()
@@
-156,6
+213,9
@@
def func(parser, options, args):
if len(args) != 2:
parser.error('incorrect number of arguments')
if len(args) != 2:
parser.error('incorrect number of arguments')
+ if __is_current_branch(args[0]):
+ raise CmdException, 'Renaming the current branch is not supported'
+
stack.Series(args[0]).rename(args[1])
print 'Renamed branch "%s" as "%s".' % (args[0], args[1])
stack.Series(args[0]).rename(args[1])
print 'Renamed branch "%s" as "%s".' % (args[0], args[1])
@@
-165,7
+225,7
@@
def func(parser, options, args):
elif options.unprotect:
if len(args) == 0:
elif options.unprotect:
if len(args) == 0:
- branch_name =
git.get_head_file
()
+ branch_name =
crt_series.get_branch
()
elif len(args) == 1:
branch_name = args[0]
else:
elif len(args) == 1:
branch_name = args[0]
else:
@@
-173,7
+233,8
@@
def func(parser, options, args):
branch = stack.Series(branch_name)
if not branch.is_initialised():
branch = stack.Series(branch_name)
if not branch.is_initialised():
- raise CmdException, 'Branch "%s" is not controlled by StGit' % branch_name
+ raise CmdException, 'Branch "%s" is not controlled by StGIT' \
+ % branch_name
print 'Unprotecting branch "%s"...' % branch_name,
sys.stdout.flush()
print 'Unprotecting branch "%s"...' % branch_name,
sys.stdout.flush()
@@
-184,8
+245,13
@@
def func(parser, options, args):
elif len(args) == 1:
elif len(args) == 1:
- if args[0] == git.get_head_file():
- raise CmdException, 'Branch "%s" is already the current branch' % args[0]
+ if __is_current_branch(args[0]):
+ raise CmdException, 'Branch "%s" is already the current branch' \
+ % args[0]
+
+ check_local_changes()
+ check_conflicts()
+ check_head_top_equal()
print 'Switching to branch "%s"...' % args[0],
sys.stdout.flush()
print 'Switching to branch "%s"...' % args[0],
sys.stdout.flush()
@@
-199,4
+265,4
@@
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')
- print
git.get_head_file
()
+ print
crt_series.get_branch
()