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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/diff-default-p1
Merge into: lp:brz
Diff against target: 101 lines (+19/-14)
3 files modified
breezy/builtins.py (+5/-5)
breezy/tests/blackbox/test_diff.py (+11/-9)
doc/en/release-notes/brz-3.0.txt (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/diff-default-p1
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+325023@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/builtins.py'
2--- breezy/builtins.py 2017-05-30 22:59:36 +0000
3+++ breezy/builtins.py 2017-06-02 20:54:42 +0000
4@@ -2297,9 +2297,9 @@
5 Same as 'brz diff' but prefix paths with old/ and new/::
6
7 brz diff --prefix old/:new/
8-
9+
10 Show the differences using a custom diff program with options::
11-
12+
13 brz diff --using /usr/bin/diff --diff-options -wu
14 """
15 _see_also = ['status']
16@@ -2340,16 +2340,16 @@
17
18 @display_command
19 def run(self, revision=None, file_list=None, diff_options=None,
20- prefix=None, old=None, new=None, using=None, format=None,
21+ prefix=None, old=None, new=None, using=None, format=None,
22 context=None):
23 from .diff import (get_trees_and_branches_to_diff_locked,
24 show_diff_trees)
25
26- if (prefix is None) or (prefix == '0'):
27+ if prefix == '0':
28 # diff -p0 format
29 old_label = ''
30 new_label = ''
31- elif prefix == '1':
32+ elif prefix == '1' or prefix is None:
33 old_label = 'old/'
34 new_label = 'new/'
35 elif ':' in prefix:
36
37=== modified file 'breezy/tests/blackbox/test_diff.py'
38--- breezy/tests/blackbox/test_diff.py 2017-05-21 18:10:28 +0000
39+++ breezy/tests/blackbox/test_diff.py 2017-06-02 20:54:42 +0000
40@@ -184,8 +184,8 @@
41 out, err = self.run_bzr(cmd, retcode=1)
42 self.assertEqual('', err)
43 self.assertEqual("=== modified file 'file'\n"
44- "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
45- "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
46+ "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
47+ "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
48 "@@ -1,1 +1,1 @@\n"
49 "-new content\n"
50 "+contents of branch1/file\n"
51@@ -196,8 +196,8 @@
52 out, err = self.run_bzr(cmd, retcode=1)
53 self.assertEqual('', err)
54 self.assertEqualDiff("=== modified file 'file'\n"
55- "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
56- "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
57+ "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
58+ "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
59 "@@ -1,1 +1,1 @@\n"
60 "-contents of branch1/file\n"
61 "+new content\n"
62@@ -261,8 +261,8 @@
63 retcode=1)
64 self.assertEqual('', err)
65 self.assertEqualDiff("=== modified file 'file'\n"
66- "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
67- "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
68+ "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
69+ "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
70 "@@ -1,1 +1,1 @@\n"
71 "-new content\n"
72 "+contents of branch1/file\n"
73@@ -397,9 +397,11 @@
74 self.assertEqual('', err)
75 # We have to skip the stuff in the middle, because it depends
76 # on time.time()
77- self.assertStartsWith(out, "=== added file 'goodbye'\n"
78- "--- goodbye\t1970-01-01 00:00:00 +0000\n"
79- "+++ goodbye\t")
80+ self.assertStartsWith(
81+ out,
82+ "=== added file 'goodbye'\n"
83+ "--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
84+ "+++ new/goodbye\t")
85 self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
86 "+baz\n\n")
87
88
89=== modified file 'doc/en/release-notes/brz-3.0.txt'
90--- doc/en/release-notes/brz-3.0.txt 2017-06-02 11:26:27 +0000
91+++ doc/en/release-notes/brz-3.0.txt 2017-06-02 20:54:42 +0000
92@@ -22,6 +22,9 @@
93 clashes with upstream Bazaar.
94 (Martin Packman, Jelmer Vernooij)
95
96+ * The --prefix/-p argument for ``bzr diff`` now defaults to -p1 rather
97+ than -p0. (Jelmer Vernooij, #1695126)
98+
99 * The ``brz register-branch`` command from the Launchpad plugin has been
100 removed, because it has not worked for at least five years: it relies on
101 password authentication rather than SSO, the relevant systems no longer

Subscribers

People subscribed via source and target branches