← 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: Patch Queue Manager
  • Date: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

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-2011 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
    )
 
32
from bzrlib.tests import (
 
33
    features,
 
34
    )
29
35
 
30
36
 
31
37
def subst_dates(string):
34
40
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
35
41
 
36
42
 
37
 
class DiffBase(ExternalBase):
 
43
class DiffBase(tests.TestCaseWithTransport):
38
44
    """Base class with common setup method"""
39
45
 
40
46
    def make_example_branch(self):
133
139
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
134
140
            error_regexes=('one or two revision specifiers',))
135
141
 
 
142
    def test_diff_using_and_format(self):
 
143
        out, err = self.run_bzr('diff --format=default --using=mydi', retcode=3,
 
144
            error_regexes=('are mutually exclusive',))
 
145
 
136
146
    def test_diff_nonexistent_revision(self):
137
147
        out, err = self.run_bzr('diff -r 123', retcode=3,
138
148
            error_regexes=("Requested revision: '123' does not "
298
308
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
299
309
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
300
310
 
 
311
    def test_custom_format(self):
 
312
        class BooDiffTree(DiffTree):
 
313
 
 
314
            def show_diff(self, specific_files, extra_trees=None):
 
315
                self.to_file.write("BOO!\n")
 
316
                return super(BooDiffTree, self).show_diff(specific_files,
 
317
                    extra_trees)
 
318
 
 
319
        diff_format_registry.register("boo", BooDiffTree, 
 
320
            "Scary diff format")
 
321
        self.addCleanup(diff_format_registry.remove, "boo")
 
322
        self.make_example_branch()
 
323
        self.build_tree_contents([('hello', 'hello world!\n')])
 
324
        output = self.run_bzr('diff --format=boo', retcode=1)
 
325
        self.assertTrue("BOO!" in output[0])
 
326
        output = self.run_bzr('diff -Fboo', retcode=1)
 
327
        self.assertTrue("BOO!" in output[0])
 
328
 
301
329
 
302
330
class TestCheckoutDiff(TestDiff):
303
331
 
355
383
 
356
384
    def test_external_diff(self):
357
385
        """Test that we can spawn an external diff process"""
 
386
        self.disable_missing_extensions_warning()
358
387
        # We have to use run_bzr_subprocess, because we need to
359
388
        # test writing directly to stdout, (there was a bug in
360
389
        # subprocess.py that we had to workaround).
361
390
        # However, if 'diff' may not be available
362
391
        self.make_example_branch()
363
 
        # this will be automatically restored by the base bzr test class
364
 
        os.environ['BZR_PROGRESS_BAR'] = 'none'
 
392
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
365
393
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
366
394
                                           universal_newlines=True,
367
395
                                           retcode=None)
368
396
        if 'Diff is not installed on this machine' in err:
369
 
            raise TestSkipped("No external 'diff' is available")
 
397
            raise tests.TestSkipped("No external 'diff' is available")
370
398
        self.assertEqual('', err)
371
399
        # We have to skip the stuff in the middle, because it depends
372
400
        # on time.time()
376
404
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
377
405
                                 "+baz\n\n")
378
406
 
 
407
    def test_external_diff_options_and_using(self):
 
408
        """Test that the options are passed correctly to an external diff process"""
 
409
        self.requireFeature(features.diff_feature)
 
410
        self.make_example_branch()
 
411
        self.build_tree_contents([('hello', 'Foo\n')])
 
412
        out, err = self.run_bzr('diff --diff-options -i --using diff',
 
413
                                    retcode=1)
 
414
        self.assertEquals("=== modified file 'hello'\n", out)
 
415
        self.assertEquals('', err)
 
416
 
379
417
 
380
418
class TestDiffOutput(DiffBase):
381
419