Mercurial > hg-stable
changeset 29359:d2168849539d
rebase: move local variable 'target' to the RR class
| author | Kostia Balytskyi <ikostia@fb.com> |
|---|---|
| date | Mon, 13 Jun 2016 22:38:54 +0100 |
| parents | 6e83f5bbed8d |
| children | 4cbe62ab5c97 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 19 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Mon Jun 13 22:36:13 2016 +0100 +++ b/hgext/rebase.py Mon Jun 13 22:38:54 2016 +0100 @@ -129,6 +129,7 @@ # dict will be what contains most of the rebase progress state. self.state = {} self.activebookmark = None + self.target = None @command('rebase', [('s', 'source', '', @@ -241,7 +242,6 @@ """ rbsrt = rebaseruntime() - target = None skipped = set() targetancestors = set() @@ -302,7 +302,7 @@ ui.warn(_('tool option will be ignored\n')) try: - (rbsrt.originalwd, target, rbsrt.state, skipped, + (rbsrt.originalwd, rbsrt.target, rbsrt.state, skipped, collapsef, keepf, keepbranchesf, rbsrt.external, rbsrt.activebookmark) = restorestatus(repo) collapsemsg = restorecollapsemsg(repo) @@ -318,7 +318,8 @@ hint = _('use "hg rebase --abort" to clear broken state') raise error.Abort(msg, hint=hint) if abortf: - return abort(repo, rbsrt.originalwd, target, rbsrt.state, + return abort(repo, rbsrt.originalwd, rbsrt.target, + rbsrt.state, activebookmark=rbsrt.activebookmark) obsoletenotrebased = {} @@ -328,7 +329,7 @@ if st == revprecursor]) rebasesetrevs = set(rbsrt.state.keys()) obsoletenotrebased = _computeobsoletenotrebased(repo, - rebaseobsrevs, target) + rebaseobsrevs, rbsrt.target) rebaseobsskipped = set(obsoletenotrebased) _checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs, rebaseobsskipped) @@ -374,9 +375,9 @@ % repo[root], hint=_('see "hg help phases" for details')) - (rbsrt.originalwd, target, rbsrt.state) = result + (rbsrt.originalwd, rbsrt.target, rbsrt.state) = result if collapsef: - targetancestors = repo.changelog.ancestors([target], + targetancestors = repo.changelog.ancestors([rbsrt.target], inclusive=True) rbsrt.external = externalparent(repo, rbsrt.state, targetancestors) @@ -399,7 +400,8 @@ # Rebase if not targetancestors: - targetancestors = repo.changelog.ancestors([target], inclusive=True) + targetancestors = repo.changelog.ancestors([rbsrt.target], + inclusive=True) # Keep track of the current bookmarks in order to reset them later currentbookmarks = repo._bookmarks.copy() @@ -424,11 +426,12 @@ ui.status(_('rebasing %s\n') % desc) ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)), _('changesets'), total) - p1, p2, base = defineparents(repo, rev, target, rbsrt.state, + p1, p2, base = defineparents(repo, rev, rbsrt.target, + rbsrt.state, targetancestors, obsoletenotrebased) - storestatus(repo, rbsrt.originalwd, target, rbsrt.state, - collapsef, keepf, keepbranchesf, + storestatus(repo, rbsrt.originalwd, rbsrt.target, + rbsrt.state, collapsef, keepf, keepbranchesf, rbsrt.external, rbsrt.activebookmark) storecollapsemsg(repo, collapsemsg) if len(repo[None].parents()) == 2: @@ -438,7 +441,7 @@ ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'rebase') stats = rebasenode(repo, rev, p1, base, rbsrt.state, - collapsef, target) + collapsef, rbsrt.target) if stats and stats[3] > 0: raise error.InterventionRequired( _('unresolved conflicts (see hg ' @@ -491,9 +494,9 @@ ui.note(_('rebase merging completed\n')) if collapsef and not keepopen: - p1, p2, _base = defineparents(repo, min(rbsrt.state), target, - rbsrt.state, targetancestors, - obsoletenotrebased) + p1, p2, _base = defineparents(repo, min(rbsrt.state), + rbsrt.target, rbsrt.state, + targetancestors, obsoletenotrebased) editopt = opts.get('edit') editform = 'rebase.collapse' if collapsemsg: @@ -512,7 +515,7 @@ keepbranches=keepbranchesf, date=date) if newnode is None: - newrev = target + newrev = rbsrt.target else: newrev = repo[newnode].rev() for oldrev in rbsrt.state.iterkeys(): @@ -530,7 +533,7 @@ nstate[repo[k].node()] = repo[v].node() # XXX this is the same as dest.node() for the non-continue path -- # this should probably be cleaned up - targetnode = repo[target].node() + targetnode = repo[rbsrt.target].node() # restore original working directory # (we do this before stripping)