← 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: Ian Clatworthy
  • Date: 2009-09-09 15:30:59 UTC
  • mto: (4634.37.2 prepare-2.0)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: ian.clatworthy@canonical.com-20090909153059-sb038agvd38ci2q8
more link fixes in the User Guide

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
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."""
 
18
"""Black-box tests for bzr diff.
 
19
"""
19
20
 
20
21
import os
21
22
import re
22
23
 
23
 
from bzrlib import (
24
 
    tests,
25
 
    workingtree,
26
 
    )
27
 
from bzrlib.diff import (
28
 
    DiffTree,
29
 
    format_registry as diff_format_registry,
30
 
    )
31
 
from bzrlib.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):
61
56
        self.build_tree_contents([('hello', 'hello world!')])
62
57
        tree.commit(message='fixing hello')
63
58
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
64
 
        self.assertTrue('\n+hello world!' in output)
 
59
        self.assert_('\n+hello world!' in output)
65
60
        output = self.run_bzr('diff -c 3', retcode=1)[0]
66
 
        self.assertTrue('\n+hello world!' in output)
 
61
        self.assert_('\n+hello world!' in output)
67
62
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
68
 
        self.assertTrue('\n+baz' in output)
 
63
        self.assert_('\n+baz' in output)
69
64
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
70
 
        self.assertTrue('\n+baz' in output)
 
65
        self.assert_('\n+baz' in output)
71
66
        self.build_tree(['moo'])
72
67
        tree.add('moo')
73
68
        os.unlink('moo')
78
73
        self.make_example_branch()
79
74
        self.build_tree_contents([('hello', 'hello world!\n')])
80
75
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
81
 
        self.assertEqual(err, '')
 
76
        self.assertEquals(err, '')
82
77
        self.assertEqualDiff(subst_dates(out), '''\
83
78
=== modified file 'hello'
84
79
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
100
95
        self.make_example_branch()
101
96
        self.build_tree_contents([('hello', 'hello world!\n')])
102
97
        out, err = self.run_bzr('diff -p1', retcode=1)
103
 
        self.assertEqual(err, '')
 
98
        self.assertEquals(err, '')
104
99
        self.assertEqualDiff(subst_dates(out), '''\
105
100
=== modified file 'hello'
106
101
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
116
111
        self.make_example_branch()
117
112
        self.build_tree_contents([('hello', 'hello world!\n')])
118
113
        out, err = self.run_bzr('diff -p0', retcode=1)
119
 
        self.assertEqual(err, '')
 
114
        self.assertEquals(err, '')
120
115
        self.assertEqualDiff(subst_dates(out), '''\
121
116
=== modified file 'hello'
122
117
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
138
133
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
139
134
            error_regexes=('one or two revision specifiers',))
140
135
 
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
136
    def test_diff_nonexistent_revision(self):
146
137
        out, err = self.run_bzr('diff -r 123', retcode=3,
147
138
            error_regexes=("Requested revision: '123' does not "
182
173
    def check_b2_vs_b1(self, cmd):
183
174
        # Compare branch2 vs branch1 using cmd and check the result
184
175
        out, err = self.run_bzr(cmd, retcode=1)
185
 
        self.assertEqual('', err)
186
 
        self.assertEqual("=== modified file 'file'\n"
 
176
        self.assertEquals('', err)
 
177
        self.assertEquals("=== modified file 'file'\n"
187
178
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
188
179
                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
189
180
                          "@@ -1,1 +1,1 @@\n"
194
185
    def check_b1_vs_b2(self, cmd):
195
186
        # Compare branch1 vs branch2 using cmd and check the result
196
187
        out, err = self.run_bzr(cmd, retcode=1)
197
 
        self.assertEqual('', err)
 
188
        self.assertEquals('', err)
198
189
        self.assertEqualDiff("=== modified file 'file'\n"
199
190
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
200
191
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
206
197
    def check_no_diffs(self, cmd):
207
198
        # Check that running cmd returns an empty diff
208
199
        out, err = self.run_bzr(cmd, retcode=0)
209
 
        self.assertEqual('', err)
210
 
        self.assertEqual('', out)
 
200
        self.assertEquals('', err)
 
201
        self.assertEquals('', out)
211
202
 
212
203
    def test_diff_branches(self):
213
204
        self.example_branches()
255
246
 
256
247
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
257
248
                                )
258
 
        self.assertEqual('', err)
259
 
        self.assertEqual('', out)
 
249
        self.assertEquals('', err)
 
250
        self.assertEquals('', out)
260
251
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
261
252
                                retcode=1)
262
 
        self.assertEqual('', err)
 
253
        self.assertEquals('', err)
263
254
        self.assertEqualDiff("=== modified file 'file'\n"
264
255
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
265
256
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
287
278
        self.example_branch2()
288
279
        self.build_tree_contents([('branch1/file1', 'new line')])
289
280
        os.mkdir('branch1/dir1')
290
 
        output = self.run_bzr('diff -r 1..', retcode=1,
291
 
                              working_dir='branch1/dir1')
 
281
        os.chdir('branch1/dir1')
 
282
        output = self.run_bzr('diff -r 1..', retcode=1)
292
283
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
293
284
 
294
285
    def test_diff_across_rename(self):
307
298
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
308
299
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
309
300
 
310
 
    def test_custom_format(self):
311
 
        class BooDiffTree(DiffTree):
312
 
 
313
 
            def show_diff(self, specific_files, extra_trees=None):
314
 
                self.to_file.write("BOO!\n")
315
 
                return super(BooDiffTree, self).show_diff(specific_files,
316
 
                    extra_trees)
317
 
 
318
 
        diff_format_registry.register("boo", BooDiffTree, "Scary diff format")
319
 
        self.addCleanup(diff_format_registry.remove, "boo")
320
 
        self.make_example_branch()
321
 
        self.build_tree_contents([('hello', 'hello world!\n')])
322
 
        output = self.run_bzr('diff --format=boo', retcode=1)
323
 
        self.assertTrue("BOO!" in output[0])
324
 
        output = self.run_bzr('diff -Fboo', retcode=1)
325
 
        self.assertTrue("BOO!" in output[0])
326
 
 
327
301
 
328
302
class TestCheckoutDiff(TestDiff):
329
303
 
341
315
        return tree
342
316
 
343
317
    def example_branches(self):
344
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
345
 
                                           self).example_branches()
 
318
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
346
319
        os.mkdir('checkouts')
347
320
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
348
321
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
382
355
 
383
356
    def test_external_diff(self):
384
357
        """Test that we can spawn an external diff process"""
385
 
        self.disable_missing_extensions_warning()
386
358
        # We have to use run_bzr_subprocess, because we need to
387
359
        # test writing directly to stdout, (there was a bug in
388
360
        # subprocess.py that we had to workaround).
389
361
        # However, if 'diff' may not be available
390
362
        self.make_example_branch()
391
 
        out, err = self.run_bzr_subprocess(
392
 
            'diff -Oprogress_bar=none -r 1 --diff-options -ub',
393
 
            universal_newlines=True,
394
 
            retcode=None)
 
363
        # this will be automatically restored by the base bzr test class
 
364
        os.environ['BZR_PROGRESS_BAR'] = 'none'
 
365
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
 
366
                                           universal_newlines=True,
 
367
                                           retcode=None)
395
368
        if 'Diff is not installed on this machine' in err:
396
 
            raise tests.TestSkipped("No external 'diff' is available")
 
369
            raise TestSkipped("No external 'diff' is available")
397
370
        self.assertEqual('', err)
398
371
        # We have to skip the stuff in the middle, because it depends
399
372
        # on time.time()
403
376
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
404
377
                                 "+baz\n\n")
405
378
 
406
 
    def test_external_diff_options_and_using(self):
407
 
        """Test that the options are passed correctly to an external diff process"""
408
 
        self.requireFeature(features.diff_feature)
409
 
        self.make_example_branch()
410
 
        self.build_tree_contents([('hello', 'Foo\n')])
411
 
        out, err = self.run_bzr('diff --diff-options -i --using diff',
412
 
                                    retcode=1)
413
 
        self.assertEqual("=== modified file 'hello'\n", out)
414
 
        self.assertEqual('', err)
415
 
 
416
379
 
417
380
class TestDiffOutput(DiffBase):
418
381
 
421
384
        self.make_example_branch()
422
385
        self.build_tree_contents([('hello', 'hello world!\n')])
423
386
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
424
 
        self.assertTrue('\n+hello world!\n' in output)
 
387
        self.assert_('\n+hello world!\n' in output)