~bzr-pqm/bzr/bzr.dev

5630.2.5 by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken.
1
# Copyright (C) 2007-2011 Canonical Ltd
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
16
17
"""WorkingTree4 format and implementation.
18
19
WorkingTree4 provides the dirstate based working tree logic.
20
21
To get a WorkingTree, call bzrdir.open_workingtree() or
22
WorkingTree.open(dir).
23
"""
24
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
25
from cStringIO import StringIO
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
26
import os
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
27
import sys
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
28
29
from bzrlib.lazy_import import lazy_import
30
lazy_import(globals(), """
31
import errno
32
import stat
33
34
from bzrlib import (
35
    bzrdir,
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
36
    cache_utf8,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
37
    debug,
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
38
    dirstate,
39
    errors,
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
40
    filters as _mod_filters,
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
41
    generate_ids,
42
    osutils,
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
43
    revision as _mod_revision,
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
44
    revisiontree,
5753.2.4 by Jelmer Vernooij
Review feedback from John.
45
    trace,
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
46
    transform,
3586.2.13 by Ian Clatworthy
fix wt5 to use views, correcting an earlier merge
47
    views,
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
48
    )
49
""")
50
51
from bzrlib.decorators import needs_read_lock, needs_write_lock
4496.3.16 by Andrew Bennetts
Remove lots of unused imports.
52
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
53
from bzrlib.lock import LogicalLockResult
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
54
from bzrlib.mutabletree import needs_tree_write_lock
55
from bzrlib.osutils import (
2255.2.202 by Martin Pool
WorkingTree_4.kind should report tree-references if they're
56
    file_kind,
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
57
    isdir,
58
    pathjoin,
59
    realpath,
60
    safe_unicode,
61
    )
62
from bzrlib.transport.local import LocalTransport
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
63
from bzrlib.tree import (
64
    InterTree,
65
    InventoryTree,
66
    )
67
from bzrlib.workingtree import (
68
    WorkingTree,
69
    WorkingTree3,
70
    WorkingTreeFormat3,
71
    )
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
72
73
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
74
class DirStateWorkingTree(WorkingTree3):
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
75
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
76
    def __init__(self, basedir,
77
                 branch,
78
                 _control_files=None,
79
                 _format=None,
80
                 _bzrdir=None):
81
        """Construct a WorkingTree for basedir.
82
83
        If the branch is not supplied, it is opened automatically.
84
        If the branch is supplied, it must be the branch for this basedir.
85
        (branch.base is not cross checked, because for remote branches that
86
        would be meaningless).
87
        """
88
        self._format = _format
89
        self.bzrdir = _bzrdir
90
        basedir = safe_unicode(basedir)
5753.2.4 by Jelmer Vernooij
Review feedback from John.
91
        trace.mutter("opening working tree %r", basedir)
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
92
        self._branch = branch
93
        self.basedir = realpath(basedir)
94
        # if branch is at our basedir and is a format 6 or less
95
        # assume all other formats have their own control files.
96
        self._control_files = _control_files
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
97
        self._transport = self._control_files._transport
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
98
        self._dirty = None
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
99
        #-------------
100
        # during a read or write lock these objects are set, and are
101
        # None the rest of the time.
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
102
        self._dirstate = None
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
103
        self._inventory = None
104
        #-------------
2974.2.2 by John Arbash Meinel
Only one test failed, because it was incorrectly succeeding.
105
        self._setup_directory_is_tree_reference()
3034.4.3 by Aaron Bentley
Add case-sensitivity handling to WorkingTree
106
        self._detect_case_handling()
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
107
        self._rules_searcher = None
3586.1.4 by Ian Clatworthy
first cut at tree-level view tests
108
        self.views = self._make_views()
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
109
        #--- allow tests to select the dirstate iter_changes implementation
110
        self._iter_changes = dirstate._process_entry
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
111
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
112
    @needs_tree_write_lock
2255.2.12 by Robert Collins
Partial implementation of WorkingTree4._add.
113
    def _add(self, files, ids, kinds):
114
        """See MutableTree._add."""
115
        state = self.current_dirstate()
116
        for f, file_id, kind in zip(files, ids, kinds):
2255.2.14 by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
117
            f = f.strip('/')
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
118
            if self.path2id(f):
119
                # special case tree root handling.
120
                if f == '' and self.path2id(f) == ROOT_ID:
121
                    state.set_path_id('', generate_ids.gen_file_id(f))
122
                continue
2255.2.12 by Robert Collins
Partial implementation of WorkingTree4._add.
123
            if file_id is None:
2255.2.20 by Robert Collins
Bypass irrelevant basis_inventory tests for dirstate.
124
                file_id = generate_ids.gen_file_id(f)
2255.2.43 by Robert Collins
WorkingTree4.add must not require a file to exist to add it when kind etc is given.
125
            # deliberately add the file with no cached stat or sha1
126
            # - on the first access it will be gathered, and we can
127
            # always change this once tests are all passing.
128
            state.add(f, file_id, kind, None, '')
2255.7.67 by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
129
        self._make_dirty(reset_inventory=True)
130
131
    def _make_dirty(self, reset_inventory):
132
        """Make the tree state dirty.
133
134
        :param reset_inventory: True if the cached inventory should be removed
135
            (presuming there is one).
136
        """
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
137
        self._dirty = True
2255.7.67 by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
138
        if reset_inventory and self._inventory is not None:
139
            self._inventory = None
2255.2.12 by Robert Collins
Partial implementation of WorkingTree4._add.
140
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
141
    @needs_tree_write_lock
142
    def add_reference(self, sub_tree):
143
        # use standard implementation, which calls back to self._add
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
144
        #
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
145
        # So we don't store the reference_revision in the working dirstate,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
146
        # it's just recorded at the moment of commit.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
147
        self._add_reference(sub_tree)
148
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
149
    def break_lock(self):
150
        """Break a lock if one is present from another instance.
151
152
        Uses the ui factory to ask for confirmation if the lock may be from
153
        an active process.
154
155
        This will probe the repository for its lock as well.
156
        """
157
        # if the dirstate is locked by an active process, reject the break lock
158
        # call.
159
        try:
160
            if self._dirstate is None:
161
                clear = True
162
            else:
163
                clear = False
164
            state = self._current_dirstate()
165
            if state._lock_token is not None:
166
                # we already have it locked. sheese, cant break our own lock.
167
                raise errors.LockActive(self.basedir)
168
            else:
169
                try:
170
                    # try for a write lock - need permission to get one anyhow
171
                    # to break locks.
172
                    state.lock_write()
173
                except errors.LockContention:
174
                    # oslocks fail when a process is still live: fail.
175
                    # TODO: get the locked lockdir info and give to the user to
176
                    # assist in debugging.
177
                    raise errors.LockActive(self.basedir)
178
                else:
179
                    state.unlock()
180
        finally:
181
            if clear:
182
                self._dirstate = None
183
        self._control_files.break_lock()
184
        self.branch.break_lock()
185
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
186
    def _comparison_data(self, entry, path):
187
        kind, executable, stat_value = \
188
            WorkingTree3._comparison_data(self, entry, path)
2255.2.205 by Martin Pool
factor out WorkingTree4._directory_is_tree_reference
189
        # it looks like a plain directory, but it's really a reference -- see
190
        # also kind()
4100.2.4 by Aaron Bentley
More support for not autodetecting tree refs
191
        if (self._repo_supports_tree_reference and kind == 'directory'
192
            and entry is not None and entry.kind == 'tree-reference'):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
193
            kind = 'tree-reference'
194
        return kind, executable, stat_value
195
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
196
    @needs_write_lock
197
    def commit(self, message=None, revprops=None, *args, **kwargs):
198
        # mark the tree as dirty post commit - commit
199
        # can change the current versioned list by doing deletes.
200
        result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
201
        self._make_dirty(reset_inventory=True)
202
        return result
203
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
204
    def current_dirstate(self):
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
205
        """Return the current dirstate object.
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
206
207
        This is not part of the tree interface and only exposed for ease of
208
        testing.
209
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
210
        :raises errors.NotWriteLocked: when not in a lock.
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
211
        """
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
212
        self._must_be_locked()
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
213
        return self._current_dirstate()
214
215
    def _current_dirstate(self):
216
        """Internal function that does not check lock status.
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
217
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
218
        This is needed for break_lock which also needs the dirstate.
219
        """
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
220
        if self._dirstate is not None:
221
            return self._dirstate
222
        local_path = self.bzrdir.get_workingtree_transport(None
223
            ).local_abspath('dirstate')
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
224
        self._dirstate = dirstate.DirState.on_file(local_path,
3368.2.52 by Ian Clatworthy
merge bzr.dev r4164
225
            self._sha1_provider())
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
226
        return self._dirstate
227
3368.2.52 by Ian Clatworthy
merge bzr.dev r4164
228
    def _sha1_provider(self):
229
        """A function that returns a SHA1Provider suitable for this tree.
230
231
        :return: None if content filtering is not supported by this tree.
232
          Otherwise, a SHA1Provider is returned that sha's the canonical
233
          form of files, i.e. after read filters are applied.
234
        """
3368.2.53 by Ian Clatworthy
sha1 calculation done by workingtree layer now
235
        if self.supports_content_filtering():
236
            return ContentFilterAwareSHA1Provider(self)
237
        else:
238
            return None
3368.2.52 by Ian Clatworthy
merge bzr.dev r4164
239
2255.2.81 by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection.
240
    def filter_unversioned_files(self, paths):
2255.7.62 by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
241
        """Filter out paths that are versioned.
2255.2.81 by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection.
242
243
        :return: set of paths.
244
        """
245
        # TODO: make a generic multi-bisect routine roughly that should list
246
        # the paths, then process one half at a time recursively, and feed the
247
        # results of each bisect in further still
248
        paths = sorted(paths)
249
        result = set()
2255.2.176 by Martin Pool
Merge dirstate and some small cleanups
250
        state = self.current_dirstate()
2255.2.81 by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection.
251
        # TODO we want a paths_to_dirblocks helper I think
252
        for path in paths:
253
            dirname, basename = os.path.split(path.encode('utf8'))
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
254
            _, _, _, path_is_versioned = state._get_block_entry_index(
255
                dirname, basename, 0)
2255.7.62 by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
256
            if not path_is_versioned:
2255.2.81 by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection.
257
                result.add(path)
258
        return result
259
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
260
    def flush(self):
261
        """Write all cached data to disk."""
2255.2.39 by Robert Collins
WorkingTree4: flush can only be used during write locks.
262
        if self._control_files._lock_mode != 'w':
263
            raise errors.NotWriteLocked(self)
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
264
        self.current_dirstate().save()
265
        self._inventory = None
266
        self._dirty = False
267
2323.4.2 by Robert Collins
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
268
    @needs_tree_write_lock
269
    def _gather_kinds(self, files, kinds):
270
        """See MutableTree._gather_kinds."""
271
        for pos, f in enumerate(files):
272
            if kinds[pos] is None:
273
                kinds[pos] = self._kind(f)
274
2255.2.34 by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
275
    def _generate_inventory(self):
276
        """Create and set self.inventory from the dirstate object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
277
2255.2.34 by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
278
        This is relatively expensive: we have to walk the entire dirstate.
279
        Ideally we would not, and can deprecate this function.
280
        """
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
281
        #: uncomment to trap on inventory requests.
282
        # import pdb;pdb.set_trace()
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
283
        state = self.current_dirstate()
284
        state._read_dirblocks_if_needed()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
285
        root_key, current_entry = self._get_entry(path='')
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
286
        current_id = root_key[2]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
287
        if not (current_entry[0][0] == 'd'): # directory
288
            raise AssertionError(current_entry)
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
289
        inv = Inventory(root_id=current_id)
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
290
        # Turn some things into local variables
291
        minikind_to_kind = dirstate.DirState._minikind_to_kind
292
        factory = entry_factory
293
        utf8_decode = cache_utf8._utf8_decode
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
294
        inv_byid = inv._byid
2255.2.73 by Robert Collins
50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first.
295
        # we could do this straight out of the dirstate; it might be fast
296
        # and should be profiled - RBC 20070216
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
297
        parent_ies = {'' : inv.root}
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
298
        for block in state._dirblocks[1:]: # skip the root
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
299
            dirname = block[0]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
300
            try:
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
301
                parent_ie = parent_ies[dirname]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
302
            except KeyError:
303
                # all the paths in this block are not versioned in this tree
304
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
305
            for key, entry in block[1]:
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
306
                minikind, link_or_sha1, size, executable, stat = entry[0]
307
                if minikind in ('a', 'r'): # absent, relocated
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
308
                    # a parent tree only entry
309
                    continue
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
310
                name = key[1]
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
311
                name_unicode = utf8_decode(name)[0]
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
312
                file_id = key[2]
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
313
                kind = minikind_to_kind[minikind]
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
314
                inv_entry = factory[kind](file_id, name_unicode,
315
                                          parent_ie.file_id)
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
316
                if kind == 'file':
2325.3.4 by John Arbash Meinel
Rather than setting the executable bit for every file, properly create the working inventory to include it.
317
                    # This is only needed on win32, where this is the only way
318
                    # we know the executable bit.
319
                    inv_entry.executable = executable
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
320
                    # not strictly needed: working tree
2325.3.4 by John Arbash Meinel
Rather than setting the executable bit for every file, properly create the working inventory to include it.
321
                    #inv_entry.text_size = size
322
                    #inv_entry.text_sha1 = sha1
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
323
                elif kind == 'directory':
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
324
                    # add this entry to the parent map.
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
325
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
326
                elif kind == 'tree-reference':
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
327
                    if not self._repo_supports_tree_reference:
4183.5.2 by Robert Collins
Support tree-reference in record_iter_changes.
328
                        raise errors.UnsupportedOperation(
329
                            self._generate_inventory,
330
                            self.branch.repository)
2255.2.218 by Robert Collins
Make the nested tree commit smoke test be more rigourous.
331
                    inv_entry.reference_revision = link_or_sha1 or None
2338.4.5 by Marien Zwart
Make an assert actually assert something.
332
                elif kind != 'symlink':
2348.1.1 by Martin Pool
(marienz) fixes for error committing merge with symlinks in dirstate
333
                    raise AssertionError("unknown kind %r" % kind)
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
334
                # These checks cost us around 40ms on a 55k entry tree
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
335
                if file_id in inv_byid:
336
                    raise AssertionError('file_id %s already in'
337
                        ' inventory as %s' % (file_id, inv_byid[file_id]))
338
                if name_unicode in parent_ie.children:
339
                    raise AssertionError('name %r already in parent'
340
                        % (name_unicode,))
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
341
                inv_byid[file_id] = inv_entry
342
                parent_ie.children[name_unicode] = inv_entry
2255.2.34 by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
343
        self._inventory = inv
344
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
345
    def _get_entry(self, file_id=None, path=None):
346
        """Get the dirstate row for file_id or path.
347
348
        If either file_id or path is supplied, it is used as the key to lookup.
349
        If both are supplied, the fastest lookup is used, and an error is
350
        raised if they do not both point at the same row.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
351
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
352
        :param file_id: An optional unicode file_id to be looked up.
353
        :param path: An optional unicode path to be looked up.
354
        :return: The dirstate row tuple for path/file_id, or (None, None)
355
        """
356
        if file_id is None and path is None:
357
            raise errors.BzrError('must supply file_id or path')
358
        state = self.current_dirstate()
359
        if path is not None:
360
            path = path.encode('utf8')
361
        return state._get_entry(0, fileid_utf8=file_id, path_utf8=path)
362
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
363
    def get_file_sha1(self, file_id, path=None, stat_value=None):
2255.2.88 by Robert Collins
Significant steps back to operation.
364
        # check file id is valid unconditionally.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
365
        entry = self._get_entry(file_id=file_id, path=path)
1551.15.56 by Aaron Bentley
Raise NoSuchId when get_file_sha1 is invoked with a baed file id
366
        if entry[0] is None:
367
            raise errors.NoSuchId(self, file_id)
2255.2.73 by Robert Collins
50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first.
368
        if path is None:
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
369
            path = pathjoin(entry[0][0], entry[0][1]).decode('utf8')
370
371
        file_abspath = self.abspath(path)
372
        state = self.current_dirstate()
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
373
        if stat_value is None:
2499.3.1 by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files
374
            try:
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
375
                stat_value = osutils.lstat(file_abspath)
2499.3.1 by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files
376
            except OSError, e:
377
                if e.errno == errno.ENOENT:
378
                    return None
379
                else:
380
                    raise
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
381
        link_or_sha1 = dirstate.update_entry(state, entry, file_abspath,
382
            stat_value=stat_value)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
383
        if entry[1][0][0] == 'f':
3709.4.1 by Robert Collins
Sha files for the stat cache more lazily rather than on first-examination, allowing less overall sha calculations to occur.
384
            if link_or_sha1 is None:
385
                file_obj, statvalue = self.get_file_with_stat(file_id, path)
386
                try:
387
                    sha1 = osutils.sha_file(file_obj)
388
                finally:
389
                    file_obj.close()
390
                self._observed_sha1(file_id, path, (sha1, statvalue))
391
                return sha1
392
            else:
393
                return link_or_sha1
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
394
        return None
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
395
2255.2.17 by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate.
396
    def _get_inventory(self):
397
        """Get the inventory for the tree. This is only valid within a lock."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
398
        if 'evil' in debug.debug_flags:
5753.2.4 by Jelmer Vernooij
Review feedback from John.
399
            trace.mutter_callsite(2,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
400
                "accessing .inventory forces a size of tree translation.")
2255.2.17 by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate.
401
        if self._inventory is not None:
402
            return self._inventory
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
403
        self._must_be_locked()
2255.2.17 by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate.
404
        self._generate_inventory()
405
        return self._inventory
406
407
    inventory = property(_get_inventory,
408
                         doc="Inventory of this Tree")
409
410
    @needs_read_lock
2255.2.34 by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
411
    def get_parent_ids(self):
412
        """See Tree.get_parent_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
413
2255.2.34 by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
414
        This implementation requests the ids list from the dirstate file.
415
        """
416
        return self.current_dirstate().get_parent_ids()
417
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
418
    def get_reference_revision(self, file_id, path=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
419
        # referenced tree's revision is whatever's currently there
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
420
        return self.get_nested_tree(file_id, path).last_revision()
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
421
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
422
    def get_nested_tree(self, file_id, path=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
423
        if path is None:
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
424
            path = self.id2path(file_id)
425
        # else: check file_id is at path?
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
426
        return WorkingTree.open(self.abspath(path))
427
2255.2.34 by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
428
    @needs_read_lock
2255.2.17 by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate.
429
    def get_root_id(self):
430
        """Return the id of this trees root"""
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
431
        return self._get_entry(path='')[0][2]
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
432
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
433
    def has_id(self, file_id):
434
        state = self.current_dirstate()
2255.2.92 by James Westby
Make the WorkingTree4 has_id use the new _get_entry rather than _get_row.
435
        row, parents = self._get_entry(file_id=file_id)
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
436
        if row is None:
437
            return False
438
        return osutils.lexists(pathjoin(
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
439
                    self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
440
4544.2.1 by Robert Collins
Add interface enforcement for the behaviour of iter_changes with missing subtrees with explicit paths - the whole subtree is returned.
441
    def has_or_had_id(self, file_id):
442
        state = self.current_dirstate()
443
        row, parents = self._get_entry(file_id=file_id)
444
        return row is not None
445
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
446
    @needs_read_lock
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
447
    def id2path(self, file_id):
2511.1.3 by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4
448
        "Convert a file-id to a path."
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
449
        state = self.current_dirstate()
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
450
        entry = self._get_entry(file_id=file_id)
451
        if entry == (None, None):
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
452
            raise errors.NoSuchId(tree=self, file_id=file_id)
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
453
        path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
454
        return path_utf8.decode('utf8')
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
455
2911.5.4 by John Arbash Meinel
Switch around to properly look up the executable bit in the basis.
456
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
457
        entry = self._get_entry(path=path)
458
        if entry == (None, None):
459
            return False # Missing entries are not executable
460
        return entry[1][0][3] # Executable?
461
2325.3.2 by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32
462
    if not osutils.supports_executable():
463
        def is_executable(self, file_id, path=None):
2511.1.3 by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4
464
            """Test if a file is executable or not.
465
466
            Note: The caller is expected to take a read-lock before calling this.
467
            """
2325.3.2 by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32
468
            entry = self._get_entry(file_id=file_id, path=path)
469
            if entry == (None, None):
470
                return False
471
            return entry[1][0][3]
2911.5.4 by John Arbash Meinel
Switch around to properly look up the executable bit in the basis.
472
473
        _is_executable_from_path_and_stat = \
474
            _is_executable_from_path_and_stat_from_basis
2325.3.2 by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32
475
    else:
476
        def is_executable(self, file_id, path=None):
2511.1.3 by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4
477
            """Test if a file is executable or not.
478
479
            Note: The caller is expected to take a read-lock before calling this.
480
            """
3146.4.5 by Aaron Bentley
Require a read lock in POSIX is_exectuable implementations, matching win32
481
            self._must_be_locked()
2325.3.2 by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32
482
            if not path:
483
                path = self.id2path(file_id)
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
484
            mode = osutils.lstat(self.abspath(path)).st_mode
2325.3.2 by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32
485
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
486
3146.8.16 by Aaron Bentley
Updates from review
487
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
488
        """See Tree.iter_all_file_ids"""
489
        self._must_be_locked()
3146.8.16 by Aaron Bentley
Updates from review
490
        result = set()
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
491
        for key, tree_details in self.current_dirstate()._iter_entries():
492
            if tree_details[0][0] in ('a', 'r'): # relocated
493
                continue
3146.8.16 by Aaron Bentley
Updates from review
494
            result.add(key[2])
495
        return result
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
496
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
497
    @needs_read_lock
498
    def __iter__(self):
499
        """Iterate through file_ids for this tree.
500
501
        file_ids are in a WorkingTree if they are in the working inventory
502
        and the working file exists.
503
        """
504
        result = []
2255.2.88 by Robert Collins
Significant steps back to operation.
505
        for key, tree_details in self.current_dirstate()._iter_entries():
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
506
            if tree_details[0][0] in ('a', 'r'): # absent, relocated
2255.2.88 by Robert Collins
Significant steps back to operation.
507
                # not relevant to the working tree
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
508
                continue
2255.2.88 by Robert Collins
Significant steps back to operation.
509
            path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
510
            if osutils.lexists(path):
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
511
                result.append(key[2])
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
512
        return iter(result)
513
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
514
    def iter_references(self):
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
515
        if not self._repo_supports_tree_reference:
516
            # When the repo doesn't support references, we will have nothing to
517
            # return
518
            return
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
519
        for key, tree_details in self.current_dirstate()._iter_entries():
520
            if tree_details[0][0] in ('a', 'r'): # absent, relocated
521
                # not relevant to the working tree
522
                continue
523
            if not key[1]:
524
                # the root is not a reference.
525
                continue
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
526
            relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
2255.2.229 by Robert Collins
Fix remaining test failures.
527
            try:
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
528
                if self._kind(relpath) == 'tree-reference':
529
                    yield relpath, key[2]
2255.2.229 by Robert Collins
Fix remaining test failures.
530
            except errors.NoSuchFile:
531
                # path is missing on disk.
532
                continue
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
533
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
534
    def _observed_sha1(self, file_id, path, (sha1, statvalue)):
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
535
        """See MutableTree._observed_sha1."""
536
        state = self.current_dirstate()
537
        entry = self._get_entry(file_id=file_id, path=path)
538
        state._observed_sha1(entry, sha1, statvalue)
539
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
540
    def kind(self, file_id):
2255.2.202 by Martin Pool
WorkingTree_4.kind should report tree-references if they're
541
        """Return the kind of a file.
542
543
        This is always the actual kind that's on disk, regardless of what it
544
        was added as.
2511.1.3 by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4
545
546
        Note: The caller is expected to take a read-lock before calling this.
2255.2.202 by Martin Pool
WorkingTree_4.kind should report tree-references if they're
547
        """
548
        relpath = self.id2path(file_id)
3376.2.11 by Martin Pool
Compare to None using is/is not not ==
549
        if relpath is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
550
            raise AssertionError(
551
                "path for id {%s} is None!" % file_id)
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
552
        return self._kind(relpath)
553
554
    def _kind(self, relpath):
2255.2.202 by Martin Pool
WorkingTree_4.kind should report tree-references if they're
555
        abspath = self.abspath(relpath)
556
        kind = file_kind(abspath)
4100.2.1 by Aaron Bentley
Disable autodetection of tree references
557
        if (self._repo_supports_tree_reference and kind == 'directory'):
558
            entry = self._get_entry(path=relpath)
559
            if entry[1] is not None:
4100.2.4 by Aaron Bentley
More support for not autodetecting tree refs
560
                if entry[1][0][0] == 't':
4100.2.1 by Aaron Bentley
Disable autodetection of tree references
561
                    kind = 'tree-reference'
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
562
        return kind
563
2255.2.21 by Robert Collins
Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass.
564
    @needs_read_lock
565
    def _last_revision(self):
566
        """See Mutable.last_revision."""
567
        parent_ids = self.current_dirstate().get_parent_ids()
568
        if parent_ids:
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
569
            return parent_ids[0]
2255.2.21 by Robert Collins
Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass.
570
        else:
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
571
            return _mod_revision.NULL_REVISION
2255.2.21 by Robert Collins
Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass.
572
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
573
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
574
        """See Branch.lock_read, and WorkingTree.unlock.
