/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: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(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) 2006-2010 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
"""Black-box tests for brz diff."""
 
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
from bzrlib import (
24
25
    tests,
25
26
    workingtree,
26
27
    )
27
 
from breezy.diff import (
 
28
from bzrlib.diff import (
28
29
    DiffTree,
29
30
    format_registry as diff_format_registry,
30
31
    )
31
 
from breezy.tests import (
32
 
    features,
33
 
    )
34
32
 
35
33
 
36
34
def subst_dates(string):
45
43
    def make_example_branch(self):
46
44
        tree = self.make_branch_and_tree('.')
47
45
        self.build_tree_contents([
48
 
            ('hello', b'foo\n'),
49
 
            ('goodbye', b'baz\n')])
 
46
            ('hello', 'foo\n'),
 
47
            ('goodbye', 'baz\n')])
50
48
        tree.add(['hello'])
51
49
        tree.commit('setup')
52
50
        tree.add(['goodbye'])
58
56
 
59
57
    def test_diff(self):
60
58
        tree = self.make_example_branch()
61
 
        self.build_tree_contents([('hello', b'hello world!')])
 
59
        self.build_tree_contents([('hello', 'hello world!')])
62
60
        tree.commit(message='fixing hello')
63
61
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
64
 
        self.assertTrue('\n+hello world!' in output)
 
62
        self.assert_('\n+hello world!' in output)
65
63
        output = self.run_bzr('diff -c 3', retcode=1)[0]
66
 
        self.assertTrue('\n+hello world!' in output)
 
64
        self.assert_('\n+hello world!' in output)
67
65
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
68
 
        self.assertTrue('\n+baz' in output)
 
66
        self.assert_('\n+baz' in output)
69
67
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
70
 
        self.assertTrue('\n+baz' in output)
 
68
        self.assert_('\n+baz' in output)
71
69
        self.build_tree(['moo'])
72
70
        tree.add('moo')
73
71
        os.unlink('moo')
76
74
    def test_diff_prefix(self):
77
75
        """diff --prefix appends to filenames in output"""
78
76
        self.make_example_branch()
79
 
        self.build_tree_contents([('hello', b'hello world!\n')])
 
77
        self.build_tree_contents([('hello', 'hello world!\n')])
80
78
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
81
 
        self.assertEqual(err, '')
 
79
        self.assertEquals(err, '')
