Mercurial > hg
diff hgext/histedit.py @ 37108:0351fb0153ba
histedit: always define update results
Before, we had a branch that could return None for the update stats.
Let's just return an updateresult instance instead.
Differential Revision: https://phab.mercurial-scm.org/D2693
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 05 Mar 2018 00:28:40 -0500 |
parents | 3d3cff1f6bde |
children | 6f570c501e3e |
line wrap: on
line diff
--- a/hgext/histedit.py Mon Mar 05 00:02:13 2018 -0500 +++ b/hgext/histedit.py Mon Mar 05 00:28:40 2018 -0500 @@ -566,7 +566,7 @@ # edits are "in place" we do not need to make any merge, # just applies changes on parent for editing cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) - stats = None + stats = mergemod.updateresult(0, 0, 0, 0) else: try: # ui.forcemerge is an internal variable, do not document