Update tests accordingly

tests/context/out.normal

 @@ -467,6 +467,13 @@
          dom.unlink()
          self.confirm(domstr == str.replace("\n", "\r\n"))
-+
-+    def testPrettyTextNode(self):
-+        str = '<A>B</A>'
-+        dom = parseString(str)
-+        dom2 = parseString(dom.toprettyxml())
-+        self.confirm(dom.childNodes[0].childNodes[0].toxml()==
-+                     dom2.childNodes[0].childNodes[0].toxml())
++
++    def testPrettyTextNode(self):
++        str = '<A>B</A>'
++        dom = parseString(str)
++        dom2 = parseString(dom.toprettyxml())
++        self.confirm(dom.childNodes[0].childNodes[0].toxml()==
++                     dom2.childNodes[0].childNodes[0].toxml())
  
      def testProcessingInstruction(self):
          dom = parseString('<e><?mypi \t\n data \t\n ?></e>')
              writer.write("\"")
          if self.childNodes:
 -            writer.write(">%s"%(newl))
-+            writer.write(">")
-+            if self.childNodes[0].nodeType != Node.TEXT_NODE:     # Strict check
-+                writer.write(newl)
++            writer.write(">")
++            if self.childNodes[0].nodeType != Node.TEXT_NODE:     # Strict check
++                writer.write(newl)
              for node in self.childNodes:
                  node.writexml(writer,indent+addindent,addindent,newl)
              writer.write("%s</%s>%s" % (indent,self.tagName,newl))
  
      def writexml(self, writer, indent="", addindent="", newl=""):
 -        _write_data(writer, "%s%s%s"%(indent, self.data, newl))
-+        _write_data(writer, self.data)
++        _write_data(writer, self.data)
  
      # DOM Level 3 (WD 9 April 2002)
  
-
+

tests/context/out.side-by-side

 @@ -467,6 +467,13 @@
 467         dom.unlink()                                                             467         dom.unlink()
 468         self.confirm(domstr == str.replace("\n", "\r\n"))                        468         self.confirm(domstr == str.replace("\n", "\r\n"))
-                                                                                     469 
-                                                                                     470     def testPrettyTextNode(self):
-                                                                                     471         str = '<A>B</A>'
-                                                                                     472         dom = parseString(str)
-                                                                                     473         dom2 = parseString(dom.toprettyxml())
-                                                                                     474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
-                                                                                     475                      dom2.childNodes[0].childNodes[0].toxml())
+                                                                                     469 
+                                                                                     470     def testPrettyTextNode(self):
+                                                                                     471         str = '<A>B</A>'
+                                                                                     472         dom = parseString(str)
+                                                                                     473         dom2 = parseString(dom.toprettyxml())
+                                                                                     474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
+                                                                                     475                      dom2.childNodes[0].childNodes[0].toxml())
 469                                                                                  476 
 470     def testProcessingInstruction(self):                                         477     def testProcessingInstruction(self):
 471         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')                     478         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')
  837             writer.write("\"")                                                    837             writer.write("\"")
  838         if self.childNodes:                                                       838         if self.childNodes:
  839             writer.write(">%s"%(newl))                                            839             writer.write(">")
-                                                                                       840             if self.childNodes[0].nodeType != Node.TEXT_NODE:     # Strict check
-                                                                                       841                 writer.write(newl)
+                                                                                       840             if self.childNodes[0].nodeType != Node.TEXT_NODE:     # Strict check
+                                                                                       841                 writer.write(newl)
  840             for node in self.childNodes:                                          842             for node in self.childNodes:
  841                 node.writexml(writer,indent+addindent,addindent,newl)             843                 node.writexml(writer,indent+addindent,addindent,newl)
  842             writer.write("%s</%s>%s" % (indent,self.tagName,newl))                844             writer.write("%s</%s>%s" % (indent,self.tagName,newl))

tests/context/out.w70

 @@ -467,6 +467,13 @@
 467         dom.unlink()                                                   467         dom.unlink()
 468         self.confirm(domstr == str.replace("\n", "\r\n"))              468         self.confirm(domstr == str.replace("\n", "\r\n"))
