Mercurial > hg-stable

changeset 23981:24b57c3899f8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filectx: use linkrev to sort ancestors We're going to make rev() lazily do _adjustlinkrevs, and we don't want that to happen when we're quickly tracing through file ancestry without caring about revs (as we do when finding copies). This takes us back to pre-linkrev-correction behavior, but shouldn't regress us relative to the last stable release.
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Feb 2015 16:23:07 -0600
parents c1ce5442453f
children 751d1138ce35
files mercurial/context.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Fri Jan 30 16:02:28 2015 +0000
+++ b/mercurial/context.py	Sun Feb 01 16:23:07 2015 -0600
@@ -954,7 +954,7 @@
         cut = followfirst and 1 or None
         while True:
             for parent in c.parents()[:cut]:
-                visit[(parent.rev(), parent.node())] = parent
+                visit[(parent.linkrev(), parent.filenode())] = parent
             if not visit:
                 break
             c = visit.pop(max(visit))