← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-07-07 21:30:06 UTC
  • mfrom: (5333.1.2 better_pyqt_include)
  • Revision ID: pqm@pqm.ubuntu.com-20100707213006-lriphkkbzwwrl7ne
(jameinel) Use a better list of PyQt includes and excludes. (Gary van der
 Merwe)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2005, 2006 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
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr diff.
21
21
import os
22
22
import re
23
23
 
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
 
24
from bzrlib import (
 
25
    tests,
 
26
    workingtree,
 
27
    )
 
28
from bzrlib.diff import (
 
29
    DiffTree,
 
30
    format_registry as diff_format_registry,
 
31
    )
29
32
 
30
33
 
31
34
def subst_dates(string):
34
37
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
35
38
 
36
39
 
37
 
class DiffBase(ExternalBase):
 
40
class DiffBase(tests.TestCaseWithTransport):
38
41
    """Base class with common setup method"""
39
42
 
40
43
    def make_example_branch(self):
41
 
        # FIXME: copied from test_too_much -- share elsewhere?
42
44
        tree = self.make_branch_and_tree('.')
43
 
        open('hello', 'wb').write('foo\n')
 
45
        self.build_tree_contents([
 
46
            ('hello', 'foo\n'),
 
47
            ('goodbye', 'baz\n')])
44
48
        tree.add(['hello'])
45
49
        tree.commit('setup')
46
 
        open('goodbye', 'wb').write('baz\n')
47
50
        tree.add(['goodbye'])
48
51
        tree.commit('setup')
 
52
        return tree
49
53
 
50
54
 
51
55
class TestDiff(DiffBase):
52
56
 
53
57
    def test_diff(self):
54
 
        self.make_example_branch()
55
 
        file('hello', 'wt').write('hello world!')
56
 
        self.run_bzr('commit -m fixing hello')
 
58
        tree = self.make_example_branch()
 
59
        self.build_tree_contents([('hello', 'hello world!')])
 
60
        tree.commit(message='fixing hello')
57
61
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
58
62
        self.assert_('\n+hello world!' in output)
59
 
        output = self.run_bzr('diff -r last:3..last:1',
60
 
                retcode=1)[0]
 
63
        output = self.run_bzr('diff -c 3', retcode=1)[0]
 
64
        self.assert_('\n+hello world!' in output)
 
65
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
 
66
        self.assert_('\n+baz' in output)
 
67
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
61
68
        self.assert_('\n+baz' in output)
62
69
        self.build_tree(['moo'])
63
 
        self.run_bzr('add moo')
 
70
        tree.add('moo')
64
71
        os.unlink('moo')
65
72
        self.run_bzr('diff')
66
73
 
67
74
    def test_diff_prefix(self):
68
75
        """diff --prefix appends to filenames in output"""
69
76
        self.make_example_branch()
70
 
        file('hello', 'wb').write('hello world!\n')
 
77
        self.build_tree_contents([('hello', 'hello world!\n')])
71
78
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
72
79
        self.assertEquals(err, '')
