# HG changeset patch # User Matt Mackall # Date 2015-02-01 22:26:35 # Node ID ff070a53ee74a786aecc798780e1cf92eba06399 # Parent 751d1138ce353352274980c47e1efd52ca37484b filectx: if we have a _descendantrev, use it to adjust linkrev This lets us use _adjustlinkrev lazily. diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -633,6 +633,11 @@ class basefilectx(object): return self._changeid elif '_changectx' in self.__dict__: return self._changectx.rev() + elif '_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._path, self._filelog, + self._filenode, self._descendantrev) else: return self._filelog.linkrev(self._filerev)