Merge lp:~jelmer/bzrtools/colordiff into lp:bzrtools

[Jelmer Vernooij]

This adds DiffWriter.writelines, required for "bzr cdiff --git" (bug 691671)

[Aaron Bentley (abentley)]

--git doesn't seem to work anyway.

[Jelmer Vernooij (jelmer)]

On Wed, 2011-04-27 at 00:22 +0000, Aaron Bentley wrote:
> --git doesn't seem to work anyway.
Sorry, it's "bzr diff --format=git" now. It requires bzr-git to be
installed.

Cheers,

Jelmer

=== modified file 'colordiff.py'
--- colordiff.py	2008-11-23 21:03:13 +0000
+++ colordiff.py	2010-12-18 00:23:03 +0000
@@ -130,6 +130,10 @@
             self.chunks = []
         self.chunks = [newstuff[-1]]
 
+    def writelines(self, lines):
+        for line in lines:
+            self.write(line)
+
     def _writeline(self, line):
         item = self.lp.parse_line(line)
         bad_ws_match = None