/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/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:16:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530191623-t9ls96vjy9wslpoo
Remove deprecated functionality.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
48
48
 
49
49
from breezy import (
50
50
    branch,
 
51
    cache_utf8,
51
52
    conflicts as _mod_conflicts,
52
53
    controldir,
53
54
    errors,
76
77
from . import (
77
78
    bzrdir,
78
79
    osutils,
79
 
    symbol_versioning,
80
80
    )
81
81
from .decorators import needs_read_lock, needs_write_lock
82
82
from .i18n import gettext
97
97
    BytesIO,
98
98
    )
99
99
from .trace import mutter, note
100
 
from .symbol_versioning import (
101
 
    deprecated_passed,
102
 
    DEPRECATED_PARAMETER,
103
 
    )
104
100
 
105
101
 
106
102
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
180
176
        return views.DisabledViews(self)
181
177
 
182
178
    def __init__(self, basedir='.',
183
 
                 branch=DEPRECATED_PARAMETER,
 
179
                 branch=None,
184
180
                 _internal=False,
185
181
                 _transport=None,
186
182
                 _format=None,
196
192
                "WorkingTree.open() to obtain a WorkingTree.")
197
193
        basedir = safe_unicode(basedir)
198
194
        mutter("opening working tree %r", basedir)
199
 
        if deprecated_passed(branch):
 
195
        if branch is not None:
200
196
            self._branch = branch
201
197
        else:
202
198
            self._branch = self.bzrdir.open_branch()
1787
1783
    """
1788
1784
 
1789
1785
    def __init__(self, basedir='.',
1790
 
                 branch=DEPRECATED_PARAMETER,
 
1786
                 branch=None,
1791
1787
                 _inventory=None,
1792
1788
                 _control_files=None,
1793
1789
                 _internal=False,
2376
2372
                raise errors.MergeModifiedFormatError()
2377
2373
            for s in _mod_rio.RioReader(hashfile):
2378
2374
                # RioReader reads in Unicode, so convert file_ids back to utf8
2379
 
                file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
 
2375
                file_id = cache_utf8.encode(s.get("file_id"))
2380
2376
                if not self.has_id(file_id):
2381
2377
                    continue
2382
2378
                text_hash = s.get("hash")