-                                                                           469 
-                                                                           470     def testPrettyTextNode(self):
-                                                                           471         str = '<A>B</A>'
-                                                                           472         dom = parseString(str)
-                                                                           473         dom2 = parseString(dom.toprettyxml())
-                                                                           474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
-                                                                           475                      dom2.childNodes[0].childNodes[0].toxml())
+                                                                           469 
+                                                                           470     def testPrettyTextNode(self):
+                                                                           471         str = '<A>B</A>'
+                                                                           472         dom = parseString(str)
+                                                                           473         dom2 = parseString(dom.toprettyxml())
+                                                                           474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
+                                                                           475                      dom2.childNodes[0].childNodes[0].toxml())
 469                                                                        476 
 470     def testProcessingInstruction(self):                               477     def testProcessingInstruction(self):
 471         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')           478         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')
  837             writer.write("\"")                                          837             writer.write("\"")
  838         if self.childNodes:                                             838         if self.childNodes:
  839             writer.write(">%s"%(newl))                                  839             writer.write(">")
-                                                                             840             if self.childNodes[0].nodeType != Node.TEXT_NODE:     # S>
-                                                                             841                 writer.write(newl)
+                                                                             840             if self.childNodes[0].nodeType != Node.TEXT_NODE:     # S>
+                                                                             841                 writer.write(newl)
  840             for node in self.childNodes:                                842             for node in self.childNodes:
  841                 node.writexml(writer,indent+addindent,addindent,newl)   843                 node.writexml(writer,indent+addindent,addindent,newl)
  842             writer.write("%s</%s>%s" % (indent,self.tagName,newl))      844             writer.write("%s</%s>%s" % (indent,self.tagName,newl))

tests/crlf/out.normal

  ## Usage of coderev.sh
  
 -Just type `./coderev.sh -h` to see the usage.
-+Just type `./coderev.sh --help` to see the usage.
++Just type `./coderev.sh --help` to see the usage.
  
      Usage:
-+
++
          coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \
                  [-F comment-file | -m 'comment...'] [file...]
  
                              specify column number where lines are broken and
                              wrapped for sdiff, default is no line wrapping
      -y, --yes             do not prompt for overwriting
-+
-+# EOF
-
++
++# EOF
+

tests/crlf/out.side-by-side

  21 Just type `./coderev.sh -h` to see the usage.                                     20 Just type `./coderev.sh --help` to see the usage.
  22                                                                                   21 
  23     Usage:                                                                        22     Usage:
-                                                                                      23 
+                                                                                      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] \
  25                 [-F comment-file | -m 'comment...'] [file...]                     25                 [-F comment-file | -m 'comment...'] [file...]
  26                                                                                   26 
 145                             specify column number where lines are broken and     145                             specify column number where lines are broken and
 146                             wrapped for sdiff, default is no line wrapping       146                             wrapped for sdiff, default is no line wrapping
 147     -y, --yes             do not prompt for overwriting                          147     -y, --yes             do not prompt for overwriting
-                                                                                     148 
-                                                                                     149 # EOF
+                                                                                     148 
+                                                                                     149 # EOF

tests/crlf/out.w70

  21 Just type `./coderev.sh -h` to see the usage.                           20 Just type `./coderev.sh --help` to see the usage.
  22                                                                         21 
  23     Usage:                                                              22     Usage:
-                                                                            23 
+                                                                            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>
  25                 [-F comment-file | -m 'comment...'] [file...]           25                 [-F comment-file | -m 'comment...'] [file...]
  26                                                                         26 
 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
+                                                                           148 
+                                                                           149 # EOF

tests/diff-ru-bin/out.normal

 +++ b/README	2013-02-23 19:52:06.000000000 +0800
 @@ -1,6 +1,6 @@
 -# To generate expected output, chdir to a subdir and use following command, then
-+# To generate expected output, cd to a subdir and use following command, then
++# To generate expected output, cd to a subdir and use following command, then
  # review with `less -R`
 -#
  ../../cdiff.py -c always < in.diff > out.normal
  ../../cdiff.py -c always -s < in.diff > out.side-by-side
  ../../cdiff.py -c always -s < in.diff -w70 > out.w70
-+# EOF
++# EOF
 Binary files a/foo.pdf and b/foo.pdf differ
 diff -ru a/foo.txt b/foo.txt
 --- 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 @@
 -Hello
-+hella
++hella
  world
