Merge pull request #74 from dimonomid/wrap_optimize

Optimize output

cdiff.py

@@ -149,14 +149,6 @@ def strtrim(text, width, wrap_char, pad):
     if tlen > width:
         text, _, _ = strsplit(text, width - 1)
 
-        # Old code always added trailing 'reset' sequence, but strsplit is
-        # smarter and only adds it when there is something to reset. However,
-        # in order not to distract with changed test data, here's workaround
-        # which keeps output exactly the same. TODO: remove it; it doesn't add
-        # any practical value for the user.
-        if not text.endswith(COLORS['reset']):
-            text += COLORS['reset']
-
         text += wrap_char
     elif pad:
         # The string is short enough, but it might need to be padded.
@@ -549,10 +541,8 @@ class DiffMarker(object):
                     out.append(COLORS['underline'] + COLORS[base_color])
                     text = text[2:]
                 elif text.startswith('\x01'):   # reset
-                    # TODO: Append resetting sequence if only there is some
-                    # text after that. That is, call out.append(...) if only
-                    # len(text) > 1.
-                    out.append(COLORS['reset'] + COLORS[base_color])
+                    if len(text) > 1:
+                        out.append(COLORS['reset'] + COLORS[base_color])
                     text = text[1:]
                 else:
                     # FIXME: utf-8 wchar might break the rule here, e.g.

tests/crlf/out.w70

@@ -5,11 +5,11 @@
 @@ -3,7 +3,6 @@
   3 ## About                                                                 3 ## About
   4                                                                          4 
-  5 Coderev is a toolkit generates static side-by-side html pages for cod>   5 Coderev is a toolkit generates static side-by-side html pages for cod>
+  5 Coderev is a toolkit generates static side-by-side html pages for cod>   5 Coderev is a toolkit generates static side-by-side html pages for cod>
   6 Typical use case is to generate diff pages for local modification in >     
   7 workspace and send page link to teammates for code review.               6 workspace and send page link to teammates for code review.
   8                                                                          7 
-  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>   8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>
+  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>   8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>
 @@ -18,9 +17,10 @@
  18                                                                         17 
  19 ## Usage of coderev.sh                                                  18 ## Usage of coderev.sh
@@ -18,12 +18,12 @@
  22                                                                         21 
  23     Usage:                                                              22     Usage:
                                                                             23 
- 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>  24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>
+ 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>  24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>
  25                 [-F comment-file | -m 'comment...'] [file...]           25                 [-F comment-file | -m 'comment...'] [file...]
  26                                                                         26 
 @@ -145,3 +145,5 @@
-145                             specify column number where lines are bro> 145                             specify column number where lines are bro>
-146                             wrapped for sdiff, default is no line wra> 146                             wrapped for sdiff, default is no line wra>
+145                             specify column number where lines are bro> 145                             specify column number where lines are bro>
+146                             wrapped for sdiff, default is no line wra> 146                             wrapped for sdiff, default is no line wra>
 147     -y, --yes             do not prompt for overwriting                147     -y, --yes             do not prompt for overwriting
                                                                            148 
                                                                            149 # EOF

tests/diff-ru-bin/out.side-by-side

@@ -14,5 +14,5 @@
 --- a/foo.txt	2013-02-23 19:55:03.000000000 +0800
 +++ b/foo.txt	2013-02-23 19:55:10.000000000 +0800
 @@ -1,2 +1,2 @@
-1 Hello                                                                            1 hella
+1 Hello                                                                            1 hella
 2 world                                                                            2 world

tests/diff-ru-bin/out.w70

@@ -14,5 +14,5 @@
 --- a/foo.txt	2013-02-23 19:55:03.000000000 +0800
 +++ b/foo.txt	2013-02-23 19:55:10.000000000 +0800
 @@ -1,2 +1,2 @@
-1 Hello                                                                  1 hella
+1 Hello                                                                  1 hella
 2 world                                                                  2 world

