/brz/remove-bazaar

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