Mercurial > public > mercurial-scm > hg-stable

diff mercurial/exchange.py @ 21941:dab31290c7eb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: only use callable return as reply handler When a bundle2 parts generator returns a non callable value, it should not be used as a reply handler. The changegroup part generator is already having this case of behavior when there is no changegroup to push. This changeset prevent a crash for user of the experimentable bundle2 feature.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 02 Jul 2014 16:13:48 +0200
parents 08dcb572a456
children bdb6d97f0a04
line wrap: on
line diff
--- a/mercurial/exchange.py	Thu Jul 24 14:29:08 2014 -0700
+++ b/mercurial/exchange.py	Wed Jul 02 16:13:48 2014 +0200
@@ -242,7 +242,8 @@
     replyhandlers = []
     for partgen in bundle2partsgenerators:
         ret = partgen(pushop, bundler)
-        replyhandlers.append(ret)
+        if callable(ret):
+            replyhandlers.append(ret)
     # do not push if nothing to push
     if bundler.nbparts <= 1:
         return