changeset 35273:8dee2080f35c

dagop: use fctx.rev() consistently in filectxancestors() We can't use fctx.linkrev() to sort fctxs coming from multiple files. This was changed at 24b57c3899f8 due to performance issue, but we know we evaluate parent.rev() in revset anyway.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 22 Sep 2016 18:01:55 +0900
parents 70e86db6a913
children 2b348dc3239a
files mercurial/dagop.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dagop.py	Thu Sep 22 17:48:46 2016 +0900
+++ b/mercurial/dagop.py	Thu Sep 22 18:01:55 2016 +0900
@@ -87,7 +87,7 @@
     yield c
     while True:
         for parent in c.parents()[:cut]:
-            visit[(parent.linkrev(), parent.filenode())] = parent
+            visit[(parent.rev(), parent.filenode())] = parent
         if not visit:
             break
         c = visit.pop(max(visit))