575
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
576
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
577
        """
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
578
        self.branch.lock_read()
579
        try:
580
            self._control_files.lock_read()
581
            try:
582
                state = self.current_dirstate()
583
                if not state._lock_token:
584
                    state.lock_read()
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
585
                # set our support for tree references from the repository in
586
                # use.
587
                self._repo_supports_tree_reference = getattr(
2323.5.16 by Martin Pool
rename support_tree_reference to supports_
588
                    self.branch.repository._format, "supports_tree_reference",
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
589
                    False)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
590
            except:
591
                self._control_files.unlock()
592
                raise
593
        except:
594
            self.branch.unlock()
595
            raise
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
596
        return LogicalLockResult(self.unlock)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
597
598
    def _lock_self_write(self):
599
        """This should be called after the branch is locked."""
600
        try:
601
            self._control_files.lock_write()
602
            try:
603
                state = self.current_dirstate()
604
                if not state._lock_token:
605
                    state.lock_write()
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
606
                # set our support for tree references from the repository in
607
                # use.
608
                self._repo_supports_tree_reference = getattr(
2323.5.16 by Martin Pool
rename support_tree_reference to supports_
609
                    self.branch.repository._format, "supports_tree_reference",
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
610
                    False)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
611
            except:
612
                self._control_files.unlock()
613
                raise
614
        except:
615
            self.branch.unlock()
616
            raise
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
617
        return LogicalLockResult(self.unlock)
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
618
619
    def lock_tree_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
620
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
621
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
622
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
623
        """
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
624
        self.branch.lock_read()
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
625
        return self._lock_self_write()
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
626
627
    def lock_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
628
        """See MutableTree.lock_write, and WorkingTree.unlock.
629
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
630
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
631
        """
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
632
        self.branch.lock_write()
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
633
        return self._lock_self_write()
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
634
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
635
    @needs_tree_write_lock
2255.2.137 by John Arbash Meinel
Move the WorkingTree.move() tests into their own module
636
    def move(self, from_paths, to_dir, after=False):
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
637
        """See WorkingTree.move()."""
2255.7.46 by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them.
638
        result = []
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
639
        if not from_paths:
2255.7.46 by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them.
640
            return result
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
641
        state = self.current_dirstate()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
642
        if isinstance(from_paths, basestring):
643
            raise ValueError()
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
644
        to_dir_utf8 = to_dir.encode('utf8')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
645
        to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
646
        id_index = state._get_id_index()
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
647
        # check destination directory
648
        # get the details for it
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
649
        to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
650
            state._get_block_entry_index(to_entry_dirname, to_basename, 0)
651
        if not entry_present:
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
652
            raise errors.BzrMoveFailedError('', to_dir,
2255.7.71 by Robert Collins
Fix blackbox test_mv usage of inventory, and the errors raised by workingtree4.move - though that should be made into a workingtree conformance test.
653
                errors.NotVersionedError(to_dir))
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
654
        to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
655
        # get a handle on the block itself.
656
        to_block_index = state._ensure_block(
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
657
            to_entry_block_index, to_entry_entry_index, to_dir_utf8)
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
658
        to_block = state._dirblocks[to_block_index]
659
        to_abs = self.abspath(to_dir)
660
        if not isdir(to_abs):
661
            raise errors.BzrMoveFailedError('',to_dir,
662
                errors.NotADirectory(to_abs))
663
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
664
        if to_entry[1][0][0] != 'd':
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
665
            raise errors.BzrMoveFailedError('',to_dir,
666
                errors.NotADirectory(to_abs))
667
668
        if self._inventory is not None:
669
            update_inventory = True
670
            inv = self.inventory
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
671
            to_dir_id = to_entry[0][2]
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
672
            to_dir_ie = inv[to_dir_id]
673
        else:
674
            update_inventory = False
675
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
676
        rollbacks = []
677
        def move_one(old_entry, from_path_utf8, minikind, executable,
678
                     fingerprint, packed_stat, size,
679
                     to_block, to_key, to_path_utf8):
680
            state._make_absent(old_entry)
681
            from_key = old_entry[0]
682
            rollbacks.append(
683
                lambda:state.update_minimal(from_key,
684
                    minikind,
685
                    executable=executable,
686
                    fingerprint=fingerprint,
687
                    packed_stat=packed_stat,
688
                    size=size,
689
                    path_utf8=from_path_utf8))
690
            state.update_minimal(to_key,
691
                    minikind,
692
                    executable=executable,
693
                    fingerprint=fingerprint,
694
                    packed_stat=packed_stat,
695
                    size=size,
696
                    path_utf8=to_path_utf8)
697
            added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
698
            new_entry = to_block[1][added_entry_index]
699
            rollbacks.append(lambda:state._make_absent(new_entry))
700
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
701
        for from_rel in from_paths:
702
            # from_rel is 'pathinroot/foo/bar'
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
703
            from_rel_utf8 = from_rel.encode('utf8')
704
            from_dirname, from_tail = osutils.split(from_rel)
705
            from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
706
            from_entry = self._get_entry(path=from_rel)
707
            if from_entry == (None, None):
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
708
                raise errors.BzrMoveFailedError(from_rel,to_dir,
4498.4.2 by Vincent Ladeuil
Turn test_non_ascii.py test_mv errors into failures.
709
                    errors.NotVersionedError(path=from_rel))
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
710
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
711
            from_id = from_entry[0][2]
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
712
            to_rel = pathjoin(to_dir, from_tail)
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
713
            to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
714
            item_to_entry = self._get_entry(path=to_rel)
715
            if item_to_entry != (None, None):
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
716
                raise errors.BzrMoveFailedError(from_rel, to_rel,
717
                    "Target is already versioned.")
718
719
            if from_rel == to_rel:
720
                raise errors.BzrMoveFailedError(from_rel, to_rel,
721
                    "Source and target are identical.")
722
723
            from_missing = not self.has_filename(from_rel)
724
            to_missing = not self.has_filename(to_rel)
725
            if after:
726
                move_file = False
727
            else:
728
                move_file = True
729
            if to_missing:
730
                if not move_file:
731
                    raise errors.BzrMoveFailedError(from_rel, to_rel,
732
                        errors.NoSuchFile(path=to_rel,
733
                        extra="New file has not been created yet"))
734
                elif from_missing:
735
                    # neither path exists
736
                    raise errors.BzrRenameFailedError(from_rel, to_rel,
737
                        errors.PathsDoNotExist(paths=(from_rel, to_rel)))
738
            else:
739
                if from_missing: # implicitly just update our path mapping
740
                    move_file = False
2255.2.139 by John Arbash Meinel
test cases for moving after a file has already been moved.
741
                elif not after:
2967.3.6 by Daniel Watkins
Extracted the string from every use of RenameFailedFilesExist to RenameFailedFilesExist itself.
742
                    raise errors.RenameFailedFilesExist(from_rel, to_rel)
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
743
744
            rollbacks = []
745
            def rollback_rename():
746
                """A single rename has failed, roll it back."""
2255.2.236 by Martin Pool
Review cleanups: mostly updating or removing todo comments.
747
                # roll back everything, even if we encounter trouble doing one
748
                # of them.
749
                #
750
                # TODO: at least log the other exceptions rather than just
751
                # losing them mbp 20070307
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
752
                exc_info = None
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
753
                for rollback in reversed(rollbacks):
754
                    try:
755
                        rollback()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
756
                    except Exception, e:
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
757
                        exc_info = sys.exc_info()
758
                if exc_info:
759
                    raise exc_info[0], exc_info[1], exc_info[2]
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
760
761
            # perform the disk move first - its the most likely failure point.
2255.2.139 by John Arbash Meinel
test cases for moving after a file has already been moved.
762
            if move_file:
763
                from_rel_abs = self.abspath(from_rel)
764
                to_rel_abs = self.abspath(to_rel)
765
                try:
766
                    osutils.rename(from_rel_abs, to_rel_abs)
767
                except OSError, e:
768
                    raise errors.BzrMoveFailedError(from_rel, to_rel, e[1])
2255.2.140 by John Arbash Meinel
Update tests to ensure basis tree is not modified
769
                rollbacks.append(lambda: osutils.rename(to_rel_abs, from_rel_abs))
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
770
            try:
771
                # perform the rename in the inventory next if needed: its easy
772
                # to rollback
773
                if update_inventory:
774
                    # rename the entry
775
                    from_entry = inv[from_id]
776
                    current_parent = from_entry.parent_id
777
                    inv.rename(from_id, to_dir_id, from_tail)
778
                    rollbacks.append(
779
                        lambda: inv.rename(from_id, current_parent, from_tail))
780
                # finally do the rename in the dirstate, which is a little
781
                # tricky to rollback, but least likely to need it.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
782
                old_block_index, old_entry_index, dir_present, file_present = \
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
783
                    state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
784
                old_block = state._dirblocks[old_block_index][1]
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
785
                old_entry = old_block[old_entry_index]
786
                from_key, old_entry_details = old_entry
787
                cur_details = old_entry_details[0]
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
788
                # remove the old row
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
789
                to_key = ((to_block[0],) + from_key[1:3])
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
790
                minikind = cur_details[0]
791
                move_one(old_entry, from_path_utf8=from_rel_utf8,
792
                         minikind=minikind,
793
                         executable=cur_details[3],
794
                         fingerprint=cur_details[1],
795
                         packed_stat=cur_details[4],
796
                         size=cur_details[2],
797
                         to_block=to_block,
798
                         to_key=to_key,
799
                         to_path_utf8=to_rel_utf8)
800
801
                if minikind == 'd':
802
                    def update_dirblock(from_dir, to_key, to_dir_utf8):
2438.1.5 by John Arbash Meinel
Fix the bug by not iterating over the same list we are modifying.
803
                        """Recursively update all entries in this dirblock."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
804
                        if from_dir == '':
805
                            raise AssertionError("renaming root not supported")
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
806
                        from_key = (from_dir, '')
807
                        from_block_idx, present = \
808
                            state._find_block_index_from_key(from_key)
809
                        if not present:
810
                            # This is the old record, if it isn't present, then
811
                            # there is theoretically nothing to update.
812
                            # (Unless it isn't present because of lazy loading,
813
                            # but we don't do that yet)
814
                            return
815
                        from_block = state._dirblocks[from_block_idx]
816
                        to_block_index, to_entry_index, _, _ = \
817
                            state._get_block_entry_index(to_key[0], to_key[1], 0)
818
                        to_block_index = state._ensure_block(
819
                            to_block_index, to_entry_index, to_dir_utf8)
820
                        to_block = state._dirblocks[to_block_index]
2438.1.5 by John Arbash Meinel
Fix the bug by not iterating over the same list we are modifying.
821
822
                        # Grab a copy since move_one may update the list.
823
                        for entry in from_block[1][:]:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
824
                            if not (entry[0][0] == from_dir):
825
                                raise AssertionError()
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
826
                            cur_details = entry[1][0]
827
                            to_key = (to_dir_utf8, entry[0][1], entry[0][2])
828
                            from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
829
                            to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
830
                            minikind = cur_details[0]
2438.1.10 by John Arbash Meinel
Make WT4.move() properly handle moving a directory with a renamed child.
831
                            if minikind in 'ar':
2438.1.8 by John Arbash Meinel
Fix the case when renaming a directory with deleted children.
832
                                # Deleted children of a renamed directory
833
                                # Do not need to be updated.
2438.1.10 by John Arbash Meinel
Make WT4.move() properly handle moving a directory with a renamed child.
834
                                # Children that have been renamed out of this
835
                                # directory should also not be updated
2438.1.8 by John Arbash Meinel
Fix the case when renaming a directory with deleted children.
836
                                continue
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
837
                            move_one(entry, from_path_utf8=from_path_utf8,
838
                                     minikind=minikind,
839
                                     executable=cur_details[3],
840
                                     fingerprint=cur_details[1],
841
                                     packed_stat=cur_details[4],
842
                                     size=cur_details[2],
843
                                     to_block=to_block,
844
                                     to_key=to_key,
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
845
                                     to_path_utf8=to_path_utf8)
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
846
                            if minikind == 'd':
847
                                # We need to move all the children of this
848
                                # entry
849
                                update_dirblock(from_path_utf8, to_key,
850
                                                to_path_utf8)
851
                    update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
852
            except:
853
                rollback_rename()
854
                raise
2255.7.46 by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them.
855
            result.append((from_rel, to_rel))
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
856
            state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
2255.7.67 by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
857
            self._make_dirty(reset_inventory=False)
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
858
2255.7.46 by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them.
859
        return result
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
860
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
861
    def _must_be_locked(self):
862
        if not self._control_files._lock_count:
863
            raise errors.ObjectNotLocked(self)
864
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
865
    def _new_tree(self):
866
        """Initialize the state in this tree to be a new tree."""
867
        self._dirty = True
868
869
    @needs_read_lock
2255.2.17 by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate.
870
    def path2id(self, path):
871
        """Return the id for path in this tree."""
2255.7.56 by Robert Collins
Document behaviour of tree.path2id("path/").
872
        path = path.strip('/')
2255.2.88 by Robert Collins
Significant steps back to operation.
873
        entry = self._get_entry(path=path)
874
        if entry == (None, None):
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
875
            return None
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
876
        return entry[0][2]
2255.2.17 by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate.
877
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
878
    def paths2ids(self, paths, trees=[], require_versioned=True):
879
        """See Tree.paths2ids().
2255.7.24 by John Arbash Meinel
Rework cmd_inventory so that it uses paths2ids and locks the trees for read.
880
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
881
        This specialisation fast-paths the case where all the trees are in the
882
        dirstate.
