[PATCH 04 of 23 v3] rebase: move local variable 'targetancestors' to the RRS class
Kostia Balytskyi
ikostia at fb.com
Thu Jun 2 10:13:45 EDT 2016
# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1464866735 -3600
# Thu Jun 02 12:25:35 2016 +0100
# Node ID 10b0606ad889fd76ff4db51669bf8b82b87ccd5b
# Parent 36e81fa2de8f71d537d36a0612c30b9435348402
rebase: move local variable 'targetancestors' to the RRS class
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -131,6 +131,7 @@
self.activebookmark = None
self.target = None
self.skipped = set()
+ self.targetancestors = set()
@command('rebase',
[('s', 'source', '',
@@ -243,8 +244,6 @@
"""
rtstate = RebaseRuntimeState()
- targetancestors = set()
-
lock = wlock = None
try:
@@ -377,10 +376,11 @@
(rtstate.originalwd, rtstate.target, rtstate.state) = result
if collapsef:
- targetancestors = repo.changelog.ancestors([rtstate.target],
- inclusive=True)
+ rtstate.targetancestors = repo.changelog.ancestors(
+ [rtstate.target],
+ inclusive=True)
rtstate.external = externalparent(repo, rtstate.state,
- targetancestors)
+ rtstate.targetancestors)
if dest.closesbranch() and not keepbranchesf:
ui.status(_('reopening closed branch head %s\n') % dest)
@@ -399,9 +399,9 @@
'branches'))
# Rebase
- if not targetancestors:
- targetancestors = repo.changelog.ancestors([rtstate.target],
- inclusive=True)
+ if not rtstate.targetancestors:
+ rtstate.targetancestors = repo.changelog.ancestors([rtstate.target],
+ inclusive=True)
# Keep track of the current bookmarks in order to reset them later
currentbookmarks = repo._bookmarks.copy()
@@ -428,7 +428,7 @@
_('changesets'), total)
p1, p2, base = defineparents(repo, rev, rtstate.target,
rtstate.state,
- targetancestors,
+ rtstate.targetancestors,
obsoletenotrebased)
storestatus(repo, rtstate.originalwd, rtstate.target,
rtstate.state, collapsef, keepf, keepbranchesf,
@@ -496,7 +496,8 @@
if collapsef and not keepopen:
p1, p2, _base = defineparents(repo, min(rtstate.state),
rtstate.target, rtstate.state,
- targetancestors, obsoletenotrebased)
+ rtstate.targetancestors,
+ obsoletenotrebased)
editopt = opts.get('edit')
editform = 'rebase.collapse'
if collapsemsg:
More information about the Mercurial-devel
mailing list