# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2018-03-05 05:28:40
# Node ID 0351fb0153baadd6bbbb6627988e539c353b30e0
# Parent  71543b942eea25a922994d66aeccb4b429e62b38

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

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -566,7 +566,7 @@ def applychanges(ui, repo, ctx, opts):
         # 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