883
        """
884
        if paths is None:
885
            return None
886
        parents = self.get_parent_ids()
887
        for tree in trees:
888
            if not (isinstance(tree, DirStateRevisionTree) and tree._revision_id in
889
                parents):
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
890
                return super(DirStateWorkingTree, self).paths2ids(paths,
891
                    trees, require_versioned)
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
892
        search_indexes = [0] + [1 + parents.index(tree._revision_id) for tree in trees]
893
        # -- make all paths utf8 --
894
        paths_utf8 = set()
895
        for path in paths:
896
            paths_utf8.add(path.encode('utf8'))
897
        paths = paths_utf8
898
        # -- paths is now a utf8 path set --
899
        # -- get the state object and prepare it.
900
        state = self.current_dirstate()
2255.2.133 by John Arbash Meinel
Implement _paths2ids using bisect recursive rather than loading
901
        if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY
902
            and '' not in paths):
903
            paths2ids = self._paths2ids_using_bisect
904
        else:
905
            paths2ids = self._paths2ids_in_memory
906
        return paths2ids(paths, search_indexes,
907
                         require_versioned=require_versioned)
908
909
    def _paths2ids_in_memory(self, paths, search_indexes,
910
                             require_versioned=True):
911
        state = self.current_dirstate()
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
912
        state._read_dirblocks_if_needed()
913
        def _entries_for_path(path):
914
            """Return a list with all the entries that match path for all ids.
915
            """
916
            dirname, basename = os.path.split(path)
917
            key = (dirname, basename, '')
918
            block_index, present = state._find_block_index_from_key(key)
919
            if not present:
920
                # the block which should contain path is absent.
921
                return []
922
            result = []
923
            block = state._dirblocks[block_index][1]
924
            entry_index, _ = state._find_entry_index(key, block)
925
            # we may need to look at multiple entries at this path: walk while the paths match.
926
            while (entry_index < len(block) and
927
                block[entry_index][0][0:2] == key[0:2]):
928
                result.append(block[entry_index])
929
                entry_index += 1
930
            return result
931
        if require_versioned:
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
932
            # -- check all supplied paths are versioned in a search tree. --
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
933
            all_versioned = True
934
            for path in paths:
935
                path_entries = _entries_for_path(path)
936
                if not path_entries:
937
                    # this specified path is not present at all: error
938
                    all_versioned = False
939
                    break
940
                found_versioned = False
941
                # for each id at this path
942
                for entry in path_entries:
943
                    # for each tree.
944
                    for index in search_indexes:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
945
                        if entry[1][index][0] != 'a': # absent
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
946
                            found_versioned = True
947
                            # all good: found a versioned cell
948
                            break
949
                if not found_versioned:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
950
                    # none of the indexes was not 'absent' at all ids for this
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
951
                    # path.
952
                    all_versioned = False
953
                    break
954
            if not all_versioned:
955
                raise errors.PathsNotVersionedError(paths)
956
        # -- remove redundancy in supplied paths to prevent over-scanning --
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
957
        search_paths = osutils.minimum_path_selection(paths)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
958
        # sketch:
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
959
        # for all search_indexs in each path at or under each element of
960
        # search_paths, if the detail is relocated: add the id, and add the
961
        # relocated path as one to search if its not searched already. If the
962
        # detail is not relocated, add the id.
963
        searched_paths = set()
964
        found_ids = set()
965
        def _process_entry(entry):
966
            """Look at search_indexes within entry.
967
968
            If a specific tree's details are relocated, add the relocation
969
            target to search_paths if not searched already. If it is absent, do
970
            nothing. Otherwise add the id to found_ids.
971
            """
972
            for index in search_indexes:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
973
                if entry[1][index][0] == 'r': # relocated
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
974
                    if not osutils.is_inside_any(searched_paths, entry[1][index][1]):
975
                        search_paths.add(entry[1][index][1])
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
976
                elif entry[1][index][0] != 'a': # absent
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
977
                    found_ids.add(entry[0][2])
978
        while search_paths:
979
            current_root = search_paths.pop()
980
            searched_paths.add(current_root)
981
            # process the entries for this containing directory: the rest will be
982
            # found by their parents recursively.
983
            root_entries = _entries_for_path(current_root)
984
            if not root_entries:
985
                # this specified path is not present at all, skip it.
986
                continue
987
            for entry in root_entries:
988
                _process_entry(entry)
989
            initial_key = (current_root, '', '')
990
            block_index, _ = state._find_block_index_from_key(initial_key)
991
            while (block_index < len(state._dirblocks) and
992
                osutils.is_inside(current_root, state._dirblocks[block_index][0])):
993
                for entry in state._dirblocks[block_index][1]:
994
                    _process_entry(entry)
995
                block_index += 1
996
        return found_ids
997
2255.2.133 by John Arbash Meinel
Implement _paths2ids using bisect recursive rather than loading
998
    def _paths2ids_using_bisect(self, paths, search_indexes,
999
                                require_versioned=True):
1000
        state = self.current_dirstate()
1001
        found_ids = set()
1002
1003
        split_paths = sorted(osutils.split(p) for p in paths)
1004
        found = state._bisect_recursive(split_paths)
1005
1006
        if require_versioned:
1007
            found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
1008
            for dir_name in split_paths:
1009
                if dir_name not in found_dir_names:
1010
                    raise errors.PathsNotVersionedError(paths)
1011
1012
        for dir_name_id, trees_info in found.iteritems():
1013
            for index in search_indexes:
1014
                if trees_info[index][0] not in ('r', 'a'):
1015
                    found_ids.add(dir_name_id[2])
1016
        return found_ids
1017
2255.2.45 by Robert Collins
Dirstate - fix revision_tree() behaviour to match the interface contract.
1018
    def read_working_inventory(self):
1019
        """Read the working inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1020
2255.2.45 by Robert Collins
Dirstate - fix revision_tree() behaviour to match the interface contract.
1021
        This is a meaningless operation for dirstate, but we obey it anyhow.
1022
        """
1023
        return self.inventory
1024
2255.2.17 by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate.
1025
    @needs_read_lock
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1026
    def revision_tree(self, revision_id):
1027
        """See Tree.revision_tree.
1028
1029
        WorkingTree4 supplies revision_trees for any basis tree.
1030
        """
1031
        dirstate = self.current_dirstate()
1032
        parent_ids = dirstate.get_parent_ids()
1033
        if revision_id not in parent_ids:
1034
            raise errors.NoSuchRevisionInTree(self, revision_id)
2255.2.45 by Robert Collins
Dirstate - fix revision_tree() behaviour to match the interface contract.
1035
        if revision_id in dirstate.get_ghosts():
1036
            raise errors.NoSuchRevisionInTree(self, revision_id)
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1037
        return DirStateRevisionTree(dirstate, revision_id,
1038
            self.branch.repository)
1039
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1040
    @needs_tree_write_lock
2255.2.37 by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
1041
    def set_last_revision(self, new_revision):
1042
        """Change the last revision in the working tree."""
1043
        parents = self.get_parent_ids()
4496.3.16 by Andrew Bennetts
Remove lots of unused imports.
1044
        if new_revision in (_mod_revision.NULL_REVISION, None):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1045
            if len(parents) >= 2:
1046
                raise AssertionError(
1047
                    "setting the last parent to none with a pending merge is "
1048
                    "unsupported.")
2255.2.37 by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
1049
            self.set_parent_ids([])
1050
        else:
2255.2.56 by Robert Collins
Dirstate: bring set_last_revision into line with the tested API.
1051
            self.set_parent_ids([new_revision] + parents[1:],
1052
                allow_leftmost_as_ghost=True)
2255.2.37 by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
1053
1054
    @needs_tree_write_lock
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1055
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1056
        """Set the parent ids to revision_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1057
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1058
        See also set_parent_trees. This api will try to retrieve the tree data
1059
        for each element of revision_ids from the trees repository. If you have
1060
        tree data already available, it is more efficient to use
1061
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
1062
        an easier API to use.
1063
1064
        :param revision_ids: The revision_ids to set as the parent ids of this
1065
            working tree. Any of these may be ghosts.
1066
        """
1067
        trees = []
1068
        for revision_id in revision_ids:
1069
            try:
1070
                revtree = self.branch.repository.revision_tree(revision_id)
2255.2.24 by John Arbash Meinel
When adding ghosts revision_tree() raises RevisionNotPresent because of Knit, not NoSuchRevision
1071
                # TODO: jam 20070213 KnitVersionedFile raises
1072
                #       RevisionNotPresent rather than NoSuchRevision if a
1073
                #       given revision_id is not present. Should Repository be
1074
                #       catching it and re-raising NoSuchRevision?
1075
            except (errors.NoSuchRevision, errors.RevisionNotPresent):
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1076
                revtree = None
1077
            trees.append((revision_id, revtree))
1078
        self.set_parent_trees(trees,
1079
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1080
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1081
    @needs_tree_write_lock
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1082
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1083
        """Set the parents of the working tree.
1084
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1085
        :param parents_list: A list of (revision_id, tree) tuples.
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1086
            If tree is None, then that element is treated as an unreachable
1087
            parent tree - i.e. a ghost.
1088
        """
1089
        dirstate = self.current_dirstate()
1090
        if len(parents_list) > 0:
1091
            if not allow_leftmost_as_ghost and parents_list[0][1] is None:
2255.2.42 by Robert Collins
Fix WorkingTree4.set_parent_trees.
1092
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1093
        real_trees = []
1094
        ghosts = []
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
1095
1096
        parent_ids = [rev_id for rev_id, tree in parents_list]
1097
        graph = self.branch.repository.get_graph()
1098
        heads = graph.heads(parent_ids)
1099
        accepted_revisions = set()
1100
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1101
        # convert absent trees to the null tree, which we convert back to
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1102
        # missing on access.
1103
        for rev_id, tree in parents_list:
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
1104
            if len(accepted_revisions) > 0:
1105
                # we always accept the first tree
1106
                if rev_id in accepted_revisions or rev_id not in heads:
1107
                    # We have already included either this tree, or its
1108
                    # descendent, so we skip it.
1109
                    continue
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
1110
            _mod_revision.check_not_reserved_id(rev_id)
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1111
            if tree is not None:
1112
                real_trees.append((rev_id, tree))
1113
            else:
1114
                real_trees.append((rev_id,
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
1115
                    self.branch.repository.revision_tree(
1116
                        _mod_revision.NULL_REVISION)))
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1117
                ghosts.append(rev_id)
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
1118
            accepted_revisions.add(rev_id)
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1119
        dirstate.set_parent_trees(real_trees, ghosts=ghosts)
2255.7.67 by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
1120
        self._make_dirty(reset_inventory=False)
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1121
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1122
    def _set_root_id(self, file_id):
1123
        """See WorkingTree.set_root_id."""
2255.2.37 by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
1124
        state = self.current_dirstate()
1125
        state.set_path_id('', file_id)
2255.7.67 by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
1126
        if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
1127
            self._make_dirty(reset_inventory=True)
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1128
2776.1.8 by Robert Collins
Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits.
1129
    def _sha_from_stat(self, path, stat_result):
1130
        """Get a sha digest from the tree's stat cache.
1131
1132
        The default implementation assumes no stat cache is present.
1133
1134
        :param path: The path.
1135
        :param stat_result: The stat result being looked up.
1136
        """
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
1137
        return self.current_dirstate().sha1_from_stat(path, stat_result)
2776.1.8 by Robert Collins
Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits.
1138
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
1139
    @needs_read_lock
1140
    def supports_tree_reference(self):
1141
        return self._repo_supports_tree_reference
1142
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1143
    def unlock(self):
1144
        """Unlock in format 4 trees needs to write the entire dirstate."""
2665.3.3 by Daniel Watkins
Added _cleanup() to the unlock() method of all implementations of WorkingTree so that the cached ignore definitions are wiped when a lock is lost.
1145
        # do non-implementation specific cleanup
1146
        self._cleanup()
1147
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1148
        if self._control_files._lock_count == 1:
1149
            # eventually we should do signature checking during read locks for
1150
            # dirstate updates.
1151
            if self._control_files._lock_mode == 'w':
1152
                if self._dirty:
1153
                    self.flush()
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
1154
            if self._dirstate is not None:
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
1155
                # This is a no-op if there are no modifications.
1156
                self._dirstate.save()
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
1157
                self._dirstate.unlock()
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
1158
            # TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
1159
            #       point. Instead, it could check if the header has been
1160
            #       modified when it is locked, and if not, it can hang on to
1161
            #       the data it has in memory.
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1162
            self._dirstate = None
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1163
            self._inventory = None
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1164
        # reverse order of locking.
1165
        try:
1166
            return self._control_files.unlock()
1167
        finally:
1168
            self.branch.unlock()
1169
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1170
    @needs_tree_write_lock
1171
    def unversion(self, file_ids):
1172
        """Remove the file ids in file_ids from the current versioned set.
1173
1174
        When a file_id is unversioned, all of its children are automatically
1175
        unversioned.
1176
1177
        :param file_ids: The file ids to stop versioning.
1178
        :raises: NoSuchId if any fileid is not currently versioned.