-
+

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

 4 ../../cdiff.py -c always < in.diff > out.normal                                  3 ../../cdiff.py -c always < in.diff > out.normal
 5 ../../cdiff.py -c always -s < in.diff > out.side-by-side                         4 ../../cdiff.py -c always -s < in.diff > out.side-by-side
 6 ../../cdiff.py -c always -s < in.diff -w70 > out.w70                             5 ../../cdiff.py -c always -s < in.diff -w70 > out.w70
-                                                                                   6 # EOF
+                                                                                   6 # EOF
 Binary files a/foo.pdf and b/foo.pdf differ
 diff -ru a/foo.txt b/foo.txt
 --- a/foo.txt	2013-02-23 19:55:03.000000000 +0800

tests/diff-ru-bin/out.w70

 4 ../../cdiff.py -c always < in.diff > out.normal                        3 ../../cdiff.py -c always < in.diff > out.normal
 5 ../../cdiff.py -c always -s < in.diff > out.side-by-side               4 ../../cdiff.py -c always -s < in.diff > out.side-by-side
 6 ../../cdiff.py -c always -s < in.diff -w70 > out.w70                   5 ../../cdiff.py -c always -s < in.diff -w70 > out.w70
-                                                                         6 # EOF
+                                                                         6 # EOF
 Binary files a/foo.pdf and b/foo.pdf differ
 diff -ru a/foo.txt b/foo.txt
 --- a/foo.txt	2013-02-23 19:55:03.000000000 +0800

tests/diff-ru/out.normal

 +++ b/README	2013-02-22 20:27:51.000000000 +0800
 @@ -1,6 +1,6 @@
 -# To generate expected output, chdir to a subdir and use following command, then
-+# To generate expected output, cd to a subdir and use following command, then
++# To generate expected output, cd to a subdir and use following command, then
  # review with `less -R`
 -#
  ../../cdiff.py -c always in.diff > out.normal 
  ../../cdiff.py -c always -s in.diff > out.side-by-side
  ../../cdiff.py -c always -s in.diff -w70 > out.w70
-+# EOF
++# EOF
 Only in a: a1
 Only in b: b1
 diff -ru a/common/foo.txt b/common/foo.txt
 +++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
 @@ -1 +1 @@
 -Hello
-+world
++world
 Only in b: date.txt
 Only in a: time.txt
-
+

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

 4 ../../cdiff.py -c always in.diff > out.normal                                    3 ../../cdiff.py -c always in.diff > out.normal 
 5 ../../cdiff.py -c always -s in.diff > out.side-by-side                           4 ../../cdiff.py -c always -s in.diff > out.side-by-side
 6 ../../cdiff.py -c always -s in.diff -w70 > out.w70                               5 ../../cdiff.py -c always -s in.diff -w70 > out.w70
-                                                                                   6 # EOF
+                                                                                   6 # EOF
 Only in a: a1
 Only in b: b1
 diff -ru a/common/foo.txt b/common/foo.txt
 1 Hello                                                                            1 world
 Only in b: date.txt
 Only in a: time.txt
-
+

tests/diff-ru/out.w70

 4 ../../cdiff.py -c always in.diff > out.normal                          3 ../../cdiff.py -c always in.diff > out.normal 
 5 ../../cdiff.py -c always -s in.diff > out.side-by-side                 4 ../../cdiff.py -c always -s in.diff > out.side-by-side
 6 ../../cdiff.py -c always -s in.diff -w70 > out.w70                     5 ../../cdiff.py -c always -s in.diff -w70 > out.w70
-                                                                         6 # EOF
+                                                                         6 # EOF
 Only in a: a1
 Only in b: b1
 diff -ru a/common/foo.txt b/common/foo.txt
 1 Hello                                                                  1 world
 Only in b: date.txt
 Only in a: time.txt
-
+

tests/git-bin/out.normal

  OUTPUT=${INPUT%.html}.pdf
  
  wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments ends here
-+
-+# EOF
++
++# EOF
 diff --git a/example.pdf b/example.pdf
 index 1eacfd8..3696851 100644
 Binary files a/example.pdf and b/example.pdf differ
 +++ b/foo.html
 @@ -1,4 +1,4 @@
 -<!doctype html>
