/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_diff.py

  • Committer: Robert Collins
  • Date: 2007-04-19 02:27:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2426.
  • Revision ID: robertc@robertcollins.net-20070419022744-pfdqz42kp1wizh43
``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
 
18
 
"""Black-box tests for brz diff."""
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
"""Black-box tests for bzr diff.
 
19
"""
19
20
 
20
21
import os
21
22
import re
22
23
 
23
 
from breezy import (
24
 
    tests,
25
 
    workingtree,
26
 
    )
27
 
from breezy.diff import (
28
 
    DiffTree,
29
 
    format_registry as diff_format_registry,
30
 
    )
31
 
from breezy.tests import (
32
 
    features,
33
 
    )
 
24
import bzrlib
 
25
from bzrlib import workingtree
 
26
from bzrlib.branch import Branch
 
27
from bzrlib.tests import TestSkipped
 
28
from bzrlib.tests.blackbox import ExternalBase
34
29
 
35
30
 
36
31
def subst_dates(string):
39
34
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
40
35
 
41
36
 
42
 
class DiffBase(tests.TestCaseWithTransport):
 
37
class DiffBase(ExternalBase):
43
38
    """Base class with common setup method"""
44
39
 
45
40
    def make_example_branch(self):
 
41
        # FIXME: copied from test_too_much -- share elsewhere?
46
42
        tree = self.make_branch_and_tree('.')
47
 
        self.build_tree_contents([
48
 
            ('hello', b'foo\n'),
49
 
            ('goodbye', b'baz\n')])
 
43
        open('hello', 'wb').write('foo\n')
50
44
        tree.add(['hello'])
51
45
        tree.commit('setup')
 
46
        open('goodbye', 'wb').write('baz\n')
52
47
        tree.add(['goodbye'])
53
48
        tree.commit('setup')
54
 
        return tree
55
49
 
56
50
 
57
51
class TestDiff(DiffBase):
58
52
 
59
53
    def test_diff(self):
60
 
        tree = self.make_example_branch()
61
 
        self.build_tree_contents([('hello', b'hello world!')])
62
 
        tree.commit(message='fixing hello')
63
 
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
64
 
        self.assertTrue('\n+hello world!' in output)
65
 
        output = self.run_bzr('diff -c 3', retcode=1)[0]
66
 
        self.assertTrue('\n+hello world!' in output)
67
 
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
68
 
        self.assertTrue('\n+baz' in output)
69
 
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
70
 
        self.assertTrue('\n+baz' in output)
71
 
        self.build_tree(['moo'])
72
 
        tree.add('moo')
 
54
        self.make_example_branch()
 
55
        file('hello', 'wt').write('hello world!')
 
56
        self.runbzr('commit -m fixing hello')
 
57
        output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
 
58
        self.assert_('\n+hello world!' in output)
 
59
        output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
 
60
        self.assert_('\n+baz' in output)
 
61
        file('moo', 'wb').write('moo')
 
62
        self.runbzr('add moo')
73
63
        os.unlink('moo')
74
 
        self.run_bzr('diff')
 
64
        self.runbzr('diff')
75
65
 
76
66
    def test_diff_prefix(self):
77
67
        """diff --prefix appends to filenames in output"""
78
68
        self.make_example_branch()
79
 
        self.build_tree_contents([('hello', b'hello world!\n')])
80
 
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
81
 
        self.assertEqual(err, '')
 
69
        file('hello', 'wb').write('hello world!\n')
 
70
        out, err = self.runbzr('diff --prefix old/:new/', retcode=1)
 
71
        self.assertEquals(err, '')