1179
        """
1180
        if not file_ids:
1181
            return
1182
        state = self.current_dirstate()
1183
        state._read_dirblocks_if_needed()
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
1184
        ids_to_unversion = set(file_ids)
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1185
        paths_to_unversion = set()
1186
        # sketch:
1187
        # check if the root is to be unversioned, if so, assert for now.
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1188
        # walk the state marking unversioned things as absent.
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1189
        # if there are any un-unversioned ids at the end, raise
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1190
        for key, details in state._dirblocks[0][1]:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1191
            if (details[0][0] not in ('a', 'r') and # absent or relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1192
                key[2] in ids_to_unversion):
1193
                # I haven't written the code to unversion / yet - it should be
1194
                # supported.
1195
                raise errors.BzrError('Unversioning the / is not currently supported')
1196
        block_index = 0
1197
        while block_index < len(state._dirblocks):
1198
            # process one directory at a time.
1199
            block = state._dirblocks[block_index]
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1200
            # first check: is the path one to remove - it or its children
1201
            delete_block = False
1202
            for path in paths_to_unversion:
1203
                if (block[0].startswith(path) and
1204
                    (len(block[0]) == len(path) or
1205
                     block[0][len(path)] == '/')):
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1206
                    # this entire block should be deleted - its the block for a
1207
                    # path to unversion; or the child of one
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1208
                    delete_block = True
1209
                    break
1210
            # TODO: trim paths_to_unversion as we pass by paths
1211
            if delete_block:
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1212
                # this block is to be deleted: process it.
1213
                # TODO: we can special case the no-parents case and
1214
                # just forget the whole block.
1215
                entry_index = 0
1216
                while entry_index < len(block[1]):
2363.2.3 by John Arbash Meinel
Just check if the entry is absent before calling _make_absent.
1217
                    entry = block[1][entry_index]
4536.2.1 by Robert Collins
Fix WorkingTree4.unversion when unversioning the parents of files that were renamed from a basis tree. (Robert Collins, bug 187207)
1218
                    if entry[1][0][0] in 'ar':
1219
                        # don't remove absent or renamed entries
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1220
                        entry_index += 1
4536.2.1 by Robert Collins
Fix WorkingTree4.unversion when unversioning the parents of files that were renamed from a basis tree. (Robert Collins, bug 187207)
1221
                    else:
1222
                        # Mark this file id as having been removed
1223
                        ids_to_unversion.discard(entry[0][2])
1224
                        if not state._make_absent(entry):
1225
                            # The block has not shrunk.
1226
                            entry_index += 1
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1227
                # go to the next block. (At the moment we dont delete empty
1228
                # dirblocks)
1229
                block_index += 1
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1230
                continue
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1231
            entry_index = 0
1232
            while entry_index < len(block[1]):
1233
                entry = block[1][entry_index]
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1234
                if (entry[1][0][0] in ('a', 'r') or # absent, relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1235
                    # ^ some parent row.
1236
                    entry[0][2] not in ids_to_unversion):
1237
                    # ^ not an id to unversion
1238
                    entry_index += 1
1239
                    continue
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1240
                if entry[1][0][0] == 'd':
2255.7.41 by John Arbash Meinel
WorkingTree.unversion() should not raise if unversioning a child and a parent.
1241
                    paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1242
                if not state._make_absent(entry):
1243
                    entry_index += 1
1244
                # we have unversioned this id
1245
                ids_to_unversion.remove(entry[0][2])
1246
            block_index += 1
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1247
        if ids_to_unversion:
1248
            raise errors.NoSuchId(self, iter(ids_to_unversion).next())
2255.7.67 by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
1249
        self._make_dirty(reset_inventory=False)
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1250
        # have to change the legacy inventory too.
1251
        if self._inventory is not None:
1252
            for file_id in file_ids:
4634.156.1 by Vincent Ladeuil
Don't traceback when unversioning a directory.
1253
                if self._inventory.has_id(file_id):
1254
                    self._inventory.remove_recursive_id(file_id)
2255.2.22 by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
1255
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1256
    @needs_tree_write_lock
3146.8.12 by Aaron Bentley
Add a flush to rename_one
1257
    def rename_one(self, from_rel, to_rel, after=False):
1258
        """See WorkingTree.rename_one"""
1259
        self.flush()
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
1260
        super(DirStateWorkingTree, self).rename_one(from_rel, to_rel, after)
3146.8.12 by Aaron Bentley
Add a flush to rename_one
1261
1262
    @needs_tree_write_lock
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1263
    def apply_inventory_delta(self, changes):
1264
        """See MutableTree.apply_inventory_delta"""
3146.8.11 by Aaron Bentley
Fix dirstate/inventory dance, mark dirstate modified and in memory
1265
        state = self.current_dirstate()
3146.8.15 by Aaron Bentley
Cleanup and docs
1266
        state.update_by_delta(changes)
3146.8.11 by Aaron Bentley
Fix dirstate/inventory dance, mark dirstate modified and in memory
1267
        self._make_dirty(reset_inventory=True)
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1268
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1269
    def update_basis_by_delta(self, new_revid, delta):
1270
        """See MutableTree.update_basis_by_delta."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1271
        if self.last_revision() == new_revid:
1272
            raise AssertionError()
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1273
        self.current_dirstate().update_basis_by_delta(delta, new_revid)
1274
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
1275
    @needs_read_lock
1276
    def _validate(self):
1277
        self._dirstate._validate()
1278
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
1279
    @needs_tree_write_lock
1280
    def _write_inventory(self, inv):
1281
        """Write inventory as the current inventory."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1282
        if self._dirty:
1283
            raise AssertionError("attempting to write an inventory when the "
1284
                "dirstate is dirty will lose pending changes")
4634.59.1 by Robert Collins
Change WT4._write_inventory to use apply_inventory_delta, avoiding the O(tree) set_state_from_inventory API. In bzr.dev we should remove that API altogether, but this patch is aimed at 2.0.1
1285
        had_inventory = self._inventory is not None
4634.59.2 by Robert Collins
Review feedback.
1286
        # Setting self._inventory = None forces the dirstate to regenerate the
1287
        # working inventory. We do this because self.inventory may be inv, or
1288
        # may have been modified, and either case would prevent a clean delta
1289
        # being created.
4634.59.1 by Robert Collins
Change WT4._write_inventory to use apply_inventory_delta, avoiding the O(tree) set_state_from_inventory API. In bzr.dev we should remove that API altogether, but this patch is aimed at 2.0.1
1290
        self._inventory = None
1291
        # generate a delta,
1292
        delta = inv._make_delta(self.inventory)
1293
        # and apply it.
1294
        self.apply_inventory_delta(delta)
1295
        if had_inventory:
2255.7.67 by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
1296
            self._inventory = inv
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
1297
        self.flush()
1298
5630.2.5 by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken.
1299
    @needs_tree_write_lock
1300
    def reset_state(self, revision_ids=None):
1301
        """Reset the state of the working tree.
1302
1303
        This does a hard-reset to a last-known-good state. This is a way to
1304
        fix if something got corrupted (like the .bzr/checkout/dirstate file)
1305
        """
1306
        if revision_ids is None:
1307
            revision_ids = self.get_parent_ids()
1308
        if not revision_ids:
1309
            base_tree = self.branch.repository.revision_tree(
1310
                _mod_revision.NULL_REVISION)
1311
            trees = []
1312
        else:
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
1313
            trees = zip(revision_ids,
1314
                        self.branch.repository.revision_trees(revision_ids))
5630.2.7 by John Arbash Meinel
Handle --force flags and propmting the user for what they might really want.
1315
            base_tree = trees[0][1]
5630.2.5 by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken.
1316
        state = self.current_dirstate()
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
1317
        # We don't support ghosts yet
1318
        state.set_state_from_scratch(base_tree.inventory, trees, [])
5630.2.5 by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken.
1319
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1320
3368.2.53 by Ian Clatworthy
sha1 calculation done by workingtree layer now
1321
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1322
1323
    def __init__(self, tree):
1324
        self.tree = tree
1325
1326
    def sha1(self, abspath):
4241.14.2 by Vincent Ladeuil
Fixed as per John's review feedback.
1327
        """See dirstate.SHA1Provider.sha1()."""
4241.14.1 by Vincent Ladeuil
Fix bug #355454 by casting to unicode.
1328
        filters = self.tree._content_filter_stack(
1329
            self.tree.relpath(osutils.safe_unicode(abspath)))
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
1330
        return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
3368.2.53 by Ian Clatworthy
sha1 calculation done by workingtree layer now
1331
1332
    def stat_and_sha1(self, abspath):
4241.14.2 by Vincent Ladeuil
Fixed as per John's review feedback.
1333
        """See dirstate.SHA1Provider.stat_and_sha1()."""
4241.14.1 by Vincent Ladeuil
Fix bug #355454 by casting to unicode.
1334
        filters = self.tree._content_filter_stack(
1335
            self.tree.relpath(osutils.safe_unicode(abspath)))
3368.2.53 by Ian Clatworthy
sha1 calculation done by workingtree layer now
1336
        file_obj = file(abspath, 'rb', 65000)
1337
        try:
1338
            statvalue = os.fstat(file_obj.fileno())
1339
            if filters:
5745.3.2 by Jelmer Vernooij
Add filters to import tariff blacklist.
1340
                file_obj = _mod_filters.filtered_input_file(file_obj, filters)
3368.2.53 by Ian Clatworthy
sha1 calculation done by workingtree layer now
1341
            sha1 = osutils.size_sha_file(file_obj)[1]
1342
        finally:
1343
            file_obj.close()
1344
        return statvalue, sha1
1345
1346
4595.11.10 by Martin Pool
Split out ContentFilteringDirStateWorkingTree
1347
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1348
    """Dirstate working tree that supports content filtering.
1349
1350
    The dirstate holds the hash and size of the canonical form of the file, 
1351
    and most methods must return that.
1352
    """
1353
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
1354
    def _file_content_summary(self, path, stat_result):
1355
        # This is to support the somewhat obsolete path_content_summary method
1356
        # with content filtering: see
5243.1.2 by Martin
Point launchpad links in comments at production server rather than edge
1357
        # <https://bugs.launchpad.net/bzr/+bug/415508>.
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
1358
        #
1359
        # If the dirstate cache is up to date and knows the hash and size,
1360
        # return that.
1361
        # Otherwise if there are no content filters, return the on-disk size
1362
        # and leave the hash blank.
1363
        # Otherwise, read and filter the on-disk file and use its size and
1364
        # hash.
1365
        #
1366
        # The dirstate doesn't store the size of the canonical form so we
1367
        # can't trust it for content-filtered trees.  We just return None.
1368
        dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1369
        executable = self._is_executable_from_path_and_stat(path, stat_result)
1370
        return ('file', None, executable, dirstate_sha1)
1371
4595.11.10 by Martin Pool
Split out ContentFilteringDirStateWorkingTree
1372
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1373
class WorkingTree4(DirStateWorkingTree):
1374
    """This is the Format 4 working tree.
1375
1376
    This differs from WorkingTree3 by:
1377
     - Having a consolidated internal dirstate, stored in a
1378
       randomly-accessible sorted file on disk.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1379
     - Not having a regular inventory attribute.  One can be synthesized
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1380
       on demand but this is expensive and should be avoided.
1381
1382
    This is new in bzr 0.15.
1383
    """
1384
1385
4595.11.10 by Martin Pool
Split out ContentFilteringDirStateWorkingTree
1386
class WorkingTree5(ContentFilteringDirStateWorkingTree):
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1387
    """This is the Format 5 working tree.
1388
1389
    This differs from WorkingTree4 by:
1390
     - Supporting content filtering.
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
1391
1392
    This is new in bzr 1.11.
1393
    """
1394
1395
4595.11.10 by Martin Pool
Split out ContentFilteringDirStateWorkingTree
1396
class WorkingTree6(ContentFilteringDirStateWorkingTree):
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
1397
    """This is the Format 6 working tree.
1398
1399
    This differs from WorkingTree5 by:
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1400
     - Supporting a current view that may mask the set of files in a tree
1401
       impacted by most user operations.
1402
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
1403
    This is new in bzr 1.14.
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1404
    """
1405
3586.2.13 by Ian Clatworthy
fix wt5 to use views, correcting an earlier merge
1406
    def _make_views(self):
1407
        return views.PathBasedViews(self)
1408
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1409
1410
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
5080.3.3 by Vincent Ladeuil
DirStateRevisionTree.kind() should respect parent_index
1411
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
1412
    missing_parent_conflicts = True
1413
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1414
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1415
                   accelerator_tree=None, hardlink=False):
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1416
        """See WorkingTreeFormat.initialize().
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1417
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
1418
        :param revision_id: allows creating a working tree at a different
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1419
        revision than the branch is at.
3123.5.17 by Aaron Bentley
Update docs
1420
        :param accelerator_tree: A tree which can be used for retrieving file
1421
            contents more quickly than the revision tree, i.e. a workingtree.
1422
            The revision tree will be used for cases where accelerator_tree's
1423
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1424
        :param hardlink: If true, hard-link files from accelerator_tree,
