--- a/mercurial/scmutil.py Sat Jun 03 14:05:52 2017 +0900
+++ b/mercurial/scmutil.py Sat Jun 03 18:57:28 2017 +0900
@@ -376,9 +376,10 @@
newdirs.append(d)
dirs[:] = newdirs
-def intrev(rev):
- """Return integer for a given revision that can be used in comparison or
+def intrev(ctx):
+ """Return integer for a given basectx that can be used in comparison or
arithmetic operation"""
+ rev = ctx.rev()
if rev is None:
return wdirrev
return rev
@@ -466,7 +467,7 @@
return parents
if repo.ui.debugflag:
return [parents[0], repo['null']]
- if parents[0].rev() >= intrev(ctx.rev()) - 1:
+ if parents[0].rev() >= intrev(ctx) - 1:
return []
return parents