Merge lp:~jelmer/brz/diff-fix into lp:brz/3.1

[Jelmer Vernooij]

Distinguish between label and path when generating diffs.

Distinguish between label and path when generating diffs.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2020-01-11 17:41:33 +0000
+++ breezy/diff.py	2020-05-30 20:21:21 +0000
@@ -734,10 +734,10 @@
             new_date = self.EPOCH_DATE
         else:
             return self.CANNOT_DIFF
-        from_label = '%s%s\t%s' % (self.old_label, old_path,
-                                   old_date)
-        to_label = '%s%s\t%s' % (self.new_label, new_path,
-                                 new_date)
+        from_label = '%s%s\t%s' % (
+            self.old_label, old_path or new_path, old_date)
+        to_label = '%s%s\t%s' % (
+            self.new_label, new_path or old_path, new_date)
         return self.diff_text(old_path, new_path, from_label, to_label)
 
     def diff_text(self, from_path, to_path, from_label, to_label):
@@ -765,7 +765,9 @@
         except errors.BinaryFile:
             self.to_file.write(
                 ("Binary files %s%s and %s%s differ\n" %
-                 (self.old_label, from_path, self.new_label, to_path)).encode(self.path_encoding, 'replace'))
+                 (self.old_label, from_path or to_path,
+                  self.new_label, to_path or from_path)
+                 ).encode(self.path_encoding, 'replace'))
         return self.CHANGED
 
 
@@ -1055,8 +1057,8 @@
                     'supported on this filesystem.' % (change.path[0],))
                 continue
             oldpath, newpath = change.path
-            oldpath_encoded = get_encoded_path(change.path[0])
-            newpath_encoded = get_encoded_path(change.path[1])
+            oldpath_encoded = get_encoded_path(oldpath)
+            newpath_encoded = get_encoded_path(newpath)
             old_present = (change.kind[0] is not None and change.versioned[0])
             new_present = (change.kind[1] is not None and change.versioned[1])
             executable = change.executable
@@ -1076,11 +1078,9 @@
             if (old_present, new_present) == (True, False):
                 self.to_file.write(b"=== removed %s '%s'\n" %
                                    (kind[0].encode('ascii'), oldpath_encoded))
-                newpath = oldpath
             elif (old_present, new_present) == (False, True):
                 self.to_file.write(b"=== added %s '%s'\n" %
                                    (kind[1].encode('ascii'), newpath_encoded))
-                oldpath = newpath
             elif renamed:
                 self.to_file.write(b"=== renamed %s '%s' => '%s'%s\n" %
                                    (kind[0].encode('ascii'), oldpath_encoded, newpath_encoded, prop_str))
 
=== modified file 'breezy/tests/blackbox/test_diff.py'
--- breezy/tests/blackbox/test_diff.py	2020-01-31 03:05:58 +0000
+++ breezy/tests/blackbox/test_diff.py	2020-05-30 20:21:21 +0000
@@ -358,6 +358,26 @@
             "=== removed file 'a'\nBinary files old/a and new/a differ\n",
             output[0])
 
+    def test_moved_away(self):
+        # pad.lv/1880354
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([('a', 'asdf\n')])
+        tree.add(['a'])
+        tree.commit('add a')
+        tree.rename_one('a', 'b')
+        self.build_tree_contents([('a', 'qwer\n')])
+        tree.add('a')
+        output, error = self.run_bzr('diff -p0', retcode=1)
+        self.assertEqualDiff("""\
+=== added file 'a'
+--- a\tYYYY-MM-DD HH:MM:SS +ZZZZ
++++ a\tYYYY-MM-DD HH:MM:SS +ZZZZ
+@@ -0,0 +1,1 @@
++qwer
+
+=== renamed file 'a' => 'b'
+""", subst_dates(output))
+
 
 class TestCheckoutDiff(TestDiff):
 
 
=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2019-12-23 01:39:21 +0000
+++ breezy/tests/test_diff.py	2020-05-30 20:21:21 +0000
@@ -608,8 +608,8 @@
             [('tree/' + alpha, b'\0'),
              ('tree/' + omega,
               (b'The %s and the %s\n' % (alpha_utf8, omega_utf8)))])
-        tree.add([alpha], [b'file-id'])
-        tree.add([omega], [b'file-id-2'])
+        tree.add([alpha])
+        tree.add([omega])
         diff_content = StubO()
         diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
         diff_content.check_types(self, bytes)
@@ -805,8 +805,11 @@
         self.differ.diff('olddir/oldfile', 'newdir/newfile')
         self.assertContainsRe(
             self.differ.to_file.getvalue(),
-            br'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
-            br' \@\@\n-old\n\n')
+            br'--- olddir/oldfile.*\n'
+            br'\+\+\+ newdir/newfile.*\n'
+            br'\@\@ -1,1 \+0,0 \@\@\n'
+            br'-old\n'
+            br'\n')
         self.assertContainsRe(self.differ.to_file.getvalue(),
                               b"=== target is 'new'\n")