# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1555009929 -7200
# Node ID fce8f5ca10d803fd75aa5b516e8718de50e94a5d
# Parent  de908951483379245ccce77ad293e2851d72f79f# Parent  84512556e148a362df9c2badffb1dfce45cdd3f4
branching: merge default change into stable

diff -r de9089514833 -r fce8f5ca10d8 hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Thu Apr 11 22:13:55 2019 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Thu Apr 11 21:12:09 2019 +0200
@@ -605,8 +605,13 @@
     # uncommit a removed file partially.
     # TODO: wrap the operations in mercurial/patch.py and mercurial/crecord.py
     # to add uncommit as an operation taking care of BC.
-    chunks, opts = cmdutil.recordfilter(repo.ui, originalchunks,
-                                        operation='discard')
+    try:
+        chunks, opts = cmdutil.recordfilter(repo.ui, originalchunks, match,
+                                            operation='discard')
+    except TypeError:
+        # hg <= 4.9 (db72f9f6580e)
+        chunks, opts = cmdutil.recordfilter(repo.ui, originalchunks,
+                                            operation='discard')
     if not chunks:
         raise error.Abort(_("nothing selected to uncommit"))
     fp = stringio()