Merge lp:~fullermd/brz/3.2-fix-diff-using into lp:brz/3.2

[Matthew Fuller]

Merge fix of --diff-options handling

Cherry pick of --diff-options fix from lp:~jelmer/brz/fix-diff-using (already applied in trunk and 3.3). By manual testing it fixes the issue there as well. Before/after selftest yield the same results.

x-ref bug 1977988 on the original issue.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

Disabling the tarmac-based bot, since 3.2 doesn't have the appropriate config for it.

[Jelmer Vernooij (jelmer)]

It looks like the jenkins bot is actually broken: https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/5515/console, so we'd have to fix that first. :-(

Unmerged revisions

7602. By Jelmer Vernooij on 2022-11-10

Fix handling of --diff-options.

Cherry pick of <email address hidden> from
fix-diff-using branch, already present in trunk and 3.3.

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2022-01-12 23:43:40 +0000
+++ breezy/diff.py	2022-11-10 00:10:25 +0000
@@ -19,6 +19,7 @@
 import os
 import re
 import sys
+from typing import Optional, List, Union
 
 from .lazy_import import lazy_import
 lazy_import(globals(), """
@@ -29,7 +30,6 @@
 
 from breezy import (
     controldir,
-    osutils,
     textfile,
     timestamp,
     views,
@@ -41,12 +41,13 @@
 
 from . import (
     errors,
+    osutils,
     )
 from .registry import (
     Registry,
     )
 from .trace import mutter, note, warning
-from .tree import FileTimestampUnavailable
+from .tree import Tree, FileTimestampUnavailable
 
 
 DEFAULT_CONTEXT_AMOUNT = 3
@@ -494,10 +495,10 @@
 
 def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
                     external_diff_options=None,
-                    old_label='a/', new_label='b/',
+                    old_label: str = 'a/', new_label: str = 'b/',
                     extra_trees=None,
-                    path_encoding='utf8',
-                    using=None,
+                    path_encoding: str = 'utf8',
+                    using: Optional[str] = None,
                     format_cls=None,
                     context=DEFAULT_CONTEXT_AMOUNT):
     """Show in text form the changes from one tree to another.
@@ -770,15 +771,18 @@
 
 class DiffFromTool(DiffPath):
 
-    def __init__(self, command_template, old_tree, new_tree, to_file,
+    def __init__(self, command_template: Union[str, List[str]],
+            old_tree: Tree, new_tree: Tree, to_file,
                  path_encoding='utf-8'):
         DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
         self.command_template = command_template
         self._root = osutils.mkdtemp(prefix='brz-diff-')
 
     @classmethod
-    def from_string(klass, command_template, old_tree, new_tree, to_file,
-                    path_encoding='utf-8'):
+    def from_string(klass,
+                    command_template: Union[str, List[str]],
+                    old_tree: Tree, new_tree: Tree, to_file,
+                    path_encoding: str = 'utf-8'):
         return klass(command_template, old_tree, new_tree, to_file,
                      path_encoding)
 
@@ -787,7 +791,7 @@
         def from_diff_tree(diff_tree):
             full_command_string = [command_string]
             if external_diff_options is not None:
-                full_command_string += ' ' + external_diff_options
+                full_command_string.extend(external_diff_options.split())
             return klass.from_string(full_command_string, diff_tree.old_tree,
                                      diff_tree.new_tree, diff_tree.to_file)
         return from_diff_tree

=== modified file 'breezy/tests/blackbox/test_diff.py'
--- breezy/tests/blackbox/test_diff.py	2021-11-15 17:27:44 +0000
+++ breezy/tests/blackbox/test_diff.py	2022-11-10 00:10:25 +0000
@@ -464,9 +464,9 @@
         self.requireFeature(features.diff_feature)
         self.make_example_branch()
         self.build_tree_contents([('hello', b'Foo\n')])
-        out, err = self.run_bzr('diff --diff-options -i --using diff',
+        out, err = self.run_bzr('diff --diff-options -i --diff-options -a --using diff',
                                 retcode=1)
-        self.assertEqual("=== modified file 'hello'\n", out)
+        self.assertEqual("=== modified file 'hello'\n1c1\n< foo\n---\n> Foo\n", out)
         self.assertEqual('', err)