diff -r b64b6fdc5c9b -r dcdf0a52ad36 mercurial/crecord.py
--- a/mercurial/crecord.py	Wed Dec 02 16:12:15 2015 -0800
+++ b/mercurial/crecord.py	Wed Dec 09 17:01:27 2015 -0800
@@ -451,7 +451,7 @@
 
     # if there are no changed files
     if len(headers) == 0:
-        return []
+        return [], {}
     uiheaders = [uiheader(h) for h in headers]
     # let user choose headers/hunks/lines, and mark their applied flags
     # accordingly