Patchwork D2924: rebase: rename conclude[memory]node() to commit[memory]node()

login
register
mail settings
Submitter phabricator
Date March 21, 2018, 11:49 p.m.
Message ID <de0bb0e409011fe92187fcce49fa726d@localhost.localdomain>
Download mbox | patch
Permalink /patch/29741/
State Not Applicable
Headers show

Comments

phabricator - March 21, 2018, 11:49 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa8d8cdafe29c: rebase: rename conclude[memory]node() to commit[memory]node() (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2924?vs=7187&id=7216

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -459,16 +459,16 @@ 
             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,
                     editor=editor,
                     user=ctx.user(),
                     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()