This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2693

histedit: always define update results
ClosedPublic

Authored by indygreg on Mar 5 2018, 1:17 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG0351fb0153ba: histedit: always define update results
Summary

Before, we had a branch that could return None for the update stats.
Let's just return an updateresult instance instead.

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

indygreg created this revision.Mar 5 2018, 1:17 AM
martinvonz accepted this revision.Mar 21 2018, 8:18 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
hgext/histedit.py
502

remove the "stats and" now?

This revision is now accepted and ready to land.Mar 21 2018, 8:18 PM
indygreg marked an inline comment as done.Mar 24 2018, 2:03 PM
indygreg added inline comments.
hgext/histedit.py
502

This is done in the next commit :)

durin42 accepted this revision.Mar 24 2018, 3:07 PM
indygreg marked an inline comment as done.Mar 24 2018, 5:21 PM
Closed by commit rHG0351fb0153ba: histedit: always define update results (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)

Diff 7273

hgext/histedit.py

"""Applies the changes from this action's rulectx onto the current """Applies the changes from this action's rulectx onto the current
parentctx, but does not commit them.""" parentctx, but does not commit them."""
repo = self.repo repo = self.repo
rulectx = repo[self.node] rulectx = repo[self.node]
repo.ui.pushbuffer(error=True, labeled=True) repo.ui.pushbuffer(error=True, labeled=True)
hg.update(repo, self.state.parentctxnode, quietempty=True) hg.update(repo, self.state.parentctxnode, quietempty=True)
stats = applychanges(repo.ui, repo, rulectx, {}) stats = applychanges(repo.ui, repo, rulectx, {})
repo.dirstate.setbranch(rulectx.branch()) repo.dirstate.setbranch(rulectx.branch())
if stats and stats[3] > 0: if stats and stats[3] > 0:
martinvonzUnsubmitted
Done

remove the "stats and" now?

martinvonz: remove the "stats and" now?
indygregAuthorUnsubmitted
Not Done

This is done in the next commit :)

indygreg: This is done in the next commit :)
buf = repo.ui.popbuffer() buf = repo.ui.popbuffer()
repo.ui.write(buf) repo.ui.write(buf)
raise error.InterventionRequired( raise error.InterventionRequired(
_('Fix up the change (%s %s)') % _('Fix up the change (%s %s)') %
(self.verb, node.short(self.node)), (self.verb, node.short(self.node)),
hint=_('hg histedit --continue to resume')) hint=_('hg histedit --continue to resume'))
else: else:
repo.ui.popbuffer() repo.ui.popbuffer()
def applychanges(ui, repo, ctx, opts): def applychanges(ui, repo, ctx, opts):
"""Merge changeset from ctx (only) in the current working directory""" """Merge changeset from ctx (only) in the current working directory"""
wcpar = repo.dirstate.parents()[0] wcpar = repo.dirstate.parents()[0]
if ctx.p1().node() == wcpar: if ctx.p1().node() == wcpar:
# edits are "in place" we do not need to make any merge, # edits are "in place" we do not need to make any merge,
# just applies changes on parent for editing # just applies changes on parent for editing
cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
stats = None stats = mergemod.updateresult(0, 0, 0, 0)
else: else:
try: try:
# ui.forcemerge is an internal variable, do not document # ui.forcemerge is an internal variable, do not document
repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'histedit') 'histedit')
stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit']) stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit'])
finally: finally:
repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') repo.ui.setconfig('ui', 'forcemerge', '', 'histedit')