This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1248

rebase: add concludememorynode(), and call it when rebasing in-memory
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG228916ca12b5: rebase: add concludememorynode(), and call it when rebasing in-memory
Summary

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

phillco updated this revision to Diff 4194.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4213.Dec 7 2017, 4:45 PM
durin42 accepted this revision.Dec 7 2017, 5:00 PM
durin42 added a subscriber: durin42.

Not in love with the code duplication here, but looking at it I don't see a clean way to avoid it either. Bleh.

This revision is now accepted and ready to land.Dec 7 2017, 5:00 PM
phillco updated this revision to Diff 4237.Dec 8 2017, 1:38 AM
phillco updated this revision to Diff 4239.Dec 8 2017, 1:54 AM
phillco updated this revision to Diff 4245.Dec 8 2017, 2:27 AM
Closed by commit rHG228916ca12b5: rebase: add concludememorynode(), and call it when rebasing in-memory (authored by phillco). · Explain WhyDec 8 2017, 3:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (81 lines)
Mmercurial/context.py (6 lines)

Diff 4265

hgext/rebase.py

_('unresolved conflicts (see hg ' _('unresolved conflicts (see hg '
'resolve, then hg rebase --continue)')) 'resolve, then hg rebase --continue)'))
finally: finally:
ui.setconfig('ui', 'forcemerge', '', 'rebase') ui.setconfig('ui', 'forcemerge', '', 'rebase')
if not self.collapsef: if not self.collapsef:
merging = p2 != nullrev merging = p2 != nullrev
editform = cmdutil.mergeeditform(merging, 'rebase') editform = cmdutil.mergeeditform(merging, 'rebase')
editor = cmdutil.getcommiteditor(editform=editform, **opts) editor = cmdutil.getcommiteditor(editform=editform, **opts)
if self.wctx.isinmemory():
newnode = concludememorynode(repo, rev, p1, p2,
wctx=self.wctx,
extrafn=_makeextrafn(self.extrafns),
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date)
mergemod.mergestate.clean(repo)
else:
newnode = concludenode(repo, rev, p1, p2, newnode = concludenode(repo, rev, p1, p2,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
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
# merge state clean-up path doesn't happen, so do it # merge state clean-up path doesn't happen, so do it
# here. Fix issue5494 # here. Fix issue5494
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
else: else:
# Skip commit if we are collapsing # Skip commit if we are collapsing
if self.wctx.isinmemory(): if self.wctx.isinmemory():
commitmsg += '\n* %s' % repo[rebased].description() commitmsg += '\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)
dsguard = None dsguard = None
if ui.configbool('rebase', 'singletransaction'): if ui.configbool('rebase', 'singletransaction'):
dsguard = dirstateguard.dirstateguard(repo, 'rebase') dsguard = dirstateguard.dirstateguard(repo, 'rebase')
if self.inmemory:
newnode = concludememorynode(repo, revtoreuse, p1,
self.external,
commitmsg=commitmsg,
extrafn=_makeextrafn(self.extrafns),
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date, wctx=self.wctx)
else:
with util.acceptintervention(dsguard): with util.acceptintervention(dsguard):
newnode = concludenode(repo, revtoreuse, p1, self.external, newnode = concludenode(repo, revtoreuse, p1, self.external,
commitmsg=commitmsg, commitmsg=commitmsg,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)
if newnode is not None: if newnode is not None:
newrev = repo[newnode].rev() newrev = repo[newnode].rev()
for oldrev in self.state.iterkeys(): for oldrev in self.state.iterkeys():
self.state[oldrev] = newrev self.state[oldrev] = newrev
if 'qtip' in repo.tags(): if 'qtip' in repo.tags():
updatemq(repo, self.state, self.skipped, **opts) updatemq(repo, self.state, self.skipped, **opts)
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 %s, there is more ' raise error.Abort(_('unable to collapse on top of %s, there is more '
'than one external parent: %s') % 'than one external parent: %s') %
(max(destancestors), (max(destancestors),
', '.join(str(p) for p in sorted(parents)))) ', '.join(str(p) for p in sorted(parents))))
def concludememorynode(repo, rev, p1, p2, wctx=None,
commitmsg=None, editor=None, extrafn=None,
keepbranches=False, date=None):
'''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
but also store useful information in extra.
Return node of committed revision.'''
ctx = repo[rev]
if commitmsg is None:
commitmsg = ctx.description()
keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
extra = {'rebase_source': ctx.hex()}
if extrafn:
extrafn(ctx, extra)
destphase = max(ctx.phase(), phases.draft)
overrides = {('phases', 'new-commit'): destphase}
with repo.ui.configoverride(overrides, 'rebase'):
if keepbranch:
repo.ui.setconfig('ui', 'allowemptycommit', True)
# Replicates the empty check in ``repo.commit``.
if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
return None
if date is None:
date = ctx.date()
# By convention, ``extra['branch']`` (set by extrafn) clobbers
# ``branch`` (used when passing ``--keepbranches``).
branch = repo[p1].branch()
if 'branch' in extra:
branch = extra['branch']
memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date,
extra=extra, user=ctx.user(), branch=branch, editor=editor)
commitres = repo.commitctx(memctx)
wctx.clean() # Might be reused
return commitres
def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None, def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None,
keepbranches=False, date=None): keepbranches=False, date=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 rev
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')

mercurial/context.py

else: else:
raise error.ProgrammingError("No such file or directory: %s" % raise error.ProgrammingError("No such file or directory: %s" %
self._path) self._path)
return self._wrappedctx[path].size() return self._wrappedctx[path].size()
def isdirty(self, path): def isdirty(self, path):
return path in self._cache return path in self._cache
def isempty(self):
# We need to discard any keys that are actually clean before the empty
# commit check.
self._compact()
return len(self._cache) == 0
def clean(self): def clean(self):
self._cache = {} self._cache = {}
def _markdirty(self, path, exists, data=None, date=None, flags=''): def _markdirty(self, path, exists, data=None, date=None, flags=''):
self._cache[path] = { self._cache[path] = {
'exists': exists, 'exists': exists,
'data': data, 'data': data,
'date': date, 'date': date,