D2924: rebase: rename conclude[memory]node() to commit[memory]node()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Mar 21 18:11:23 UTC 2018
martinvonz created this revision.
martinvonz added a reviewer: phillco.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The functions do little more than commit at this point.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2924
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
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()
To: martinvonz, phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list