-+<!DOCTYPE html>
++<!DOCTYPE html>
  <html>
  
  <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.side-by-side

 13 OUTPUT=${INPUT%.html}.pdf                                                        13 OUTPUT=${INPUT%.html}.pdf
 14                                                                                  14 
 15 wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments ends here   15 wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments ends here
-                                                                                    16 
-                                                                                    17 # EOF
+                                                                                    16 
+                                                                                    17 # EOF
 diff --git a/example.pdf b/example.pdf
 index 1eacfd8..3696851 100644
 Binary files a/example.pdf and b/example.pdf differ
 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

 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 >
-                                                                          16 
-                                                                          17 # EOF
+                                                                          16 
+                                                                          17 # EOF
 diff --git a/example.pdf b/example.pdf
 index 1eacfd8..3696851 100644
 Binary files a/example.pdf and b/example.pdf differ
 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.normal

      """Main program.
  
      Returns a suggested exit status (0, 1, 2).
-+
++
      """
      # Set up option parser
      parser = optparse.OptionParser(usage="modernize [options] file|dir ...")
-
+

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

 14     """Main program.                                                             14     """Main program.
 15                                                                                  15 
 16     Returns a suggested exit status (0, 1, 2).                                   16     Returns a suggested exit status (0, 1, 2).
-                                                                                    17 
+                                                                                    17 
 17     """                                                                          18     """
 18     # Set up option parser                                                       19     # Set up option parser
 19     parser = optparse.OptionParser(usage="modernize [options] file|dir ...")     20     parser = optparse.OptionParser(usage="modernize [options] file|dir ...")

tests/git-log/out.w70

 14     """Main program.                                                   14     """Main program.
 15                                                                        15 
 16     Returns a suggested exit status (0, 1, 2).                         16     Returns a suggested exit status (0, 1, 2).
-                                                                          17 
+                                                                          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>

tests/git-perm/out.normal

 diff --git a/cdiff.py b/cdiff.py
 old mode 100755
 new mode 100644
-
+

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

 diff --git a/cdiff.py b/cdiff.py
 old mode 100755
 new mode 100644
-
+

tests/git-perm/out.w70

 diff --git a/cdiff.py b/cdiff.py
 old mode 100755
 new mode 100644
-
+

tests/git/out.normal

  
      def markup_side_by_side(self, width):
 -        """width of 0 means infinite width, None means auto detect. Returns a
-+        """Returns a generator"""
++        """Returns a generator"""
 -        generator
 -        """
          def _normalize(line):
  
          # Setup line width and number width
 -        if not width: width = 80
-+        if width <= 0:
-+            width = 80
++        if width <= 0:
++            width = 80
          (start, offset) = self._hunks[-1].get_old_addr()
          max1 = start + offset - 1
          (start, offset) = self._hunks[-1].get_new_addr()
      parser.add_option('-s', '--side-by-side', action='store_true',
              help=('show in side-by-side mode'))
 -    parser.add_option('-w', '--width', type='int', default=None,
-+    parser.add_option('-w', '--width', type='int', default=80,
++    parser.add_option('-w', '--width', type='int', default=80,
 -            help='set line width (side-by-side mode only)')
-+            help='set line width (side-by-side mode only), default is 80')
++            help='set line width (side-by-side mode only), default is 80')
      opts, args = parser.parse_args()
 -
 -    if opts.width and opts.width < 0:
      if len(args) >= 1:
          diff_hdl = open(args[0], 'r')
      elif sys.stdin.isatty():
-
+

tests/git/out.side-by-side

 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:
-                                                                                     149             width = 80
+                                                                                     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
 153         (start, offset) = self._hunks[-1].get_new_addr()                         152         (start, offset) = self._hunks[-1].get_new_addr()

tests/git/out.w70

 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:
-                                                                           149             width = 80
+                                                                           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
 153         (start, offset) = self._hunks[-1].get_new_addr()               152         (start, offset) = self._hunks[-1].get_new_addr()

tests/hg-log/out.normal

 @@ -467,6 +467,13 @@
          dom.unlink()
          self.confirm(domstr == str.replace("\n", "\r\n"))
