/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 breezy/tests/blackbox/test_diff.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 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 bzr diff.
19
 
"""
 
18
"""Black-box tests for brz diff."""
20
19
 
21
20
import os
22
21
import re
23
22
 
24
 
from bzrlib import (
 
23
from breezy import (
25
24
    tests,
26
25
    workingtree,
27
26
    )
28
 
from bzrlib.diff import (
 
27
from breezy.diff import (
29
28
    DiffTree,
30
29
    format_registry as diff_format_registry,
31
30
    )
 
31
from breezy.tests import (
 
32
    features,
 
33
    )
32
34
 
33
35
 
34
36
def subst_dates(string):
43
45
    def make_example_branch(self):
44
46
        tree = self.make_branch_and_tree('.')
45
47
        self.build_tree_contents([
46
 
            ('hello', 'foo\n'),
47
 
            ('goodbye', 'baz\n')])
 
48
            ('hello', b'foo\n'),
 
49
            ('goodbye', b'baz\n')])
48
50
        tree.add(['hello'])
49
51
        tree.commit('setup')
50
52
        tree.add(['goodbye'])
56
58
 
57
59
    def test_diff(self):
58
60
        tree = self.make_example_branch()
59
 
        self.build_tree_contents([('hello', 'hello world!')])
 
61
        self.build_tree_contents([('hello', b'hello world!')])
60
62
        tree.commit(message='fixing hello')
61
63
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
62
 
        self.assert_('\n+hello world!' in output)
 
64
        self.assertTrue('\n+hello world!' in output)
63
65
        output = self.run_bzr('diff -c 3', retcode=1)[0]
64
 
        self.assert_('\n+hello world!' in output)
 
66
        self.assertTrue('\n+hello world!' in output)
65
67
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
66
 
        self.assert_('\n+baz' in output)
 
68
        self.assertTrue('\n+baz' in output)
67
69
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
68
 
        self.assert_('\n+baz' in output)
 
70
        self.assertTrue('\n+baz' in output)
69
71
        self.build_tree(['moo'])
70
72
        tree.add('moo')
71
73
        os.unlink('moo')
74
76
    def test_diff_prefix(self):
75
77
        """diff --prefix appends to filenames in output"""
76
78
        self.make_example_branch()
77
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
79
        self.build_tree_contents([('hello', b'hello world!\n')])
78
80
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
79
 
        self.assertEquals(err, '')
 
81
        self.assertEqual(err, '')
80
82
        self.assertEqualDiff(subst_dates(out), '''\
81
83
=== modified file 'hello'
82
84
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
91
93
        # There was an error in error reporting for this option
92
94
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
93
95
        self.assertContainsRe(err,
94
 
            '--prefix expects two values separated by a colon')
 
96
            b'--prefix expects two values separated by a colon')
95
97
 
96
98
    def test_diff_p1(self):
97
99
        """diff -p1 produces lkml-style diffs"""
98
100
        self.make_example_branch()
99
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
101
        self.build_tree_contents([('hello', b'hello world!\n')])
100
102
        out, err = self.run_bzr('diff -p1', retcode=1)
101
 
        self.assertEquals(err, '')
 
103
        self.assertEqual(err, '')
102
104
        self.assertEqualDiff(subst_dates(out), '''\
103
105
=== modified file 'hello'
104
106
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
112
114
    def test_diff_p0(self):
113
115
        """diff -p0 produces diffs with no prefix"""
114
116
        self.make_example_branch()
115
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
117
        self.build_tree_contents([('hello', b'hello world!\n')])
116
118
        out, err = self.run_bzr('diff -p0', retcode=1)
117
 
        self.assertEquals(err, '')
 
119
        self.assertEqual(err, '')
118
120
        self.assertEqualDiff(subst_dates(out), '''\
119
121
=== modified file 'hello'
120
122
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
148
150
    def test_diff_nonexistent_dotted_revision(self):
149
151
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
150
152
        self.assertContainsRe(err,
151
 
            "Requested revision: '1.1' does not exist in branch:")
 
153
            b"Requested revision: '1.1' does not exist in branch:")
152
154
 
153
155
    def test_diff_nonexistent_dotted_revision_change(self):
154
156
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
155
157
        self.assertContainsRe(err,
156
 
            "Requested revision: '1.1' does not exist in branch:")
 
158
            b"Requested revision: '1.1' does not exist in branch:")
157
159
 
158
160
    def test_diff_unversioned(self):
159
161
        # Get an error when diffing a non-versioned file.
161
163
        self.make_example_branch()
162
164
        self.build_tree(['unversioned-file'])
163
165
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
164
 
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
 
166
        self.assertContainsRe(err, b'not versioned.*unversioned-file')
165
167
 
166
168
    # TODO: What should diff say for a file deleted in working tree?
167
169
 
172
174
        branch1_tree.add('file')
173
175
        branch1_tree.add('file2')
174
176
        branch1_tree.commit(message='add file and file2')
175
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
176
 
        self.build_tree_contents([('branch2/file', 'new content\n')])
 
177
        branch2_tree = branch1_tree.controldir.sprout('branch2').open_workingtree()
 
178
        self.build_tree_contents([('branch2/file', b'new content\n')])
177
179
        branch2_tree.commit(message='update file')
178
180
        return branch1_tree, branch2_tree
179
181
 
180
182
    def check_b2_vs_b1(self, cmd):
181
183
        # Compare branch2 vs branch1 using cmd and check the result
182
184
        out, err = self.run_bzr(cmd, retcode=1)
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))
 
185
        self.assertEqual(b'', err)
 
186
        self.assertEqual(b"=== modified file 'file'\n"
 
187
                         b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
188
                         b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
189
                         b"@@ -1,1 +1,1 @@\n"
 
190
                         b"-new content\n"
 
191
                         b"+contents of branch1/file\n"
 
192
                         b"\n", subst_dates(out))
191
193
 
192
194
    def check_b1_vs_b2(self, cmd):
193
195
        # Compare branch1 vs branch2 using cmd and check the result
194
196
        out, err = self.run_bzr(cmd, retcode=1)
195
 
        self.assertEquals('', err)
196
 
        self.assertEqualDiff("=== modified file 'file'\n"
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))
 
197
        self.assertEqual(b'', err)
 
198
        self.assertEqualDiff(b"=== modified file 'file'\n"
 
199
                             b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
200
                             b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
201
                             b"@@ -1,1 +1,1 @@\n"
 
202
                             b"-contents of branch1/file\n"
 
203
                             b"+new content\n"
 
204
                             b"\n", subst_dates(out))
203
205
 
204
206
    def check_no_diffs(self, cmd):
205
207
        # Check that running cmd returns an empty diff
206
208
        out, err = self.run_bzr(cmd, retcode=0)
207
 
        self.assertEquals('', err)
208
 
        self.assertEquals('', out)
 
209
        self.assertEqual(b'', err)
 
210
        self.assertEqual(b'', out)
209
211
 
210
212
    def test_diff_branches(self):
211
213
        self.example_branches()
227
229
    def test_diff_branches_no_working_trees(self):
228
230
        branch1_tree, branch2_tree = self.example_branches()
229
231
        # Compare a working tree to a branch without a WT
230
 
        dir1 = branch1_tree.bzrdir
 
232
        dir1 = branch1_tree.controldir
231
233
        dir1.destroy_workingtree()
232
234
        self.assertFalse(dir1.has_workingtree())
233
235
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
238
240
        self.check_b1_vs_b2('diff --old branch1 branch2')
239
241
        self.check_b1_vs_b2('diff branch1 --new branch2')
240
242
        # Compare a branch with a WT against another without a WT
241
 
        dir2 = branch2_tree.bzrdir
 
243
        dir2 = branch2_tree.controldir
242
244
        dir2.destroy_workingtree()
243
245
        self.assertFalse(dir2.has_workingtree())
244
246
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
248
250
    def test_diff_revno_branches(self):
249
251
        self.example_branches()
250
252
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
251
 
        self.build_tree_contents([('branch2/file', 'even newer content')])
 
253
        self.build_tree_contents([('branch2/file', b'even newer content')])
252
254
        branch2_tree.commit(message='update file once more')
253
255
 
254
256
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
255
257
                                )
256
 
        self.assertEquals('', err)
257
 
        self.assertEquals('', out)
 
258
        self.assertEqual(b'', err)
 
259
        self.assertEqual(b'', out)
258
260
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
259
261
                                retcode=1)
260
 
        self.assertEquals('', err)
261
 
        self.assertEqualDiff("=== modified file 'file'\n"
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))
 
262
        self.assertEqual(b'', err)
 
263
        self.assertEqualDiff(b"=== modified file 'file'\n"
 
264
                             b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
265
                             b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
266
                             b"@@ -1,1 +1,1 @@\n"
 
267
                             b"-new content\n"
 
268
                             b"+contents of branch1/file\n"
 
269
                             b"\n", subst_dates(out))
268
270
 
269
271
    def example_branch2(self):
270
272
        branch1_tree = self.make_branch_and_tree('branch1')
271
 
        self.build_tree_contents([('branch1/file1', 'original line\n')])
 
273
        self.build_tree_contents([('branch1/file1', b'original line\n')])
272
274
        branch1_tree.add('file1')
273
275
        branch1_tree.commit(message='first commit')
274
 
        self.build_tree_contents([('branch1/file1', 'repo line\n')])
 
276
        self.build_tree_contents([('branch1/file1', b'repo line\n')])
275
277
        branch1_tree.commit(message='second commit')
276
278
        return branch1_tree
277
279
 
278
280
    def test_diff_to_working_tree(self):
279
281
        self.example_branch2()
280
 
        self.build_tree_contents([('branch1/file1', 'new line')])
 
282
        self.build_tree_contents([('branch1/file1', b'new line')])
281
283
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
282
284
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
283
285
 
284
286
    def test_diff_to_working_tree_in_subdir(self):
285
287
        self.example_branch2()
286
 
        self.build_tree_contents([('branch1/file1', 'new line')])
 
288
        self.build_tree_contents([('branch1/file1', b'new line')])
287
289
        os.mkdir('branch1/dir1')
288
 
        os.chdir('branch1/dir1')
289
 
        output = self.run_bzr('diff -r 1..', retcode=1)
 
290
        output = self.run_bzr('diff -r 1..', retcode=1,
 
291
                              working_dir='branch1/dir1')
290
292
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
291
293
 
292
294
    def test_diff_across_rename(self):
299
301
 
300
302
    def test_diff_to_branch_no_working_tree(self):
301
303
        branch1_tree = self.example_branch2()
302
 
        dir1 = branch1_tree.bzrdir
 
304
        dir1 = branch1_tree.controldir
303
305
        dir1.destroy_workingtree()
304
306
        self.assertFalse(dir1.has_workingtree())
305
307
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
313
315
                return super(BooDiffTree, self).show_diff(specific_files,
314
316
                    extra_trees)
315
317
 
316
 
        diff_format_registry.register("boo", BooDiffTree, 
317
 
            "Scary diff format")
 
318
        diff_format_registry.register("boo", BooDiffTree, "Scary diff format")
318
319
        self.addCleanup(diff_format_registry.remove, "boo")
319
320
        self.make_example_branch()
320
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
321
        self.build_tree_contents([('hello', b'hello world!\n')])
321
322
        output = self.run_bzr('diff --format=boo', retcode=1)
322
323
        self.assertTrue("BOO!" in output[0])
 
324
        output = self.run_bzr('diff -Fboo', retcode=1)
 
325
        self.assertTrue("BOO!" in output[0])
323
326
 
324
327
 
325
328
class TestCheckoutDiff(TestDiff):
338
341
        return tree
339
342
 
340
343
    def example_branches(self):
341
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
 
344
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
 
345
                                           self).example_branches()
342
346
        os.mkdir('checkouts')
343
347
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
344
348
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
356
360
 
357
361
    def test_diff_label_added(self):
358
362
        tree = super(TestDiffLabels, self).make_example_branch()
359
 
        self.build_tree_contents([('barbar', 'barbar')])
 
363
        self.build_tree_contents([('barbar', b'barbar')])
360
364
        tree.add('barbar')
361
365
        diff = self.run_bzr('diff', retcode=1)
362
366
        self.assertTrue("=== added file 'barbar'" in diff[0])
363
367
 
364
368
    def test_diff_label_modified(self):
365
369
        super(TestDiffLabels, self).make_example_branch()
366
 
        self.build_tree_contents([('hello', 'barbar')])
 
370
        self.build_tree_contents([('hello', b'barbar')])
367
371
        diff = self.run_bzr('diff', retcode=1)
368
372
        self.assertTrue("=== modified file 'hello'" in diff[0])
369
373
 
384
388
        # subprocess.py that we had to workaround).
385
389
        # However, if 'diff' may not be available
386
390
        self.make_example_branch()
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)
 
391
        out, err = self.run_bzr_subprocess(
 
392
            'diff -Oprogress_bar=none -r 1 --diff-options -ub',
 
393
            universal_newlines=True,
 
394
            retcode=None)
392
395
        if 'Diff is not installed on this machine' in err:
393
396
            raise tests.TestSkipped("No external 'diff' is available")
394
 
        self.assertEqual('', err)
 
397
        self.assertEqual(b'', err)
395
398
        # We have to skip the stuff in the middle, because it depends
396
399
        # on time.time()
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")
 
400
        self.assertStartsWith(
 
401
            out,
 
402
            b"=== added file 'goodbye'\n"
 
403
            b"--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
 
404
            b"+++ new/goodbye\t")
 
405
        self.assertEndsWith(out, b"\n@@ -0,0 +1 @@\n"
 
406
                                 b"+baz\n\n")
 
407
 
 
408
    def test_external_diff_options_and_using(self):
 
409
        """Test that the options are passed correctly to an external diff process"""
 
410
        self.requireFeature(features.diff_feature)
 
411
        self.make_example_branch()
 
412
        self.build_tree_contents([('hello', b'Foo\n')])
 
413
        out, err = self.run_bzr('diff --diff-options -i --using diff',
 
414
                                    retcode=1)
 
415
        self.assertEqual(b"=== modified file 'hello'\n", out)
 
416
        self.assertEqual(b'', err)
402
417
 
403
418
 
404
419
class TestDiffOutput(DiffBase):
406
421
    def test_diff_output(self):
407
422
        # check that output doesn't mangle line-endings
408
423
        self.make_example_branch()
409
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
424
        self.build_tree_contents([('hello', b'hello world!\n')])
410
425
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
411
 
        self.assert_('\n+hello world!\n' in output)
 
426
        self.assertTrue('\n+hello world!\n' in output)