Mercurial > public > mercurial-scm > hg
diff hgext/histedit.py @ 42052:15d2afa31e57
histedit: narrow the scope of discarded ui output
In 34165875fa5df813bec3a0cd348932b304d44efb, a lot of the output from
histedit was excluded. This slightly adjusts the scope of that exclusion,
to both discard more uninsteresting messages, and ensure that pre-merge-tool
output gets shown before the external merge tool is executed.
Differential Revision: https://phab.mercurial-scm.org/D6177
| author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
|---|---|
| date | Mon, 01 Apr 2019 19:02:24 -0700 |
| parents | 1f567a9e25bd |
| children | fc0095256513 |
line wrap: on
line diff
--- a/hgext/histedit.py Fri Mar 29 21:53:15 2019 -0400 +++ b/hgext/histedit.py Mon Apr 01 19:02:24 2019 -0700 @@ -522,17 +522,14 @@ rulectx = repo[self.node] repo.ui.pushbuffer(error=True, labeled=True) hg.update(repo, self.state.parentctxnode, quietempty=True) + repo.ui.popbuffer() stats = applychanges(repo.ui, repo, rulectx, {}) repo.dirstate.setbranch(rulectx.branch()) if stats.unresolvedcount: - buf = repo.ui.popbuffer() - repo.ui.write(buf) raise error.InterventionRequired( _('Fix up the change (%s %s)') % (self.verb, node.short(self.node)), hint=_('hg histedit --continue to resume')) - else: - repo.ui.popbuffer() def continuedirty(self): """Continues the action when changes have been applied to the working @@ -593,8 +590,10 @@ if ctx.p1().node() == wcpar: # edits are "in place" we do not need to make any merge, # just applies changes on parent for editing + ui.pushbuffer() cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) stats = mergemod.updateresult(0, 0, 0, 0) + ui.popbuffer() else: try: # ui.forcemerge is an internal variable, do not document