# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1573161680 28800
# Node ID d8033f75a52ecdf9ba96a0674f3ca3a7e34fd706
# Parent  bb2b4f6c99dc0fe01c2832f374362c0cbc3fb69b
obslog: use singular name "succnode" for each element of {succnodes}

The name that we pass for formatlist() is the name of each
element. After this patch, you'll write '{succnodes % "{succnode}"}'
instead of the confusing '{succnodes % "{succnodes}"}' (where the two
"succnodes" refer to different things.

Users can write templates that are compatible across this change by
using e.g. '{succnodes % "{if(succnode, succnode, succnodes)}"}'.

diff -r bb2b4f6c99dc -r d8033f75a52e hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Wed Nov 13 13:47:55 2019 +0700
+++ b/hgext3rd/evolve/obshistory.py	Thu Nov 07 13:21:20 2019 -0800
@@ -547,7 +547,7 @@
         fm.plain(b' as ')
 
         shortsnodes = (nodemod.short(succnode) for succnode in sorted(succnodes))
-        nodes = fm.formatlist(shortsnodes, b'succnodes', sep=b', ')
+        nodes = fm.formatlist(shortsnodes, b'succnode', sep=b', ')
         fm.write(b'succnodes', b'%s', nodes,
                  label=b"evolve.node")
 
@@ -675,7 +675,7 @@
         fm.plain(b' as ')
 
         shortsnodes = (nodemod.short(succnode) for succnode in sorted(succnodes))
-        nodes = fm.formatlist(shortsnodes, b'succnodes', sep=b', ')
+        nodes = fm.formatlist(shortsnodes, b'succnode', sep=b', ')
         fm.write(b'succnodes', b'%s', nodes,
                  label=b"evolve.node")