← 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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2010 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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr diff.
21
21
import os
22
22
import re
23
23
 
24
 
from bzrlib import (
25
 
    tests,
26
 
    workingtree,
27
 
    )
28
 
from bzrlib.diff import (
29
 
    DiffTree,
30
 
    format_registry as diff_format_registry,
31
 
    )
 
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
32
29
 
33
30
 
34
31
def subst_dates(string):
37
34
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
38
35
 
39
36
 
40
 
class DiffBase(tests.TestCaseWithTransport):
 
37
class DiffBase(ExternalBase):
41
38
    """Base class with common setup method"""
42
39
 
43
40
    def make_example_branch(self):
60
57
        tree.commit(message='fixing hello')
61
58
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
62
59
        self.assert_('\n+hello world!' in output)
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]
 
60
        output = self.run_bzr('diff -r last:3..last:1',
 
61
                retcode=1)[0]
68
62
        self.assert_('\n+baz' in output)
69
63
        self.build_tree(['moo'])
70
64
        tree.add('moo')
129
123
        # Get an error from a file that does not exist at all
130
124
        # (Malone #3619)
131
125
        self.make_example_branch()
132
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
133
 
            error_regexes=('not versioned.*does-not-exist',))
 
126
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
 
127
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
134
128
 
135
129
    def test_diff_illegal_revision_specifiers(self):
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:")
 
130
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
 
131
        self.assertContainsRe(err, 'one or two revision specifiers')
157
132
 
158
133
    def test_diff_unversioned(self):
159
134
        # Get an error when diffing a non-versioned file.
168
143
    def example_branches(self):
169
144
        branch1_tree = self.make_branch_and_tree('branch1')
170
145
        self.build_tree(['branch1/file'], line_endings='binary')
171
 
        self.build_tree(['branch1/file2'], line_endings='binary')
172
146
        branch1_tree.add('file')
173
 
        branch1_tree.add('file2')
174
 
        branch1_tree.commit(message='add file and file2')
 
147
        branch1_tree.commit(message='add file')
175
148
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
176
149
        self.build_tree_contents([('branch2/file', 'new content\n')])
177
150
        branch2_tree.commit(message='update file')
178
151
        return branch1_tree, branch2_tree
179
152
 
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)
 
153
    def test_diff_branches(self):
 
154
        self.example_branches()
 
155
        # should open branch1 and diff against branch2, 
 
156
        out, err = self.run_bzr('diff -r branch:branch2 branch1',
 
157
                                retcode=1)
183
158
        self.assertEquals('', err)
184
159
        self.assertEquals("=== modified file 'file'\n"
185
160
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
188
163
                          "-new content\n"
189
164
                          "+contents of branch1/file\n"
190
165
                          "\n", subst_dates(out))
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
        out, err = self.run_bzr('diff branch2 branch1',
 
167
                                         retcode=1)
195
168
        self.assertEquals('', err)
196
169
        self.assertEqualDiff("=== modified file 'file'\n"
197
170
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
198
171
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
199
172
                              "@@ -1,1 +1,1 @@\n"
200
 
                              "-contents of branch1/file\n"
201
 
                              "+new content\n"
 
173
                              "-new content\n"
 
174
                              "+contents of branch1/file\n"
202
175
                              "\n", subst_dates(out))
203
176
 
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
 
 
248
177
    def test_diff_revno_branches(self):
249
178
        self.example_branches()
250
179
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
281
210
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
282
211
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
283
212
 
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')
291
 
 
292
213
    def test_diff_across_rename(self):
293
214
        """The working tree path should always be considered for diffing"""
294
215
        tree = self.make_example_branch()
297
218
        self.run_bzr('diff hello1', retcode=1)
298
219
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
299
220
 
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
 
 
324
221
 
325
222
class TestCheckoutDiff(TestDiff):
326
223
 
378
275
 
379
276
    def test_external_diff(self):
380
277
        """Test that we can spawn an external diff process"""
381
 
        self.disable_missing_extensions_warning()
382
278
        # We have to use run_bzr_subprocess, because we need to
383
279
        # test writing directly to stdout, (there was a bug in
384
280
        # subprocess.py that we had to workaround).
385
281
        # However, if 'diff' may not be available
386
282
        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)
 
283
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
284
        try:
 
285
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
286
            out, err = self.run_bzr_subprocess('diff -r 1 --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
            
392
295
        if 'Diff is not installed on this machine' in err:
393
 
            raise tests.TestSkipped("No external 'diff' is available")
 
296
            raise TestSkipped("No external 'diff' is available")
394
297
        self.assertEqual('', err)
395
298
        # We have to skip the stuff in the middle, because it depends
396
299
        # on time.time()