82
80
        self.assertEqualDiff(subst_dates(out), '''\
83
81
=== modified file 'hello'
84
82
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
93
91
        # There was an error in error reporting for this option
94
92
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
95
93
        self.assertContainsRe(err,
96
 
                              '--prefix expects two values separated by a colon')
 
94
            '--prefix expects two values separated by a colon')
97
95
 
98
96
    def test_diff_p1(self):
99
97
        """diff -p1 produces lkml-style diffs"""
100
98
        self.make_example_branch()
101
 
        self.build_tree_contents([('hello', b'hello world!\n')])
 
99
        self.build_tree_contents([('hello', 'hello world!\n')])
102
100
        out, err = self.run_bzr('diff -p1', retcode=1)
103
 
        self.assertEqual(err, '')
 
101
        self.assertEquals(err, '')
104
102
        self.assertEqualDiff(subst_dates(out), '''\
105
103
=== modified file 'hello'
106
104
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
114
112
    def test_diff_p0(self):
115
113
        """diff -p0 produces diffs with no prefix"""
116
114
        self.make_example_branch()
117
 
        self.build_tree_contents([('hello', b'hello world!\n')])
 
115
        self.build_tree_contents([('hello', 'hello world!\n')])
118
116
        out, err = self.run_bzr('diff -p0', retcode=1)
119
 
        self.assertEqual(err, '')
 
117
        self.assertEquals(err, '')
120
118
        self.assertEqualDiff(subst_dates(out), '''\
121
119
=== modified file 'hello'
122
120
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
132
130
        # (Malone #3619)
133
131
        self.make_example_branch()
134
132
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
135
 
                                error_regexes=('not versioned.*does-not-exist',))
 
133
            error_regexes=('not versioned.*does-not-exist',))
136
134
 
137
135
    def test_diff_illegal_revision_specifiers(self):
138
136
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
139
 
                                error_regexes=('one or two revision specifiers',))
 
137
            error_regexes=('one or two revision specifiers',))
140
138
 
141
139
    def test_diff_using_and_format(self):
142
140
        out, err = self.run_bzr('diff --format=default --using=mydi', retcode=3,
143
 
                                error_regexes=('are mutually exclusive',))
 
141
            error_regexes=('are mutually exclusive',))
144
142
 
145
143
    def test_diff_nonexistent_revision(self):
146
144
        out, err = self.run_bzr('diff -r 123', retcode=3,
147
 
                                error_regexes=("Requested revision: '123' does not "
148
 
                                               "exist in branch:",))
 
145
            error_regexes=("Requested revision: '123' does not "
 
146
                "exist in branch:",))
149
147
 
150
148
    def test_diff_nonexistent_dotted_revision(self):
151
149
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
152
150
        self.assertContainsRe(err,
153
 
                              "Requested revision: '1.1' does not exist in branch:")
 
151
            "Requested revision: '1.1' does not exist in branch:")
154
152
 
155
153
    def test_diff_nonexistent_dotted_revision_change(self):
156
154
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
157
155
        self.assertContainsRe(err,
158
 
                              "Requested revision: '1.1' does not exist in branch:")
 
156
            "Requested revision: '1.1' does not exist in branch:")
159
157
 
160
158
    def test_diff_unversioned(self):
161
159
        # Get an error when diffing a non-versioned file.
174
172
        branch1_tree.add('file')
175
173
        branch1_tree.add('file2')
176
174
        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')])
 
175
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
 
176
        self.build_tree_contents([('branch2/file', 'new content\n')])
180
177
        branch2_tree.commit(message='update file')
181
178
        return branch1_tree, branch2_tree
182
179
 
183
180
    def check_b2_vs_b1(self, cmd):
184
181
        # Compare branch2 vs branch1 using cmd and check the result
185
182
        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))
 
183
        self.assertEquals('', err)
 
184
        self.assertEquals("=== modified file 'file'\n"
 
185
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
186
                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
187
                          "@@ -1,1 +1,1 @@\n"
 
188
                          "-new content\n"
 
189
                          "+contents of branch1/file\n"
 
190
                          "\n", subst_dates(out))
194
191
 
195
192
    def check_b1_vs_b2(self, cmd):
196
193
        # Compare branch1 vs branch2 using cmd and check the result
197
194
        out, err = self.run_bzr(cmd, retcode=1)
198
 
        self.assertEqual('', err)
 
195
        self.assertEquals('', err)
199
196
        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))
 
197
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
198
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
199
                              "@@ -1,1 +1,1 @@\n"
 
200
                              "-contents of branch1/file\n"
 
201
                              "+new content\n"
 
202
                              "\n", subst_dates(out))
206
203
 
207
204
    def check_no_diffs(self, cmd):
208
205
        # Check that running cmd returns an empty diff
209
206
        out, err = self.run_bzr(cmd, retcode=0)
210
 
        self.assertEqual('', err)
211
 
        self.assertEqual('', out)
 
207
        self.assertEquals('', err)
 
208
        self.assertEquals('', out)
212
209
 
213
210
    def test_diff_branches(self):
214
211
        self.example_branches()
230
227
    def test_diff_branches_no_working_trees(self):
231
228
        branch1_tree, branch2_tree = self.example_branches()
232
229
        # Compare a working tree to a branch without a WT
233
 
        dir1 = branch1_tree.controldir
 
230
        dir1 = branch1_tree.bzrdir
234
231
        dir1.destroy_workingtree()
235
232
        self.assertFalse(dir1.has_workingtree())
236
233
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
241
238
        self.check_b1_vs_b2('diff --old branch1 branch2')
242
239
        self.check_b1_vs_b2('diff branch1 --new branch2')
243
240
        # Compare a branch with a WT against another without a WT
244
 
        dir2 = branch2_tree.controldir
 
241
        dir2 = branch2_tree.bzrdir
245
242
        dir2.destroy_workingtree()
246
243
        self.assertFalse(dir2.has_workingtree())
247
244
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
251
248
    def test_diff_revno_branches(self):
252
249
        self.example_branches()
253
250
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
254
 
        self.build_tree_contents([('branch2/file', b'even newer content')])
 
251
        self.build_tree_contents([('branch2/file', 'even newer content')])
255
252
        branch2_tree.commit(message='update file once more')
256
253
 
257
254
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
258
255
                                )
259
 
        self.assertEqual('', err)
260
 
        self.assertEqual('', out)
 
256
        self.assertEquals('', err)
 
257
        self.assertEquals('', out)
261
258
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
262
259
                                retcode=1)
263
 
        self.assertEqual('', err)
 
260
        self.assertEquals('', err)
264
261
        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))
 
262
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
263
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
264
                              "@@ -1,1 +1,1 @@\n"
 
265
                              "-new content\n"
 
266
                              "+contents of branch1/file\n"
 
267
                              "\n", subst_dates(out))
293
268
 
294
269
    def example_branch2(self):
295
270
        branch1_tree = self.make_branch_and_tree('branch1')
296
 
        self.build_tree_contents([('branch1/file1', b'original line\n')])
 
271
        self.build_tree_contents([('branch1/file1', 'original line\n')])
297
272
        branch1_tree.add('file1')
298
273
        branch1_tree.commit(message='first commit')
299
 
        self.build_tree_contents([('branch1/file1', b'repo line\n')])
 
274
        self.build_tree_contents([('branch1/file1', 'repo line\n')])
300
275
        branch1_tree.commit(message='second commit')
301
276
        return branch1_tree
302
277
 
303
278
    def test_diff_to_working_tree(self):
304
279
        self.example_branch2()
305
 
        self.build_tree_contents([('branch1/file1', b'new line')])
 
280
        self.build_tree_contents([('branch1/file1', 'new line')])
306
281
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
307
282
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
308
283
 
309
284
    def test_diff_to_working_tree_in_subdir(self):
310
285
        self.example_branch2()
311
 
        self.build_tree_contents([('branch1/file1', b'new line')])
 
286
        self.build_tree_contents([('branch1/file1', 'new line')])
312
287
        os.mkdir('branch1/dir1')
313
 
        output = self.run_bzr('diff -r 1..', retcode=1,
314
 
                              working_dir='branch1/dir1')
 
288
        os.chdir('branch1/dir1')
 
289
        output = self.run_bzr('diff -r 1..', retcode=1)
315
290
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
316
291
 
317
292
    def test_diff_across_rename(self):
324
299
 
325
300
    def test_diff_to_branch_no_working_tree(self):
326
301
        branch1_tree = self.example_branch2()
327
 
        dir1 = branch1_tree.controldir
 
302
        dir1 = branch1_tree.bzrdir
328
303
        dir1.destroy_workingtree()
329
304
        self.assertFalse(dir1.has_workingtree())
330
305
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
336
311
            def show_diff(self, specific_files, extra_trees=None):
337
312
                self.to_file.write("BOO!\n")
338
313
                return super(BooDiffTree, self).show_diff(specific_files,
339
 
                                                          extra_trees)
 
314
                    extra_trees)
340
315
 
341
 
        diff_format_registry.register("boo", BooDiffTree, "Scary diff format")
 
316
        diff_format_registry.register("boo", BooDiffTree, 
 
317
            "Scary diff format")
342
318
        self.addCleanup(diff_format_registry.remove, "boo")
343
319
        self.make_example_branch()
344
 
        self.build_tree_contents([('hello', b'hello world!\n')])
 
320
        self.build_tree_contents([('hello', 'hello world!\n')])
345
321
        output = self.run_bzr('diff --format=boo', retcode=1)
346
322
        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
323
 
361
324
 
362
325
class TestCheckoutDiff(TestDiff):
375
338
        return tree
376
339
 
377
340
    def example_branches(self):
378
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
379
 
                                           self).example_branches()
 
341
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
380
342
        os.mkdir('checkouts')
381
343
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
382
344
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
394
356
 
395
357
    def test_diff_label_added(self):
396
358
        tree = super(TestDiffLabels, self).make_example_branch()
397
 
        self.build_tree_contents([('barbar', b'barbar')])
 
359
        self.build_tree_contents([('barbar', 'barbar')])
398
360
        tree.add('barbar')
399
361
        diff = self.run_bzr('diff', retcode=1)
400
362
        self.assertTrue("=== added file 'barbar'" in diff[0])
401
363
 
402
364
    def test_diff_label_modified(self):
403
365
        super(TestDiffLabels, self).make_example_branch()
404
 
        self.build_tree_contents([('hello', b'barbar')])
 
366
        self.build_tree_contents([('hello', 'barbar')])
405
367
        diff = self.run_bzr('diff', retcode=1)
406
368
        self.assertTrue("=== modified file 'hello'" in diff[0])
407
369
 
422
384
        # subprocess.py that we had to workaround).
423
385
        # However, if 'diff' may not be available
424
386
        self.make_example_branch()
425
 
        out, err = self.run_bzr_subprocess(
426
 
            'diff -Oprogress_bar=none -r 1 --diff-options -ub',
427
 
            universal_newlines=True,
428
 
            retcode=None)
429
 
        if b'Diff is not installed on this machine' in err:
 
387
        # this will be automatically restored by the base bzr test class
 
388
        os.environ['BZR_PROGRESS_BAR'] = 'none'
 
389
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
 
390
                                           universal_newlines=True,
 
391
                                           retcode=None)
 
392
        if 'Diff is not installed on this machine' in err:
430
393
            raise tests.TestSkipped("No external 'diff' is available")
431
 
        self.assertEqual(b'', err)
 
394
        self.assertEqual('', err)
432
395
        # We have to skip the stuff in the middle, because it depends
433
396
        # on time.time()
434
 
        self.assertStartsWith(
435
 
            out,
436
 
            b"=== added file 'goodbye'\n"
437
 
            b"--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
438
 
            b"+++ new/goodbye\t")
439
 
        self.assertEndsWith(out, b"\n@@ -0,0 +1 @@\n"
440
 
                                 b"+baz\n\n")
441
 
 
442
 
    def test_external_diff_options_and_using(self):
443
 
        """Test that the options are passed correctly to an external diff process"""
444
 
        self.requireFeature(features.diff_feature)
445
 
        self.make_example_branch()
446
 
        self.build_tree_contents([('hello', b'Foo\n')])
447
 
        out, err = self.run_bzr('diff --diff-options -i --using diff',
448
 
                                retcode=1)
449
 
        self.assertEqual("=== modified file 'hello'\n", out)
450
 
        self.assertEqual('', err)
 
397
        self.assertStartsWith(out, "=== added file 'goodbye'\n"
 
398
                                   "--- goodbye\t1970-01-01 00:00:00 +0000\n"
 
399
                                   "+++ goodbye\t")
 
400
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
 
401
                                 "+baz\n\n")
451
402
 
452
403
 
453
404
class TestDiffOutput(DiffBase):
455
406
    def test_diff_output(self):
456
407
        # check that output doesn't mangle line-endings
457
408
        self.make_example_branch()
458
 
        self.build_tree_contents([('hello', b'hello world!\n')])
 
409
        self.build_tree_contents([('hello', 'hello world!\n')])
459
410
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
460
 
        self.assertTrue(b'\n+hello world!\n' in output)
 
411
        self.assert_('\n+hello world!\n' in output)