Merge lp:~jelmer/brz/diff-using-fix into lp:brz/3.0

[Jelmer Vernooij]

Fix 'bzr diff --using' when no variables are specified in the template.

Fix 'bzr diff --using' when no variables are specified in the template.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/74/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/75/

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2018-11-25 21:48:55 +0000
+++ breezy/diff.py	2019-12-22 11:33:00 +0000
@@ -729,6 +729,8 @@
         my_map = {'old_path': old_path, 'new_path': new_path}
         command = [AtTemplate(t).substitute(my_map) for t in
                    self.command_template]
+        if command == self.command_template:
+            command += [old_path, new_path]
         if sys.platform == 'win32':  # Popen doesn't accept unicode on win32
             command_encoded = []
             for c in command:

=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2018-11-25 21:48:55 +0000
+++ breezy/tests/test_diff.py	2019-12-22 11:33:00 +0000
@@ -1400,6 +1400,15 @@
         self.assertEqual(['diff', '@old_path', '@new_path'],
                          diff_obj.command_template)
 
+    def test_from_string_no_paths(self):
+        diff_obj = diff.DiffFromTool.from_string(
+            ['diff', "-u5"], None, None, None)
+        self.addCleanup(diff_obj.finish)
+        self.assertEqual(['diff', '-u5'],
+                         diff_obj.command_template)
+        self.assertEqual(['diff', '-u5', 'old-path', 'new-path'],
+                         diff_obj._get_command('old-path', 'new-path'))
+
     def test_from_string_u5(self):
         diff_obj = diff.DiffFromTool.from_string('diff "-u 5"',
                                                  None, None, None)

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-11-19 17:16:42 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-12-22 11:33:00 +0000
@@ -32,6 +32,9 @@
 .. Fixes for situations where brz would previously crash or give incorrect
    or undesirable results.
 
+* Fix ``brz diff --using`` when {old_path} and {new_path} are not
+  specified in the template. (#1847915, Jelmer Vernooij)
+
 Documentation
 *************