73
80
        self.assertEqualDiff(subst_dates(out), '''\
89
96
    def test_diff_p1(self):
90
97
        """diff -p1 produces lkml-style diffs"""
91
98
        self.make_example_branch()
92
 
        file('hello', 'wb').write('hello world!\n')
 
99
        self.build_tree_contents([('hello', 'hello world!\n')])
93
100
        out, err = self.run_bzr('diff -p1', retcode=1)
94
101
        self.assertEquals(err, '')
95
102
        self.assertEqualDiff(subst_dates(out), '''\
105
112
    def test_diff_p0(self):
106
113
        """diff -p0 produces diffs with no prefix"""
107
114
        self.make_example_branch()
108
 
        file('hello', 'wb').write('hello world!\n')
 
115
        self.build_tree_contents([('hello', 'hello world!\n')])
109
116
        out, err = self.run_bzr('diff -p0', retcode=1)
110
117
        self.assertEquals(err, '')
111
118
        self.assertEqualDiff(subst_dates(out), '''\
122
129
        # Get an error from a file that does not exist at all
123
130
        # (Malone #3619)
124
131
        self.make_example_branch()
125
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
126
 
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
 
132
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
 
133
            error_regexes=('not versioned.*does-not-exist',))
127
134
 
128
135
    def test_diff_illegal_revision_specifiers(self):
129
 
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
130
 
        self.assertContainsRe(err, 'one or two revision specifiers')
 
136
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
 
137
            error_regexes=('one or two revision specifiers',))
 
138
 
 
139
    def test_diff_using_and_format(self):
 
140
        out, err = self.run_bzr('diff --format=default --using=mydi', retcode=3,
 
141
            error_regexes=('are mutually exclusive',))
 
142
 
 
143
    def test_diff_nonexistent_revision(self):
 
144
        out, err = self.run_bzr('diff -r 123', retcode=3,
 
145
            error_regexes=("Requested revision: '123' does not "
 
146
                "exist in branch:",))
 
147
 
 
148
    def test_diff_nonexistent_dotted_revision(self):
 
149
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
 
150
        self.assertContainsRe(err,
 
151
            "Requested revision: '1.1' does not exist in branch:")
 
152
 
 
153
    def test_diff_nonexistent_dotted_revision_change(self):
 
154
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
 
155
        self.assertContainsRe(err,
 
156
            "Requested revision: '1.1' does not exist in branch:")
131
157
 
132
158
    def test_diff_unversioned(self):
133
159
        # Get an error when diffing a non-versioned file.
140
166
    # TODO: What should diff say for a file deleted in working tree?
141
167
 
142
168
    def example_branches(self):
143
 
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
144
 
        self.run_bzr('init branch1')[0]
145
 
        self.run_bzr('add branch1/file')[0]
146
 
        self.run_bzr(['commit', '-m', 'add file', 'branch1'])
147
 
        self.run_bzr('branch branch1 branch2')[0]
 
169
        branch1_tree = self.make_branch_and_tree('branch1')
 
170
        self.build_tree(['branch1/file'], line_endings='binary')
 
171
        self.build_tree(['branch1/file2'], line_endings='binary')
 
172
        branch1_tree.add('file')
 
173
        branch1_tree.add('file2')
 
174
        branch1_tree.commit(message='add file and file2')
 
175
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
148
176
        self.build_tree_contents([('branch2/file', 'new content\n')])
149
 
        self.run_bzr(['commit', '-m', 'update file', 'branch2'])
 
177
        branch2_tree.commit(message='update file')
 
178
        return branch1_tree, branch2_tree
150
179
 
151
 
    def test_diff_branches(self):
152
 
        self.example_branches()
153
 
        # should open branch1 and diff against branch2, 
154
 
        out, err = self.run_bzr('diff -r branch:branch2 branch1',
155
 
                                retcode=1)
 
180
    def check_b2_vs_b1(self, cmd):
 
181
        # Compare branch2 vs branch1 using cmd and check the result
 
182
        out, err = self.run_bzr(cmd, retcode=1)
156
183
        self.assertEquals('', err)
157
184
        self.assertEquals("=== modified file 'file'\n"
158
185
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
161
188
                          "-new content\n"
162
189
                          "+contents of branch1/file\n"
163
190
                          "\n", subst_dates(out))
164
 
        out, err = self.run_bzr('diff branch2 branch1',
165
 
                                         retcode=1)
 
191
 
 
192
    def check_b1_vs_b2(self, cmd):
 
193
        # Compare branch1 vs branch2 using cmd and check the result
 
194
        out, err = self.run_bzr(cmd, retcode=1)
166
195
        self.assertEquals('', err)
167
196
        self.assertEqualDiff("=== modified file 'file'\n"
168
197
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
169
198
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
170
199
                              "@@ -1,1 +1,1 @@\n"
171
 
                              "-new content\n"
172
 
                              "+contents of branch1/file\n"
 
200
                              "-contents of branch1/file\n"
 
201
                              "+new content\n"
173
202
                              "\n", subst_dates(out))
174
203
 
 
204
    def check_no_diffs(self, cmd):
 
205
        # Check that running cmd returns an empty diff
 
206
        out, err = self.run_bzr(cmd, retcode=0)
 
207
        self.assertEquals('', err)
 
208
        self.assertEquals('', out)
 
209
 
 
210
    def test_diff_branches(self):
 
211
        self.example_branches()
 
212
        # should open branch1 and diff against branch2,
 
213
        self.check_b2_vs_b1('diff -r branch:branch2 branch1')
 
214
        # Compare two working trees using various syntax forms
 
215
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
 
216
        self.check_b2_vs_b1('diff --old branch2 branch1')
 
217
        self.check_b2_vs_b1('diff branch2 --new branch1')
 
218
        # Test with a selected file that was changed
 
219
        self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
 
220
        self.check_b2_vs_b1('diff --old branch2 branch1/file')
 
221
        self.check_b2_vs_b1('diff branch2/file --new branch1')
 
222
        # Test with a selected file that was not changed
 
223
        self.check_no_diffs('diff --old branch2 --new branch1 file2')
 
224
        self.check_no_diffs('diff --old branch2 branch1/file2')
 
225
        self.check_no_diffs('diff branch2/file2 --new branch1')
 
226
 
 
227
    def test_diff_branches_no_working_trees(self):
 
228
        branch1_tree, branch2_tree = self.example_branches()
 
229
        # Compare a working tree to a branch without a WT
 
230
        dir1 = branch1_tree.bzrdir
 
231
        dir1.destroy_workingtree()
 
232
        self.assertFalse(dir1.has_workingtree())
 
233
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
 
234
        self.check_b2_vs_b1('diff --old branch2 branch1')
 
235
        self.check_b2_vs_b1('diff branch2 --new branch1')
 
236
        # Compare a branch without a WT to one with a WT
 
237
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
 
238
        self.check_b1_vs_b2('diff --old branch1 branch2')
 
239
        self.check_b1_vs_b2('diff branch1 --new branch2')
 
240
        # Compare a branch with a WT against another without a WT
 
241
        dir2 = branch2_tree.bzrdir
 
242
        dir2.destroy_workingtree()
 
243
        self.assertFalse(dir2.has_workingtree())
 
244
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
 
245
        self.check_b1_vs_b2('diff --old branch1 branch2')
 
246
        self.check_b1_vs_b2('diff branch1 --new branch2')
 
247
 
175
248
    def test_diff_revno_branches(self):
176
249
        self.example_branches()
177
 
        print >> open('branch2/file', 'wb'), 'even newer content'
178
 
        self.run_bzr(['commit', '-m',
179
 
                      'update file once more', 'branch2'])
 
250
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
 
251
        self.build_tree_contents([('branch2/file', 'even newer content')])
 
252
        branch2_tree.commit(message='update file once more')
180
253
 
181
254
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
182
255
                                )
194
267
                              "\n", subst_dates(out))
195
268
 
196
269
    def example_branch2(self):
197
 
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
198
 
        self.run_bzr('init branch1')[0]
199
 
        self.run_bzr('add branch1/file1')[0]
200
 
        print >> open('branch1/file1', 'wb'), 'original line'
201
 
        self.run_bzr(['commit', '-m', 'first commit', 'branch1'])
202
 
        
203
 
        print >> open('branch1/file1', 'wb'), 'repo line'
204
 
        self.run_bzr(['commit', '-m', 'second commit', 'branch1'])
 
270
        branch1_tree = self.make_branch_and_tree('branch1')
 
271
        self.build_tree_contents([('branch1/file1', 'original line\n')])
 
272
        branch1_tree.add('file1')
 
273
        branch1_tree.commit(message='first commit')
 
274
        self.build_tree_contents([('branch1/file1', 'repo line\n')])
 
275
        branch1_tree.commit(message='second commit')
 
276
        return branch1_tree
205
277
 
206
278
    def test_diff_to_working_tree(self):
207
279
        self.example_branch2()
208
 
        
209
 
        print >> open('branch1/file1', 'wb'), 'new line'
210
 
        output = self.run_bzr('diff -r 1.. branch1',
211
 
                              retcode=1)
212
 
        self.assertTrue('\n-original line\n+new line\n' in output[0])
 
280
        self.build_tree_contents([('branch1/file1', 'new line')])
 
281
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
 
282
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
283
 
 
284
    def test_diff_to_working_tree_in_subdir(self):
 
285
        self.example_branch2()
 
286
        self.build_tree_contents([('branch1/file1', 'new line')])
 
287
        os.mkdir('branch1/dir1')
 
288
        os.chdir('branch1/dir1')
 
289
        output = self.run_bzr('diff -r 1..', retcode=1)
 
290
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
213
291
 
214
292
    def test_diff_across_rename(self):
215
293
        """The working tree path should always be considered for diffing"""
216
 
        self.make_example_branch()
 
294
        tree = self.make_example_branch()
217
295
        self.run_bzr('diff -r 0..1 hello', retcode=1)
218
 
        wt = workingtree.WorkingTree.open_containing('.')[0]
219
 
        wt.rename_one('hello', 'hello1')
 
296
        tree.rename_one('hello', 'hello1')
220
297
        self.run_bzr('diff hello1', retcode=1)
221
298
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
222
299
 
 
300
    def test_diff_to_branch_no_working_tree(self):
 
301
        branch1_tree = self.example_branch2()
 
302
        dir1 = branch1_tree.bzrdir
 
303
        dir1.destroy_workingtree()
 
304
        self.assertFalse(dir1.has_workingtree())
 
305
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
 
306
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
 
307
 
 
308
    def test_custom_format(self):
 
309
        class BooDiffTree(DiffTree):
 
310
 
 
311
            def show_diff(self, specific_files, extra_trees=None):
 
312
                self.to_file.write("BOO!\n")
 
313
                return super(BooDiffTree, self).show_diff(specific_files,
 
314
                    extra_trees)
 
315
 
 
316
        diff_format_registry.register("boo", BooDiffTree, 
 
317
            "Scary diff format")
 
318
        self.addCleanup(diff_format_registry.remove, "boo")
 
319
        self.make_example_branch()
 
320
        self.build_tree_contents([('hello', 'hello world!\n')])
 
321
        output = self.run_bzr('diff --format=boo', retcode=1)
 
322
        self.assertTrue("BOO!" in output[0])
 
323
 
223
324
 
224
325
class TestCheckoutDiff(TestDiff):
225
326
 
226
327
    def make_example_branch(self):
227
 
        super(TestCheckoutDiff, self).make_example_branch()
228
 
        self.run_bzr('checkout . checkout')
 
328
        tree = super(TestCheckoutDiff, self).make_example_branch()
 
329
        tree = tree.branch.create_checkout('checkout')
229
330
        os.chdir('checkout')
 
331
        return tree
230
332
 
231
333
    def example_branch2(self):
232
 
        super(TestCheckoutDiff, self).example_branch2()
 
334
        tree = super(TestCheckoutDiff, self).example_branch2()
233
335
        os.mkdir('checkouts')
234
 
        self.run_bzr('checkout branch1 checkouts/branch1')
 
336
        tree = tree.branch.create_checkout('checkouts/branch1')
235
337
        os.chdir('checkouts')
 
338
        return tree
236
339
 
237
340
    def example_branches(self):
238
 
        super(TestCheckoutDiff, self).example_branches()
 
341
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
239
342
        os.mkdir('checkouts')
240
 
        self.run_bzr('checkout branch1 checkouts/branch1')
241
 
        self.run_bzr('checkout branch2 checkouts/branch2')
 
343
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
 
344
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
242
345
        os.chdir('checkouts')
 
346
        return branch1_tree, branch2_tree
243
347
 
244
348
 
245
349
class TestDiffLabels(DiffBase):
246
350
 
247
351
    def test_diff_label_removed(self):
248
 
        super(TestDiffLabels, self).make_example_branch()
249
 
        self.run_bzr('remove hello')
 
352
        tree = super(TestDiffLabels, self).make_example_branch()
 
353
        tree.remove('hello', keep_files=False)
250
354
        diff = self.run_bzr('diff', retcode=1)
251
355
        self.assertTrue("=== removed file 'hello'" in diff[0])
252
356
 
253
357
    def test_diff_label_added(self):
254
 
        super(TestDiffLabels, self).make_example_branch()
255
 
        file('barbar', 'wt').write('barbar')
256
 
        self.run_bzr('add barbar')
 
358
        tree = super(TestDiffLabels, self).make_example_branch()
 
359
        self.build_tree_contents([('barbar', 'barbar')])
 
360
        tree.add('barbar')
257
361
        diff = self.run_bzr('diff', retcode=1)
258
362
        self.assertTrue("=== added file 'barbar'" in diff[0])
259
363
 
260
364
    def test_diff_label_modified(self):
261
365
        super(TestDiffLabels, self).make_example_branch()
262
 
        file('hello', 'wt').write('barbar')
 
366
        self.build_tree_contents([('hello', 'barbar')])
263
367
        diff = self.run_bzr('diff', retcode=1)
264
368
        self.assertTrue("=== modified file 'hello'" in diff[0])
265
369
 
266
370
    def test_diff_label_renamed(self):
267
 
        super(TestDiffLabels, self).make_example_branch()
268
 
        self.run_bzr('rename hello gruezi')
 
371
        tree = super(TestDiffLabels, self).make_example_branch()
 
372
        tree.rename_one('hello', 'gruezi')
269
373
        diff = self.run_bzr('diff', retcode=1)
270
374
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
271
375
 
274
378
 
275
379
    def test_external_diff(self):
276
380
        """Test that we can spawn an external diff process"""
 
381
        self.disable_missing_extensions_warning()
277
382
        # We have to use run_bzr_subprocess, because we need to
278
383
        # test writing directly to stdout, (there was a bug in
279
384
        # subprocess.py that we had to workaround).
280
385
        # However, if 'diff' may not be available
281
386
        self.make_example_branch()
282
 
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
283
 
        try:
284
 
            os.environ['BZR_PROGRESS_BAR'] = 'none'
285
 
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
286
 
                                               '--diff-options', '-ub',
287
 
                                               universal_newlines=True,
288
 
                                               retcode=None)
289
 
        finally:
290
 
            if orig_progress is None:
291
 
                del os.environ['BZR_PROGRESS_BAR']
292
 
            else:
293
 
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
294
 
            
 
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)
295
392
        if 'Diff is not installed on this machine' in err:
296
 
            raise TestSkipped("No external 'diff' is available")
 
393
            raise tests.TestSkipped("No external 'diff' is available")
297
394
        self.assertEqual('', err)
298
395
        # We have to skip the stuff in the middle, because it depends
299
396
        # on time.time()
309
406
    def test_diff_output(self):
310
407
        # check that output doesn't mangle line-endings
311
408
        self.make_example_branch()
312
 
        file('hello', 'wb').write('hello world!\n')
 
409
        self.build_tree_contents([('hello', 'hello world!\n')])
313
410
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
314
411
        self.assert_('\n+hello world!\n' in output)