patch: a little bit more robust line counting on diff --stat (issue3183) stable
authorJesus Espino Garcia <jesus.espino@kaleidos.net>
Sat, 21 Jan 2012 23:50:58 +0100
branchstable
changeset 15971 089ee59a8658
parent 15970 9f2ed48f8cda
child 15972 341c58282b25
patch: a little bit more robust line counting on diff --stat (issue3183)
mercurial/patch.py
--- a/mercurial/patch.py	Sat Jan 21 13:31:41 2012 +0100
+++ b/mercurial/patch.py	Sat Jan 21 23:50:58 2012 +0100
@@ -1802,9 +1802,9 @@
             elif line.startswith('diff -r'):
                 # format: "diff -r ... -r ... filename"
                 filename = diffre.search(line).group(1)
-        elif line.startswith('+') and not line.startswith('+++'):
+        elif line.startswith('+') and not line.startswith('+++ '):
             adds += 1
-        elif line.startswith('-') and not line.startswith('---'):
+        elif line.startswith('-') and not line.startswith('--- '):
             removes += 1
         elif (line.startswith('GIT binary patch') or
               line.startswith('Binary file')):