/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/check.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/check.py
38
38
 
39
39
from . import (
40
40
    errors,
41
 
    ui,
42
41
    )
43
 
from .branch import Branch
44
42
from .controldir import ControlDir
45
 
from .revision import NULL_REVISION
46
 
from .sixish import (
47
 
    viewitems,
48
 
    )
49
43
from .trace import note
50
 
from .workingtree import WorkingTree
51
44
from .i18n import gettext
52
45
 
 
46
 
53
47
class Check(object):
54
48
    """Check a repository"""
55
49
 
104
98
    """
105
99
    try:
106
100
        base_tree, branch, repo, relpath = \
107
 
                        ControlDir.open_containing_tree_branch_or_repository(path)
 
101
            ControlDir.open_containing_tree_branch_or_repository(path)
108
102
    except errors.NotBranchError:
109
103
        base_tree = branch = repo = None
110
104
 
111
105
    to_unlock = []
112
 
    needed_refs= {}
 
106
    needed_refs = {}
113
107
    try:
114
108
        if base_tree is not None:
115
109
            # If the tree is a lightweight checkout we won't see it in
148
142
                    note(gettext("Checking repository at '%s'.")
149
143
                         % (repo.user_url,))
150
144
                result = repo.check(None, callback_refs=needed_refs,
151
 
                    check_repo=do_repo)
 
145
                                    check_repo=do_repo)
152
146
                result.report_results(verbose)
153
147
        else:
154
148
            if do_tree: