diff -r dbae581010ea -r ec46b0ee2e3c mercurial/dagop.py
--- a/mercurial/dagop.py	Tue Mar 13 21:22:14 2018 +0900
+++ b/mercurial/dagop.py	Mon Mar 12 20:37:08 2018 +0900
@@ -442,12 +442,12 @@
     """
 
     if linenumber:
-        def decorate(text, rev):
-            return ([annotateline(fctx=rev, lineno=i)
+        def decorate(text, fctx):
+            return ([annotateline(fctx=fctx, lineno=i)
                      for i in xrange(1, _countlines(text) + 1)], text)
     else:
-        def decorate(text, rev):
-            return ([annotateline(fctx=rev)] * _countlines(text), text)
+        def decorate(text, fctx):
+            return ([annotateline(fctx=fctx)] * _countlines(text), text)
 
     # This algorithm would prefer to be recursive, but Python is a
     # bit recursion-hostile. Instead we do an iterative