Let the caller supply the diff text to diffstat()

Almost all diffstat() callers already have the diff text, so they
might as well pass it to diffstat() instead of letting it recompute
it. In some cases this even makes for a code simplification since the
diff (and thus diffstat) parameters were nontrivial.

Also, diffstat() wasn't as versatile as diff(); for example, it didn't
accept any extra diff options. This patch solves all of those problems
as a side-effect.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/diff.py b/stgit/commands/diff.py
index 7c213d12fe07f23b6a25ca96290daeffbf0e1683..fd6be34377280e8027460bbcea230885ada75ec1 100644 (file)
--- a/stgit/commands/diff.py
+++ b/stgit/commands/diff.py
@@ -81,12 +81,11 @@ def func(parser, options, args):
         rev1 = 'HEAD'
         rev2 = None
 
         rev1 = 'HEAD'
         rev2 = None
 

+    diff_str = git.diff(args, git_id(crt_series, rev1),
+                        git_id(crt_series, rev2),
+                        diff_flags = options.diff_flags)

     if options.stat:
     if options.stat:

-        out.stdout_raw(git.diffstat(args, git_id(crt_series, rev1),
-                                    git_id(crt_series, rev2)) + '\n')
+        out.stdout_raw(git.diffstat(diff_str) + '\n')

     else:
     else:

-        diff_str = git.diff(args, git_id(crt_series, rev1),
-                            git_id(crt_series, rev2),
-                            diff_flags = options.diff_flags)

         if diff_str:
             pager(diff_str)
         if diff_str:
             pager(diff_str)

diff --git a/stgit/commands/edit.py b/stgit/commands/edit.py
index da6727593ee341d9808f7975721c85737d57e781..9915e4990923bbb5e8656d9697fbf44a992ff581 100644 (file)
--- a/stgit/commands/edit.py
+++ b/stgit/commands/edit.py
@@ -154,9 +154,9 @@ def __generate_file(pname, write_fn, options):
                 '%(diffstat)s\n' \
                 '%(diff)s'
 
                 '%(diffstat)s\n' \
                 '%(diff)s'
 

-        tmpl_dict['diffstat'] = git.diffstat(rev1 = bottom, rev2 = top)

         tmpl_dict['diff'] = git.diff(rev1 = bottom, rev2 = top,
                                      diff_flags = options.diff_flags)
         tmpl_dict['diff'] = git.diff(rev1 = bottom, rev2 = top,
                                      diff_flags = options.diff_flags)

+        tmpl_dict['diffstat'] = git.diffstat(tmpl_dict['diff'])

 
     for key in tmpl_dict:
         # make empty strings if key is not available
 
     for key in tmpl_dict:
         # make empty strings if key is not available

diff --git a/stgit/commands/export.py b/stgit/commands/export.py
index 16c64ba63a787f40c0386f7c59c514b374df0461..50f6f671a979ef7bca12fa2900ada64679546670 100644 (file)
--- a/stgit/commands/export.py
+++ b/stgit/commands/export.py
@@ -138,11 +138,13 @@ def func(parser, options, args):
         long_descr = reduce(lambda x, y: x + '\n' + y,
                             descr_lines[1:], '').strip()
 
         long_descr = reduce(lambda x, y: x + '\n' + y,
                             descr_lines[1:], '').strip()
 

