Mercurial > hg > mercurial-source

changeset 37894:0351fb0153ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 71543b942eea
children a532b2f54f95
files hgext/histedit.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -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