1425
            where possible.
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
1426
1551.15.6 by Aaron Bentley
Use ROOT_ID when the repository supports old clients (Bug #107168)
1427
        These trees get an initial random root id, if their repository supports
1428
        rich root data, TREE_ROOT otherwise.
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1429
        """
1430
        if not isinstance(a_bzrdir.transport, LocalTransport):
1431
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1432
        transport = a_bzrdir.get_workingtree_transport(self)
1433
        control_files = self._open_control_files(a_bzrdir)
1434
        control_files.create_lock()
1435
        control_files.lock_write()
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1436
        transport.put_bytes('format', self.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
1437
            mode=a_bzrdir._get_file_mode())
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1438
        if from_branch is not None:
1439
            branch = from_branch
1440
        else:
1441
            branch = a_bzrdir.open_branch()
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1442
        if revision_id is None:
1443
            revision_id = branch.last_revision()
1444
        local_path = transport.local_abspath('dirstate')
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
1445
        # write out new dirstate (must exist when we create the tree)
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
1446
        state = dirstate.DirState.initialize(local_path)
1447
        state.unlock()
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
1448
        del state
3588.2.1 by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4
1449
        wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1450
                         branch,
1451
                         _format=self,
1452
                         _bzrdir=a_bzrdir,
1453
                         _control_files=control_files)
1454
        wt._new_tree()
2255.7.42 by Robert Collins
WorkingTree4 only needs a tree write lock during initialize, not a deep write lock.
1455
        wt.lock_tree_write()
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1456
        try:
3588.2.1 by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4
1457
            self._init_custom_control_files(wt)
4496.3.16 by Andrew Bennetts
Remove lots of unused imports.
1458
            if revision_id in (None, _mod_revision.NULL_REVISION):
1551.15.6 by Aaron Bentley
Use ROOT_ID when the repository supports old clients (Bug #107168)
1459
                if branch.repository.supports_rich_root():
1460
                    wt._set_root_id(generate_ids.gen_root_id())
1461
                else:
1462
                    wt._set_root_id(ROOT_ID)
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
1463
                wt.flush()
3123.5.14 by Aaron Bentley
Avoid Repository.revision_tree in common-case branching
1464
            basis = None
1465
            # frequently, we will get here due to branching.  The accelerator
1466
            # tree will be the tree from the branch, so the desired basis
1467
            # tree will often be a parent of the accelerator tree.
1468
            if accelerator_tree is not None:
1469
                try:
1470
                    basis = accelerator_tree.revision_tree(revision_id)
1471
                except errors.NoSuchRevision:
1472
                    pass
1473
            if basis is None:
1474
                basis = branch.repository.revision_tree(revision_id)
4496.3.16 by Andrew Bennetts
Remove lots of unused imports.
1475
            if revision_id == _mod_revision.NULL_REVISION:
3123.5.14 by Aaron Bentley
Avoid Repository.revision_tree in common-case branching
1476
                parents_list = []
1477
            else:
1478
                parents_list = [(revision_id, basis)]
1479
            basis.lock_read()
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
1480
            try:
1481
                wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
2255.2.177 by Martin Pool
merge dirstate sorting fix, add more validation tests
1482
                wt.flush()
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
1483
                # if the basis has a root id we have to use that; otherwise we
1484
                # use a new random one
1485
                basis_root_id = basis.get_root_id()
1486
                if basis_root_id is not None:
1487
                    wt._set_root_id(basis_root_id)
1488
                    wt.flush()
4377.1.1 by Ian Clatworthy
speed up branch-in-a-shared-repo for development6-rich-root format
1489
                if wt.supports_content_filtering():
4826.1.2 by Andrew Bennetts
Remove code that prevents trying hardlinking from content-filtered trees.
1490
                    # The original tree may not have the same content filters
1491
                    # applied so we can't safely build the inventory delta from
1492
                    # the source tree.
4393.3.1 by Ian Clatworthy
fix status & commit issue reported by Frits Jalvingh
1493
                    delta_from_tree = False
1494
                else:
1495
                    delta_from_tree = True
3453.2.6 by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment
1496
                # delta_from_tree is safe even for DirStateRevisionTrees,
1497
                # because wt4.apply_inventory_delta does not mutate the input
1498
                # inventory entries.
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
1499
                transform.build_tree(basis, wt, accelerator_tree,
4393.3.1 by Ian Clatworthy
fix status & commit issue reported by Frits Jalvingh
1500
                                     hardlink=hardlink,
1501
                                     delta_from_tree=delta_from_tree)
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
1502
            finally:
1503
                basis.unlock()
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1504
        finally:
1505
            control_files.unlock()
1506
            wt.unlock()
1507
        return wt
1508
3588.2.1 by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4
1509
    def _init_custom_control_files(self, wt):
1510
        """Subclasses with custom control files should override this method.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1511
3588.2.1 by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4
1512
        The working tree and control files are locked for writing when this
1513
        method is called.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1514
3588.2.1 by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4
1515
        :param wt: the WorkingTree object
1516
        """
1517
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1518
    def _open(self, a_bzrdir, control_files):
1519
        """Open the tree itself.
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1520
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1521
        :param a_bzrdir: the dir for the tree.
1522
        :param control_files: the control files for the tree.
1523
        """
3588.2.1 by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4
1524
        return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1525
                           branch=a_bzrdir.open_branch(),
1526
                           _format=self,
1527
                           _bzrdir=a_bzrdir,
1528
                           _control_files=control_files)
1529
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1530
    def __get_matchingbzrdir(self):
4241.1.1 by Ian Clatworthy
tree code cleanups from brisbane-core
1531
        return self._get_matchingbzrdir()
1532
1533
    def _get_matchingbzrdir(self):
1534
        """Overrideable method to get a bzrdir for testing."""
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1535
        # please test against something that will let us do tree references
1536
        return bzrdir.format_registry.make_bzrdir(
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1537
            'dirstate-with-subtree')
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1538
1539
    _matchingbzrdir = property(__get_matchingbzrdir)
1540
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1541
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1542
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1543
    """The first consolidated dirstate working tree format.
1544
1545
    This format:
1546
        - exists within a metadir controlling .bzr
1547
        - includes an explicit version marker for the workingtree control
1548
          files, separate from the BzrDir format
1549
        - modifies the hash cache format
1550
        - is new in bzr 0.15
1551
        - uses a LockDir to guard access to it.
1552
    """
1553
1554
    upgrade_recommended = False
1555
1556
    _tree_class = WorkingTree4
1557
1558
    def get_format_string(self):
1559
        """See WorkingTreeFormat.get_format_string()."""
1560
        return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1561
1562
    def get_format_description(self):
1563
        """See WorkingTreeFormat.get_format_description()."""
1564
        return "Working tree format 4"
1565
1566
1567
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
1568
    """WorkingTree format supporting content filtering.
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1569
    """
1570
1571
    upgrade_recommended = False
1572
1573
    _tree_class = WorkingTree5
1574
1575
    def get_format_string(self):
1576
        """See WorkingTreeFormat.get_format_string()."""
1577
        return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1578
1579
    def get_format_description(self):
1580
        """See WorkingTreeFormat.get_format_description()."""
1581
        return "Working tree format 5"
1582
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
1583
    def supports_content_filtering(self):
1584
        return True
1585
1586
1587
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1588
    """WorkingTree format supporting views.
1589
    """
1590
1591
    upgrade_recommended = False
1592
1593
    _tree_class = WorkingTree6
1594
1595
    def get_format_string(self):
1596
        """See WorkingTreeFormat.get_format_string()."""
1597
        return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1598
1599
    def get_format_description(self):
1600
        """See WorkingTreeFormat.get_format_description()."""
1601
        return "Working tree format 6"
1602
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1603
    def _init_custom_control_files(self, wt):
1604
        """Subclasses with custom control files should override this method."""
1605
        wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1606
1607
    def supports_content_filtering(self):
1608
        return True
1609
1610
    def supports_views(self):
1611
        return True
1612
1613
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
1614
class DirStateRevisionTree(InventoryTree):
4595.11.1 by Martin Pool
doc
1615
    """A revision tree pulling the inventory from a dirstate.
1616
    
1617
    Note that this is one of the historical (ie revision) trees cached in the
1618
    dirstate for easy access, not the workingtree.
1619
    """
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1620
1621
    def __init__(self, dirstate, revision_id, repository):
1622
        self._dirstate = dirstate
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
1623
        self._revision_id = revision_id
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1624
        self._repository = repository
1625
        self._inventory = None
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1626
        self._locked = 0
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
1627
        self._dirstate_locked = False
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
1628
        self._repo_supports_tree_reference = getattr(
1629
            repository._format, "supports_tree_reference",
1630
            False)
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1631
2255.2.184 by Martin Pool
Fixes for some comparison tests; repr of DirStateRevisionTree
1632
    def __repr__(self):
1633
        return "<%s of %s in %s>" % \
1634
            (self.__class__.__name__, self._revision_id, self._dirstate)
1635
1551.15.46 by Aaron Bentley
Move plan merge to tree
1636
    def annotate_iter(self, file_id,
1637
                      default_revision=_mod_revision.CURRENT_REVISION):
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1638
        """See Tree.annotate_iter"""
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
1639
        text_key = (file_id, self.get_file_revision(file_id))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1640
        annotations = self._repository.texts.annotate(text_key)
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1641
        return [(key[-1], line) for (key, line) in annotations]
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1642
1551.15.46 by Aaron Bentley
Move plan merge to tree
1643
    def _get_ancestors(self, default_revision):
1644
        return set(self._repository.get_ancestry(self._revision_id,
1645
                                                 topo_sorted=False))
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1646
    def _comparison_data(self, entry, path):
2255.2.182 by Martin Pool
merge dirstate and trunk
1647
        """See Tree._comparison_data."""
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1648
        if entry is None:
1649
            return None, False, None
1650
        # trust the entry as RevisionTree does, but this may not be
1651
        # sensible: the entry might not have come from us?
1652
        return entry.kind, entry.executable, None
1653
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
1654
    def _file_size(self, entry, stat_value):
1655
        return entry.text_size
1656
2255.2.78 by Robert Collins
Really finish the prior commit.
1657
    def filter_unversioned_files(self, paths):
1658
        """Filter out paths that are not versioned.
1659
1660
        :return: set of paths.
1661
        """
1662
        pred = self.has_filename
1663
        return set((p for p in paths if not pred(p)))
1664
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
1665
    def get_root_id(self):
1666
        return self.path2id('')
1667
3016.1.1 by Aaron Bentley
Update DirStateRevisionTree to avoid using inventory
1668
    def id2path(self, file_id):
1669
        "Convert a file-id to a path."
1670
        entry = self._get_entry(file_id=file_id)
1671
        if entry == (None, None):
1672
            raise errors.NoSuchId(tree=self, file_id=file_id)
1673
        path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
1674
        return path_utf8.decode('utf8')
1675
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
1676
    def iter_references(self):
1677
        if not self._repo_supports_tree_reference:
1678
            # When the repo doesn't support references, we will have nothing to
1679
            # return
1680
            return iter([])
1681
        # Otherwise, fall back to the default implementation
1682
        return super(DirStateRevisionTree, self).iter_references()
1683
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
1684
    def _get_parent_index(self):
1685
        """Return the index in the dirstate referenced by this tree."""
1686
        return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1687
2255.2.98 by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory.
1688
    def _get_entry(self, file_id=None, path=None):
1689
        """Get the dirstate row for file_id or path.
1690
1691
        If either file_id or path is supplied, it is used as the key to lookup.
1692
        If both are supplied, the fastest lookup is used, and an error is
1693
        raised if they do not both point at the same row.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1694
2255.2.98 by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory.
1695
        :param file_id: An optional unicode file_id to be looked up.
1696
        :param path: An optional unicode path to be looked up.
1697
        :return: The dirstate row tuple for path/file_id, or (None, None)
1698
        """
1699
        if file_id is None and path is None:
1700
            raise errors.BzrError('must supply file_id or path')
1701
        if path is not None:
1702
            path = path.encode('utf8')
4377.3.4 by Ian Clatworthy
back out tree-level cache of dirstate entries as agreed during review
1703
        parent_index = self._get_parent_index()
1704
        return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
2255.2.98 by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory.
1705
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1706
    def _generate_inventory(self):
1707
        """Create and set self.inventory from the dirstate object.
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1708
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1709
        (So this is only called the first time the inventory is requested for
2255.2.182 by Martin Pool
merge dirstate and trunk
1710
        this tree; it then remains in memory until it's out of date.)
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1711
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1712
        This is relatively expensive: we have to walk the entire dirstate.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1713
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1714
        if not self._locked:
1715
            raise AssertionError(
1716
                'cannot generate inventory of an unlocked '
1717
                'dirstate revision tree')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1718
        # separate call for profiling - makes it clear where the costs are.
1719
        self._dirstate._read_dirblocks_if_needed()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1720
        if self._revision_id not in self._dirstate.get_parent_ids():
1721
            raise AssertionError(
1722
                'parent %s has disappeared from %s' % (
1723
                self._revision_id, self._dirstate.get_parent_ids()))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1724
        parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1725
        # This is identical now to the WorkingTree _generate_inventory except
1726
        # for the tree index use.
1727
        root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
1728
        current_id = root_key[2]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1729
        if current_entry[parent_index][0] != 'd':
1730
            raise AssertionError()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1731
        inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1732
        inv.root.revision = current_entry[parent_index][4]
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
1733
        # Turn some things into local variables
1734
        minikind_to_kind = dirstate.DirState._minikind_to_kind
1735
        factory = entry_factory
1736
        utf8_decode = cache_utf8._utf8_decode
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
1737
        inv_byid = inv._byid
2255.2.73 by Robert Collins
50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first.
1738
        # we could do this straight out of the dirstate; it might be fast
1739
        # and should be profiled - RBC 20070216
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
1740
        parent_ies = {'' : inv.root}
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1741
        for block in self._dirstate._dirblocks[1:]: #skip root
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1742
            dirname = block[0]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1743
            try:
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
1744
                parent_ie = parent_ies[dirname]
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1745
            except KeyError:
1746
                # all the paths in this block are not versioned in this tree
1747
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1748
            for key, entry in block[1]:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1749
                minikind, fingerprint, size, executable, revid = entry[parent_index]
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
1750
                if minikind in ('a', 'r'): # absent, relocated
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1751
                    # not this tree
1752
                    continue
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
1753
                name = key[1]
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
1754
                name_unicode = utf8_decode(name)[0]
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
1755
                file_id = key[2]
2255.2.114 by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
1756
                kind = minikind_to_kind[minikind]
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
1757
                inv_entry = factory[kind](file_id, name_unicode,
1758
                                          parent_ie.file_id)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1759
                inv_entry.revision = revid
1760
                if kind == 'file':
1761
                    inv_entry.executable = executable
1762
                    inv_entry.text_size = size
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1763
                    inv_entry.text_sha1 = fingerprint
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1764
                elif kind == 'directory':
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
1765
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
1766
                elif kind == 'symlink':
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1767
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1768
                elif kind == 'tree-reference':
2255.2.218 by Robert Collins
Make the nested tree commit smoke test be more rigourous.
1769
                    inv_entry.reference_revision = fingerprint or None
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1770
                else:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1771
                    raise AssertionError("cannot convert entry %r into an InventoryEntry"
1772
                            % entry)
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
1773
                # These checks cost us around 40ms on a 55k entry tree
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1774
                if file_id in inv_byid:
1775
                    raise AssertionError('file_id %s already in'
1776
                        ' inventory as %s' % (file_id, inv_byid[file_id]))
1777
                if name_unicode in parent_ie.children:
1778
                    raise AssertionError('name %r already in parent'
1779
                        % (name_unicode,))
2255.2.115 by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
1780
                inv_byid[file_id] = inv_entry
1781
                parent_ie.children[name_unicode] = inv_entry
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1782
        self._inventory = inv
1783
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
1784
    def get_file_mtime(self, file_id, path=None):
1785
        """Return the modification time for this record.
1786
1787
        We return the timestamp of the last-changed revision.
1788
        """
1789
        # Make sure the file exists
1790
        entry = self._get_entry(file_id, path=path)
1791
        if entry == (None, None): # do we raise?
1792
            return None
1793
        parent_index = self._get_parent_index()
1794
        last_changed_revision = entry[1][parent_index][4]
4976.1.2 by Jelmer Vernooij
Raise FileStampUnavailable if there is no filestamp known.
1795
        try:
1796
            rev = self._repository.get_revision(last_changed_revision)
1797
        except errors.NoSuchRevision:
1798
            raise errors.FileTimestampUnavailable(self.id2path(file_id))
1799
        return rev.timestamp
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
1800
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1801
    def get_file_sha1(self, file_id, path=None, stat_value=None):
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1802
        entry = self._get_entry(file_id=file_id, path=path)
1803
        parent_index = self._get_parent_index()
1804
        parent_details = entry[1][parent_index]
1805
        if parent_details[0] == 'f':
1806
            return parent_details[1]
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1807
        return None
1808
5793.2.3 by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method.
1809
    @needs_read_lock
1810
    def get_file_revision(self, file_id):
1811
        return self.inventory[file_id].revision
1812
2743.3.3 by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path
1813
    def get_file(self, file_id, path=None):
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1814
        return StringIO(self.get_file_text(file_id))
1815
1816
    def get_file_size(self, file_id):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
1817
        """See Tree.get_file_size"""
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1818
        return self.inventory[file_id].text_size
1819
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
1820
    def get_file_text(self, file_id, path=None):
4202.1.1 by John Arbash Meinel
Update Repository.iter_files_bytes() to return an iterable of bytestrings.
1821
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1822
        return ''.join(content)
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1823
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
1824
    def get_reference_revision(self, file_id, path=None):
1825
        return self.inventory[file_id].reference_revision
2255.2.218 by Robert Collins
Make the nested tree commit smoke test be more rigourous.
1826
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1827
    def iter_files_bytes(self, desired_files):
1828
        """See Tree.iter_files_bytes.
2708.1.4 by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes
1829
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1830
        This version is implemented on top of Repository.iter_files_bytes"""
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
1831
        parent_index = self._get_parent_index()
2708.1.11 by Aaron Bentley
Test and tweak error handling
1832
        repo_desired_files = []
1833
        for file_id, identifier in desired_files:
1834
            entry = self._get_entry(file_id)
1835
            if entry == (None, None):
1836
                raise errors.NoSuchId(self, file_id)
1837
            repo_desired_files.append((file_id, entry[1][parent_index][4],
1838
                                       identifier))
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
1839
        return self._repository.iter_files_bytes(repo_desired_files)
2708.1.4 by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes
1840
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
1841
    def get_symlink_target(self, file_id):
1842
        entry = self._get_entry(file_id=file_id)
1843
        parent_index = self._get_parent_index()
1844
        if entry[1][parent_index][0] != 'l':
1845
            return None
1846
        else:
4216.3.1 by Robert Collins
Fix Tree.get_symlink_target to decode from the disk encoding to get a unicode encoded string.
1847
            target = entry[1][parent_index][1]
1848
            target = target.decode('utf8')
1849
            return target
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
1850
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1851
    def get_revision_id(self):
1852
        """Return the revision id for this tree."""
1853
        return self._revision_id
1854
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1855
    def _get_inventory(self):
1856
        if self._inventory is not None:
1857
            return self._inventory
2255.2.182 by Martin Pool
merge dirstate and trunk
1858
        self._must_be_locked()
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1859
        self._generate_inventory()
1860
        return self._inventory
1861
1862
    inventory = property(_get_inventory,
1863
                         doc="Inventory of this Tree")
1864
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1865
    def get_parent_ids(self):
1866
        """The parents of a tree in the dirstate are not cached."""
1867
        return self._repository.get_revision(self._revision_id).parent_ids
1868
2255.2.30 by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.
1869
    def has_filename(self, filename):
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
1870
        return bool(self.path2id(filename))
2255.2.30 by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.
1871
2255.2.182 by Martin Pool
merge dirstate and trunk
1872
    def kind(self, file_id):
3016.1.1 by Aaron Bentley
Update DirStateRevisionTree to avoid using inventory
1873
        entry = self._get_entry(file_id=file_id)[1]
3376.2.11 by Martin Pool
Compare to None using is/is not not ==
1874
        if entry is None:
3016.1.1 by Aaron Bentley
Update DirStateRevisionTree to avoid using inventory
1875
            raise errors.NoSuchId(tree=self, file_id=file_id)
5080.3.3 by Vincent Ladeuil
DirStateRevisionTree.kind() should respect parent_index
1876
        parent_index = self._get_parent_index()
1877
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
2255.2.182 by Martin Pool
merge dirstate and trunk
1878
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
1879
    def stored_kind(self, file_id):
1880
        """See Tree.stored_kind"""
1881
        return self.kind(file_id)
1882
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
1883
    def path_content_summary(self, path):
1884
        """See Tree.path_content_summary."""
1885
        id = self.inventory.path2id(path)
1886
        if id is None:
1887
            return ('missing', None, None, None)
1888
        entry = self._inventory[id]
1889
        kind = entry.kind
1890
        if kind == 'file':
1891
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
1892
        elif kind == 'symlink':
1893
            return (kind, None, None, entry.symlink_target)
1894
        else:
1895
            return (kind, None, None, None)
1896
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1897
    def is_executable(self, file_id, path=None):
1898
        ie = self.inventory[file_id]
1899
        if ie.kind != "file":
5050.57.1 by Aaron Bentley
Make is_executable treat symlinks and directories the same across tree types.
1900
            return False
2255.2.31 by Robert Collins
Work in progress to make merge_inner work with dirstate trees.
1901
        return ie.executable
1902
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1903
    def is_locked(self):
1904
        return self._locked
1905
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1906
    def list_files(self, include_root=False, from_dir=None, recursive=True):
2255.2.71 by John Arbash Meinel
Add a test for list_files, and implement it for DirStateRevisionTree
1907
        # We use a standard implementation, because DirStateRevisionTree is
1908
        # dealing with one of the parents of the current state
1909
        inv = self._get_inventory()
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1910
        if from_dir is None:
1911
            from_dir_id = None
1912
        else:
1913
            from_dir_id = inv.path2id(from_dir)
4370.5.3 by Ian Clatworthy
handle unversioned directories
1914
            if from_dir_id is None:
1915
                # Directory not versioned
1916
                return
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1917
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1918
        if inv.root is not None and not include_root and from_dir is None:
2255.2.71 by John Arbash Meinel
Add a test for list_files, and implement it for DirStateRevisionTree
1919
            entries.next()
1920
        for path, entry in entries:
1921
            yield path, 'V', entry.kind, entry.file_id, entry
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1922
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1923
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1924
        """Lock the tree for a set of operations.
1925
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1926
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1927
        """
2255.2.79 by Robert Collins
Take out repository locks from Dirstate revision trees, to improve file text access performance.
1928
        if not self._locked:
1929
            self._repository.lock_read()
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
1930
            if self._dirstate._lock_token is None:
1931
                self._dirstate.lock_read()
1932
                self._dirstate_locked = True
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1933
        self._locked += 1
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1934
        return LogicalLockResult(self.unlock)
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1935
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1936
    def _must_be_locked(self):
1937
        if not self._locked:
1938
            raise errors.ObjectNotLocked(self)
1939
2255.2.98 by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory.
1940
    @needs_read_lock
2255.2.65 by John Arbash Meinel
override path2id because it should be optimized anyway
1941
    def path2id(self, path):
1942
        """Return the id for path in this tree."""
2255.2.98 by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory.
1943
        # lookup by path: faster than splitting and walking the ivnentory.
1944
        entry = self._get_entry(path=path)
1945
        if entry == (None, None):
1946
            return None
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
1947
        return entry[0][2]
2255.2.65 by John Arbash Meinel
override path2id because it should be optimized anyway
1948
2255.2.3 by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
1949
    def unlock(self):
1950
        """Unlock, freeing any cache memory used during the lock."""
1951
        # outside of a lock, the inventory is suspect: release it.
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1952
        self._locked -=1
1953
        if not self._locked:
1954
            self._inventory = None
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
1955
            self._locked = 0
1956
            if self._dirstate_locked:
1957
                self._dirstate.unlock()
1958
                self._dirstate_locked = False
2255.2.79 by Robert Collins
Take out repository locks from Dirstate revision trees, to improve file text access performance.
1959
            self._repository.unlock()
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1960
3504.2.1 by John Arbash Meinel
Shortcut iter_references when we know references aren't supported.
1961
    @needs_read_lock
1962
    def supports_tree_reference(self):
1963
        return self._repo_supports_tree_reference
1964
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1965
    def walkdirs(self, prefix=""):
2255.2.236 by Martin Pool
Review cleanups: mostly updating or removing todo comments.
1966
        # TODO: jam 20070215 This is the lazy way by using the RevisionTree
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1967
        # implementation based on an inventory.
2255.2.236 by Martin Pool
Review cleanups: mostly updating or removing todo comments.
1968
        # This should be cleaned up to use the much faster Dirstate code
1969
        # So for now, we just build up the parent inventory, and extract
1970
        # it the same way RevisionTree does.
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1971
        _directory = 'directory'
2255.2.70 by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs()
1972
        inv = self._get_inventory()
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1973
        top_id = inv.path2id(prefix)
1974
        if top_id is None:
1975
            pending = []
1976
        else:
2255.2.70 by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs()
1977
            pending = [(prefix, top_id)]
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1978
        while pending:
1979
            dirblock = []
2255.2.70 by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs()
1980
            relpath, file_id = pending.pop()
1981
            # 0 - relpath, 1- file-id
1982
            if relpath:
1983
                relroot = relpath + '/'
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1984
            else:
1985
                relroot = ""
1986
            # FIXME: stash the node in pending
2255.2.70 by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs()
1987
            entry = inv[file_id]
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1988
            for name, child in entry.sorted_children():
1989
                toppath = relroot + name
1990
                dirblock.append((toppath, name, child.kind, None,
1991
                    child.file_id, child.kind
1992
                    ))
2255.2.70 by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs()
1993
            yield (relpath, entry.file_id), dirblock
2255.2.69 by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
1994
            # push the user specified dirs from dirblock
1995
            for dir in reversed(dirblock):
1996
                if dir[2] == _directory:
2255.2.70 by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs()
1997
                    pending.append((dir[0], dir[4]))
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
1998
1999
2000
class InterDirStateTree(InterTree):
2255.13.3 by Martin Pool
Comments and better assertions in InterDirStateTree
2001
    """Fast path optimiser for changes_from with dirstate trees.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2002
2003
    This is used only when both trees are in the dirstate working file, and
2004
    the source is any parent within the dirstate, and the destination is
2255.13.3 by Martin Pool
Comments and better assertions in InterDirStateTree
2005
    the current working tree of the same dirstate.
2006
    """
2007
    # this could be generalized to allow comparisons between any trees in the
2008
    # dirstate, and possibly between trees stored in different dirstates.
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2009
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2010
    def __init__(self, source, target):
2011
        super(InterDirStateTree, self).__init__(source, target)
2012
        if not InterDirStateTree.is_compatible(source, target):
2013
            raise Exception, "invalid source %r and target %r" % (source, target)
2014
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2015
    @staticmethod
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2016
    def make_source_parent_tree(source, target):
2017
        """Change the source tree into a parent of the target."""
2018
        revid = source.commit('record tree')
5741.1.4 by Jelmer Vernooij
Change Branch.fetch to take fetch_tags argument rather than fetch_spec.
2019
        target.branch.fetch(source.branch, revid)
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2020
        target.set_parent_ids([revid])
2021
        return target.basis_tree(), target
2255.7.25 by John Arbash Meinel
Shave off 200+ ms of 'time bzr status' in lp tree
2022
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2023
    @classmethod
3696.4.15 by Robert Collins
Merge bzr.dev.
2024
    def make_source_parent_tree_python_dirstate(klass, test_case, source, target):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2025
        result = klass.make_source_parent_tree(source, target)
2026
        result[1]._iter_changes = dirstate.ProcessEntryPython
2027
        return result
2028
2029
    @classmethod
4913.2.4 by John Arbash Meinel
Switch CompiledDirstateHelpersFeature.
2030
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
2031
                                                  target):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2032
        from bzrlib.tests.test__dirstate_helpers import \
4913.2.25 by John Arbash Meinel
Some helpers were accessing a feature that got renamed.
2033
            compiled_dirstate_helpers_feature
2034
        test_case.requireFeature(compiled_dirstate_helpers_feature)
4459.2.1 by Vincent Ladeuil
Use a consistent scheme for naming pyrex source files.
2035
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2036
        result = klass.make_source_parent_tree(source, target)
2037
        result[1]._iter_changes = ProcessEntryC
2038
        return result
2039
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2040
    _matching_from_tree_format = WorkingTreeFormat4()
2041
    _matching_to_tree_format = WorkingTreeFormat4()
3363.14.11 by Aaron Bentley
Fix intertree tests with dirstate
2042
2043
    @classmethod
2044
    def _test_mutable_trees_to_test_trees(klass, test_case, source, target):
3696.4.15 by Robert Collins
Merge bzr.dev.
2045
        # This method shouldn't be called, because we have python and C
2046
        # specific flavours.
2047
        raise NotImplementedError
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2048
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
2049
    def iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2050
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
2051
                      require_versioned=True, want_unversioned=False):
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2052
        """Return the changes from source to target.
2053
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
2054
        :return: An iterator that yields tuples. See InterTree.iter_changes
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2055
            for details.
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2056
        :param specific_files: An optional list of file paths to restrict the
2057
            comparison to. When mapping filenames to ids, all matches in all
2058
            trees (including optional extra_trees) are used, and all children of
2059
            matched directories are included.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2060
        :param include_unchanged: An optional boolean requesting the inclusion of
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2061
            unchanged entries in the result.
2062
        :param extra_trees: An optional list of additional trees to use when
2063
            mapping the contents of specific_files (paths) to file_ids.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2064
        :param require_versioned: If True, all files in specific_files must be
2065
            versioned in one of source, target, extra_trees or
2066
            PathsNotVersionedError is raised.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
2067
        :param want_unversioned: Should unversioned files be returned in the
2068
            output. An unversioned file is defined as one with (False, False)
2069
            for the versioned pair.
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
2070
        """