+        diff = git.diff(rev1 = patch.get_bottom(),
+                        rev2 = patch.get_top(),
+                        diff_flags = options.diff_flags)

         tmpl_dict = {'description': patch.get_description().rstrip(),
                      'shortdescr': short_descr,
                      'longdescr': long_descr,
         tmpl_dict = {'description': patch.get_description().rstrip(),
                      'shortdescr': short_descr,
                      'longdescr': long_descr,

-                     'diffstat': git.diffstat(rev1 = patch.get_bottom(),
-                                              rev2 = patch.get_top()),
+                     'diffstat': git.diffstat(diff),

                      'authname': patch.get_authname(),
                      'authemail': patch.get_authemail(),
                      'authdate': patch.get_authdate(),
                      'authname': patch.get_authname(),
                      'authemail': patch.get_authemail(),
                      'authdate': patch.get_authdate(),


@@ -172,9 +174,7 @@ def func(parser, options, args):
             print '-'*79
 
         f.write(descr)
             print '-'*79
 
         f.write(descr)

-        f.write(git.diff(rev1 = patch.get_bottom(),
-                         rev2 = patch.get_top(),
-                         diff_flags = options.diff_flags))
+        f.write(diff)

         if not options.stdout:
             f.close()
         patch_no += 1
         if not options.stdout:
             f.close()
         patch_no += 1

diff --git a/stgit/commands/files.py b/stgit/commands/files.py
index ab1f6a32477100854059a4c067815feeaed2639b..b43b12f87457411b7082250ec9346489213089b8 100644 (file)
--- a/stgit/commands/files.py
+++ b/stgit/commands/files.py
@@ -60,7 +60,7 @@ def func(parser, options, args):
     rev2 = git_id(crt_series, '%s//top' % patch)
 
     if options.stat:
     rev2 = git_id(crt_series, '%s//top' % patch)
 
     if options.stat:

-        out.stdout_raw(git.diffstat(rev1 = rev1, rev2 = rev2) + '\n')
+        out.stdout_raw(git.diffstat(git.diff(rev1 = rev1, rev2 = rev2)) + '\n')

     elif options.bare:
         out.stdout_raw(git.barefiles(rev1, rev2) + '\n')
     else:
     elif options.bare:
         out.stdout_raw(git.barefiles(rev1, rev2) + '\n')
     else:

diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index 4aa16fbc31fe314a9e996413fa61b808ce6201f2..7d19ecacd239cff0f3b0a39f4e936cebaef3a7ed 100644 (file)
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -360,9 +360,9 @@ def __build_cover(tmpl, patches, msg_id, options):
                  'number':       number_str,
                  'shortlog':     stack.shortlog(crt_series.get_patch(p)
                                                 for p in patches),
                  'number':       number_str,
                  'shortlog':     stack.shortlog(crt_series.get_patch(p)
                                                 for p in patches),

-                 'diffstat':     git.diffstat(
+                 'diffstat':     git.diffstat(git.diff(

                      rev1 = git_id(crt_series, '%s//bottom' % patches[0]),
                      rev1 = git_id(crt_series, '%s//bottom' % patches[0]),

-                     rev2 = git_id(crt_series, '%s//top' % patches[-1]))}
+                     rev2 = git_id(crt_series, '%s//top' % patches[-1])))}

 
     try:
         msg_string = tmpl % tmpl_dict
 
     try:
         msg_string = tmpl % tmpl_dict


@@ -433,6 +433,9 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options):
     else:
         number_str = ''
 
     else:
         number_str = ''
 

+    diff = git.diff(rev1 = git_id(crt_series, '%s//bottom' % patch),
+                    rev2 = git_id(crt_series, '%s//top' % patch),
+                    diff_flags = options.diff_flags)

     tmpl_dict = {'patch':        patch,
                  'sender':       sender,
                  # for backward template compatibility
     tmpl_dict = {'patch':        patch,
                  'sender':       sender,
                  # for backward template compatibility


@@ -441,13 +444,8 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options):
                  'longdescr':    long_descr,
                  # for backward template compatibility
                  'endofheaders': '',
                  'longdescr':    long_descr,
                  # for backward template compatibility
                  'endofheaders': '',

-                 'diff':         git.diff(
-                     rev1 = git_id(crt_series, '%s//bottom' % patch),
-                     rev2 = git_id(crt_series, '%s//top' % patch),
-                     diff_flags = options.diff_flags),
-                 'diffstat':     git.diffstat(
-                     rev1 = git_id(crt_series, '%s//bottom'%patch),
-                     rev2 = git_id(crt_series, '%s//top' % patch)),
+                 'diff':         diff,
+                 'diffstat':     git.diffstat(diff),

                  # for backward template compatibility
                  'date':         '',
                  'version':      version_str,
                  # for backward template compatibility
                  'date':         '',
                  'version':      version_str,

diff --git a/stgit/git.py b/stgit/git.py
index 85cceb0f1f3137bdb80800272a446000bdc96332..4dc4dcfef738ed3dcaef3b7c1072899af9b1c1d0 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -640,12 +640,9 @@ def diff(files = None, rev1 = 'HEAD', rev2 = None, diff_flags = [],
     else:
         return ''
 
     else:
         return ''
 

-# TODO: take another parameter representing a diff string as we
-# usually invoke git.diff() form the calling functions
-def diffstat(files = None, rev1 = 'HEAD', rev2 = None):
-    """Return the diffstat between rev1 and rev2."""
-    return GRun('apply', '--stat', '--summary'
-                ).raw_input(diff(files, rev1, rev2)).raw_output()
+def diffstat(diff):
+    """Return the diffstat of the supplied diff."""
+    return GRun('apply', '--stat', '--summary').raw_input(diff).raw_output()

 
 def files(rev1, rev2, diff_flags = []):
     """Return the files modified between rev1 and rev2
 
 def files(rev1, rev2, diff_flags = []):
     """Return the files modified between rev1 and rev2