This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7828

rebase: remove some redundant setting of dirstate parents
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8082a77cc3a2: rebase: remove some redundant setting of dirstate parents
Summary

Since we're now setting the dirstate parents to its correct values
from the beginning (right after merge.update()), we usually don't
need to set them again before committing. The only case we need to
care about is when committing collapsed commits. So we can remove the
setparents() calls just before committing and add one only for the
collapse case.

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 planned changes to this revision.Jan 14 2020, 12:34 PM

I'll rebase this on top of the series with D7859, which should make the test impact go away.

martinvonz edited the summary of this revision. (Show Details)Jan 16 2020, 3:18 AM
martinvonz updated this revision to Diff 19346.
martinvonz updated this revision to Diff 19706.Jan 29 2020, 8:01 PM
martinvonz updated this revision to Diff 19862.Feb 3 2020, 1:08 PM
martinvonz updated this revision to Diff 20098.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

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (4 lines)

Diff 20138

hgext/rebase.py

commitmsg = b'Collapsed revision' commitmsg = b'Collapsed revision'
for rebased in sorted(self.state): for rebased in sorted(self.state):
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())
newnode = self._concludenode( newnode = self._concludenode(
revtoreuse, p1, self.external, editor, commitmsg=commitmsg revtoreuse, p1, self.external, 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
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 = None branch = None
if b'branch' in extra: if b'branch' in extra:
branch = extra[b'branch'] branch = extra[b'branch']
wctx.setparents(repo[p1].node(), repo[p2].node())
memctx = wctx.tomemctx( memctx = wctx.tomemctx(
commitmsg, commitmsg,
date=date, date=date,
extra=extra, extra=extra,
user=user, user=user,
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, 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(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:
repo.setparents(repo[p1].node(), repo[p2].node())
# Commit might fail if unresolved files exist # Commit might fail if unresolved files exist
newnode = repo.commit( newnode = repo.commit(
text=commitmsg, user=user, date=date, extra=extra, editor=editor text=commitmsg, user=user, date=date, extra=extra, editor=editor
) )
repo.dirstate.setbranch(repo[newnode].branch()) repo.dirstate.setbranch(repo[newnode].branch())
return newnode return newnode