facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

rebase: remove unnecessary '.unfiltered()' calls

Browse Source 
Now we have a clear centric place to control whether `rbsrt.repo` is
unfiltered or not, we can drop `unfiltered()` in other places.

Differential Revision: https://phab.mercurial-scm.org/D645
This commit is contained in:
Jun Wu 2017-09-06 16:17:04 -07:00
parent 1392df8e4d
commit 9a0daf2508
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hgext/rebase.py
View File

@ -192,7 +192,8 @@ class rebaseruntime(object):
self._writestatus(f)
def _writestatus(self, f):
repo = self.repo.unfiltered()
repo = self.repo
assert repo.filtername is None
f.write(repo[self.originalwd].hex() + '\n')
# was "dest". we now write dest per src root below.
f.write('\n')
@ -215,7 +216,8 @@ class rebaseruntime(object):
def restorestatus(self):
"""Restore a previously stored status"""
self.prepared = True
repo = self.repo.unfiltered()
repo = self.repo
assert repo.filtername is None
keepbranches = None
legacydest = None
collapse = False
@ -1067,9 +1069,9 @@ def _checkobsrebase(repo, ui, rebaseobsrevs, rebaseobsskipped):
"experimental.allowdivergence=True")
raise error.Abort(msg % (",".join(divhashes),), hint=h)
def successorrevs(repo, rev):
def successorrevs(unfi, rev):
"""yield revision numbers for successors of rev"""
unfi = repo.unfiltered()
assert unfi.filtername is None
nodemap = unfi.changelog.nodemap
for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]):
if s in nodemap:
@ -1091,7 +1093,8 @@ def defineparents(repo, rev, destmap, state, skipped, obsskipped):
block below.
"""
# use unfiltered changelog since successorrevs may return filtered nodes
cl = repo.unfiltered().changelog
assert repo.filtername is None
cl = repo.changelog
def isancestor(a, b):
# take revision numbers instead of nodes
if a == b:
@ -1607,7 +1610,8 @@ def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap):
obsolete => None entries in the mapping indicate nodes with no successor"""
obsoletenotrebased = {}
cl = repo.unfiltered().changelog
assert repo.filtername is None
cl = repo.changelog
nodemap = cl.nodemap
for srcrev in rebaseobsrevs:
srcnode = cl.node(srcrev)