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):
initialized = ' '
current = ' '
protected = ' '
branch = stack.Series(branch_name)
- if os.path.isdir(os.path.join(git.base_dir, 'patches', branch_name)):
+ 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'
print '%s %s%s\t%s\t%s' % (current, initialized, protected, branch_name, \
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'
- 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)
- 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)
+ print 'done'
def func(parser, options, args):
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 = args[1]
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:
print 'Available branches:'
for i in branches:
- print_branch(i)
+ __print_branch(i)
return
elif options.protect:
if len(args) == 0:
- branch = git.get_head_file()
+ branch_name = git.get_head_file()
elif len(args) == 1:
- branch = args[0]
+ branch_name = args[0]
else:
parser.error('incorrect number of arguments')
+ branch = stack.Series(branch_name)
- base = os.path.join(git.base_dir, 'refs', 'bases', branch)
- if not os.path.isfile(base):
- raise CmdException, 'Branch "%s" is not controlled by StGit' % branch
+ if not branch.is_initialised():
+ raise CmdException, 'Branch "%s" is not controlled by StGIT' \
+ % branch_name
- print 'Protecting branch "%s"...' % branch,
+ print 'Protecting branch "%s"...' % branch_name,
sys.stdout.flush()
- stack.Series(branch).protect()
+ branch.protect()
print 'done'
return
if len(args) != 2:
parser.error('incorrect number of arguments')
- rename_branch(args[0], args[1])
+
+ 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])
+
return
elif options.unprotect:
if len(args) == 0:
- branch = git.get_head_file()
+ branch_name = git.get_head_file()
elif len(args) == 1:
- branch = args[0]
+ branch_name = args[0]
else:
parser.error('incorrect number of arguments')
+ branch = stack.Series(branch_name)
- base = os.path.join(git.base_dir, 'refs', 'bases', branch)
- if not os.path.isfile(base):
- raise CmdException, 'Branch "%s" is not controlled by StGit' % branch
+ if not branch.is_initialised():
+ raise CmdException, 'Branch "%s" is not controlled by StGIT' \
+ % branch_name
- print 'Unprotecting branch "%s"...' % branch,
+ print 'Unprotecting branch "%s"...' % branch_name,
sys.stdout.flush()
- stack.Series(branch).unprotect()
+ 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]
+ 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()
~mdw / stgit / blobdiff