Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 36241:01280638bdb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: make node parameter of makefileobj() mandatory (API) (repo, node) pair will be replaced with ctx, so makefilename() can be easily ported to templater.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 02 Apr 2015 23:22:02 +0900
parents 39b3aab6231e
children 33ed8b511185
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed Feb 14 21:36:15 2018 +0900
+++ b/mercurial/cmdutil.py	Thu Apr 02 23:22:02 2015 +0900
@@ -893,23 +893,17 @@
 
 def makefilename(repo, pat, node, desc=None,
                   total=None, seqno=None, revwidth=None, pathname=None):
-    node_expander = {
+    expander = {
         'H': lambda: hex(node),
         'R': lambda: '%d' % repo.changelog.rev(node),
         'h': lambda: short(node),
-        'm': lambda: re.sub('[^\w]', '_', desc or '')
-        }
-    expander = {
+        'm': lambda: re.sub('[^\w]', '_', desc or ''),
+        'r': lambda: ('%d' % repo.changelog.rev(node)).zfill(revwidth or 0),
         '%': lambda: '%',
         'b': lambda: os.path.basename(repo.root),
         }
 
     try:
-        if node:
-            expander.update(node_expander)
-        if node:
-            expander['r'] = (lambda:
-                    ('%d' % repo.changelog.rev(node)).zfill(revwidth or 0))
         if total is not None:
             expander['N'] = lambda: '%d' % total
         if seqno is not None:
@@ -960,7 +954,7 @@
     def __exit__(self, exc_type, exc_value, exc_tb):
         pass
 
-def makefileobj(repo, pat, node=None, desc=None, total=None,
+def makefileobj(repo, pat, node, desc=None, total=None,
                 seqno=None, revwidth=None, mode='wb', modemap=None,
                 pathname=None):