This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7829

rebase: remove some now-unused parent arguments
ClosedPublic

Authored by martinvonz on Jan 11 2020, 1:47 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGcd43cae79f25: rebase: remove some now-unused parent arguments

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.Jan 11 2020, 1:47 AM
martinvonz updated this revision to Diff 19347.Jan 16 2020, 3:18 AM
martinvonz updated this revision to Diff 19707.Jan 29 2020, 8:01 PM
martinvonz updated this revision to Diff 19863.Feb 3 2020, 1:08 PM
martinvonz updated this revision to Diff 20099.Feb 10 2020, 7:23 PM
durin42 accepted this revision.Feb 10 2020, 9:16 PM
This revision is now accepted and ready to land.Feb 10 2020, 9:16 PM
martinvonz added a commit: rHGcd43cae79f25: rebase: remove some now-unused parent arguments.Feb 10 2020, 9:24 PM
Closed by commit rHGcd43cae79f25: rebase: remove some now-unused parent arguments (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (14 lines)

Diff 20139

hgext/rebase.py

self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
) )
for rev in sortedrevs: for rev in sortedrevs:
self._rebasenode(tr, rev, allowdivergence, progress) self._rebasenode(tr, rev, allowdivergence, progress)
p.complete() p.complete()
ui.note(_(b'rebase merging completed\n')) ui.note(_(b'rebase merging completed\n'))
def _concludenode(self, rev, p1, p2, editor, commitmsg=None): def _concludenode(self, rev, p1, 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] ctx = repo[rev]
if commitmsg is None: if commitmsg is None:
commitmsg = ctx.description() commitmsg = ctx.description()
date = self.date date = self.date
if date is None: if date is None:
date = ctx.date() date = ctx.date()
extra = {b'rebase_source': ctx.hex()} extra = {b'rebase_source': ctx.hex()}
for c in self.extrafns: for c in self.extrafns:
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 = {(b'phases', b'new-commit'): destphase} overrides = {(b'phases', b'new-commit'): destphase}
if keepbranch: if keepbranch:
overrides[(b'ui', b'allowemptycommit')] = True overrides[(b'ui', b'allowemptycommit')] = True
with repo.ui.configoverride(overrides, b'rebase'): with repo.ui.configoverride(overrides, b'rebase'):
if self.inmemory: if self.inmemory:
newnode = commitmemorynode( newnode = commitmemorynode(
repo, 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 = commitnode( newnode = commitnode(
repo, 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 not self.collapsef: if not self.collapsef:
merging = p2 != nullrev merging = p2 != nullrev
editform = cmdutil.mergeeditform(merging, b'rebase') editform = cmdutil.mergeeditform(merging, b'rebase')
editor = cmdutil.getcommiteditor( editor = cmdutil.getcommiteditor(
editform=editform, **pycompat.strkwargs(opts) editform=editform, **pycompat.strkwargs(opts)
) )
newnode = self._concludenode(rev, p1, p2, editor) newnode = self._concludenode(rev, p1, editor)
else: else:
# Skip commit if we are collapsing # Skip commit if we are collapsing
newnode = None newnode = None
# Update the state # Update the state
if newnode is not None: if newnode is not None:
self.state[rev] = repo[newnode].rev() self.state[rev] = repo[newnode].rev()
ui.debug(b'rebased as %s\n' % short(newnode)) ui.debug(b'rebased as %s\n' % short(newnode))
else: else:
if rebased not in self.skipped: if rebased not in self.skipped:
commitmsg += b'\n* %s' % repo[rebased].description() commitmsg += b'\n* %s' % repo[rebased].description()
editopt = True editopt = True
editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
revtoreuse = max(self.state) revtoreuse = max(self.state)
self.wctx.setparents(repo[p1].node(), repo[self.external].node()) self.wctx.setparents(repo[p1].node(), repo[self.external].node())
newnode = self._concludenode( newnode = self._concludenode(
revtoreuse, p1, self.external, editor, commitmsg=commitmsg revtoreuse, p1, editor, commitmsg=commitmsg
) )
if newnode is not None: if newnode is not None:
newrev = repo[newnode].rev() newrev = repo[newnode].rev()
for oldrev in self.state: for oldrev in self.state:
self.state[oldrev] = newrev self.state[oldrev] = newrev
if b'qtip' in repo.tags(): if b'qtip' in repo.tags():
_( _(
b'unable to collapse on top of %d, there is more ' b'unable to collapse on top of %d, there is more '
b'than one external parent: %s' b'than one external parent: %s'
) )
% (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents))) % (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents)))
) )
def commitmemorynode(repo, p1, p2, wctx, editor, extra, user, date, commitmsg): def commitmemorynode(repo, wctx, editor, extra, user, date, 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(b'ui', b'allowemptycommit'): if wctx.isempty() and not repo.ui.configbool(b'ui', b'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=branch, branch=branch,
editor=editor, 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 commitnode(repo, p1, p2, editor, extra, user, date, commitmsg): def commitnode(repo, 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(b'rebase', b'singletransaction'): if not repo.ui.configbool(b'rebase', b'singletransaction'):
dsguard = dirstateguard.dirstateguard(repo, b'rebase') dsguard = dirstateguard.dirstateguard(repo, b'rebase')
with dsguard: with dsguard:
# Commit might fail if unresolved files exist # Commit might fail if unresolved files exist
newnode = repo.commit( newnode = repo.commit(