X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/f644f510bf66b9c6eb1b44668663350bb5083599..d37ff07984e8230e9444fdce2af0f8da3a46db64:/stgit/commands/branch.py diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py index 5f79f7e..c22e143 100644 --- a/stgit/commands/branch.py +++ b/stgit/commands/branch.py @@ -45,12 +45,11 @@ 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'), + make_option('-d', '--description', + help = 'set the branch description'), make_option('--force', help = 'force a delete when the series is not empty', action = 'store_true'), @@ -69,7 +68,7 @@ options = [make_option('-c', '--create', def __is_current_branch(branch_name): - return crt_series.get_branch() == branch_name + return crt_series.get_name() == branch_name def __print_branch(branch_name, length): initialized = ' ' @@ -84,8 +83,8 @@ def __print_branch(branch_name, length): current = '>' if branch.get_protected(): protected = 'p' - print current + ' ' + initialized + protected + '\t' + \ - branch_name.ljust(length) + ' | ' + branch.get_description() + out.stdout(current + ' ' + initialized + protected + '\t' + + branch_name.ljust(length) + ' | ' + branch.get_description()) def __delete_branch(doomed_name, force = False): doomed = stack.Series(doomed_name) @@ -93,8 +92,7 @@ def __delete_branch(doomed_name, force = False): if doomed.get_protected(): raise CmdException, 'This branch is protected. Delete is not permitted' - print 'Deleting branch "%s"...' % doomed_name, - sys.stdout.flush() + out.start('Deleting branch "%s"' % doomed_name) if __is_current_branch(doomed_name): check_local_changes() @@ -109,7 +107,7 @@ def __delete_branch(doomed_name, force = False): if doomed_name != 'master': git.delete_branch(doomed_name) - print 'done' + out.done() def func(parser, options, args): @@ -128,17 +126,20 @@ def func(parser, options, args): if git.rev_parse(args[1]) == git.rev_parse('refs/heads/' + args[1]): # we are for sure referring to a branch parentbranch = 'refs/heads/' + args[1] - print 'Recording "%s" as parent branch.' % parentbranch + out.info('Recording "%s" as parent branch' % parentbranch) elif git.rev_parse(args[1]) and re.search('/', args[1]): # FIXME: should the test be more strict ? parentbranch = args[1] else: # Note: this includes refs to StGIT patches - print 'Don\'t know how to determine parent branch from "%s".' % args[1] + out.info('Don\'t know how to determine parent branch' + ' from "%s"' % args[1]) parentbranch = None except git.GitException: - # should use a more specific exception to catch only non-git refs ? - print 'Don\'t know how to determine parent branch from "%s".' % args[1] + # should use a more specific exception to catch only + # non-git refs ? + out.info('Don\'t know how to determine parent branch' + ' from "%s"' % args[1]) parentbranch = None tree_id = git_id(args[1]) @@ -149,9 +150,10 @@ def func(parser, options, args): if parentbranch: parentremote = git.identify_remote(parentbranch) if parentremote: - print 'Using "%s" remote to pull parent from.' % parentremote + out.info('Using remote "%s" to pull parent from' + % parentremote) else: - print 'Recording as a local branch.' + out.info('Recording as a local branch') else: # no known parent branch, can't guess the remote parentremote = None @@ -160,13 +162,13 @@ def func(parser, options, args): parent_remote = parentremote, parent_branch = parentbranch) - print 'Branch "%s" created.' % args[0] + out.info('Branch "%s" created' % args[0]) return elif options.clone: if len(args) == 0: - clone = crt_series.get_branch() + \ + clone = crt_series.get_name() + \ time.strftime('-%C%y%m%d-%H%M%S') elif len(args) == 1: clone = args[0] @@ -177,19 +179,10 @@ def func(parser, options, args): check_conflicts() check_head_top_equal() - print 'Cloning current branch to "%s"...' % clone, - sys.stdout.flush() + out.start('Cloning current branch to "%s"' % clone) crt_series.clone(clone) - print 'done' - - return - - elif options.convert: - - if len(args) != 0: - parser.error('incorrect number of arguments') + out.done() - crt_series.convert() return elif options.delete: @@ -211,18 +204,18 @@ def func(parser, options, args): branches.sort() if branches: - print 'Available branches:' + out.info('Available branches:') max_len = max([len(i) for i in branches]) for i in branches: __print_branch(i, max_len) else: - print 'No branches' + out.info('No branches') return elif options.protect: if len(args) == 0: - branch_name = crt_series.get_branch() + branch_name = crt_series.get_name() elif len(args) == 1: branch_name = args[0] else: @@ -233,10 +226,9 @@ def func(parser, options, args): raise CmdException, 'Branch "%s" is not controlled by StGIT' \ % branch_name - print 'Protecting branch "%s"...' % branch_name, - sys.stdout.flush() + out.start('Protecting branch "%s"' % branch_name) branch.protect() - print 'done' + out.done() return @@ -250,14 +242,14 @@ def func(parser, options, args): stack.Series(args[0]).rename(args[1]) - print 'Renamed branch "%s" as "%s".' % (args[0], args[1]) + out.info('Renamed branch "%s" to "%s"' % (args[0], args[1])) return elif options.unprotect: if len(args) == 0: - branch_name = crt_series.get_branch() + branch_name = crt_series.get_name() elif len(args) == 1: branch_name = args[0] else: @@ -268,10 +260,27 @@ def func(parser, options, args): raise CmdException, 'Branch "%s" is not controlled by StGIT' \ % branch_name - print 'Unprotecting branch "%s"...' % branch_name, - sys.stdout.flush() + out.info('Unprotecting branch "%s"' % branch_name) branch.unprotect() - print 'done' + out.done() + + return + + elif options.description is not None: + + if len(args) == 0: + branch_name = crt_series.get_name() + 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 + + branch.set_description(options.description) return @@ -285,16 +294,13 @@ def func(parser, options, args): check_conflicts() check_head_top_equal() - print 'Switching to branch "%s"...' % args[0], - sys.stdout.flush() - + out.start('Switching to branch "%s"' % args[0]) git.switch_branch(args[0]) - - print 'done' + out.done() return # default action: print the current branch if len(args) != 0: parser.error('incorrect number of arguments') - print crt_series.get_branch() + print crt_series.get_name()