Patchwork D2963: debugsetparents: avoid using "r1/r2" variable names for nodeids

login
register
mail settings
Submitter phabricator
Date March 28, 2018, 11:25 p.m.
Message ID <355d11612bbf2c6814aa0b26705530a7@localhost.localdomain>
Download mbox | patch
Permalink /patch/29927/
State Not Applicable
Headers show

Comments

phabricator - March 28, 2018, 11:25 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8bac14ce5778: debugsetparents: avoid using &quot;r1/r2&quot; variable names for nodeids (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2963?vs=7355&id=7358

REVISION DETAIL
  https://phab.mercurial-scm.org/D2963

AFFECTED FILES
  mercurial/debugcommands.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -2288,11 +2288,11 @@ 
     Returns 0 on success.
     """
 
-    r1 = scmutil.revsingle(repo, rev1).node()
-    r2 = scmutil.revsingle(repo, rev2, 'null').node()
+    node1 = scmutil.revsingle(repo, rev1).node()
+    node2 = scmutil.revsingle(repo, rev2, 'null').node()
 
     with repo.wlock():
-        repo.setparents(r1, r2)
+        repo.setparents(node1, node2)
 
 @command('debugssl', [], '[SOURCE]', optionalrepo=True)
 def debugssl(ui, repo, source=None, **opts):