← 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

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
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):
133
136
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
134
137
            error_regexes=('one or two revision specifiers',))
135
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
 
136
143
    def test_diff_nonexistent_revision(self):
137
144
        out, err = self.run_bzr('diff -r 123', retcode=3,
138
145
            error_regexes=("Requested revision: '123' does not "
298
305
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
299
306
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
300
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
 
301
324
 
302
325
class TestCheckoutDiff(TestDiff):
303
326
 
355
378
 
356
379
    def test_external_diff(self):
357
380
        """Test that we can spawn an external diff process"""
 
381
        self.disable_missing_extensions_warning()
358
382
        # We have to use run_bzr_subprocess, because we need to
359
383
        # test writing directly to stdout, (there was a bug in
360
384
        # subprocess.py that we had to workaround).
361
385
        # However, if 'diff' may not be available
362
386
        self.make_example_branch()
363
 
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
364
 
        try:
365
 
            os.environ['BZR_PROGRESS_BAR'] = 'none'
366
 
            out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
367
 
                                               universal_newlines=True,
368
 
                                               retcode=None)
369
 
        finally:
370
 
            if orig_progress is None:
371
 
                del os.environ['BZR_PROGRESS_BAR']
372
 
            else:
373
 
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
374
 
 
 
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)
375
392
        if 'Diff is not installed on this machine' in err:
376
 
            raise TestSkipped("No external 'diff' is available")
 
393
            raise tests.TestSkipped("No external 'diff' is available")
377
394
        self.assertEqual('', err)
378
395
        # We have to skip the stuff in the middle, because it depends
379
396
        # on time.time()