# HG changeset patch # User Matt Mackall # Date 1422829387 21600 # Node ID 24b57c3899f897d9e8d63c6e8591994d1b8c212a # Parent c1ce5442453ff6fe63e7da0f8804db1845ecaf98 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. diff -r c1ce5442453f -r 24b57c3899f8 mercurial/context.py --- 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))