From patchwork Wed Mar 28 23:25:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D2962: tag: avoid using "r" variable name for nodeid From: phabricator X-Patchwork-Id: 29929 Message-Id: <5255d56fa13025997081aa82f7473ec8@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Wed, 28 Mar 2018 23:25:30 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHGbb141aa54728: tag: avoid using "r" variable name for nodeid (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2962?vs=7354&id=7357 REVISION DETAIL https://phab.mercurial-scm.org/D2962 AFFECTED FILES mercurial/commands.py CHANGE DETAILS To: martinvonz, #hg-reviewers, indygreg Cc: mercurial-devel diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -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)