Merge lp:~toshio/bzr-gtk/handle-patch-dirty into lp:bzr-gtk/gtk2

[Toshio Kuratomi]

This fixes bzr-handle-patch to not traceback with patches that have leading and trailing comments if a newer bzr (2.2b1 is the first release to support this) is installed. If an older bzr is installed, the code falls back on the old behaviour that handles clean patches but fails on "dirty" ones.

Note: Detection of recent enough bzr uses inspect.getargspec() rather than checking against bzrlib.version_info since
* it seems more pythonic to detect that bzrlib has the necessary parameter than to hardcode versions
* since the change only appears in bzr-2.2b1; downstream distributors are likely to backport the fix. If they do that, a bzrlib.version_info check in bzr-gtk would need to be patched out as well as it would no longer represent the capabilities of that bzrlib.

If you don't like getargspec(), we can substitute::

  if bzrlib.version_info[:2] >= (2, 2, 0, 'b', 1):

=== modified file 'bzr-handle-patch'
--- bzr-handle-patch	2009-11-13 19:07:28 +0000
+++ bzr-handle-patch	2010-04-13 15:23:16 +0000
@@ -25,7 +25,7 @@
 	try:
 		directive = merge_directive.MergeDirective.from_lines(lines)
 	except errors.NotAMergeDirective:
-		controller = DiffController(path, lines)
+		controller = DiffController(path, lines, allow_dirty=True)
 	else:
 		controller = MergeDirectiveController(path, directive)
 	window = controller.window

=== modified file 'diff.py'
--- diff.py	2010-02-24 07:47:17 +0000
+++ diff.py	2010-04-13 15:23:16 +0000
@@ -17,6 +17,7 @@
 import os
 import re
 import sys
+import inspect
 try:
     from xml.etree.ElementTree import Element, SubElement, tostring
 except ImportError:
@@ -524,9 +525,10 @@
 
 class DiffController(object):
 
-    def __init__(self, path, patch, window=None):
+    def __init__(self, path, patch, window=None, allow_dirty=False):
         self.path = path
         self.patch = patch
+        self.allow_dirty = allow_dirty
         if window is None:
             window = DiffWindow(operations=self._provide_operations())
             self.initialize_window(window)
@@ -538,7 +540,12 @@
 
     def get_diff_sections(self):
         yield "Complete Diff", None, ''.join(self.patch)
-        for patch in parse_patches(self.patch):
+        # allow_dirty was added to parse_patches in bzrlib 2.2b1
+        if 'allow_dirty' in inspect.getargspec(parse_patches).args:
+            patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
+        else:
+            patches = parse_patches(self.patch)
+        for patch in patches:
             oldname = patch.oldname.split('\t')[0]
             newname = patch.newname.split('\t')[0]
             yield oldname, newname, str(patch)