--- a/mercurial/patch.py	Sat Nov 21 17:40:26 2015 +0200
+++ b/mercurial/patch.py	Mon Nov 30 16:35:21 2015 -0800
@@ -1106,8 +1106,8 @@
                         applied[newhunk.filename()].append(newhunk)
             else:
                 fixoffset += chunk.removed - chunk.added
-    return sum([h for h in applied.itervalues()
-               if h[0].special() or len(h) > 1], [])
+    return (sum([h for h in applied.itervalues()
+               if h[0].special() or len(h) > 1], []), {})
 class hunk(object):
     def __init__(self, desc, num, lr, context):
         self.number = num