2255.2.155 by Martin Pool
Better assertion message from InterDirStateTree._iter_changes
2071
        # TODO: handle extra trees in the dirstate.
2974.2.1 by John Arbash Meinel
Re-enable the fast path for the no-parent commit case.
2072
        if (extra_trees or specific_files == []):
2255.2.155 by Martin Pool
Better assertion message from InterDirStateTree._iter_changes
2073
            # we can't fast-path these cases (yet)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2074
            return super(InterDirStateTree, self).iter_changes(
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2075
                include_unchanged, specific_files, pb, extra_trees,
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2076
                require_versioned, want_unversioned=want_unversioned)
2255.7.1 by John Arbash Meinel
_iter_changes should return Unicode paths.
2077
        parent_ids = self.target.get_parent_ids()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2078
        if not (self.source._revision_id in parent_ids
4496.3.16 by Andrew Bennetts
Remove lots of unused imports.
2079
                or self.source._revision_id == _mod_revision.NULL_REVISION):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2080
            raise AssertionError(
2081
                "revision {%s} is not stored in {%s}, but %s "
2082
                "can only be used for trees stored in the dirstate"
2083
                % (self.source._revision_id, self.target, self.iter_changes))
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2084
        target_index = 0
4496.3.16 by Andrew Bennetts
Remove lots of unused imports.
2085
        if self.source._revision_id == _mod_revision.NULL_REVISION:
