changeset 37046:a8d8cdafe29c

rebase: rename conclude[memory]node() to commit[memory]node() The functions do little more than commit at this point. Differential Revision: https://phab.mercurial-scm.org/D2924
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 21 Mar 2018 09:56:41 -0700
parents 8ff5772711fa
children d3a9036d9ae9
files hgext/rebase.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Tue Mar 20 22:11:10 2018 -0700
+++ b/hgext/rebase.py	Wed Mar 21 09:56:41 2018 -0700
@@ -459,7 +459,7 @@
             overrides[('ui', 'allowemptycommit')] = True
         with repo.ui.configoverride(overrides, 'rebase'):
             if self.inmemory:
-                newnode = concludememorynode(repo, p1, p2,
+                newnode = commitmemorynode(repo, p1, p2,
                     wctx=self.wctx,
                     extra=extra,
                     commitmsg=commitmsg,
@@ -468,7 +468,7 @@
                     date=date)
                 mergemod.mergestate.clean(repo)
             else:
-                newnode = concludenode(repo, p1, p2,
+                newnode = commitnode(repo, p1, p2,
                     extra=extra,
                     commitmsg=commitmsg,
                     editor=editor,
@@ -1032,8 +1032,7 @@
                      (max(destancestors),
                       ', '.join("%d" % p for p in sorted(parents))))
 
-def concludememorynode(repo, p1, p2, wctx, editor, extra, user, date,
-                       commitmsg):
+def commitmemorynode(repo, p1, p2, wctx, editor, extra, user, date, commitmsg):
     '''Commit the memory changes with parents p1 and p2.
     Return node of committed revision.'''
     # Replicates the empty check in ``repo.commit``.
@@ -1052,7 +1051,7 @@
     wctx.clean() # Might be reused
     return commitres
 
-def concludenode(repo, p1, p2, editor, extra, user, date, commitmsg):
+def commitnode(repo, p1, p2, editor, extra, user, date, commitmsg):
     '''Commit the wd changes with parents p1 and p2.
     Return node of committed revision.'''
     dsguard = util.nullcontextmanager()