[PATCH 2 of 5] templater: fix variable name that shadows built-in

Matt Mackall mpm at selenic.com
Tue Aug 25 14:56:38 CDT 2015


# HG changeset patch
# User Matt Mackall <mpm at selenic.com>
# Date 1440525441 18000
#      Tue Aug 25 12:57:21 2015 -0500
# Node ID acf5f71584b3d6321ba96785865c8f75f4fe6164
# Parent  4c938a20ce8f8c6004d7d181fc6bff9fdc90b5dd
templater: fix variable name that shadows built-in

diff -r 4c938a20ce8f -r acf5f71584b3 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Tue Aug 25 09:38:06 2015 -0500
+++ b/mercurial/cmdutil.py	Tue Aug 25 12:57:21 2015 -0500
@@ -1450,10 +1450,10 @@
 
         types = {'header': '', 'footer': '', 'changeset': 'changeset'}
         for mode, postfix in tmplmodes:
-            for type in types:
-                cur = postfix and ('%s_%s' % (type, postfix)) or type
+            for t in types:
+                cur = postfix and ('%s_%s' % (t, postfix)) or t
                 if mode and cur in self.t:
-                    types[type] = cur
+                    types[t] = cur
 
         try:
             # write header


More information about the Mercurial-devel mailing list