-+
-+    def testPrettyTextNode(self):
-+        str = '<A>B</A>'
-+        dom = parseString(str)
-+        dom2 = parseString(dom.toprettyxml())
-+        self.confirm(dom.childNodes[0].childNodes[0].toxml()==
-+                     dom2.childNodes[0].childNodes[0].toxml())
++
++    def testPrettyTextNode(self):
++        str = '<A>B</A>'
++        dom = parseString(str)
++        dom2 = parseString(dom.toprettyxml())
++        self.confirm(dom.childNodes[0].childNodes[0].toxml()==
++                     dom2.childNodes[0].childNodes[0].toxml())
  
      def testProcessingInstruction(self):
          dom = parseString('<e><?mypi \t\n data \t\n ?></e>')
              writer.write("\"")
          if self.childNodes:
 -            writer.write(">%s"%(newl))
-+            writer.write(">")
-+            if self.childNodes[0].nodeType != Node.TEXT_NODE:
-+                writer.write(newl)
++            writer.write(">")
++            if self.childNodes[0].nodeType != Node.TEXT_NODE:
++                writer.write(newl)
              for node in self.childNodes:
                  node.writexml(writer,indent+addindent,addindent,newl)
              writer.write("%s</%s>%s" % (indent,self.tagName,newl))
  
      def writexml(self, writer, indent="", addindent="", newl=""):
 -        _write_data(writer, "%s%s%s"%(indent, self.data, newl))
-+        _write_data(writer, self.data)
++        _write_data(writer, self.data)
  
      # DOM Level 3 (WD 9 April 2002)
  
-
+

tests/hg-log/out.side-by-side

 @@ -467,6 +467,13 @@
 467         dom.unlink()                                                             467         dom.unlink()
 468         self.confirm(domstr == str.replace("\n", "\r\n"))                        468         self.confirm(domstr == str.replace("\n", "\r\n"))
-                                                                                     469 
-                                                                                     470     def testPrettyTextNode(self):
-                                                                                     471         str = '<A>B</A>'
-                                                                                     472         dom = parseString(str)
-                                                                                     473         dom2 = parseString(dom.toprettyxml())
-                                                                                     474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
-                                                                                     475                      dom2.childNodes[0].childNodes[0].toxml())
+                                                                                     469 
+                                                                                     470     def testPrettyTextNode(self):
+                                                                                     471         str = '<A>B</A>'
+                                                                                     472         dom = parseString(str)
+                                                                                     473         dom2 = parseString(dom.toprettyxml())
+                                                                                     474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
+                                                                                     475                      dom2.childNodes[0].childNodes[0].toxml())
 469                                                                                  476 
 470     def testProcessingInstruction(self):                                         477     def testProcessingInstruction(self):
 471         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')                     478         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')
  837             writer.write("\"")                                                    837             writer.write("\"")
  838         if self.childNodes:                                                       838         if self.childNodes:
  839             writer.write(">%s"%(newl))                                            839             writer.write(">")
-                                                                                       840             if self.childNodes[0].nodeType != Node.TEXT_NODE:
-                                                                                       841                 writer.write(newl)
+                                                                                       840             if self.childNodes[0].nodeType != Node.TEXT_NODE:
+                                                                                       841                 writer.write(newl)
  840             for node in self.childNodes:                                          842             for node in self.childNodes:
  841                 node.writexml(writer,indent+addindent,addindent,newl)             843                 node.writexml(writer,indent+addindent,addindent,newl)
  842             writer.write("%s</%s>%s" % (indent,self.tagName,newl))                844             writer.write("%s</%s>%s" % (indent,self.tagName,newl))

tests/hg-log/out.w70

 @@ -467,6 +467,13 @@
 467         dom.unlink()                                                   467         dom.unlink()
 468         self.confirm(domstr == str.replace("\n", "\r\n"))              468         self.confirm(domstr == str.replace("\n", "\r\n"))
-                                                                           469 
-                                                                           470     def testPrettyTextNode(self):
-                                                                           471         str = '<A>B</A>'
-                                                                           472         dom = parseString(str)
-                                                                           473         dom2 = parseString(dom.toprettyxml())
-                                                                           474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
-                                                                           475                      dom2.childNodes[0].childNodes[0].toxml())
+                                                                           469 
+                                                                           470     def testPrettyTextNode(self):
+                                                                           471         str = '<A>B</A>'
+                                                                           472         dom = parseString(str)
+                                                                           473         dom2 = parseString(dom.toprettyxml())
+                                                                           474         self.confirm(dom.childNodes[0].childNodes[0].toxml()==
+                                                                           475                      dom2.childNodes[0].childNodes[0].toxml())
 469                                                                        476 
 470     def testProcessingInstruction(self):                               477     def testProcessingInstruction(self):
 471         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')           478         dom = parseString('<e><?mypi \t\n data \t\n ?></e>')
  837             writer.write("\"")                                          837             writer.write("\"")
  838         if self.childNodes:                                             838         if self.childNodes:
  839             writer.write(">%s"%(newl))                                  839             writer.write(">")
