def func(parser, options, args):
"""Rebase the current stack
"""
if len(args) != 1:
parser.error('incorrect number of arguments')
repository = directory.repository
stack = repository.get_stack()
iw = repository.default_iw
if stack.protected:
raise CmdException('This branch is protected. Rebase is not permitted')
target = git_commit(args[0], repository)
applied = stack.patchorder.applied
retval = prepare_rebase(stack, 'rebase')
if retval:
return retval
rebase(stack, iw, target)
if not options.nopush:
return post_rebase(stack,
applied,
'rebase',
check_merged=options.merged)
def func(parser, options, args):
"""Rebase the current stack"""
if options.interactive:
# destination is optional for '--interactive'
if len(args) not in (0, 1):
parser.error('incorrect number of arguments')
else:
if len(args) != 1:
parser.error('incorrect number of arguments')
repository = directory.repository
stack = repository.get_stack()
iw = repository.default_iw
if stack.protected:
raise CmdException('This branch is protected. Rebase is not permitted')
if len(args) > 0:
target = git_commit(args[0], repository)
else:
target = stack.base
if options.autostash and not iw.worktree_clean():
repository.run(['git', 'stash', 'push']).run()
stashed_worktree = True
else:
stashed_worktree = False
applied = stack.patchorder.applied
retval = prepare_rebase(stack, 'rebase')
if retval:
return retval
rebase(stack, iw, target)
if options.interactive:
retval = __do_rebase_interactive(repository,
applied,
check_merged=options.merged)
elif not options.nopush:
retval = post_rebase(stack,
applied,
'rebase',
check_merged=options.merged)
else:
retval = None
if stashed_worktree:
try:
repository.run(['git', 'stash', 'pop']).run()
except RunException:
raise StashPopConflictException()
return retval
def func(parser, options, args):
"""Rebase the current stack
"""
if len(args) != 1:
parser.error('incorrect number of arguments')
if crt_series.get_protected():
raise CmdException('This branch is protected. Rebase is not permitted')
check_local_changes()
check_conflicts()
check_head_top_equal(crt_series)
# ensure an exception is raised before popping on non-existent target
if git_id(crt_series, args[0]) is None:
raise GitException('Unknown revision: %s' % args[0])
applied = prepare_rebase(crt_series)
rebase(crt_series, args[0])
post_rebase(crt_series, applied, options.nopush, options.merged)
print_crt_patch(crt_series)
def func(parser, options, args):
"""Rebase the current stack
"""
if len(args) != 1:
parser.error('incorrect number of arguments')
if crt_series.get_protected():
raise CmdException('This branch is protected. Rebase is not permitted')
check_local_changes()
check_conflicts()
check_head_top_equal(crt_series)
# ensure an exception is raised before popping on non-existent target
if git_id(crt_series, args[0]) is None:
raise GitException('Unknown revision: %s' % args[0])
applied = prepare_rebase(crt_series)
rebase(crt_series, args[0])
post_rebase(crt_series, applied, options.nopush, options.merged)
print_crt_patch(crt_series)
def func(parser, options, args):
"""Rebase the current stack"""
if options.interactive:
# destination is optional for '--interactive'
if len(args) not in (0, 1):
parser.error('incorrect number of arguments')
else:
if len(args) != 1:
parser.error('incorrect number of arguments')
repository = directory.repository
stack = repository.get_stack()
iw = repository.default_iw
if stack.protected:
raise CmdException('This branch is protected. Rebase is not permitted')
if len(args) > 0:
target = git_commit(args[0], repository)
else:
target = stack.base
applied = stack.patchorder.applied
retval = prepare_rebase(stack, 'rebase')
if retval:
return retval
rebase(stack, iw, target)
if options.interactive:
return __do_rebase_interactive(repository,
applied,
check_merged=options.merged)
elif not options.nopush:
return post_rebase(stack,
applied,
'rebase',
check_merged=options.merged)
def func(parser, options, args):
"""Pull the changes from a remote repository"""
repository = directory.repository
iw = repository.default_iw
stack = repository.get_stack()
policy = config.get('branch.%s.stgit.pull-policy' %
stack.name) or config.get('stgit.pull-policy')
if policy not in ['pull', 'fetch-rebase', 'rebase']:
raise GitConfigException('Unsupported pull-policy "%s"' % policy)
remote_name = None
if policy == 'rebase':
# parent is local
if len(args) == 1:
parser.error(
'specifying a repository is meaningless for policy="%s"' %
(policy, ))
elif len(args) > 0:
parser.error('incorrect number of arguments')
else:
# parent is remote
if len(args) > 1:
parser.error('incorrect number of arguments')
if len(args) >= 1:
remote_name = args[0]
else:
remote_name = stack.parent_remote
if policy in ['pull', 'fetch-rebase'] and remote_name is None:
parser.error(
'There is no tracking information for the current branch.\n'
'Please specify the remote repository to pull from.')
if stack.protected:
raise CmdException('This branch is protected. Pulls are not permitted')
applied = stack.patchorder.applied
retval = prepare_rebase(stack, 'pull')
if retval:
return retval
# pull the remote changes
if policy == 'pull':
out.info('Pulling from "%s"' % remote_name)
pull(repository, remote_name)
elif policy == 'fetch-rebase':
out.info('Fetching from "%s"' % remote_name)
fetch(repository, remote_name)
try:
target = repository.rev_parse('FETCH_HEAD')
except RepositoryException:
out.error('Could not find the remote head to rebase onto - '
'fix branch.%s.merge in .git/config' % stack.name)
out.error('Pushing any patches back...')
post_rebase(stack, applied, 'pull', check_merged=False)
raise
rebase(stack, iw, target)
elif policy == 'rebase':
value = config.get('branch.%s.stgit.parentbranch' % stack.name)
if value:
parent_commit = git_commit(value, repository)
else:
try:
parent_commit = repository.rev_parse('heads/origin')
except RepositoryException:
raise CmdException('Cannot find a parent branch for "%s"' %
stack.name)
else:
out.warn(
'No parent branch declared for stack "%s", defaulting to'
'"heads/origin".' % stack.name,
'Consider setting "branch.%s.stgit.parentbranch" with '
'"git config".' % stack.name,
)
rebase(stack, iw, parent_commit)
if not options.nopush:
post_rebase(stack, applied, 'pull', check_merged=options.merged)
# maybe tidy up
if config.getbool('stgit.keepoptimized'):
repository.repack()
def func(parser, options, args):
"""Pull the changes from a remote repository
"""
policy = config.get('branch.%s.stgit.pull-policy' % crt_series.get_name()) or \
config.get('stgit.pull-policy')
if policy == 'rebase':
# parent is local
if len(args) == 1:
parser.error(
'specifying a repository is meaningless for policy="%s"' %
policy)
if len(args) > 0:
parser.error('incorrect number of arguments')
else:
# parent is remote
if len(args) > 1:
parser.error('incorrect number of arguments')
if len(args) >= 1:
repository = args[0]
else:
repository = crt_series.get_parent_remote()
if crt_series.get_protected():
raise CmdException('This branch is protected. Pulls are not permitted')
check_local_changes()
check_conflicts()
check_head_top_equal(crt_series)
if policy not in ['pull', 'fetch-rebase', 'rebase']:
raise GitConfigException('Unsupported pull-policy "%s"' % policy)
applied = prepare_rebase(crt_series)
# pull the remote changes
if policy == 'pull':
out.info('Pulling from "%s"' % repository)
git.pull(repository)
elif policy == 'fetch-rebase':
out.info('Fetching from "%s"' % repository)
git.fetch(repository)
try:
target = git.fetch_head()
except git.GitException:
out.error(
'Could not find the remote head to rebase onto - fix branch.%s.merge in .git/config'
% crt_series.get_name())
out.error('Pushing any patches back...')
post_rebase(crt_series, applied, False, False)
raise
rebase(crt_series, target)
elif policy == 'rebase':
rebase(crt_series, crt_series.get_parent_branch())
post_rebase(crt_series, applied, options.nopush, options.merged)
# maybe tidy up
if config.getbool('stgit.keepoptimized'):
git.repack()
print_crt_patch(crt_series)
def func(parser, options, args):
"""Pull the changes from a remote repository
"""
policy = config.get('branch.%s.stgit.pull-policy' % crt_series.get_name()) or \
config.get('stgit.pull-policy')
if policy == 'rebase':
# parent is local
if len(args) == 1:
parser.error('specifying a repository is meaningless for policy="%s"' % policy)
if len(args) > 0:
parser.error('incorrect number of arguments')
else:
# parent is remote
if len(args) > 1:
parser.error('incorrect number of arguments')
if len(args) >= 1:
repository = args[0]
else:
repository = crt_series.get_parent_remote()
if crt_series.get_protected():
raise CmdException('This branch is protected. Pulls are not permitted')
check_local_changes()
check_conflicts()
check_head_top_equal(crt_series)
if policy not in ['pull', 'fetch-rebase', 'rebase']:
raise GitConfigException('Unsupported pull-policy "%s"' % policy)
applied = prepare_rebase(crt_series)
# pull the remote changes
if policy == 'pull':
out.info('Pulling from "%s"' % repository)
git.pull(repository)
elif policy == 'fetch-rebase':
out.info('Fetching from "%s"' % repository)
git.fetch(repository)
try:
target = git.fetch_head()
except git.GitException:
out.error('Could not find the remote head to rebase onto - fix branch.%s.merge in .git/config' % crt_series.get_name())
out.error('Pushing any patches back...')
post_rebase(crt_series, applied, False, False)
raise
rebase(crt_series, target)
elif policy == 'rebase':
rebase(crt_series, crt_series.get_parent_branch())
post_rebase(crt_series, applied, options.nopush, options.merged)
# maybe tidy up
if config.get('stgit.keepoptimized') == 'yes':
git.repack()
print_crt_patch(crt_series)
