This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2924

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

Authored by martinvonz on Mar 21 2018, 2:10 PM.

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa8d8cdafe29c: rebase: rename conclude[memory]node() to commit[memory]node()
Summary

The functions do little more than commit at this point.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:47 PM
indygreg added a subscriber: indygreg.

Very nice cleanup!

This revision is now accepted and ready to land.Mar 21 2018, 7:47 PM
Closed by commit rHGa8d8cdafe29c: rebase: rename conclude[memory]node() to commit[memory]node() (authored by martinvonz). · Explain WhyMar 21 2018, 7:48 PM
This revision was automatically updated to reflect the committed changes.
phillco added a comment.Mar 21 2018, 7:49 PM

What _is_ the difference between "conclude" and "commit"?

martinvonz added a comment.Mar 21 2018, 7:57 PM
In D2924#47088, @phillco wrote:

What _is_ the difference between "conclude" and "commit"?

I had assumed it was called "conclude" because it did more than commit (the stuff that's now in _concludecommit()). There's obviously no agreed-upon definition of the terms in a hg context, so I guess we'll have to interpret it as we like.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (9 lines)

Diff 7187

hgext/rebase.py

c(ctx, extra) c(ctx, extra)
keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch() keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
destphase = max(ctx.phase(), phases.draft) destphase = max(ctx.phase(), phases.draft)
overrides = {('phases', 'new-commit'): destphase} overrides = {('phases', 'new-commit'): destphase}
if keepbranch: if keepbranch:
overrides[('ui', 'allowemptycommit')] = True overrides[('ui', 'allowemptycommit')] = True
with repo.ui.configoverride(overrides, 'rebase'): with repo.ui.configoverride(overrides, 'rebase'):
if self.inmemory: if self.inmemory:
newnode = concludememorynode(repo, p1, p2, newnode = commitmemorynode(repo, p1, p2,
wctx=self.wctx, wctx=self.wctx,
extra=extra, extra=extra,
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
user=ctx.user(), user=ctx.user(),
date=date) date=date)
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
else: else:
newnode = concludenode(repo, p1, p2, newnode = commitnode(repo, p1, p2,
extra=extra, extra=extra,
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
user=ctx.user(), user=ctx.user(),
date=date) date=date)
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal # If it ended up being a no-op commit, then the normal
return nullrev return nullrev
if len(parents) == 1: if len(parents) == 1:
return parents.pop() return parents.pop()
raise error.Abort(_('unable to collapse on top of %d, there is more ' raise error.Abort(_('unable to collapse on top of %d, there is more '
'than one external parent: %s') % 'than one external parent: %s') %
(max(destancestors), (max(destancestors),
', '.join("%d" % p for p in sorted(parents)))) ', '.join("%d" % p for p in sorted(parents))))
def concludememorynode(repo, p1, p2, wctx, editor, extra, user, date, def commitmemorynode(repo, p1, p2, wctx, editor, extra, user, date, commitmsg):
commitmsg):
'''Commit the memory changes with parents p1 and p2. '''Commit the memory changes with parents p1 and p2.
Return node of committed revision.''' Return node of committed revision.'''
# Replicates the empty check in ``repo.commit``. # Replicates the empty check in ``repo.commit``.
if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'): if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
return None return None
# By convention, ``extra['branch']`` (set by extrafn) clobbers # By convention, ``extra['branch']`` (set by extrafn) clobbers
# ``branch`` (used when passing ``--keepbranches``). # ``branch`` (used when passing ``--keepbranches``).
branch = repo[p1].branch() branch = repo[p1].branch()
if 'branch' in extra: if 'branch' in extra:
branch = extra['branch'] branch = extra['branch']
memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date, memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date,
extra=extra, user=user, branch=branch, editor=editor) extra=extra, user=user, branch=branch, editor=editor)
commitres = repo.commitctx(memctx) commitres = repo.commitctx(memctx)
wctx.clean() # Might be reused wctx.clean() # Might be reused
return commitres 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. '''Commit the wd changes with parents p1 and p2.
Return node of committed revision.''' Return node of committed revision.'''
dsguard = util.nullcontextmanager() dsguard = util.nullcontextmanager()
if not repo.ui.configbool('rebase', 'singletransaction'): if not repo.ui.configbool('rebase', 'singletransaction'):
dsguard = dirstateguard.dirstateguard(repo, 'rebase') dsguard = dirstateguard.dirstateguard(repo, 'rebase')
with dsguard: with dsguard:
repo.setparents(repo[p1].node(), repo[p2].node()) repo.setparents(repo[p1].node(), repo[p2].node())