-                                                                             840             if self.childNodes[0].nodeType != Node.TEXT_NODE:
-                                                                             841                 writer.write(newl)
+                                                                             840             if self.childNodes[0].nodeType != Node.TEXT_NODE:
+                                                                             841                 writer.write(newl)
  840             for node in self.childNodes:                                842             for node in self.childNodes:
  841                 node.writexml(writer,indent+addindent,addindent,newl)   843                 node.writexml(writer,indent+addindent,addindent,newl)
  842             writer.write("%s</%s>%s" % (indent,self.tagName,newl))      844             writer.write("%s</%s>%s" % (indent,self.tagName,newl))

tests/latin1/out.normal

  int latin1()
  {
  	static int x;
-
+

tests/regression.sh

 function pass()
 {
     if [[ -t 1 ]]; then
-        echo -e "\x1b[01;32mPASS\x1b[0m" "$*"
+        echo -e "\x1b[032mPASS\x1b[0m" "$*"
     else
         echo "PASS" "$*"
     fi

tests/strange/out.normal

 --- /dev/null
 +++ b/.gitignore
 @@ -0,0 +1 @@
-+*.pyc
++*.pyc
 diff --git a/README b/README
 index 7e70850..b5eb369 100644
 --- a/README
 +++ b/README
 @@ -1 +1,2 @@
  Sun Feb  3 13:57:05 CST 2013
-+Sun Feb  3 13:57:15 CST 2013
-
++Sun Feb  3 13:57:15 CST 2013
+

tests/strange/out.side-by-side

 --- /dev/null
 +++ b/.gitignore
 @@ -0,0 +1 @@
-                                                                                     1 *.pyc
+                                                                                     1 *.pyc
 diff --git a/README b/README
 index 7e70850..b5eb369 100644
 --- a/README
 +++ b/README
 @@ -1 +1,2 @@
 1 Sun Feb  3 13:57:05 CST 2013                                                     1 Sun Feb  3 13:57:05 CST 2013
-                                                                                   2 Sun Feb  3 13:57:15 CST 2013
+                                                                                   2 Sun Feb  3 13:57:15 CST 2013

tests/strange/out.w70

 --- /dev/null
 +++ b/.gitignore
 @@ -0,0 +1 @@
-                                                                           1 *.pyc
+                                                                           1 *.pyc
 diff --git a/README b/README
 index 7e70850..b5eb369 100644
 --- a/README
 +++ b/README
 @@ -1 +1,2 @@
 1 Sun Feb  3 13:57:05 CST 2013                                           1 Sun Feb  3 13:57:05 CST 2013
-                                                                         2 Sun Feb  3 13:57:15 CST 2013
+                                                                         2 Sun Feb  3 13:57:15 CST 2013

tests/svn-log/out.normal

 +++ src/share/example.sh	(revision 1235)
 @@ -1,3 +1,3 @@
 -#!/bin/sh
-+#!/bin/bash
++#!/bin/bash
  #
  # Test program, also try run me as yroot (sudo ./example.sh)
 
 --- ChangeLog	(revision 1233)
 +++ ChangeLog	(revision 1234)
 @@ -1,3 +1,6 @@
-+Version 0.0.4
-+    * Add prototype of perl module
-+
++Version 0.0.4
++    * Add prototype of perl module
++
  Version 0.0.3
      * Implement '-d' option
      * Add configfile to set global debug flag
 --- src/share/example.sh	(revision 0)
 +++ src/share/example.sh	(revision 1234)
 @@ -0,0 +1,4 @@
-+#!/bin/sh
-+#
-+# Test program, also try run me as yroot (sudo ./example.sh)
-+#
++#!/bin/sh
++#
++# Test program, also try run me as yroot (sudo ./example.sh)
++#
 
 Property changes on: src/share/example.sh
 ___________________________________________________________________
 Added: svn:executable
 ## -0,0 +1 ##
-+*
++*
 Added: svn:keywords
 ## -0,0 +1 ##
-+Id
-
++Id
+

tests/svn-log/out.side-by-side

 --- ChangeLog	(revision 1233)
 +++ ChangeLog	(revision 1234)
 @@ -1,3 +1,6 @@
-                                                                                   1 Version 0.0.4
-                                                                                   2     * Add prototype of perl module
-                                                                                   3 
+                                                                                   1 Version 0.0.4
+                                                                                   2     * Add prototype of perl module
+                                                                                   3 
 1 Version 0.0.3                                                                    4 Version 0.0.3
 2     * Implement '-d' option                                                      5     * Implement '-d' option
 3     * Add configfile to set global debug flag                                    6     * Add configfile to set global debug flag
 --- src/share/example.sh	(revision 0)
 +++ src/share/example.sh	(revision 1234)
 @@ -0,0 +1,4 @@
-                                                                                     1 #!/bin/sh
-                                                                                     2 #
-                                                                                     3 # Test program, also try run me as yroot (sudo ./example.sh)
-                                                                                     4 #
+                                                                                     1 #!/bin/sh
+                                                                                     2 #
+                                                                                     3 # Test program, also try run me as yroot (sudo ./example.sh)
+                                                                                     4 #
 
 Property changes on: src/share/example.sh
 ___________________________________________________________________
 Added: svn:executable
 ## -0,0 +1 ##
-                                                                                     1 *
+                                                                                     1 *
 Added: svn:keywords
 ## -0,0 +1 ##
-                                                                                     1 Id
+                                                                                     1 Id

tests/svn-log/out.w70

 --- ChangeLog	(revision 1233)
 +++ ChangeLog	(revision 1234)
 @@ -1,3 +1,6 @@
-                                                                         1 Version 0.0.4
-                                                                         2     * Add prototype of perl module
-                                                                         3 
+                                                                         1 Version 0.0.4
+                                                                         2     * Add prototype of perl module
+                                                                         3 
 1 Version 0.0.3                                                          4 Version 0.0.3
 2     * Implement '-d' option                                            5     * Implement '-d' option
 3     * Add configfile to set global debug flag                          6     * Add configfile to set global debug flag
 --- src/share/example.sh	(revision 0)
 +++ src/share/example.sh	(revision 1234)
 @@ -0,0 +1,4 @@
-                                                                           1 #!/bin/sh
-                                                                           2 #
-                                                                           3 # Test program, also try run me as yroot (sudo ./example.sh)
-                                                                           4 #
+                                                                           1 #!/bin/sh
+                                                                           2 #
+                                                                           3 # Test program, also try run me as yroot (sudo ./example.sh)
+                                                                           4 #
 
 Property changes on: src/share/example.sh
 ___________________________________________________________________
 Added: svn:executable
 ## -0,0 +1 ##
-                                                                           1 *
+                                                                           1 *
 Added: svn:keywords
 ## -0,0 +1 ##
-                                                                           1 Id
+                                                                           1 Id

tests/svn-merge/out.normal

 Modified: svn:mergeinfo
    Merged /repository/foo/branches/foo-bar:r4-9
    Merged /repository/foo/trunk/foo:r2-3
-
+

tests/svn-merge/out.side-by-side

 Modified: svn:mergeinfo
    Merged /repository/foo/branches/foo-bar:r4-9
    Merged /repository/foo/trunk/foo:r2-3
-
+

tests/svn-merge/out.w70

 Modified: svn:mergeinfo
    Merged /repository/foo/branches/foo-bar:r4-9
    Merged /repository/foo/trunk/foo:r2-3
-
+

tests/svn-property/out.normal

 ===================================================================
 Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
-
+

tests/svn-property/out.side-by-side

 ===================================================================
 Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
-
+

tests/svn-property/out.w70

 ===================================================================
 Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
-
+

tests/svn/out.normal

  ## Usage of coderev.sh
  
 -Just type `./coderev.sh -h` to see the usage.
-+Just type `./coderev.sh --help` to see the usage.
++Just type `./coderev.sh --help` to see the usage.
  
      Usage:
-+
++
          coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \
                  [-F comment-file | -m 'comment...'] [file...]
  
                              specify column number where lines are broken and
                              wrapped for sdiff, default is no line wrapping
      -y, --yes             do not prompt for overwriting
-+
-+# EOF
-
++
++# EOF
+

tests/svn/out.side-by-side

  21 Just type `./coderev.sh -h` to see the usage.                                     20 Just type `./coderev.sh --help` to see the usage.
  22                                                                                   21 
  23     Usage:                                                                        22     Usage:
-                                                                                      23 
+                                                                                      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] \
  25                 [-F comment-file | -m 'comment...'] [file...]                     25                 [-F comment-file | -m 'comment...'] [file...]
  26                                                                                   26 
 145                             specify column number where lines are broken and     145                             specify column number where lines are broken and
 146                             wrapped for sdiff, default is no line wrapping       146                             wrapped for sdiff, default is no line wrapping
 147     -y, --yes             do not prompt for overwriting                          147     -y, --yes             do not prompt for overwriting
-                                                                                     148 
-                                                                                     149 # EOF
+                                                                                     148 
+                                                                                     149 # EOF

tests/svn/out.w70

  21 Just type `./coderev.sh -h` to see the usage.                           20 Just type `./coderev.sh --help` to see the usage.
  22                                                                         21 
  23     Usage:                                                              22     Usage:
-                                                                            23 
+                                                                            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>
  25                 [-F comment-file | -m 'comment...'] [file...]           25                 [-F comment-file | -m 'comment...'] [file...]
  26                                                                         26 
 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
+                                                                           148 
+                                                                           149 # EOF

tests/test_cdiff.py

         self.assertEqual(out[0], '\x1b[33m--- old\n\x1b[0m')
         self.assertEqual(out[1], '\x1b[33m+++ new\n\x1b[0m')
         self.assertEqual(out[2], '\x1b[1;34m@@ -0,0 +1 @@\n\x1b[0m')
-        self.assertEqual(out[3], '\x1b[1;32m+spam\n\x1b[0m')
+        self.assertEqual(out[3], '\x1b[32m+spam\n\x1b[0m')
 
     def test_markup_traditional_both_changed(self):
         hunk = cdiff.Hunk([], '@@ -1,2 +1,2 @@\n', (1, 2), (1, 2))
             '\x1b[4m\x1b[31ma\x1b[0m\x1b[31m\n\x1b[0m')
         self.assertEqual(
             out[4],
-            '\x1b[1;32m+\x1b[0m\x1b[32mhell'
+            '\x1b[32m+\x1b[0m\x1b[32mhell'
             '\x1b[4m\x1b[32mo\x1b[0m\x1b[32m\n\x1b[0m')
         self.assertEqual(out[5], '\x1b[0m common\n\x1b[0m')
 
             '\x1b[33m '
             '\x1b[0m         '
             '\x1b[0m\x1b[33m2\x1b[0m '
