--- 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')
--- a/tests/test-annotate.t Sun Mar 11 21:26:15 2018 +0900
+++ b/tests/test-annotate.t Sun Mar 11 21:36:28 2018 +0900
@@ -71,6 +71,11 @@
}
]
+log-like templating
+
+ $ hg annotate -T'{lines % "{rev} {node|shortest}: {line}"}' a
+ 0 8435: a
+
$ cat <<EOF >>a
> a
> a