2255.7.1 by John Arbash Meinel
_iter_changes should return Unicode paths.
2086
            source_index = None
2087
            indices = (target_index,)
2088
        else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2089
            if not (self.source._revision_id in parent_ids):
2090
                raise AssertionError(
2091
                    "Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
2092
                    self.source._revision_id, parent_ids))
2255.7.1 by John Arbash Meinel
_iter_changes should return Unicode paths.
2093
            source_index = 1 + parent_ids.index(self.source._revision_id)
2974.2.1 by John Arbash Meinel
Re-enable the fast path for the no-parent commit case.
2094
            indices = (source_index, target_index)
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2095
        # -- make all specific_files utf8 --
2096
        if specific_files:
2097
            specific_files_utf8 = set()
2098
            for path in specific_files:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2099
                # Note, if there are many specific files, using cache_utf8
2100
                # would be good here.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2101
                specific_files_utf8.add(path.encode('utf8'))
2102
            specific_files = specific_files_utf8
2103
        else:
2104
            specific_files = set([''])
2105
        # -- specific_files is now a utf8 path set --
4325.3.1 by Johan Walles
Don't reinvent osutils.minimum_path_selection().
2106
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2107
        # -- get the state object and prepare it.
2108
        state = self.target.current_dirstate()
2109
        state._read_dirblocks_if_needed()
2110
        if require_versioned:
2111
            # -- check all supplied paths are versioned in a search tree. --
4475.1.1 by Benoît Pierre
Improve "Path(s) are not versioned" error reporting for some commands.
2112
            not_versioned = []
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2113
            for path in specific_files:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2114
                path_entries = state._entries_for_path(path)
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2115
                if not path_entries:
2116
                    # this specified path is not present at all: error
4475.1.1 by Benoît Pierre
Improve "Path(s) are not versioned" error reporting for some commands.
2117
                    not_versioned.append(path)
2118
                    continue
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2119
                found_versioned = False
2120
                # for each id at this path
2121
                for entry in path_entries:
2122
                    # for each tree.
2255.7.1 by John Arbash Meinel
_iter_changes should return Unicode paths.
2123
                    for index in indices:
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2124
                        if entry[1][index][0] != 'a': # absent
2125
                            found_versioned = True
2126
                            # all good: found a versioned cell
2127
                            break
2128
                if not found_versioned:
2129
                    # none of the indexes was not 'absent' at all ids for this
2130
                    # path.
4475.1.1 by Benoît Pierre
Improve "Path(s) are not versioned" error reporting for some commands.
2131
                    not_versioned.append(path)
2132
            if len(not_versioned) > 0:
2133
                raise errors.PathsNotVersionedError(not_versioned)
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2134
        # -- remove redundancy in supplied specific_files to prevent over-scanning --
4325.3.1 by Johan Walles
Don't reinvent osutils.minimum_path_selection().
2135
        search_specific_files = osutils.minimum_path_selection(specific_files)
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
2136
2137
        use_filesystem_for_exec = (sys.platform != 'win32')
2138
        iter_changes = self.target._iter_changes(include_unchanged,
2139
            use_filesystem_for_exec, search_specific_files, state,
2140
            source_index, target_index, want_unversioned, self.target)
2141
        return iter_changes.iter_changes()
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
2142
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2143
    @staticmethod
2144
    def is_compatible(source, target):
2145
        # the target must be a dirstate working tree
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2146
        if not isinstance(target, DirStateWorkingTree):
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2147
            return False
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2148
        # the source must be a revtree or dirstate rev tree.
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2149
        if not isinstance(source,
2150
            (revisiontree.RevisionTree, DirStateRevisionTree)):
2151
            return False
2152
        # the source revid must be in the target dirstate
4496.3.16 by Andrew Bennetts
Remove lots of unused imports.
2153
        if not (source._revision_id == _mod_revision.NULL_REVISION or
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2154
            source._revision_id in target.get_parent_ids()):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2155
            # TODO: what about ghosts? it may well need to
2255.2.117 by Robert Collins
Add an InterDirStateTree InterTree optimiser.
2156
            # check for them explicitly.
2157
            return False
2158
        return True
2159
2160
InterTree.register_optimiser(InterDirStateTree)
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2161
2162
2163
class Converter3to4(object):
2164
    """Perform an in-place upgrade of format 3 to format 4 trees."""
2165
2166
    def __init__(self):
2167
        self.target_format = WorkingTreeFormat4()
2168
2169
    def convert(self, tree):
2170
        # lock the control files not the tree, so that we dont get tree
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2171
        # on-unlock behaviours, and so that noone else diddles with the
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2172
        # tree during upgrade.
2173
        tree._control_files.lock_write()
2174
        try:
2334.1.3 by John Arbash Meinel
When upgrading, we can't assume that WorkingTree._inventory is valid, because that is now
2175
            tree.read_working_inventory()
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2176
            self.create_dirstate_data(tree)
2177
            self.update_format(tree)
2178
            self.remove_xml_files(tree)
2179
        finally:
2180
            tree._control_files.unlock()
2181
2182
    def create_dirstate_data(self, tree):
2183
        """Create the dirstate based data for tree."""
2184
        local_path = tree.bzrdir.get_workingtree_transport(None
2185
            ).local_abspath('dirstate')
2186
        state = dirstate.DirState.from_tree(tree, local_path)
2187
        state.save()
2188
        state.unlock()
2189
2190
    def remove_xml_files(self, tree):
2191
        """Remove the oldformat 3 data."""
2192
        transport = tree.bzrdir.get_workingtree_transport(None)
2193
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
2194
            'pending-merges', 'stat-cache']:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
2195
            try:
2196
                transport.delete(path)
2197
            except errors.NoSuchFile:
2198
                # some files are optional - just deal.
2199
                pass
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2200
2201
    def update_format(self, tree):
2202
        """Change the format marker."""
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
2203
        tree._transport.put_bytes('format',
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2204
            self.target_format.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2205
            mode=tree.bzrdir._get_file_mode())
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2206
2207
2208
class Converter4to5(object):
2209
    """Perform an in-place upgrade of format 4 to format 5 trees."""
2210
2211
    def __init__(self):
2212
        self.target_format = WorkingTreeFormat5()
2213
2214
    def convert(self, tree):
2215
        # lock the control files not the tree, so that we don't get tree
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2216
        # on-unlock behaviours, and so that no-one else diddles with the
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2217
        # tree during upgrade.
2218
        tree._control_files.lock_write()
2219
        try:
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
2220
            self.update_format(tree)
2221
        finally:
2222
            tree._control_files.unlock()
2223
2224
    def update_format(self, tree):
2225
        """Change the format marker."""
2226
        tree._transport.put_bytes('format',
2227
            self.target_format.get_format_string(),
2228
            mode=tree.bzrdir._get_file_mode())
2229
2230
2231
class Converter4or5to6(object):
2232
    """Perform an in-place upgrade of format 4 or 5 to format 6 trees."""
2233
2234
    def __init__(self):
2235
        self.target_format = WorkingTreeFormat6()
2236
2237
    def convert(self, tree):
2238
        # lock the control files not the tree, so that we don't get tree
2239
        # on-unlock behaviours, and so that no-one else diddles with the
2240
        # tree during upgrade.
2241
        tree._control_files.lock_write()
2242
        try:
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2243
            self.init_custom_control_files(tree)
2244
            self.update_format(tree)
2245
        finally:
2246
            tree._control_files.unlock()
2247
2248
    def init_custom_control_files(self, tree):
2249
        """Initialize custom control files."""
2250
        tree._transport.put_bytes('views', '',
2251
            mode=tree.bzrdir._get_file_mode())
2252
2253
    def update_format(self, tree):
2254
        """Change the format marker."""
2255
        tree._transport.put_bytes('format',
2256
            self.target_format.get_format_string(),
2257
            mode=tree.bzrdir._get_file_mode())