Mercurial: hgext/rebase.py comparison

comparison hgext/rebase.py @ 29400:c79da70a4659

rebase: move collapse-related local variables to the RR class This commit moves the following variables local to the 'rebase' function to be fields of the rebaseruntime class: -collapsef -collapsemsg

author	Kostia Balytskyi <ikostia@fb.com>
date	Tue, 21 Jun 2016 06:29:23 -0700
parents	adb0d58b8b0b
children	87acd047711e

comparison

equal deleted inserted replaced

-:adb0d58b8b0b
+:c79da70a4659
 self.activebookmark = None
 self.target = None
 self.skipped = set()
 self.targetancestors = set()
+self.collapsef = opts.get('collapse', False)
+self.collapsemsg = cmdutil.logmessage(ui, opts)
 @command('rebase',
 [('s', 'source', '',
 _('rebase the specified changeset and descendants'), _('REV')),
 ('b', 'base', '',
 _('rebase everything from branching point of specified changeset'),
 # search default destination in this space
 # used in the 'hg pull --rebase' case, see issue 5214.
 destspace = opts.get('_destspace')
 contf = opts.get('continue')
 abortf = opts.get('abort')
-collapsef = opts.get('collapse', False)
-collapsemsg = cmdutil.logmessage(ui, opts)
 date = opts.get('date', None)
 e = opts.get('extrafn') # internal, used by e.g. hgsubversion
 extrafns = [_savegraft]
 if e:
 extrafns = [e]
 help = "hg%s help -e histedit" % enablehistedit
 msg = _("interactive history editing is supported by the "
 "'histedit' extension (see \"%s\")") % help
 raise error.Abort(msg)
-if collapsemsg and not collapsef:
+if rbsrt.collapsemsg and not rbsrt.collapsef:
 raise error.Abort(
 _('message can only be specified with collapse'))
 if contf or abortf:
 if contf and abortf:
 raise error.Abort(_('cannot use both abort and continue'))
-if collapsef:
+if rbsrt.collapsef:
 raise error.Abort(
 _('cannot use collapse with continue or abort'))
 if srcf or basef or destf:
 raise error.Abort(
 _('abort and continue do not allow specifying revisions'))
 if abortf and opts.get('tool', False):
 ui.warn(_('tool option will be ignored\n'))
 try:
 (rbsrt.originalwd, rbsrt.target, rbsrt.state,
-rbsrt.skipped, collapsef, keepf, keepbranchesf,
+rbsrt.skipped, rbsrt.collapsef, keepf, keepbranchesf,
 rbsrt.external, rbsrt.activebookmark) = restorestatus(repo)
-collapsemsg = restorecollapsemsg(repo)
+rbsrt.collapsemsg = restorecollapsemsg(repo)
 except error.RepoLookupError:
 if abortf:
 clearstatus(repo)
 clearcollapsemsg(repo)
 repo.ui.warn(_('rebase aborted (no revision is removed,'
 rebaseobsskipped = set(obsoletenotrebased)
 _checkobsrebase(repo, ui, rebaseobsrevs,
 rebasesetrevs,
 rebaseobsskipped)
-result = buildstate(repo, dest, rebaseset, collapsef,
+result = buildstate(repo, dest, rebaseset, rbsrt.collapsef,
 obsoletenotrebased)
 if not result:
 # Empty state built, nothing to rebase
 ui.status(_('nothing to rebase\n'))
 raise error.Abort(_("can't rebase public changeset %s")
 % repo[root],
 hint=_('see "hg help phases" for details'))
 (rbsrt.originalwd, rbsrt.target, rbsrt.state) = result
-if collapsef:
+if rbsrt.collapsef:
 rbsrt.targetancestors = repo.changelog.ancestors([rbsrt.target],
 inclusive=True)
 rbsrt.external = externalparent(repo, rbsrt.state,
 rbsrt.targetancestors)
 if keepbranchesf:
 # insert _savebranch at the start of extrafns so if
 # there's a user-provided extrafn it can clobber branch if
 # desired
 extrafns.insert(0, _savebranch)
-if collapsef:
+if rbsrt.collapsef:
 branches = set()
 for rev in rbsrt.state:
 branches.add(repo[rev].branch())
 if len(branches) > 1:
 raise error.Abort(_('cannot collapse multiple named '
 p1, p2, base = defineparents(repo, rev, rbsrt.target,
 rbsrt.state,
 rbsrt.targetancestors,
 obsoletenotrebased)
 storestatus(repo, rbsrt.originalwd, rbsrt.target,
-rbsrt.state, collapsef, keepf, keepbranchesf,
+rbsrt.state, rbsrt.collapsef, keepf,
-rbsrt.external, rbsrt.activebookmark)
+keepbranchesf, rbsrt.external,
-storecollapsemsg(repo, collapsemsg)
+rbsrt.activebookmark)
+storecollapsemsg(repo, rbsrt.collapsemsg)
 if len(repo[None].parents()) == 2:
 repo.ui.debug('resuming interrupted rebase\n')
 else:
 try:
 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
 'rebase')
 stats = rebasenode(repo, rev, p1, base, rbsrt.state,
-collapsef, rbsrt.target)
+rbsrt.collapsef, rbsrt.target)
 if stats and stats[3] > 0:
 raise error.InterventionRequired(
 _('unresolved conflicts (see hg '
 'resolve, then hg rebase --continue)'))
 finally:
 ui.setconfig('ui', 'forcemerge', '', 'rebase')
-if not collapsef:
+if not rbsrt.collapsef:
 merging = p2 != nullrev
 editform = cmdutil.mergeeditform(merging, 'rebase')
 editor = cmdutil.getcommiteditor(editform=editform, **opts)
 newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn,
 editor=editor,
 # Update the state
 if newnode is not None:
 rbsrt.state[rev] = repo[newnode].rev()
 ui.debug('rebased as %s\n' % short(newnode))
 else:
-if not collapsef:
+if not rbsrt.collapsef:
 ui.warn(_('note: rebase of %d:%s created no changes '
 'to commit\n') % (rev, ctx))
 rbsrt.skipped.add(rev)
 rbsrt.state[rev] = p1
 ui.debug('next revision set to %s\n' % p1)
 (desc, repo[rbsrt.state[rev]]))
 ui.progress(_('rebasing'), None)
 ui.note(_('rebase merging completed\n'))
-if collapsef and not keepopen:
+if rbsrt.collapsef and not keepopen:
 p1, p2, _base = defineparents(repo, min(rbsrt.state),
 rbsrt.target, rbsrt.state,
 rbsrt.targetancestors,
 obsoletenotrebased)
 editopt = opts.get('edit')
 editform = 'rebase.collapse'
-if collapsemsg:
+if rbsrt.collapsemsg:
-commitmsg = collapsemsg
+commitmsg = rbsrt.collapsemsg
 else:
 commitmsg = 'Collapsed revision'
 for rebased in rbsrt.state:
 if rebased not in rbsrt.skipped and\
 rbsrt.state[rebased] > nullmerge:
 ui.note(_("update back to initial working directory parent\n"))
 hg.updaterepo(repo, newwd, False)
 if not keepf:
 collapsedas = None
-if collapsef:
+if rbsrt.collapsef:
 collapsedas = newnode
 clearrebased(ui, repo, rbsrt.state, rbsrt.skipped, collapsedas)
 with repo.transaction('bookmark') as tr:
 if currentbookmarks:

Mercurial > hg

comparison hgext/rebase.py @ 29400:c79da70a4659