changeset 4145:08b3c370e8b3

pullbundle: compat with Mercurial 4.7
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 26 Sep 2018 13:15:40 +0200
parents b5cd26712e4b
children f7aa0ecae3a4
files hgext3rd/pullbundle.py
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/pullbundle.py	Tue Sep 25 19:35:33 2018 +0200
+++ b/hgext3rd/pullbundle.py	Wed Sep 26 13:15:40 2018 +0200
@@ -359,9 +359,13 @@
     old = changegroup._changegroupinfo
     try:
         changegroup._changegroupinfo = _changegroupinfo
-        cgstream = changegroup.makestream(repo, outgoing, version, source,
-                                          bundlecaps=bundlecaps,
-                                          filematcher=filematcher)
+        if filematcher is not None:
+            cgstream = changegroup.makestream(repo, outgoing, version, source,
+                                              bundlecaps=bundlecaps,
+                                              filematcher=filematcher)
+        else:
+            cgstream = changegroup.makestream(repo, outgoing, version, source,
+                                              bundlecaps=bundlecaps)
     finally:
         changegroup._changegroupinfo = old