Merge lp:~jelmer/brz/diff-binary-weird into lp:brz

[Jelmer Vernooij]

Don't include datestamps in filenames when reporting on binary files.

Don't include datestamps in filenames when reporting on binary files.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

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

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

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2019-06-26 20:41:57 +0000
+++ breezy/diff.py	2019-07-07 19:00:04 +0000
@@ -768,8 +768,8 @@
                              context_lines=self.context_lines)
         except errors.BinaryFile:
             self.to_file.write(
-                ("Binary files %s and %s differ\n" %
-                 (from_label, to_label)).encode(self.path_encoding, 'replace'))
+                ("Binary files %s%s and %s%s differ\n" %
+                 (self.old_label, from_path, self.new_label, to_path)).encode(self.path_encoding, 'replace'))
         return self.CHANGED
 
 

=== modified file 'breezy/tests/blackbox/test_diff.py'
--- breezy/tests/blackbox/test_diff.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_diff.py	2019-07-07 19:00:04 +0000
@@ -325,6 +325,17 @@
         output = self.run_bzr('diff -Fboo', retcode=1)
         self.assertTrue("BOO!" in output[0])
 
+    def test_binary_diff_remove(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([('a', b'\x00' * 20)])
+        tree.add(['a'])
+        tree.commit('add binary file')
+        os.unlink('a')
+        output = self.run_bzr('diff', retcode=1)
+        self.assertEqual(
+            "=== removed file 'a'\nBinary files old/a and new/a differ\n",
+            output[0])
+
 
 class TestCheckoutDiff(TestDiff):
 

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-07-07 18:18:20 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-07-07 19:00:04 +0000
@@ -76,6 +76,9 @@
   (i.e. when a non-int is specified as the value for an integer
   parameter) (#237844, Jelmer Vernooij)
 
+* Don't include timestamps in filenames when reporting on binary
+  files in diff. (Jelmer Vernooij, #71307)
+
 * Ignore UnknownFormatErrors when scanning for control directories.
   (Jelmer Vernooij, #468332)