-            '\x1b[1;32mspammm\x1b[0m\n')
+            '\x1b[32mspammm\x1b[0m\n')
         self.assertEqual(
             out[7],
             '\x1b[33m2\x1b[0m '
             '\x1b[33m '
             '\x1b[0m  ' + (' ' * 80) +
             '\x1b[0m\x1b[33m2\x1b[0m '
-            '\x1b[1;32mspammm\x1b[0m\n')
+            '\x1b[32mspammm\x1b[0m\n')
         self.assertEqual(
             out[7],
             '\x1b[33m2\x1b[0m '
             out[6],
             '\x1b[33m \x1b[0m        '
             '\x1b[0m\x1b[33m2\x1b[0m '
-            '\x1b[1;32mspammm\x1b[0m\n')
+            '\x1b[32mspammm\x1b[0m\n')
         self.assertEqual(
             out[7],
             '\x1b[33m2\x1b[0m '
             '\x1b[33m \x1b[0m       '
             '\x1b[0m\x1b[33m2\x1b[0m '
             ''
-            '\x1b[1;32mspam\x1b[0m\x1b[1;35m>\x1b[0m\n')
+            '\x1b[32mspam\x1b[0m\x1b[1;35m>\x1b[0m\n')
         self.assertEqual(
             out[7],
             '\x1b[33m2\x1b[0m '