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

[Toshio Kuratomi]

[Toshio Kuratomi (toshio)]

Fix for traceback when applying a patch that has non-patch content. Need to have a fix applied to bzrlib before this is applied.

[Jelmer Vernooij (jelmer)]

We shouldn't pass allow_dirty to parse_patches() unless the version of bzr is recent enough.

[Toshio Kuratomi (toshio)]

Updated. I used inspect.getargspec() as it seems more pythonic to check that the function we're calling supports the argument. We could compare to bzrlib.version_info instead if you don't like inspect but the fix doesn't show up in bzrlib until 2.2b1.

[Toshio Kuratomi (toshio)]

"doesn't show up in bzrlib until 2.2b1."... so distributions that backport the fix to bzr-2.0.x or 2.1.x would need to patch this section of code disable the version check. Whereas using getargspec() will just work if the fix is backported.

[Jelmer Vernooij (jelmer)]

I can live with getargspec. I'll merge, sorry about the delay.

[Jelmer Vernooij (jelmer)]

Nevermind, it was already merged :)

=== modified file 'bzr-handle-patch'
--- bzr-handle-patch	2009-11-13 19:07:28 +0000
+++ bzr-handle-patch	2010-04-13 14:23:27 +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 14:23:27 +0000
@@ -524,9 +524,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 +539,7 @@
 
     def get_diff_sections(self):
         yield "Complete Diff", None, ''.join(self.patch)
-        for patch in parse_patches(self.patch):
+        for patch in parse_patches(self.patch, self.allow_dirty):
             oldname = patch.oldname.split('\t')[0]
             newname = patch.newname.split('\t')[0]
             yield oldname, newname, str(patch)