← 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: Alexander Belchenko
  • Date: 2007-11-02 05:12:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2957.
  • Revision ID: bialix@ukr.net-20071102051217-5ebfnblbcihhut5g
John's review

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 bzr 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 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
131
126
        # Get an error from a file that does not exist at all
132
127
        # (Malone #3619)
133
128
        self.make_example_branch()
134
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
135
 
            error_regexes=('not versioned.*does-not-exist',))
 
129
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
 
130
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
136
131
 
137
132
    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:")
 
133
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
 
134
        self.assertContainsRe(err, 'one or two revision specifiers')
159
135
 
160
136
    def test_diff_unversioned(self):
161
137
        # Get an error when diffing a non-versioned file.
170
146
    def example_branches(self):
171
147
        branch1_tree = self.make_branch_and_tree('branch1')
172
148
        self.build_tree(['branch1/file'], line_endings='binary')
173
 
        self.build_tree(['branch1/file2'], line_endings='binary')
174
149
        branch1_tree.add('file')
175
 
        branch1_tree.add('file2')
176
 
        branch1_tree.commit(message='add file and file2')
 
150
        branch1_tree.commit(message='add file')
177
151
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
178
152
        self.build_tree_contents([('branch2/file', 'new content\n')])
179
153
        branch2_tree.commit(message='update file')
180
154
        return branch1_tree, branch2_tree
181
155
 
182
 
    def check_b2_vs_b1(self, cmd):
183
 
        # Compare branch2 vs branch1 using cmd and check the result
184
 
        out, err = self.run_bzr(cmd, retcode=1)
185
 
        self.assertEqual('', err)
186
 
        self.assertEqual("=== modified file 'file'\n"
 
156
    def test_diff_branches(self):
 
157
        self.example_branches()
 
158
        # should open branch1 and diff against branch2, 
 
159
        out, err = self.run_bzr('diff -r branch:branch2 branch1',
 
160
                                retcode=1)
 
161
        self.assertEquals('', err)
 
162
        self.assertEquals("=== modified file 'file'\n"
187
163
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
188
164
                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
189
165
                          "@@ -1,1 +1,1 @@\n"
190
166
                          "-new content\n"
191
167
                          "+contents of branch1/file\n"
192
168
                          "\n", subst_dates(out))
193
 
 
194
 
    def check_b1_vs_b2(self, cmd):
195
 
        # Compare branch1 vs branch2 using cmd and check the result
196
 
        out, err = self.run_bzr(cmd, retcode=1)
197
 
        self.assertEqual('', err)
 
169
        out, err = self.run_bzr('diff branch2 branch1',
 
170
                                         retcode=1)
 
171
        self.assertEquals('', err)
198
172
        self.assertEqualDiff("=== modified file 'file'\n"
199
173
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
200
174
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
201
175
                              "@@ -1,1 +1,1 @@\n"
202
 
                              "-contents of branch1/file\n"
203
 
                              "+new content\n"
 
176
                              "-new content\n"
 
177
                              "+contents of branch1/file\n"
204
178
                              "\n", subst_dates(out))
205
179
 
206
 
    def check_no_diffs(self, cmd):
207
 
        # Check that running cmd returns an empty diff
208
 
        out, err = self.run_bzr(cmd, retcode=0)
209
 
        self.assertEqual('', err)
210
 
        self.assertEqual('', out)
211
 
 
212
 
    def test_diff_branches(self):
213
 
        self.example_branches()
214
 
        # should open branch1 and diff against branch2,
215
 
        self.check_b2_vs_b1('diff -r branch:branch2 branch1')
216
 
        # Compare two working trees using various syntax forms
217
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
218
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
219
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
220
 
        # Test with a selected file that was changed
221
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
222
 
        self.check_b2_vs_b1('diff --old branch2 branch1/file')
223
 
        self.check_b2_vs_b1('diff branch2/file --new branch1')
224
 
        # Test with a selected file that was not changed
225
 
        self.check_no_diffs('diff --old branch2 --new branch1 file2')
226
 
        self.check_no_diffs('diff --old branch2 branch1/file2')
227
 
        self.check_no_diffs('diff branch2/file2 --new branch1')
228
 
 
229
 
    def test_diff_branches_no_working_trees(self):
230
 
        branch1_tree, branch2_tree = self.example_branches()
231
 
        # Compare a working tree to a branch without a WT
232
 
        dir1 = branch1_tree.bzrdir
233
 
        dir1.destroy_workingtree()
234
 
        self.assertFalse(dir1.has_workingtree())
235
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
236
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
237
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
238
 
        # Compare a branch without a WT to one with a WT
239
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
240
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
241
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
242
 
        # Compare a branch with a WT against another without a WT
243
 
        dir2 = branch2_tree.bzrdir
244
 
        dir2.destroy_workingtree()
245
 
        self.assertFalse(dir2.has_workingtree())
246
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
247
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
248
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
249
 
 
250
180
    def test_diff_revno_branches(self):
251
181
        self.example_branches()
252
182
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
255
185
 
256
186
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
257
187
                                )
