Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugsetparents: avoid using "r1/r2" variable names for nodeids
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 28 Mar 2018 15:31:18 -0700
changeset 37146 8bac14ce5778
parent 37145 bb141aa54728
child 37147 004ecdbe96ec
debugsetparents: avoid using "r1/r2" variable names for nodeids Differential Revision: https://phab.mercurial-scm.org/D2963
mercurial/debugcommands.py file | annotate | diff | comparison | revisions 
--- 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):
hg-stable