This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2915

rebase: pass in ctx, not rev, to conclude[memory]node()
ClosedPublic

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

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHGfbc82a08bdcb: rebase: pass in ctx, not rev, to conclude[memory]node()
Summary

They both need it and there's no locking that might make the results
different, so let's do it in one place. This also lets us move out
more common code in the following patches.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:34 PM
This revision is now accepted and ready to land.Mar 21 2018, 7:34 PM
Closed by commit rHGfbc82a08bdcb: rebase: pass in ctx, not rev, to conclude[memory]node() (authored by martinvonz). · Explain WhyMar 21 2018, 7:44 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (15 lines)

Diff 7207

hgext/rebase.py

ui.note(_('rebase merging completed\n')) ui.note(_('rebase merging completed\n'))
def _concludenode(self, rev, p1, p2, editor, commitmsg=None): def _concludenode(self, rev, p1, p2, editor, commitmsg=None):
'''Commit the wd changes with parents p1 and p2. '''Commit the wd changes with parents p1 and p2.
Reuse commit info from rev but also store useful information in extra. Reuse commit info from rev but also store useful information in extra.
Return node of committed revision.''' Return node of committed revision.'''
repo = self.repo repo = self.repo
ctx = repo[rev]
if self.inmemory: if self.inmemory:
newnode = concludememorynode(repo, rev, p1, p2, newnode = concludememorynode(repo, ctx, p1, p2,
wctx=self.wctx, wctx=self.wctx,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
else: else:
newnode = concludenode(repo, rev, p1, p2, newnode = concludenode(repo, ctx, p1, p2,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
commitmsg=commitmsg, commitmsg=commitmsg,
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.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, rev, p1, p2, wctx, editor, extrafn, keepbranches, def concludememorynode(repo, ctx, p1, p2, wctx, editor, extrafn, keepbranches,
date, commitmsg=None): date, commitmsg=None):
'''Commit the memory changes with parents p1 and p2. Reuse commit info from '''Commit the memory changes with parents p1 and p2. Reuse commit info from
rev but also store useful information in extra. ctx but also store useful information in extra.
Return node of committed revision.''' Return node of committed revision.'''
ctx = repo[rev]
if commitmsg is None: if commitmsg is None:
commitmsg = ctx.description() commitmsg = ctx.description()
keepbranch = keepbranches and repo[p1].branch() != ctx.branch() keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
extra = {'rebase_source': ctx.hex()} extra = {'rebase_source': ctx.hex()}
if extrafn: if extrafn:
extrafn(ctx, extra) extrafn(ctx, extra)
destphase = max(ctx.phase(), phases.draft) destphase = max(ctx.phase(), phases.draft)
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=ctx.user(), branch=branch, editor=editor) extra=extra, user=ctx.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, rev, p1, p2, editor, extrafn, keepbranches, date, def concludenode(repo, ctx, p1, p2, editor, extrafn, keepbranches, date,
commitmsg=None): commitmsg=None):
'''Commit the wd changes with parents p1 and p2. Reuse commit info from rev '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx
but also store useful information in extra. but also store useful information in extra.
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())
ctx = repo[rev]
if commitmsg is None: if commitmsg is None:
commitmsg = ctx.description() commitmsg = ctx.description()
keepbranch = keepbranches and repo[p1].branch() != ctx.branch() keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
extra = {'rebase_source': ctx.hex()} extra = {'rebase_source': ctx.hex()}
if extrafn: if extrafn:
extrafn(ctx, extra) extrafn(ctx, extra)
destphase = max(ctx.phase(), phases.draft) destphase = max(ctx.phase(), phases.draft)