[PATCH 1 of 2] diffstat: don't fail on merges

[Alexander Solovyov]

# HG changeset patch
# User Alexander Solovyov <piranha at piranha.org.ua>
# Date 1231871286 -7200
# Node ID 13ea6795429ea3273b023133f4d0261cbdb4086b
# Parent  97253bcb44a897837720ced80fe898048d6dcbe0
diffstat: don't fail on merges

diff -r 97253bcb44a8 -r 13ea6795429e mercurial/patch.py
--- a/mercurial/patch.py	Tue Jan 13 13:43:42 2009 +0100
+++ b/mercurial/patch.py	Tue Jan 13 20:28:06 2009 +0200
@@ -1343,14 +1343,13 @@
         single(rev, seqno+1, fp)
 
 def diffstatdata(lines):
-    filename = None
+    filename, adds, removes = None, 0, 0
     for line in lines:
         if line.startswith('diff'):
             if filename:
                 yield (filename, adds, removes)
             # set numbers to 0 anyway when starting new file
-            adds = 0
-            removes = 0
+            adds, removes = 0, 0
             if line.startswith('diff --git'):
                 filename = gitre.search(line).group(1)
             else: