changeset 37143:8bac14ce5778

debugsetparents: avoid using "r1/r2" variable names for nodeids Differential Revision: https://phab.mercurial-scm.org/D2963
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 28 Mar 2018 15:31:18 -0700
parents bb141aa54728
children 004ecdbe96ec
files mercurial/debugcommands.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/debugcommands.py	Wed Mar 28 15:29:49 2018 -0700
+++ b/mercurial/debugcommands.py	Wed Mar 28 15:31:18 2018 -0700
@@ -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):