Merge lp:~jelmer/brz/diff-default-p1 into lp:brz

[Jelmer Vernooij]

Make 'bzr diff' default to -p1 rather than -p0.

Make 'bzr diff' default to -p1 rather than -p0.

[Martin Packman (gz)]

I approve, and disbelieve that the damage is limited to these few tests.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-05-30 22:59:36 +0000
+++ breezy/builtins.py	2017-06-02 20:54:42 +0000
@@ -2297,9 +2297,9 @@
         Same as 'brz diff' but prefix paths with old/ and new/::
 
             brz diff --prefix old/:new/
-            
+
         Show the differences using a custom diff program with options::
-        
+
             brz diff --using /usr/bin/diff --diff-options -wu
     """
     _see_also = ['status']
@@ -2340,16 +2340,16 @@
 
     @display_command
     def run(self, revision=None, file_list=None, diff_options=None,
-            prefix=None, old=None, new=None, using=None, format=None, 
+            prefix=None, old=None, new=None, using=None, format=None,
             context=None):
         from .diff import (get_trees_and_branches_to_diff_locked,
             show_diff_trees)
 
-        if (prefix is None) or (prefix == '0'):
+        if prefix == '0':
             # diff -p0 format
             old_label = ''
             new_label = ''
-        elif prefix == '1':
+        elif prefix == '1' or prefix is None:
             old_label = 'old/'
             new_label = 'new/'
         elif ':' in prefix:
 
=== modified file 'breezy/tests/blackbox/test_diff.py'
--- breezy/tests/blackbox/test_diff.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_diff.py	2017-06-02 20:54:42 +0000
@@ -184,8 +184,8 @@
         out, err = self.run_bzr(cmd, retcode=1)
         self.assertEqual('', err)
         self.assertEqual("=== modified file 'file'\n"
-                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
-                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
+                          "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
+                          "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
                           "@@ -1,1 +1,1 @@\n"
                           "-new content\n"
                           "+contents of branch1/file\n"
@@ -196,8 +196,8 @@
         out, err = self.run_bzr(cmd, retcode=1)
         self.assertEqual('', err)
         self.assertEqualDiff("=== modified file 'file'\n"
-                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
-                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
+                              "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
+                              "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
                               "@@ -1,1 +1,1 @@\n"
                               "-contents of branch1/file\n"
                               "+new content\n"
@@ -261,8 +261,8 @@
                                 retcode=1)
         self.assertEqual('', err)
         self.assertEqualDiff("=== modified file 'file'\n"
-                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
-                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
+                              "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
+                              "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
                               "@@ -1,1 +1,1 @@\n"
                               "-new content\n"
                               "+contents of branch1/file\n"
@@ -397,9 +397,11 @@
         self.assertEqual('', err)
         # We have to skip the stuff in the middle, because it depends
         # on time.time()
-        self.assertStartsWith(out, "=== added file 'goodbye'\n"
-                                   "--- goodbye\t1970-01-01 00:00:00 +0000\n"
-                                   "+++ goodbye\t")
+        self.assertStartsWith(
+            out,
+            "=== added file 'goodbye'\n"
+            "--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
+            "+++ new/goodbye\t")
         self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
                                  "+baz\n\n")
 
 
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-06-02 11:26:27 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-06-02 20:54:42 +0000
@@ -22,6 +22,9 @@
    clashes with upstream Bazaar.
    (Martin Packman, Jelmer Vernooij)
 
+ * The --prefix/-p argument for ``bzr diff`` now defaults to -p1 rather
+   than -p0. (Jelmer Vernooij, #1695126)
+
  * The ``brz register-branch`` command from the Launchpad plugin has been
    removed, because it has not worked for at least five years: it relies on
    password authentication rather than SSO, the relevant systems no longer