diff hgext/patchbomb.py @ 7547:4949729ee9ee

python implementation of diffstat Implemented as two functions: diffstat, which yields lines of text, formatted as a usual diffstat output, and diffstatdata, which is called inside diffstat to do real performing and yield file names with appropriate data (numbers of added and removed lines).
author Alexander Solovyov <piranha@piranha.org.ua>
date Thu, 25 Dec 2008 10:48:24 +0200
parents 0b6428da1f22
children f7739cf3833c
line wrap: on
line diff
--- a/hgext/patchbomb.py	Sun Dec 28 19:59:42 2008 +0100
+++ b/hgext/patchbomb.py	Thu Dec 25 10:48:24 2008 +0200
@@ -9,8 +9,7 @@
 
   The remainder of the changeset description.
 
-  [Optional] If the diffstat program is installed, the result of
-  running diffstat on the patch.
+  [Optional] The result of running diffstat on the patch.
 
   The patch itself, as generated by "hg export".
 
@@ -99,16 +98,12 @@
 
 def cdiffstat(ui, summary, patchlines):
     s = patch.diffstat(patchlines)
-    if s:
-        if summary:
-            ui.write(summary, '\n')
-            ui.write(s, '\n')
-        ans = prompt(ui, _('Does the diffstat above look okay? '), 'y')
-        if not ans.lower().startswith('y'):
-            raise util.Abort(_('diffstat rejected'))
-    elif s is None:
-        ui.warn(_('no diffstat information available\n'))
-        s = ''
+    if summary:
+        ui.write(summary, '\n')
+        ui.write(s, '\n')
+    ans = prompt(ui, _('Does the diffstat above look okay? '), 'y')
+    if not ans.lower().startswith('y'):
+        raise util.Abort(_('diffstat rejected'))
     return s
 
 def makepatch(ui, repo, patch, opts, _charsets, idx, total, patchname=None):