tests/diff-ru/out.side-by-side

@@ -15,7 +15,7 @@
 --- a/common/foo.txt	2013-02-22 20:28:32.000000000 +0800
 +++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
 @@ -1 +1 @@
-1 Hello                                                                            1 world
+1 Hello                                                                            1 world
 Only in b: date.txt
 Only in a: time.txt
-
+

tests/diff-ru/out.w70

@@ -15,7 +15,7 @@
 --- a/common/foo.txt	2013-02-22 20:28:32.000000000 +0800
 +++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
 @@ -1 +1 @@
-1 Hello                                                                  1 world
+1 Hello                                                                  1 world
 Only in b: date.txt
 Only in a: time.txt
-
+

tests/git-bin/out.side-by-side

@@ -16,11 +16,11 @@
 --- a/foo.html
 +++ b/foo.html
 @@ -1,4 +1,4 @@
-1 <!doctype html>                                                                  1 <!DOCTYPE html>
+1 <!doctype html>                                                                  1 <!DOCTYPE html>
 2 <html>                                                                           2 <html>
 3                                                                                  3 
 4 <head>                                                                           4 <head>
 diff --git a/foo.pdf b/foo.pdf
 index 0e90017..3c3b90d 100644
 Binary files a/foo.pdf and b/foo.pdf differ
-
+

tests/git-bin/out.w70

@@ -5,7 +5,7 @@
 @@ -13,3 +13,5 @@ INPUT=${1:-foo.html}
 13 OUTPUT=${INPUT%.html}.pdf                                              13 OUTPUT=${INPUT%.html}.pdf
 14                                                                        14 
-15 wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments > 15 wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments >
+15 wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments > 15 wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments >
                                                                           16 
                                                                           17 # EOF
 diff --git a/example.pdf b/example.pdf
@@ -16,11 +16,11 @@
 --- a/foo.html
 +++ b/foo.html
 @@ -1,4 +1,4 @@
-1 <!doctype html>                                                        1 <!DOCTYPE html>
+1 <!doctype html>                                                        1 <!DOCTYPE html>
 2 <html>                                                                 2 <html>
 3                                                                        3 
 4 <head>                                                                 4 <head>
 diff --git a/foo.pdf b/foo.pdf
 index 0e90017..3c3b90d 100644
 Binary files a/foo.pdf and b/foo.pdf differ
-
+

tests/git-log/out.w70

@@ -34,4 +34,4 @@
                                                                           17 
 17     """                                                                18     """
 18     # Set up option parser                                             19     # Set up option parser
