Mercurial > hg

changeset 37142:bb141aa54728

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tag: avoid using "r" variable name for nodeid Differential Revision: https://phab.mercurial-scm.org/D2962
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 28 Mar 2018 15:29:49 -0700
parents eb4a23382e18
children 8bac14ce5778
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Mar 28 15:30:09 2018 -0700
+++ b/mercurial/commands.py	Wed Mar 28 15:29:49 2018 -0700
@@ -5314,12 +5314,12 @@
             if not opts.get('force') and bheads and p1 not in bheads:
                 raise error.Abort(_('working directory is not at a branch head '
                                     '(use -f to force)'))
-        r = scmutil.revsingle(repo, rev_).node()
+        node = scmutil.revsingle(repo, rev_).node()
 
         if not message:
             # we don't translate commit messages
             message = ('Added tag %s for changeset %s' %
-                       (', '.join(names), short(r)))
+                       (', '.join(names), short(node)))
 
         date = opts.get('date')
         if date:
@@ -5337,7 +5337,7 @@
             scmutil.revsingle(repo, rev_).rev() == nullrev):
             raise error.Abort(_("cannot tag null revision"))
 
-        tagsmod.tag(repo, names, r, message, opts.get('local'),
+        tagsmod.tag(repo, names, node, message, opts.get('local'),
                     opts.get('user'), date, editor=editor)
     finally:
         release(lock, wlock)