82
72
        self.assertEqualDiff(subst_dates(out), '''\
83
73
=== modified file 'hello'
84
74
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
91
81
 
92
82
    def test_diff_illegal_prefix_value(self):
93
83
        # There was an error in error reporting for this option
94
 
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
 
84
        out, err = self.runbzr('diff --prefix old/', retcode=3)
95
85
        self.assertContainsRe(err,
96
 
                              '--prefix expects two values separated by a colon')
 
86
            '--prefix expects two values separated by a colon')
97
87
 
98
88
    def test_diff_p1(self):
99
89
        """diff -p1 produces lkml-style diffs"""
100
90
        self.make_example_branch()
101
 
        self.build_tree_contents([('hello', b'hello world!\n')])
102
 
        out, err = self.run_bzr('diff -p1', retcode=1)
103
 
        self.assertEqual(err, '')
 
91
        file('hello', 'wb').write('hello world!\n')
 
92
        out, err = self.runbzr('diff -p1', retcode=1)
 
93
        self.assertEquals(err, '')
104
94
        self.assertEqualDiff(subst_dates(out), '''\
105
95
=== modified file 'hello'
106
96
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
114
104
    def test_diff_p0(self):
115
105
        """diff -p0 produces diffs with no prefix"""
116
106
        self.make_example_branch()
117
 
        self.build_tree_contents([('hello', b'hello world!\n')])
118
 
        out, err = self.run_bzr('diff -p0', retcode=1)
119
 
        self.assertEqual(err, '')
 
107
        file('hello', 'wb').write('hello world!\n')
 
108
        out, err = self.runbzr('diff -p0', retcode=1)
 
109
        self.assertEquals(err, '')
120
110
        self.assertEqualDiff(subst_dates(out), '''\
121
111
=== modified file 'hello'
122
112
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
131
121
        # Get an error from a file that does not exist at all
132
122
        # (Malone #3619)
133
123
        self.make_example_branch()
134
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
135
 
                                error_regexes=('not versioned.*does-not-exist',))
 
124
        out, err = self.runbzr('diff does-not-exist', retcode=3)
 
125
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
136
126
 
137
127
    def test_diff_illegal_revision_specifiers(self):
138
 
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
139
 
                                error_regexes=('one or two revision specifiers',))
140
 
 
141
 
    def test_diff_using_and_format(self):
142
 
        out, err = self.run_bzr('diff --format=default --using=mydi', retcode=3,
143
 
                                error_regexes=('are mutually exclusive',))
144
 
 
145
 
    def test_diff_nonexistent_revision(self):
146
 
        out, err = self.run_bzr('diff -r 123', retcode=3,
147
 
                                error_regexes=("Requested revision: '123' does not "
148
 
                                               "exist in branch:",))
149
 
 
150
 
    def test_diff_nonexistent_dotted_revision(self):
151
 
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
152
 
        self.assertContainsRe(err,
153
 
                              "Requested revision: '1.1' does not exist in branch:")
154
 
 
155
 
    def test_diff_nonexistent_dotted_revision_change(self):
156
 
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
157
 
        self.assertContainsRe(err,
158
 
                              "Requested revision: '1.1' does not exist in branch:")
 
128
        out, err = self.runbzr('diff -r 1..23..123', retcode=3)
 
129
        self.assertContainsRe(err, 'one or two revision specifiers')
159
130
 
160
131
    def test_diff_unversioned(self):
161
132
        # Get an error when diffing a non-versioned file.
162
133
        # (Malone #3619)
163
134
        self.make_example_branch()
164
135
        self.build_tree(['unversioned-file'])
165
 
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
 
136
        out, err = self.runbzr('diff unversioned-file', retcode=3)
166
137
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
167
138
 
168
139
    # TODO: What should diff say for a file deleted in working tree?
169
140
 
170
141
    def example_branches(self):
171
 
        branch1_tree = self.make_branch_and_tree('branch1')
172
 
        self.build_tree(['branch1/file'], line_endings='binary')
173
 
        self.build_tree(['branch1/file2'], line_endings='binary')
174
 
        branch1_tree.add('file')
175
 
        branch1_tree.add('file2')
176
 
        branch1_tree.commit(message='add file and file2')
177
 
        branch2_tree = branch1_tree.controldir.sprout(
178
 
            'branch2').open_workingtree()
179
 
        self.build_tree_contents([('branch2/file', b'new content\n')])
180
 
        branch2_tree.commit(message='update file')
181
 
        return branch1_tree, branch2_tree
182
 
 
183
 
    def check_b2_vs_b1(self, cmd):
184
 
        # Compare branch2 vs branch1 using cmd and check the result
185
 
        out, err = self.run_bzr(cmd, retcode=1)
186
 
        self.assertEqual('', err)
187
 
        self.assertEqual("=== modified file 'file'\n"
188
 
                         "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
189
 
                         "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
190
 
                         "@@ -1,1 +1,1 @@\n"
191
 
                         "-new content\n"
192
 
                         "+contents of branch1/file\n"
193
 
                         "\n", subst_dates(out))
194
 
 
195
 
    def check_b1_vs_b2(self, cmd):
196
 
        # Compare branch1 vs branch2 using cmd and check the result
197
 
        out, err = self.run_bzr(cmd, retcode=1)
198
 
        self.assertEqual('', err)
199
 
        self.assertEqualDiff("=== modified file 'file'\n"
200
 
                             "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
201
 
                             "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
202
 
                             "@@ -1,1 +1,1 @@\n"
203
 
                             "-contents of branch1/file\n"
204
 
                             "+new content\n"
205
 
                             "\n", subst_dates(out))
206
 
 
207
 
    def check_no_diffs(self, cmd):
208
 
        # Check that running cmd returns an empty diff
209
 
        out, err = self.run_bzr(cmd, retcode=0)
210
 
        self.assertEqual('', err)
211
 
        self.assertEqual('', out)
 
142
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
 
143
        self.capture('init branch1')
 
144
        self.capture('add branch1/file')
 
145
        self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
 
146
        self.capture('branch branch1 branch2')
 
147
        print >> open('branch2/file', 'wb'), 'new content'
 
148
        self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
212
149
 
213
150
    def test_diff_branches(self):
214
151
        self.example_branches()
215
 
        # should open branch1 and diff against branch2,
216
 
        self.check_b2_vs_b1('diff -r branch:branch2 branch1')
217
 
        # Compare two working trees using various syntax forms
218
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
219
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
220
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
221
 
        # Test with a selected file that was changed
222
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
223
 
        self.check_b2_vs_b1('diff --old branch2 branch1/file')
224
 
        self.check_b2_vs_b1('diff branch2/file --new branch1')
225
 
        # Test with a selected file that was not changed
226
 
        self.check_no_diffs('diff --old branch2 --new branch1 file2')
227
 
        self.check_no_diffs('diff --old branch2 branch1/file2')
228
 
        self.check_no_diffs('diff branch2/file2 --new branch1')
229
 
 
230
 
    def test_diff_branches_no_working_trees(self):
231
 
        branch1_tree, branch2_tree = self.example_branches()
232
 
        # Compare a working tree to a branch without a WT
233
 
        dir1 = branch1_tree.controldir
234
 
        dir1.destroy_workingtree()
235
 
        self.assertFalse(dir1.has_workingtree())
236
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
237
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
238
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
239
 
        # Compare a branch without a WT to one with a WT
240
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
241
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
242
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
243
 
        # Compare a branch with a WT against another without a WT
244
 
        dir2 = branch2_tree.controldir
245
 
        dir2.destroy_workingtree()
246
 
        self.assertFalse(dir2.has_workingtree())
247
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
248
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
249
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
 
152
        # should open branch1 and diff against branch2, 
 
153
        out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 
 
154
                                          'branch1'],
 
155
                                         retcode=1)
 
156
        self.assertEquals('', err)
 
157
        self.assertEquals("=== modified file 'file'\n"
 
158
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
159
                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
160
                          "@@ -1,1 +1,1 @@\n"
 
161
                          "-new content\n"
 
162
                          "+contents of branch1/file\n"
 
163
                          "\n", subst_dates(out))
 
164
        out, err = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
 
165
                                         retcode=1)
 
166
        self.assertEquals('', err)
 
167
        self.assertEqualDiff("=== modified file 'file'\n"
 
168
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
169
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
170
                              "@@ -1,1 +1,1 @@\n"
 
171
                              "-new content\n"
 
172
                              "+contents of branch1/file\n"
 
173
                              "\n", subst_dates(out))
250
174
 
251
175
    def test_diff_revno_branches(self):
252
176
        self.example_branches()
253
 
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
254
 
        self.build_tree_contents([('branch2/file', b'even newer content')])
255
 
        branch2_tree.commit(message='update file once more')
 
177
        print >> open('branch2/file', 'wb'), 'even newer content'
 
178
        self.run_bzr_captured(['commit', '-m', 
 
179
                               'update file once more', 'branch2'])
256
180
 
257
 
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
258
 
                                )
259
 
        self.assertEqual('', err)
260
 
        self.assertEqual('', out)
261
 
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
262
 
                                retcode=1)
263
 
        self.assertEqual('', err)
 
181
        out, err = self.run_bzr_captured(['diff', '-r',
 
182
                                          'revno:1:branch2..revno:1:branch1'],
 
183
                                         retcode=0)
 
184
        self.assertEquals('', err)
 
185
        self.assertEquals('', out)
 
186
        out, err = self.run_bzr_captured(['diff', '-r', 
 
187
                                          'revno:2:branch2..revno:1:branch1'],
 
188
                                         retcode=1)
 
189
        self.assertEquals('', err)
264
190
        self.assertEqualDiff("=== modified file 'file'\n"
265
 
                             "--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
266
 
                             "+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
267
 
                             "@@ -1,1 +1,1 @@\n"
268
 
                             "-new content\n"
269
 
                             "+contents of branch1/file\n"
270
 
                             "\n", subst_dates(out))
271
 
 
272
 
    def test_diff_color_always(self):
273
 
        from ...terminal import colorstring
274
 
        from ... import colordiff
275
 
        self.overrideAttr(colordiff, 'GLOBAL_COLORDIFFRC', None)
276
 
        self.example_branches()
277
 
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
278
 
        self.build_tree_contents([('branch2/file', b'even newer content')])
279
 
        branch2_tree.commit(message='update file once more')
280
 
 
281
 
        out, err = self.run_bzr('diff --color=always -r revno:2:branch2..revno:1:branch1',
282
 
                                retcode=1)
283
 
        self.assertEqual('', err)
284
 
        self.assertEqualDiff((
285
 
            colorstring(b"=== modified file 'file'\n", 'darkyellow') +
286
 
            colorstring(b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n", 'darkred') +
287
 
            colorstring(b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n", 'darkblue') +
288
 
            colorstring(b"@@ -1 +1 @@\n", 'darkgreen') +
289
 
            colorstring(b"-new content\n", 'darkred') +
290
 
            colorstring(b"+contents of branch1/file\n", 'darkblue') +
291
 
            colorstring(b"\n", 'darkwhite')).decode(),
292
 
            subst_dates(out))
 
191
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
192
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
193
                              "@@ -1,1 +1,1 @@\n"
 
194
                              "-new content\n"
 
195
                              "+contents of branch1/file\n"
 
196
                              "\n", subst_dates(out))
293
197
 
294
198
    def example_branch2(self):
295
 
        branch1_tree = self.make_branch_and_tree('branch1')
296
 
        self.build_tree_contents([('branch1/file1', b'original line\n')])
297
 
        branch1_tree.add('file1')
298
 
        branch1_tree.commit(message='first commit')
299
 
        self.build_tree_contents([('branch1/file1', b'repo line\n')])
300
 
        branch1_tree.commit(message='second commit')
301
 
        return branch1_tree
 
199
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
 
200
        self.capture('init branch1')
 
201
        self.capture('add branch1/file1')
 
202
        print >> open('branch1/file1', 'wb'), 'original line'
 
203
        self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
 
204
        
 
205
        print >> open('branch1/file1', 'wb'), 'repo line'
 
206
        self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
302
207
 
303
208
    def test_diff_to_working_tree(self):
304
209
        self.example_branch2()
305
 
        self.build_tree_contents([('branch1/file1', b'new line')])
306
 
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
307
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
308
 
 
309
 
    def test_diff_to_working_tree_in_subdir(self):
310
 
        self.example_branch2()
311
 
        self.build_tree_contents([('branch1/file1', b'new line')])
312
 
        os.mkdir('branch1/dir1')
313
 
        output = self.run_bzr('diff -r 1..', retcode=1,
314
 
                              working_dir='branch1/dir1')
315
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
210
        
 
211
        print >> open('branch1/file1', 'wb'), 'new line'
 
212
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],
 
213
                                       retcode=1)
 
214
        self.assertTrue('\n-original line\n+new line\n' in output[0])
316
215
 
317
216
    def test_diff_across_rename(self):
318
217
        """The working tree path should always be considered for diffing"""
319
 
        tree = self.make_example_branch()
320
 
        self.run_bzr('diff -r 0..1 hello', retcode=1)
321
 
        tree.rename_one('hello', 'hello1')
322
 
        self.run_bzr('diff hello1', retcode=1)
323
 
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
324
 
 
325
 
    def test_diff_to_branch_no_working_tree(self):
326
 
        branch1_tree = self.example_branch2()
327
 
        dir1 = branch1_tree.controldir
328
 
        dir1.destroy_workingtree()
329
 
        self.assertFalse(dir1.has_workingtree())
330
 
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
331
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
332
 
 
333
 
    def test_custom_format(self):
334
 
        class BooDiffTree(DiffTree):
335
 
 
336
 
            def show_diff(self, specific_files, extra_trees=None):
337
 
                self.to_file.write("BOO!\n")
338
 
                return super(BooDiffTree, self).show_diff(specific_files,
339
 
                                                          extra_trees)
340
 
 
341
 
        diff_format_registry.register("boo", BooDiffTree, "Scary diff format")
342
 
        self.addCleanup(diff_format_registry.remove, "boo")
343
218
        self.make_example_branch()
344
 
        self.build_tree_contents([('hello', b'hello world!\n')])
345
 
        output = self.run_bzr('diff --format=boo', retcode=1)
346
 
        self.assertTrue("BOO!" in output[0])
347
 
        output = self.run_bzr('diff -Fboo', retcode=1)
348
 
        self.assertTrue("BOO!" in output[0])
349
 
 
350
 
    def test_binary_diff_remove(self):
351
 
        tree = self.make_branch_and_tree('.')
352
 
        self.build_tree_contents([('a', b'\x00' * 20)])
353
 
        tree.add(['a'])
354
 
        tree.commit('add binary file')
355
 
        os.unlink('a')
356
 
        output = self.run_bzr('diff', retcode=1)
357
 
        self.assertEqual(
358
 
            "=== removed file 'a'\nBinary files old/a and new/a differ\n",
359
 
            output[0])
360
 
 
361
 
    def test_moved_away(self):
362
 
        # pad.lv/1880354
363
 
        tree = self.make_branch_and_tree('.')
364
 
        self.build_tree_contents([('a', 'asdf\n')])
365
 
        tree.add(['a'])
366
 
        tree.commit('add a')
367
 
        tree.rename_one('a', 'b')
368
 
        self.build_tree_contents([('a', 'qwer\n')])
369
 
        tree.add('a')
370
 
        output, error = self.run_bzr('diff -p0', retcode=1)
371
 
        self.assertEqualDiff("""\
372
 
=== added file 'a'
373
 
--- a\tYYYY-MM-DD HH:MM:SS +ZZZZ
374
 
+++ a\tYYYY-MM-DD HH:MM:SS +ZZZZ
375
 
@@ -0,0 +1,1 @@
376
 
+qwer
377
 
 
378
 
=== renamed file 'a' => 'b'
379
 
""", subst_dates(output))
 
219
        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
 
220
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
221
        wt.rename_one('hello', 'hello1')
 
222
        self.run_bzr('diff', 'hello1', retcode=1)
 
223
        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
380
224
 
381
225
 
382
226
class TestCheckoutDiff(TestDiff):
383
227
 
384
228
    def make_example_branch(self):
385
 
        tree = super(TestCheckoutDiff, self).make_example_branch()
386
 
        tree = tree.branch.create_checkout('checkout')
 
229
        super(TestCheckoutDiff, self).make_example_branch()
 
230
        self.runbzr('checkout . checkout')
387
231
        os.chdir('checkout')
388
 
        return tree
389
232
 
390
233
    def example_branch2(self):
391
 
        tree = super(TestCheckoutDiff, self).example_branch2()
 
234
        super(TestCheckoutDiff, self).example_branch2()
392
235
        os.mkdir('checkouts')
393
 
        tree = tree.branch.create_checkout('checkouts/branch1')
 
236
        self.runbzr('checkout branch1 checkouts/branch1')
394
237
        os.chdir('checkouts')
395
 
        return tree
396
238
 
397
239
    def example_branches(self):
398
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
399
 
                                           self).example_branches()
 
240
        super(TestCheckoutDiff, self).example_branches()
400
241
        os.mkdir('checkouts')
401
 
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
402
 
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
 
242
        self.runbzr('checkout branch1 checkouts/branch1')
 
243
        self.runbzr('checkout branch2 checkouts/branch2')
403
244
        os.chdir('checkouts')
404
 
        return branch1_tree, branch2_tree
405
245
 
406
246
 
407
247
class TestDiffLabels(DiffBase):
408
248
 
409
249
    def test_diff_label_removed(self):
410
 
        tree = super(TestDiffLabels, self).make_example_branch()
411
 
        tree.remove('hello', keep_files=False)
412
 
        diff = self.run_bzr('diff', retcode=1)
 
250
        super(TestDiffLabels, self).make_example_branch()
 
251
        self.runbzr('remove hello')
 
252
        diff = self.run_bzr_captured(['diff'], retcode=1)
413
253
        self.assertTrue("=== removed file 'hello'" in diff[0])
414
254
 
415
255
    def test_diff_label_added(self):
416
 
        tree = super(TestDiffLabels, self).make_example_branch()
417
 
        self.build_tree_contents([('barbar', b'barbar')])
418
 
        tree.add('barbar')
419
 
        diff = self.run_bzr('diff', retcode=1)
 
256
        super(TestDiffLabels, self).make_example_branch()
 
257
        file('barbar', 'wt').write('barbar')
 
258
        self.runbzr('add barbar')
 
259
        diff = self.run_bzr_captured(['diff'], retcode=1)
420
260
        self.assertTrue("=== added file 'barbar'" in diff[0])
421
261
 
422
262
    def test_diff_label_modified(self):
423
263
        super(TestDiffLabels, self).make_example_branch()
424
 
        self.build_tree_contents([('hello', b'barbar')])
425
 
        diff = self.run_bzr('diff', retcode=1)
 
264
        file('hello', 'wt').write('barbar')
 
265
        diff = self.run_bzr_captured(['diff'], retcode=1)
426
266
        self.assertTrue("=== modified file 'hello'" in diff[0])
427
267
 
428
268
    def test_diff_label_renamed(self):
429
 
        tree = super(TestDiffLabels, self).make_example_branch()
430
 
        tree.rename_one('hello', 'gruezi')
431
 
        diff = self.run_bzr('diff', retcode=1)
 
269
        super(TestDiffLabels, self).make_example_branch()
 
270
        self.runbzr('rename hello gruezi')
 
271
        diff = self.run_bzr_captured(['diff'], retcode=1)
432
272
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
433
273
 
434
274
 
436
276
 
437
277
    def test_external_diff(self):
438
278
        """Test that we can spawn an external diff process"""
439
 
        self.disable_missing_extensions_warning()
440
279
        # We have to use run_bzr_subprocess, because we need to
441
280
        # test writing directly to stdout, (there was a bug in
442
281
        # subprocess.py that we had to workaround).
443
282
        # However, if 'diff' may not be available
444
283
        self.make_example_branch()
445
 
        out, err = self.run_bzr_subprocess(
446
 
            'diff -Oprogress_bar=none -r 1 --diff-options -ub',
447
 
            universal_newlines=True,
448
 
            retcode=None)
449
 
        if b'Diff is not installed on this machine' in err:
450
 
            raise tests.TestSkipped("No external 'diff' is available")
451
 
        self.assertEqual(b'', err)
 
284
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
285
        try:
 
286
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
287
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
 
288
                                               '--diff-options', '-ub',
 
289
                                               universal_newlines=True,
 
290
                                               retcode=None)
 
291
        finally:
 
292
            if orig_progress is None:
 
293
                del os.environ['BZR_PROGRESS_BAR']
 
294
            else:
 
295
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
296
            
 
297
        if 'Diff is not installed on this machine' in err:
 
298
            raise TestSkipped("No external 'diff' is available")
 
299
        self.assertEqual('', err)
452
300
        # We have to skip the stuff in the middle, because it depends
453
301
        # on time.time()
454
 
        self.assertStartsWith(
455
 
            out,
456
 
            b"=== added file 'goodbye'\n"
457
 
            b"--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
458
 
            b"+++ new/goodbye\t")
459
 
        self.assertEndsWith(out, b"\n@@ -0,0 +1 @@\n"
460
 
                                 b"+baz\n\n")
461
 
 
462
 
    def test_external_diff_options_and_using(self):
463
 
        """Test that the options are passed correctly to an external diff process"""
464
 
        self.requireFeature(features.diff_feature)
465
 
        self.make_example_branch()
466
 
        self.build_tree_contents([('hello', b'Foo\n')])
467
 
        out, err = self.run_bzr('diff --diff-options -i --using diff',
468
 
                                retcode=1)
469
 
        self.assertEqual("=== modified file 'hello'\n", out)
470
 
        self.assertEqual('', err)
 
302
        self.assertStartsWith(out, "=== added file 'goodbye'\n"
 
303
                                   "--- goodbye\t1970-01-01 00:00:00 +0000\n"
 
304
                                   "+++ goodbye\t")
 
305
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
 
306
                                 "+baz\n\n")
471
307
 
472
308
 
473
309
class TestDiffOutput(DiffBase):
475
311
    def test_diff_output(self):
476
312
        # check that output doesn't mangle line-endings
477
313
        self.make_example_branch()
478
 
        self.build_tree_contents([('hello', b'hello world!\n')])
 
314
        file('hello', 'wb').write('hello world!\n')
479
315
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
480
 
        self.assertTrue(b'\n+hello world!\n' in output)
 
316
        self.assert_('\n+hello world!\n' in output)