258
 
        self.assertEqual('', err)
259
 
        self.assertEqual('', out)
 
188
        self.assertEquals('', err)
 
189
        self.assertEquals('', out)
260
190
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
261
191
                                retcode=1)
262
 
        self.assertEqual('', err)
 
192
        self.assertEquals('', err)
263
193
        self.assertEqualDiff("=== modified file 'file'\n"
264
194
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
265
195
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
283
213
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
284
214
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
285
215
 
286
 
    def test_diff_to_working_tree_in_subdir(self):
287
 
        self.example_branch2()
288
 
        self.build_tree_contents([('branch1/file1', 'new line')])
289
 
        os.mkdir('branch1/dir1')
290
 
        output = self.run_bzr('diff -r 1..', retcode=1,
291
 
                              working_dir='branch1/dir1')
292
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
293
 
 
294
216
    def test_diff_across_rename(self):
295
217
        """The working tree path should always be considered for diffing"""
296
218
        tree = self.make_example_branch()
299
221
        self.run_bzr('diff hello1', retcode=1)
300
222
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
301
223
 
302
 
    def test_diff_to_branch_no_working_tree(self):
303
 
        branch1_tree = self.example_branch2()
304
 
        dir1 = branch1_tree.bzrdir
305
 
        dir1.destroy_workingtree()
306
 
        self.assertFalse(dir1.has_workingtree())
307
 
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
308
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
309
 
 
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
224
 
328
225
class TestCheckoutDiff(TestDiff):
329
226
 
341
238
        return tree
342
239
 
343
240
    def example_branches(self):
344
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
345
 
                                           self).example_branches()
 
241
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
346
242
        os.mkdir('checkouts')
347
243
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
348
244
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
382
278
 
383
279
    def test_external_diff(self):
384
280
        """Test that we can spawn an external diff process"""
385
 
        self.disable_missing_extensions_warning()
386
281
        # We have to use run_bzr_subprocess, because we need to
387
282
        # test writing directly to stdout, (there was a bug in
388
283
        # subprocess.py that we had to workaround).
389
284
        # However, if 'diff' may not be available
390
285
        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)
 
286
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
287
        try:
 
288
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
289
            out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
 
290
                                               universal_newlines=True,
 
291
                                               retcode=None)
 
292
        finally:
 
293
            if orig_progress is None:
 
294
                del os.environ['BZR_PROGRESS_BAR']
 
295
            else:
 
296
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
297
            
395
298
        if 'Diff is not installed on this machine' in err:
396
 
            raise tests.TestSkipped("No external 'diff' is available")
 
299
            raise TestSkipped("No external 'diff' is available")
397
300
        self.assertEqual('', err)
398
301
        # We have to skip the stuff in the middle, because it depends
399
302
        # on time.time()
403
306
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
404
307
                                 "+baz\n\n")
405
308
 
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
309
 
417
310
class TestDiffOutput(DiffBase):
418
311
 
421
314
        self.make_example_branch()
422
315
        self.build_tree_contents([('hello', 'hello world!\n')])
423
316
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
424
 
        self.assertTrue('\n+hello world!\n' in output)
 
317
        self.assert_('\n+hello world!\n' in output)