-19     parser = optparse.OptionParser(usage="modernize [options] file|di> 20     parser = optparse.OptionParser(usage="modernize [options] file|di>
+19     parser = optparse.OptionParser(usage="modernize [options] file|di> 20     parser = optparse.OptionParser(usage="modernize [options] file|di>

tests/git/out.side-by-side

@@ -12,7 +12,7 @@
 128                     yield self._markup_common(' ' + old[1])                      128                     yield self._markup_common(' ' + old[1])
 129                                                                                  129 
 130     def markup_side_by_side(self, width):                                        130     def markup_side_by_side(self, width):
-131         """width of 0 means infinite width, None means auto detect. Returns a    131         """Returns a generator"""
+131         """width of 0 means infinite width, None means auto detect. Returns a    131         """Returns a generator"""
 132         generator     
 133         """     
 134         def _normalize(line):                                                    132         def _normalize(line):
@@ -22,7 +22,7 @@
 147                 return markup                                                    145                 return markup
 148                                                                                  146 
 149         # Setup line width and number width                                      147         # Setup line width and number width
-150         if not width: width = 80                                                 148         if width <= 0:
+150         if not width: width = 80                                                 148         if width <= 0:
                                                                                      149             width = 80
 151         (start, offset) = self._hunks[-1].get_old_addr()                         150         (start, offset) = self._hunks[-1].get_old_addr()
 152         max1 = start + offset - 1                                                151         max1 = start + offset - 1

tests/git/out.w70

@@ -12,7 +12,7 @@
 128                     yield self._markup_common(' ' + old[1])            128                     yield self._markup_common(' ' + old[1])
 129                                                                        129 
 130     def markup_side_by_side(self, width):                              130     def markup_side_by_side(self, width):
-131         """width of 0 means infinite width, None means auto detect. R> 131         """Returns a generator"""
+131         """width of 0 means infinite width, None means auto detect. R> 131         """Returns a generator"""
 132         generator     
 133         """     
 134         def _normalize(line):                                          132         def _normalize(line):
@@ -22,7 +22,7 @@
 147                 return markup                                          145                 return markup
 148                                                                        146 
 149         # Setup line width and number width                            147         # Setup line width and number width
-150         if not width: width = 80                                       148         if width <= 0:
+150         if not width: width = 80                                       148         if width <= 0:
                                                                            149             width = 80
 151         (start, offset) = self._hunks[-1].get_old_addr()               150         (start, offset) = self._hunks[-1].get_old_addr()
 152         max1 = start + offset - 1                                      151         max1 = start + offset - 1

tests/regression.sh

@@ -33,7 +33,7 @@ function cmp_output()
     local cdiff_opt=${3:-""}
     local cmd
 
-    cmd=$(printf "%-8s $CDIFF %-18s <  %-30s " $PYTHON "$cdiff_opt" "$input")
+    cmd=$(printf "%-8s $CDIFF %-24s <  %-30s " $PYTHON "$cdiff_opt" "$input")
     printf "$cmd"
     if eval $cmd 2>/dev/null | diff -ubq $expected_out - >& /dev/null; then
         pass
@@ -56,9 +56,11 @@ function main()
         cmp_output $d/in.diff $d/out.normal "-c always" || ((e++))
         cmp_output $d/in.diff $d/out.side-by-side "-c always -s" || ((e++))
         cmp_output $d/in.diff $d/out.w70 "-c always -s -w70" || ((e++))
+        cmp_output $d/in.diff $d/out.w70.wrap "-c always -s -w70 --wrap" || ((e++))
         cmp_output $d/in.diff $d/in.diff "-c auto" || ((e++))
         cmp_output $d/in.diff $d/in.diff "-c auto -s" || ((e++))
         cmp_output $d/in.diff $d/in.diff "-c auto -s -w70" || ((e++))
+        cmp_output $d/in.diff $d/in.diff "-c auto -s -w70 --wrap" || ((e++))
         (( total += 6 ))
     done
 

tests/svn/out.w70

@@ -5,11 +5,11 @@
 @@ -3,7 +3,6 @@
   3 ## About                                                                 3 ## About
   4                                                                          4 
-  5 Coderev is a toolkit generates static side-by-side html pages for cod>   5 Coderev is a toolkit generates static side-by-side html pages for cod>
+  5 Coderev is a toolkit generates static side-by-side html pages for cod>   5 Coderev is a toolkit generates static side-by-side html pages for cod>
   6 Typical use case is to generate diff pages for local modification in >     
   7 workspace and send page link to teammates for code review.               6 workspace and send page link to teammates for code review.
   8                                                                          7 
-  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>   8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>
+  9 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>   8 See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) f>
 @@ -18,9 +17,10 @@
  18                                                                         17 
  19 ## Usage of coderev.sh                                                  18 ## Usage of coderev.sh
@@ -18,12 +18,12 @@
  22                                                                         21 
  23     Usage:                                                              22     Usage:
                                                                             23 
- 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>  24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>
+ 24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>  24         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name>
  25                 [-F comment-file | -m 'comment...'] [file...]           25                 [-F comment-file | -m 'comment...'] [file...]
  26                                                                         26 
 @@ -145,3 +145,5 @@
-145                             specify column number where lines are bro> 145                             specify column number where lines are bro>
-146                             wrapped for sdiff, default is no line wra> 146                             wrapped for sdiff, default is no line wra>
+145                             specify column number where lines are bro> 145                             specify column number where lines are bro>
+146                             wrapped for sdiff, default is no line wra> 146                             wrapped for sdiff, default is no line wra>
 147     -y, --yes             do not prompt for overwriting                147     -y, --yes             do not prompt for overwriting
                                                                            148 
                                                                            149 # EOF

tests/test_cdiff.py

@@ -231,7 +231,7 @@ class DiffMarkupTest(unittest.TestCase):
             '\x1b[33m1\x1b[0m '
             '\x1b[31m\x1b[7m\x1b[31mh\x1b[0m\x1b[31mhello\x1b[0m  '
             '\x1b[0m\x1b[33m1\x1b[0m '
-            '\x1b[32mhello\x1b[7m\x1b[32mo\x1b[0m\x1b[32m\x1b[0m\n')
+            '\x1b[32mhello\x1b[7m\x1b[32mo\x1b[0m\n')
         self.assertEqual(
             out[6],
             '\x1b[33m '
@@ -261,7 +261,7 @@ class DiffMarkupTest(unittest.TestCase):
             '\x1b[33m5\x1b[0m '
             '\x1b[31m\x1b[7m\x1b[31m      \x1b[0m\x1b[1;35m>\x1b[0m '
             '\x1b[0m\x1b[33m5\x1b[0m '
-            '\x1b[32m\x1b[7m\x1b[32m spaced\x1b[0m\x1b[32m\x1b[0m\n')
+            '\x1b[32m\x1b[7m\x1b[32m spaced\x1b[0m\n')
 
     # This test is not valid anymore
     def __test_markup_side_by_side_neg_width(self):
