/brz/remove-bazaar

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