mercurial/commands.py
changeset 36985 66e64681e0a8
parent 36960 66651ec259ea
child 36996 1bf555cb680e
--- a/mercurial/commands.py	Sun Mar 11 21:26:15 2018 +0900
+++ b/mercurial/commands.py	Sun Mar 11 21:36:28 2018 +0900
@@ -405,14 +405,15 @@
                 formats.append(['%s' for x in l])
             pieces.append(l)
 
-        for f, p, l in zip(zip(*formats), zip(*pieces), lines):
+        for f, p, (n, l) in zip(zip(*formats), zip(*pieces), lines):
             fm.startitem()
+            fm.context(fctx=n.fctx)
             fm.write(fields, "".join(f), *p)
-            if l[0].skip:
+            if n.skip:
                 fmt = "* %s"
             else:
                 fmt = ": %s"
-            fm.write('line', fmt, l[1])
+            fm.write('line', fmt, l)
 
         if not lines[-1][1].endswith('\n'):
             fm.plain('\n')