@@ -325,11 +325,10 @@ class DiffMarkupTest(unittest.TestCase):
         self.assertEqual(out[4], '\x1b[1;34m@@ -1,5 +1,5 @@\n\x1b[0m')
         self.assertEqual(
             out[5],
-
             '\x1b[33m1\x1b[0m '
             '\x1b[31m\x1b[7m\x1b[31mh\x1b[0m\x1b[31mhello\x1b[0m '
             '\x1b[0m\x1b[33m1\x1b[0m '
-            '\x1b[32mhello\x1b[7m\x1b[32mo\x1b[0m\x1b[32m\x1b[0m\n')
+            '\x1b[32mhello\x1b[7m\x1b[32mo\x1b[0m\n')
         self.assertEqual(
             out[6],
             '\x1b[33m \x1b[0m        '
@@ -432,7 +431,7 @@ class DiffMarkupTest(unittest.TestCase):
             '\x1b[33m1\x1b[0m '
             '\x1b[31m\x1b[7m\x1b[31mh\x1b[0m\x1b[31mhello\x1b[0m   '
             '\x1b[0m\x1b[33m1\x1b[0m '
-            '\x1b[32mhello\x1b[7m\x1b[32mo\x1b[0m\x1b[32m\x1b[0m\n')
+            '\x1b[32mhello\x1b[7m\x1b[32mo\x1b[0m\n')
         self.assertEqual(
             out[6],
             '\x1b[33m '
@@ -460,9 +459,9 @@ class DiffMarkupTest(unittest.TestCase):
         self.assertEqual(
             out[10],
             '\x1b[33m5\x1b[0m '
-            '\x1b[31m\x1b[7m\x1b[31m  tabbed\x1b[0m\x1b[31m\x1b[0m '
+            '\x1b[31m\x1b[7m\x1b[31m  tabbed\x1b[0m '
             '\x1b[0m\x1b[33m5\x1b[0m '
-            '\x1b[32m\x1b[7m\x1b[32m spaced\x1b[0m\x1b[32m\x1b[0m\n')
+            '\x1b[32m\x1b[7m\x1b[32m spaced\x1b[0m\n')
 
 
 class UnifiedDiffTest(unittest.TestCase):