Patchwork [09,of,17] rebase: clarify naming of variables holding node hashes - don't call them rev

login
register
mail settings
Submitter Mads Kiilerich
Date Nov. 30, 2014, 7:08 p.m.
Message ID <8767105e12d87ea8e378.1417374516@localhost.localdomain>
Download mbox | patch
Permalink /patch/6913/
State Superseded
Commit 2e047b1558a5ba399c18b24df4833d1b1bacabe6
Headers show

Comments

Mads Kiilerich - Nov. 30, 2014, 7:08 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1417374421 -3600
#      Sun Nov 30 20:07:01 2014 +0100
# Node ID 8767105e12d87ea8e37803d6c7b792be66771e6d
# Parent  29e5055154d72cee53986e57b50b6ee6a999bd88
rebase: clarify naming of variables holding node hashes - don't call them rev

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -401,20 +401,20 @@  def rebase(ui, repo, **opts):
                     merging = repo[p2].rev() != nullrev
                     editform = cmdutil.mergeeditform(merging, 'rebase')
                     editor = cmdutil.getcommiteditor(editform=editform, **opts)
-                    newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn,
-                                          editor=editor)
+                    newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn,
+                                           editor=editor)
                 else:
                     # Skip commit if we are collapsing
                     repo.dirstate.beginparentchange()
                     repo.setparents(repo[p1].node())
                     repo.dirstate.endparentchange()
-                    newrev = None
+                    newnode = None
                 # Update the state
-                if newrev is not None:
-                    r = repo[newrev].rev()
+                if newnode is not None:
+                    r = repo[newnode].rev()
                     state[rev] = r
                     ui.debug(' rebased %d:%s as %s\n' %
-                             (rev, short(node), short(newrev)))
+                             (rev, short(node), short(newnode)))
                 else:
                     if collapsef:
                         ui.status(_(' ignoring empty changeset %d:%s while '
@@ -451,11 +451,11 @@  def rebase(ui, repo, **opts):
                         commitmsg += '\n* %s' % repo[rebased].description()
                 editopt = True
             editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
-            newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg,
-                                  extrafn=extrafn, editor=editor)
+            newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg,
+                                   extrafn=extrafn, editor=editor)
             for oldrev in state.iterkeys():
                 if state[oldrev] >= nullrev:
-                    state[oldrev] = newrev
+                    state[oldrev] = newnode
 
         if 'qtip' in repo.tags():
             updatemq(repo, state, skipped, **opts)
@@ -480,7 +480,7 @@  def rebase(ui, repo, **opts):
         if not keepf:
             collapsedas = None
             if collapsef:
-                collapsedas = newrev
+                collapsedas = newnode
             clearrebased(ui, repo, state, skipped, collapsedas)
 
         if currentbookmarks:
@@ -526,7 +526,8 @@  def externalparent(repo, state, targetan
                       ', '.join(str(p) for p in sorted(parents))))
 
 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None):
-    'Commit the changes and store useful information in extra'
+    '''Commit the changes and store useful information in extra.
+    Return node of committed revision.'''
     try:
         repo.dirstate.beginparentchange()
         repo.setparents(repo[p1].node(), repo[p2].node())
@@ -543,13 +544,13 @@  def concludenode(repo, rev, p1, p2, comm
             targetphase = max(ctx.phase(), phases.draft)
             repo.ui.setconfig('phases', 'new-commit', targetphase, 'rebase')
             # Commit might fail if unresolved files exist
-            newrev = repo.commit(text=commitmsg, user=ctx.user(),
-                                 date=ctx.date(), extra=extra, editor=editor)
+            newnode = repo.commit(text=commitmsg, user=ctx.user(),
+                                  date=ctx.date(), extra=extra, editor=editor)
         finally:
             repo.ui.restoreconfig(backup)
 
-        repo.dirstate.setbranch(repo[newrev].branch())
-        return newrev
+        repo.dirstate.setbranch(repo[newnode].branch())
+        return newnode
     except util.Abort:
         # Invalidate the previous setparents
         repo.dirstate.invalidate()