← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

(gz) Never raise KnownFailure in tests,
 use knownFailure method instead (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
27
27
import tempfile
28
28
 
29
29
from bzrlib import (
 
30
    bzrdir,
 
31
    cmdline,
30
32
    cleanup,
31
 
    cmdline,
32
 
    controldir,
33
33
    errors,
34
34
    osutils,
35
35
    patiencediff,
39
39
    )
40
40
 
41
41
from bzrlib.workingtree import WorkingTree
42
 
from bzrlib.i18n import gettext
43
42
""")
44
43
 
45
44
from bzrlib.registry import (
356
355
    if old_url is None:
357
356
        old_url = default_location
358
357
    working_tree, branch, relpath = \
359
 
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
 
358
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
360
359
    lock_tree_or_branch(working_tree, branch)
361
360
    if consider_relpath and relpath != '':
362
361
        if working_tree is not None and apply_view:
370
369
        new_url = default_location
371
370
    if new_url != old_url:
372
371
        working_tree, branch, relpath = \
373
 
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
 
372
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
374
373
        lock_tree_or_branch(working_tree, branch)
375
374
        if consider_relpath and relpath != '':
376
375
            if working_tree is not None and apply_view:
394
393
            if view_files:
395
394
                specific_files = view_files
396
395
                view_str = views.view_display_str(view_files)
397
 
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
 
396
                note("*** Ignoring files outside view. View is %s" % view_str)
398
397
 
399
398
    # Get extra trees that ought to be searched for file-ids
400
399
    extra_trees = None