[PATCH 4 of 7 V2] context: introduce a `_findchangerev` method to `filectx`
Boris Feld
boris.feld at octobus.net
Mon Oct 1 12:46:27 EDT 2018
# HG changeset patch
# User Boris Feld <boris.feld at octobus.net>
# Date 1536255775 14400
# Thu Sep 06 13:42:55 2018 -0400
# Node ID cc6fb373cf83293cac66743fd13e7909f8d40031
# Parent d29a0e8369b999cf3cf5e3b66a341ab4a50384b0
# EXP-Topic copy-perf
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r cc6fb373cf83
context: introduce a `_findchangerev` method to `filectx`
In the same spirit as `_introrev` we want to introduce a way to limit graph
walking when resolving `filectx.rev()`. We introduce a new internal function for
this purpose.
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -629,16 +629,21 @@ class basefilectx(object):
@propertycache
def _changeid(self):
+ return self._findchangerev()
+
+ def _findchangerev(self):
if r'_changeid' in self.__dict__:
- return self._changeid
+ changeid = self._changeid
elif r'_changectx' in self.__dict__:
- return self._changectx.rev()
+ changeid = self._changectx.rev()
elif r'_descendantrev' in self.__dict__:
# this file context was created from a revision with a known
# descendant, we can (lazily) correct for linkrev aliases
- return self._adjustlinkrev(self._descendantrev)
+ changeid = self._adjustlinkrev(self._descendantrev)
else:
- return self._filelog.linkrev(self._filerev)
+ changeid = self._filelog.linkrev(self._filerev)
+ self._changeid = changeid
+ return changeid
@propertycache
def _filenode(self):
@@ -870,7 +875,7 @@ class basefilectx(object):
else:
return self._adjustlinkrev(lazyrev, inclusive=True)
else:
- return self.rev()
+ return self._findchangerev()
def introfilectx(self):
"""Return filectx having identical contents, but pointing to the
More information about the Mercurial-devel
mailing list