← 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: Jelmer Vernooij
  • Date: 2012-03-15 02:42:48 UTC
  • mto: This revision was merged to the branch mainline in revision 6510.
  • Revision ID: jelmer@samba.org-20120315024248-7nyk2zxc52i1u8gj
extention -> extension.

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-2012 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 bzr diff."""
20
19
 
21
20
import os
22
21
import re
25
24
    tests,
26
25
    workingtree,
27
26
    )
 
27
from bzrlib.diff import (
 
28
    DiffTree,
 
29
    format_registry as diff_format_registry,
 
30
    )
 
31
from bzrlib.tests import (
 
32
    features,
 
33
    )
28
34
 
29
35
 
30
36
def subst_dates(string):
132
138
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
133
139
            error_regexes=('one or two revision specifiers',))
134
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
 
135
145
    def test_diff_nonexistent_revision(self):
136
146
        out, err = self.run_bzr('diff -r 123', retcode=3,
137
147
            error_regexes=("Requested revision: '123' does not "
277
287
        self.example_branch2()
278
288
        self.build_tree_contents([('branch1/file1', 'new line')])
279
289
        os.mkdir('branch1/dir1')
280
 
        os.chdir('branch1/dir1')
281
 
        output = self.run_bzr('diff -r 1..', retcode=1)
 
290
        output = self.run_bzr('diff -r 1..', retcode=1,
 
291
                              working_dir='branch1/dir1')
282
292
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
283
293
 
284
294
    def test_diff_across_rename(self):
297
307
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
298
308
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
299
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
 
300
327
 
301
328
class TestCheckoutDiff(TestDiff):
302
329
 
314
341
        return tree
315
342
 
316
343
    def example_branches(self):
317
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
 
344
        branch1_tree, branch2_tree = super(TestCheckoutDiff,
 
345
                                           self).example_branches()
318
346
        os.mkdir('checkouts')
319
347
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
320
348
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
360
388
        # subprocess.py that we had to workaround).
361
389
        # However, if 'diff' may not be available
362
390
        self.make_example_branch()
363
 
        # this will be automatically restored by the base bzr test class
364
 
        os.environ['BZR_PROGRESS_BAR'] = 'none'
 
391
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
365
392
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
366
393
                                           universal_newlines=True,
367
394
                                           retcode=None)
376
403
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
377
404
                                 "+baz\n\n")
378
405
 
 
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.assertEquals("=== modified file 'hello'\n", out)
 
414
        self.assertEquals('', err)
 
415
 
379
416
 
380
417
class TestDiffOutput(DiffBase):
381
418