/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1852.13.20 by Robert Collins
Steps toward an object model.
17
"""DirState objects record the state of a directory and its bzr metadata.
18
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
19
Pseudo EBNF grammar for the state file. Fields are separated by NULLs, and
20
lines by NL. The field delimiters are ommitted in the grammar, line delimiters
21
are not - this is done for clarity of reading. All string data is in utf8.
22
2255.2.172 by Martin Pool
Recognize 't' (tree-reference) minikind in DirState._get_entry
23
MINIKIND = "f" | "d" | "l" | "a" | "r" | "t";
1852.13.20 by Robert Collins
Steps toward an object model.
24
NL = "\n";
25
NULL = "\0";
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
26
WHOLE_NUMBER = {digit}, digit;
27
BOOLEAN = "y" | "n";
28
REVISION_ID = a non-empty utf8 string;
1852.13.20 by Robert Collins
Steps toward an object model.
29
30
dirstate format = header line, full checksum, row count, parent details,
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
31
 ghost_details, entries;
2818.2.2 by Ian Clatworthy
review feedback
32
header line = "#bazaar dirstate flat format 3", NL;
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
33
full checksum = "crc32: ", ["-"], WHOLE_NUMBER, NL;
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
34
row count = "num_entries: ", WHOLE_NUMBER, NL;
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
35
parent_details = WHOLE NUMBER, {REVISION_ID}* NL;
36
ghost_details = WHOLE NUMBER, {REVISION_ID}*, NL;
37
entries = {entry};
38
entry = entry_key, current_entry_details, {parent_entry_details};
39
entry_key = dirname,  basename, fileid;
40
current_entry_details = common_entry_details, working_entry_details;
41
parent_entry_details = common_entry_details, history_entry_details;
42
common_entry_details = MINIKIND, fingerprint, size, executable
43
working_entry_details = packed_stat
44
history_entry_details = REVISION_ID;
45
executable = BOOLEAN;
46
size = WHOLE_NUMBER;
47
fingerprint = a nonempty utf8 sequence with meaning defined by minikind.
48
49
Given this definition, the following is useful to know:
50
entry (aka row) - all the data for a given key.
51
entry[0]: The key (dirname, basename, fileid)
52
entry[0][0]: dirname
53
entry[0][1]: basename
54
entry[0][2]: fileid
55
entry[1]: The tree(s) data for this path and id combination.
56
entry[1][0]: The current tree
57
entry[1][1]: The second tree
58
59
For an entry for a tree, we have (using tree 0 - current tree) to demonstrate:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
60
entry[1][0][0]: minikind
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
61
entry[1][0][1]: fingerprint
62
entry[1][0][2]: size
63
entry[1][0][3]: executable
64
entry[1][0][4]: packed_stat
65
OR (for non tree-0)
66
entry[1][1][4]: revision_id
67
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
68
There may be multiple rows at the root, one per id present in the root, so the
69
in memory root row is now:
70
self._dirblocks[0] -> ('', [entry ...]),
71
and the entries in there are
72
entries[0][0]: ''
73
entries[0][1]: ''
74
entries[0][2]: file_id
75
entries[1][0]: The tree data for the current tree for this fileid at /
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
76
etc.
77
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
78
Kinds:
79
'r' is a relocated entry: This path is not present in this tree with this id,
80
    but the id can be found at another location. The fingerprint is used to
81
    point to the target location.
82
'a' is an absent entry: In that tree the id is not present at this path.
83
'd' is a directory entry: This path in this tree is a directory with the
84
    current file id. There is no fingerprint for directories.
85
'f' is a file entry: As for directory, but its a file. The fingerprint is a
86
    sha1 value.
87
'l' is a symlink entry: As for directory, but a symlink. The fingerprint is the
88
    link target.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
89
't' is a reference to a nested subtree; the fingerprint is the referenced
90
    revision.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
91
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
92
Ordering:
93
94
The entries on disk and in memory are ordered according to the following keys:
95
96
    directory, as a list of components
97
    filename
98
    file-id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
99
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
100
--- Format 1 had the following different definition: ---
1852.13.20 by Robert Collins
Steps toward an object model.
101
rows = dirname, NULL, basename, NULL, MINIKIND, NULL, fileid_utf8, NULL,
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
102
    WHOLE NUMBER (* size *), NULL, packed stat, NULL, sha1|symlink target, 
1852.13.20 by Robert Collins
Steps toward an object model.
103
    {PARENT ROW}
104
PARENT ROW = NULL, revision_utf8, NULL, MINIKIND, NULL, dirname, NULL,
105
    basename, NULL, WHOLE NUMBER (* size *), NULL, "y" | "n", NULL,
106
    SHA1
107
2255.2.4 by Robert Collins
Snapshot dirstate development
108
PARENT ROW's are emitted for every parent that is not in the ghosts details
109
line. That is, if the parents are foo, bar, baz, and the ghosts are bar, then
110
each row will have a PARENT ROW for foo and baz, but not for bar.
111
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
112
113
In any tree, a kind of 'moved' indicates that the fingerprint field
114
(which we treat as opaque data specific to the 'kind' anyway) has the
115
details for the id of this row in that tree.
116
117
I'm strongly tempted to add a id->path index as well, but I think that
118
where we need id->path mapping; we also usually read the whole file, so
119
I'm going to skip that for the moment, as we have the ability to locate
120
via bisect any path in any tree, and if we lookup things by path, we can
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
121
accumulate an id->path mapping as we go, which will tend to match what we
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
122
looked for.
123
124
I plan to implement this asap, so please speak up now to alter/tweak the
125
design - and once we stabilise on this, I'll update the wiki page for
126
it.
127
128
The rationale for all this is that we want fast operations for the
129
common case (diff/status/commit/merge on all files) and extremely fast
130
operations for the less common but still occurs a lot status/diff/commit
131
on specific files). Operations on specific files involve a scan for all
132
the children of a path, *in every involved tree*, which the current
133
format did not accommodate. 
1852.13.20 by Robert Collins
Steps toward an object model.
134
----
135
136
Design priorities:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
137
 1) Fast end to end use for bzr's top 5 uses cases. (commmit/diff/status/merge/???)
1852.13.20 by Robert Collins
Steps toward an object model.
138
 2) fall back current object model as needed.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
139
 3) scale usably to the largest trees known today - say 50K entries. (mozilla
140
    is an example of this)
1852.13.20 by Robert Collins
Steps toward an object model.
141
142
143
Locking:
144
 Eventually reuse dirstate objects across locks IFF the dirstate file has not
145
 been modified, but will require that we flush/ignore cached stat-hit data
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
146
 because we won't want to restat all files on disk just because a lock was
1852.13.20 by Robert Collins
Steps toward an object model.
147
 acquired, yet we cannot trust the data after the previous lock was released.
148
149
Memory representation:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
150
 vector of all directories, and vector of the childen ?
1852.13.20 by Robert Collins
Steps toward an object model.
151
   i.e. 
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
152
     root_entrie = (direntry for root, [parent_direntries_for_root]), 
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
153
     dirblocks = [
1852.13.20 by Robert Collins
Steps toward an object model.
154
     ('', ['data for achild', 'data for bchild', 'data for cchild'])
155
     ('dir', ['achild', 'cchild', 'echild'])
156
     ]
157
    - single bisect to find N subtrees from a path spec
158
    - in-order for serialisation - this is 'dirblock' grouping.
159
    - insertion of a file '/a' affects only the '/' child-vector, that is, to
160
      insert 10K elements from scratch does not generates O(N^2) memoves of a
161
      single vector, rather each individual, which tends to be limited to a 
162
      manageable number. Will scale badly on trees with 10K entries in a 
163
      single directory. compare with Inventory.InventoryDirectory which has
164
      a dictionary for the children. No bisect capability, can only probe for
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
165
      exact matches, or grab all elements and sort.
166
    - What's the risk of error here? Once we have the base format being processed
1852.13.20 by Robert Collins
Steps toward an object model.
167
      we should have a net win regardless of optimality. So we are going to 
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
168
      go with what seems reasonable.
2255.2.4 by Robert Collins
Snapshot dirstate development
169
open questions:
1852.13.20 by Robert Collins
Steps toward an object model.
170
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
171
Maybe we should do a test profile of the core structure - 10K simulated
172
searches/lookups/etc?
1852.13.20 by Robert Collins
Steps toward an object model.
173
174
Objects for each row?
175
The lifetime of Dirstate objects is current per lock, but see above for
176
possible extensions. The lifetime of a row from a dirstate is expected to be
177
very short in the optimistic case: which we are optimising for. For instance,
178
subtree status will determine from analysis of the disk data what rows need to
179
be examined at all, and will be able to determine from a single row whether
180
that file has altered or not, so we are aiming to process tens of thousands of
181
entries each second within the dirstate context, before exposing anything to
182
the larger codebase. This suggests we want the time for a single file
183
comparison to be < 0.1 milliseconds. That would give us 10000 paths per second
184
processed, and to scale to 100 thousand we'll another order of magnitude to do
185
that. Now, as the lifetime for all unchanged entries is the time to parse, stat
186
the file on disk, and then immediately discard, the overhead of object creation
187
becomes a significant cost.
188
189
Figures: Creating a tuple from from 3 elements was profiled at 0.0625
190
microseconds, whereas creating a object which is subclassed from tuple was
191
0.500 microseconds, and creating an object with 3 elements and slots was 3
192
microseconds long. 0.1 milliseconds is 100 microseconds, and ideally we'll get
193
down to 10 microseconds for the total processing - having 33% of that be object
194
creation is a huge overhead. There is a potential cost in using tuples within
195
each row which is that the conditional code to do comparisons may be slower
196
than method invocation, but method invocation is known to be slow due to stack
197
frame creation, so avoiding methods in these tight inner loops in unfortunately
198
desirable. We can consider a pyrex version of this with objects in future if
199
desired.
200
201
"""
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
202
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
203
import bisect
2474.1.40 by John Arbash Meinel
(python-only) Shave a bit of time off by calling binascii.b2a_base64
204
import binascii
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
205
import errno
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
206
import os
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
207
from stat import S_IEXEC
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
208
import stat
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
209
import struct
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
210
import sys
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
211
import time
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
212
import zlib
213
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
214
from bzrlib import (
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
215
    cache_utf8,
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
216
    debug,
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
217
    errors,
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
218
    inventory,
2255.4.2 by James Westby
(broken) Add the locking methods.
219
    lock,
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
220
    osutils,
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
221
    trace,
222
    )
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
223
224
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
225
def pack_stat(st, _encode=binascii.b2a_base64, _pack=struct.pack):
226
    """Convert stat values into a packed representation."""
227
    # jam 20060614 it isn't really worth removing more entries if we
228
    # are going to leave it in packed form.
229
    # With only st_mtime and st_mode filesize is 5.5M and read time is 275ms
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
230
    # With all entries, filesize is 5.9M and read time is maybe 280ms
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
231
    # well within the noise margin
232
2485.3.6 by John Arbash Meinel
Delay calling pathjoin() until we've figured out we're going to use it
233
    # base64 encoding always adds a final newline, so strip it off
2485.3.7 by John Arbash Meinel
Comment on some alternative 'pack_stat'
234
    # The current version
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
235
    return _encode(_pack('>LLLLLL'
236
        , st.st_size, int(st.st_mtime), int(st.st_ctime)
237
        , st.st_dev, st.st_ino & 0xFFFFFFFF, st.st_mode))[:-1]
2485.3.7 by John Arbash Meinel
Comment on some alternative 'pack_stat'
238
    # This is 0.060s / 1.520s faster by not encoding as much information
239
    # return _encode(_pack('>LL', int(st.st_mtime), st.st_mode))[:-1]
240
    # This is not strictly faster than _encode(_pack())[:-1]
241
    # return '%X.%X.%X.%X.%X.%X' % (
242
    #      st.st_size, int(st.st_mtime), int(st.st_ctime),
243
    #      st.st_dev, st.st_ino, st.st_mode)
244
    # Similar to the _encode(_pack('>LL'))
245
    # return '%X.%X' % (int(st.st_mtime), st.st_mode)
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
246
247
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
248
class DirState(object):
249
    """Record directory and metadata state for fast access.
250
251
    A dirstate is a specialised data structure for managing local working
252
    tree state information. Its not yet well defined whether it is platform
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
253
    specific, and if it is how we detect/parameterize that.
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
254
255
    Dirstates use the usual lock_write, lock_read and unlock mechanisms.
256
    Unlike most bzr disk formats, DirStates must be locked for reading, using
257
    lock_read.  (This is an os file lock internally.)  This is necessary
258
    because the file can be rewritten in place.
259
260
    DirStates must be explicitly written with save() to commit changes; just
261
    unlocking them does not write the changes to disk.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
262
    """
263
2255.2.169 by Martin Pool
(broken) merge dirstate branch
264
    _kind_to_minikind = {
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
265
            'absent': 'a',
266
            'file': 'f',
267
            'directory': 'd',
268
            'relocated': 'r',
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
269
            'symlink': 'l',
270
            'tree-reference': 't',
271
        }
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
272
    _minikind_to_kind = {
273
            'a': 'absent',
274
            'f': 'file',
275
            'd': 'directory',
276
            'l':'symlink',
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
277
            'r': 'relocated',
278
            't': 'tree-reference',
279
        }
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
280
    _stat_to_minikind = {
281
        stat.S_IFDIR:'d',
282
        stat.S_IFREG:'f',
283
        stat.S_IFLNK:'l',
284
    }
1852.13.20 by Robert Collins
Steps toward an object model.
285
    _to_yesno = {True:'y', False: 'n'} # TODO profile the performance gain
286
     # of using int conversion rather than a dict here. AND BLAME ANDREW IF
287
     # it is faster.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
288
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
289
    # TODO: jam 20070221 Figure out what to do if we have a record that exceeds
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
290
    #       the BISECT_PAGE_SIZE. For now, we just have to make it large enough
291
    #       that we are sure a single record will always fit.
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
292
    BISECT_PAGE_SIZE = 4096
293
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
294
    NOT_IN_MEMORY = 0
295
    IN_MEMORY_UNMODIFIED = 1
296
    IN_MEMORY_MODIFIED = 2
297
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
298
    # A pack_stat (the x's) that is just noise and will never match the output
299
    # of base64 encode.
2255.2.4 by Robert Collins
Snapshot dirstate development
300
    NULLSTAT = 'x' * 32
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
301
    NULL_PARENT_DETAILS = ('a', '', 0, False, '')
2255.2.4 by Robert Collins
Snapshot dirstate development
302
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
303
    HEADER_FORMAT_2 = '#bazaar dirstate flat format 2\n'
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
304
    HEADER_FORMAT_3 = '#bazaar dirstate flat format 3\n'
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
305
2255.4.1 by James Westby
Store the filename of the dirstate in an attribute.
306
    def __init__(self, path):
2255.2.4 by Robert Collins
Snapshot dirstate development
307
        """Create a  DirState object.
308
2255.4.1 by James Westby
Store the filename of the dirstate in an attribute.
309
        :param path: The path at which the dirstate file on disk should live.
2255.2.4 by Robert Collins
Snapshot dirstate development
310
        """
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
311
        # _header_state and _dirblock_state represent the current state
312
        # of the dirstate metadata and the per-row data respectiely.
313
        # NOT_IN_MEMORY indicates that no data is in memory
314
        # IN_MEMORY_UNMODIFIED indicates that what we have in memory
315
        #   is the same as is on disk
316
        # IN_MEMORY_MODIFIED indicates that we have a modified version
317
        #   of what is on disk. 
318
        # In future we will add more granularity, for instance _dirblock_state
319
        # will probably support partially-in-memory as a separate variable,
320
        # allowing for partially-in-memory unmodified and partially-in-memory
321
        # modified states.
322
        self._header_state = DirState.NOT_IN_MEMORY
323
        self._dirblock_state = DirState.NOT_IN_MEMORY
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
324
        # If true, an error has been detected while updating the dirstate, and 
325
        # for safety we're not going to commit to disk.
326
        self._changes_aborted = False
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
327
        self._dirblocks = []
328
        self._ghosts = []
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
329
        self._parents = []
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
330
        self._state_file = None
2255.4.2 by James Westby
(broken) Add the locking methods.
331
        self._filename = path
332
        self._lock_token = None
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
333
        self._lock_state = None
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
334
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
335
        # a map from packed_stat to sha's.
336
        self._packed_stat_index = None
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
337
        self._end_of_header = None
2255.10.6 by John Arbash Meinel
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
338
        self._cutoff_time = None
2255.7.20 by John Arbash Meinel
update test for format 3, and enable caching of path split while lock is held.
339
        self._split_path_cache = {}
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
340
        self._bisect_page_size = DirState.BISECT_PAGE_SIZE
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
341
        if 'hashcache' in debug.debug_flags:
342
            self._sha1_file = self._sha1_file_and_mutter
343
        else:
344
            self._sha1_file = osutils.sha_file_by_name
2921.1.4 by Robert Collins
Documentation to aid our failing memory in the future.
345
        # These two attributes provide a simple cache for lookups into the
346
        # dirstate in-memory vectors. By probing respectively for the last
347
        # block, and for the next entry, we save nearly 2 bisections per path
348
        # during commit.
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
349
        self._last_block_index = None
350
        self._last_entry_index = None
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
351
2255.2.222 by Martin Pool
Add DirState repr so we get meaningful messages
352
    def __repr__(self):
353
        return "%s(%r)" % \
354
            (self.__class__.__name__, self._filename)
355
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
356
    def add(self, path, file_id, kind, stat, fingerprint):
2255.2.8 by Robert Collins
First DirState.add() method test passing.
357
        """Add a path to be tracked.
358
359
        :param path: The path within the dirstate - '' is the root, 'foo' is the
360
            path foo within the root, 'foo/bar' is the path bar within foo 
361
            within the root.
362
        :param file_id: The file id of the path being added.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
363
        :param kind: The kind of the path, as a string like 'file', 
364
            'directory', etc.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
365
        :param stat: The output of os.lstat for the path.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
366
        :param fingerprint: The sha value of the file,
367
            or the target of a symlink,
368
            or the referenced revision id for tree-references,
369
            or '' for directories.
2255.2.8 by Robert Collins
First DirState.add() method test passing.
370
        """
371
        # adding a file:
372
        # find the block its in. 
373
        # find the location in the block.
374
        # check its not there
375
        # add it.
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
376
        #------- copied from inventory.ensure_normalized_name - keep synced.
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
377
        # --- normalized_filename wants a unicode basename only, so get one.
2474.1.74 by John Arbash Meinel
Revert the accidental removal of the Unicode normalization check code.
378
        dirname, basename = osutils.split(path)
379
        # we dont import normalized_filename directly because we want to be
380
        # able to change the implementation at runtime for tests.
381
        norm_name, can_access = osutils.normalized_filename(basename)
382
        if norm_name != basename:
383
            if can_access:
384
                basename = norm_name
385
            else:
386
                raise errors.InvalidNormalization(path)
2255.2.225 by Martin Pool
Prohibit dirstate from getting entries called ..
387
        # you should never have files called . or ..; just add the directory
388
        # in the parent, or according to the special treatment for the root
389
        if basename == '.' or basename == '..':
390
            raise errors.InvalidEntryName(path)
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
391
        # now that we've normalised, we need the correct utf8 path and 
392
        # dirname and basename elements. This single encode and split should be
393
        # faster than three separate encodes.
2474.1.74 by John Arbash Meinel
Revert the accidental removal of the Unicode normalization check code.
394
        utf8path = (dirname + '/' + basename).strip('/').encode('utf8')
395
        dirname, basename = osutils.split(utf8path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
396
        if file_id.__class__ != str:
397
            raise AssertionError(
398
                "must be a utf8 file_id not %s" % (type(file_id), ))
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
399
        # Make sure the file_id does not exist in this tree
400
        file_id_entry = self._get_entry(0, fileid_utf8=file_id)
401
        if file_id_entry != (None, None):
402
            path = osutils.pathjoin(file_id_entry[0][0], file_id_entry[0][1])
403
            kind = DirState._minikind_to_kind[file_id_entry[1][0][0]]
404
            info = '%s:%s' % (kind, path)
405
            raise errors.DuplicateFileId(file_id, info)
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
406
        first_key = (dirname, basename, '')
407
        block_index, present = self._find_block_index_from_key(first_key)
408
        if present:
409
            # check the path is not in the tree
410
            block = self._dirblocks[block_index][1]
411
            entry_index, _ = self._find_entry_index(first_key, block)
412
            while (entry_index < len(block) and 
413
                block[entry_index][0][0:2] == first_key[0:2]):
414
                if block[entry_index][1][0][0] not in 'ar':
415
                    # this path is in the dirstate in the current tree.
416
                    raise Exception, "adding already added path!"
2255.7.76 by Robert Collins
Fix _get_entry, which got broken at some point, this fixes tests now, so it should not be breakable in future.
417
                entry_index += 1
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
418
        else:
2255.7.10 by John Arbash Meinel
Handle the case when we are adding a file to an empty directory.
419
            # The block where we want to put the file is not present. But it
420
            # might be because the directory was empty, or not loaded yet. Look
421
            # for a parent entry, if not found, raise NotVersionedError
422
            parent_dir, parent_base = osutils.split(dirname)
423
            parent_block_idx, parent_entry_idx, _, parent_present = \
424
                self._get_block_entry_index(parent_dir, parent_base, 0)
425
            if not parent_present:
426
                raise errors.NotVersionedError(path, str(self))
427
            self._ensure_block(parent_block_idx, parent_entry_idx, dirname)
2255.2.8 by Robert Collins
First DirState.add() method test passing.
428
        block = self._dirblocks[block_index][1]
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
429
        entry_key = (dirname, basename, file_id)
2255.2.43 by Robert Collins
WorkingTree4.add must not require a file to exist to add it when kind etc is given.
430
        if stat is None:
431
            size = 0
432
            packed_stat = DirState.NULLSTAT
433
        else:
434
            size = stat.st_size
435
            packed_stat = pack_stat(stat)
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
436
        parent_info = self._empty_parent_info()
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
437
        minikind = DirState._kind_to_minikind[kind]
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.
438
        if kind == 'file':
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
439
            entry_data = entry_key, [
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
440
                (minikind, fingerprint, size, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
441
                ] + parent_info
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.
442
        elif kind == 'directory':
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
443
            entry_data = entry_key, [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
444
                (minikind, '', 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
445
                ] + parent_info
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.
446
        elif kind == 'symlink':
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
447
            entry_data = entry_key, [
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
448
                (minikind, fingerprint, size, False, packed_stat),
449
                ] + parent_info
450
        elif kind == 'tree-reference':
451
            entry_data = entry_key, [
452
                (minikind, fingerprint, 0, False, packed_stat),
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
453
                ] + parent_info
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
454
        else:
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.
455
            raise errors.BzrError('unknown kind %r' % kind)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
456
        entry_index, present = self._find_entry_index(entry_key, block)
2323.4.1 by Robert Collins
dirstate correctness: allow adding paths present in the basis.
457
        if not present:
458
            block.insert(entry_index, entry_data)
459
        else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
460
            if block[entry_index][1][0][0] != 'a':
461
                raise AssertionError(" %r(%r) already added" % (basename, file_id))
2323.4.1 by Robert Collins
dirstate correctness: allow adding paths present in the basis.
462
            block[entry_index][1][0] = entry_data[1][0]
2255.2.8 by Robert Collins
First DirState.add() method test passing.
463
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.
464
        if kind == 'directory':
465
           # insert a new dirblock
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
466
           self._ensure_block(block_index, entry_index, utf8path)
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
467
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
468
        if self._id_index:
469
            self._id_index.setdefault(entry_key[2], set()).add(entry_key)
2255.2.8 by Robert Collins
First DirState.add() method test passing.
470
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
471
    def _bisect(self, paths):
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
472
        """Bisect through the disk structure for specific rows.
473
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
474
        :param paths: A list of paths to find
475
        :return: A dict mapping path => entries for found entries. Missing
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
476
                 entries will not be in the map.
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
477
                 The list is not sorted, and entries will be populated
478
                 based on when they were read.
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
479
        """
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
480
        self._requires_lock()
481
        # We need the file pointer to be right after the initial header block
482
        self._read_header_if_needed()
483
        # If _dirblock_state was in memory, we should just return info from
484
        # there, this function is only meant to handle when we want to read
485
        # part of the disk.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
486
        if self._dirblock_state != DirState.NOT_IN_MEMORY:
487
            raise AssertionError("bad dirblock state %r" % self._dirblock_state)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
488
489
        # The disk representation is generally info + '\0\n\0' at the end. But
490
        # for bisecting, it is easier to treat this as '\0' + info + '\0\n'
491
        # Because it means we can sync on the '\n'
492
        state_file = self._state_file
493
        file_size = os.fstat(state_file.fileno()).st_size
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
494
        # We end up with 2 extra fields, we should have a trailing '\n' to
495
        # ensure that we read the whole record, and we should have a precursur
496
        # '' which ensures that we start after the previous '\n'
497
        entry_field_count = self._fields_per_entry() + 1
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
498
499
        low = self._end_of_header
500
        high = file_size - 1 # Ignore the final '\0'
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
501
        # Map from (dir, name) => entry
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
502
        found = {}
503
504
        # Avoid infinite seeking
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
505
        max_count = 30*len(paths)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
506
        count = 0
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
507
        # pending is a list of places to look.
508
        # each entry is a tuple of low, high, dir_names
509
        #   low -> the first byte offset to read (inclusive)
510
        #   high -> the last byte offset (inclusive)
511
        #   dir_names -> The list of (dir, name) pairs that should be found in
512
        #                the [low, high] range
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
513
        pending = [(low, high, paths)]
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
514
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
515
        page_size = self._bisect_page_size
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
516
517
        fields_to_entry = self._get_fields_to_entry()
518
519
        while pending:
520
            low, high, cur_files = pending.pop()
521
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
522
            if not cur_files or low >= high:
523
                # Nothing to find
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
524
                continue
525
526
            count += 1
527
            if count > max_count:
528
                raise errors.BzrError('Too many seeks, most likely a bug.')
529
530
            mid = max(low, (low+high-page_size)/2)
531
532
            state_file.seek(mid)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
533
            # limit the read size, so we don't end up reading data that we have
534
            # already read.
535
            read_size = min(page_size, (high-mid)+1)
536
            block = state_file.read(read_size)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
537
538
            start = mid
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
539
            entries = block.split('\n')
540
541
            if len(entries) < 2:
542
                # We didn't find a '\n', so we cannot have found any records.
543
                # So put this range back and try again. But we know we have to
544
                # increase the page size, because a single read did not contain
545
                # a record break (so records must be larger than page_size)
2255.2.128 by John Arbash Meinel
Rather than falling over when the page size is to small, just increase it and try again.
546
                page_size *= 2
547
                pending.append((low, high, cur_files))
548
                continue
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
549
550
            # Check the first and last entries, in case they are partial, or if
551
            # we don't care about the rest of this page
552
            first_entry_num = 0
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
553
            first_fields = entries[0].split('\0')
554
            if len(first_fields) < entry_field_count:
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
555
                # We didn't get the complete first entry
556
                # so move start, and grab the next, which
557
                # should be a full entry
558
                start += len(entries[0])+1
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
559
                first_fields = entries[1].split('\0')
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
560
                first_entry_num = 1
561
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
562
            if len(first_fields) <= 2:
563
                # We didn't even get a filename here... what do we do?
2255.2.128 by John Arbash Meinel
Rather than falling over when the page size is to small, just increase it and try again.
564
                # Try a large page size and repeat this query
565
                page_size *= 2
566
                pending.append((low, high, cur_files))
567
                continue
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
568
            else:
569
                # Find what entries we are looking for, which occur before and
570
                # after this first record.
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
571
                after = start
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
572
                if first_fields[1]:
573
                    first_path = first_fields[1] + '/' + first_fields[2]
574
                else:
575
                    first_path = first_fields[2]
2474.1.66 by John Arbash Meinel
Some restructuring.
576
                first_loc = _bisect_path_left(cur_files, first_path)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
577
578
                # These exist before the current location
579
                pre = cur_files[:first_loc]
580
                # These occur after the current location, which may be in the
581
                # data we read, or might be after the last entry
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
582
                post = cur_files[first_loc:]
583
584
            if post and len(first_fields) >= entry_field_count:
585
                # We have files after the first entry
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
586
587
                # Parse the last entry
588
                last_entry_num = len(entries)-1
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
589
                last_fields = entries[last_entry_num].split('\0')
590
                if len(last_fields) < entry_field_count:
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
591
                    # The very last hunk was not complete,
592
                    # read the previous hunk
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
593
                    after = mid + len(block) - len(entries[-1])
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
594
                    last_entry_num -= 1
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
595
                    last_fields = entries[last_entry_num].split('\0')
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
596
                else:
597
                    after = mid + len(block)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
598
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
599
                if last_fields[1]:
600
                    last_path = last_fields[1] + '/' + last_fields[2]
601
                else:
602
                    last_path = last_fields[2]
2474.1.66 by John Arbash Meinel
Some restructuring.
603
                last_loc = _bisect_path_right(post, last_path)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
604
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
605
                middle_files = post[:last_loc]
606
                post = post[last_loc:]
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
607
608
                if middle_files:
609
                    # We have files that should occur in this block
610
                    # (>= first, <= last)
611
                    # Either we will find them here, or we can mark them as
612
                    # missing.
613
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
614
                    if middle_files[0] == first_path:
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
615
                        # We might need to go before this location
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
616
                        pre.append(first_path)
617
                    if middle_files[-1] == last_path:
618
                        post.insert(0, last_path)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
619
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
620
                    # Find out what paths we have
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
621
                    paths = {first_path:[first_fields]}
622
                    # last_path might == first_path so we need to be
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
623
                    # careful if we should append rather than overwrite
624
                    if last_entry_num != first_entry_num:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
625
                        paths.setdefault(last_path, []).append(last_fields)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
626
                    for num in xrange(first_entry_num+1, last_entry_num):
627
                        # TODO: jam 20070223 We are already splitting here, so
628
                        #       shouldn't we just split the whole thing rather
629
                        #       than doing the split again in add_one_record?
630
                        fields = entries[num].split('\0')
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
631
                        if fields[1]:
632
                            path = fields[1] + '/' + fields[2]
633
                        else:
634
                            path = fields[2]
635
                        paths.setdefault(path, []).append(fields)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
636
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
637
                    for path in middle_files:
638
                        for fields in paths.get(path, []):
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
639
                            # offset by 1 because of the opening '\0'
640
                            # consider changing fields_to_entry to avoid the
641
                            # extra list slice
642
                            entry = fields_to_entry(fields[1:])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
643
                            found.setdefault(path, []).append(entry)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
644
645
            # Now we have split up everything into pre, middle, and post, and
646
            # we have handled everything that fell in 'middle'.
647
            # We add 'post' first, so that we prefer to seek towards the
648
            # beginning, so that we will tend to go as early as we need, and
649
            # then only seek forward after that.
650
            if post:
651
                pending.append((after, high, post))
652
            if pre:
653
                pending.append((low, start-1, pre))
654
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
655
        # Consider that we may want to return the directory entries in sorted
656
        # order. For now, we just return them in whatever order we found them,
657
        # and leave it up to the caller if they care if it is ordered or not.
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
658
        return found
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
659
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
660
    def _bisect_dirblocks(self, dir_list):
661
        """Bisect through the disk structure to find entries in given dirs.
662
663
        _bisect_dirblocks is meant to find the contents of directories, which
664
        differs from _bisect, which only finds individual entries.
665
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
666
        :param dir_list: A sorted list of directory names ['', 'dir', 'foo'].
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
667
        :return: A map from dir => entries_for_dir
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
668
        """
669
        # TODO: jam 20070223 A lot of the bisecting logic could be shared
670
        #       between this and _bisect. It would require parameterizing the
671
        #       inner loop with a function, though. We should evaluate the
672
        #       performance difference.
673
        self._requires_lock()
674
        # We need the file pointer to be right after the initial header block
675
        self._read_header_if_needed()
676
        # If _dirblock_state was in memory, we should just return info from
677
        # there, this function is only meant to handle when we want to read
678
        # part of the disk.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
679
        if self._dirblock_state != DirState.NOT_IN_MEMORY:
680
            raise AssertionError("bad dirblock state %r" % self._dirblock_state)
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
681
        # The disk representation is generally info + '\0\n\0' at the end. But
682
        # for bisecting, it is easier to treat this as '\0' + info + '\0\n'
683
        # Because it means we can sync on the '\n'
684
        state_file = self._state_file
685
        file_size = os.fstat(state_file.fileno()).st_size
686
        # We end up with 2 extra fields, we should have a trailing '\n' to
687
        # ensure that we read the whole record, and we should have a precursur
688
        # '' which ensures that we start after the previous '\n'
689
        entry_field_count = self._fields_per_entry() + 1
690
691
        low = self._end_of_header
692
        high = file_size - 1 # Ignore the final '\0'
693
        # Map from dir => entry
694
        found = {}
695
696
        # Avoid infinite seeking
697
        max_count = 30*len(dir_list)
698
        count = 0
699
        # pending is a list of places to look.
700
        # each entry is a tuple of low, high, dir_names
701
        #   low -> the first byte offset to read (inclusive)
702
        #   high -> the last byte offset (inclusive)
703
        #   dirs -> The list of directories that should be found in
704
        #                the [low, high] range
705
        pending = [(low, high, dir_list)]
706
707
        page_size = self._bisect_page_size
708
709
        fields_to_entry = self._get_fields_to_entry()
710
711
        while pending:
712
            low, high, cur_dirs = pending.pop()
713
714
            if not cur_dirs or low >= high:
715
                # Nothing to find
716
                continue
717
718
            count += 1
719
            if count > max_count:
720
                raise errors.BzrError('Too many seeks, most likely a bug.')
721
722
            mid = max(low, (low+high-page_size)/2)
723
724
            state_file.seek(mid)
725
            # limit the read size, so we don't end up reading data that we have
726
            # already read.
727
            read_size = min(page_size, (high-mid)+1)
728
            block = state_file.read(read_size)
729
730
            start = mid
731
            entries = block.split('\n')
732
733
            if len(entries) < 2:
734
                # We didn't find a '\n', so we cannot have found any records.
735
                # So put this range back and try again. But we know we have to
736
                # increase the page size, because a single read did not contain
737
                # a record break (so records must be larger than page_size)
738
                page_size *= 2
739
                pending.append((low, high, cur_dirs))
740
                continue
741
742
            # Check the first and last entries, in case they are partial, or if
743
            # we don't care about the rest of this page
744
            first_entry_num = 0
745
            first_fields = entries[0].split('\0')
746
            if len(first_fields) < entry_field_count:
747
                # We didn't get the complete first entry
748
                # so move start, and grab the next, which
749
                # should be a full entry
750
                start += len(entries[0])+1
751
                first_fields = entries[1].split('\0')
752
                first_entry_num = 1
753
754
            if len(first_fields) <= 1:
755
                # We didn't even get a dirname here... what do we do?
756
                # Try a large page size and repeat this query
757
                page_size *= 2
758
                pending.append((low, high, cur_dirs))
759
                continue
760
            else:
761
                # Find what entries we are looking for, which occur before and
762
                # after this first record.
763
                after = start
764
                first_dir = first_fields[1]
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
765
                first_loc = bisect.bisect_left(cur_dirs, first_dir)
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
766
767
                # These exist before the current location
768
                pre = cur_dirs[:first_loc]
769
                # These occur after the current location, which may be in the
770
                # data we read, or might be after the last entry
771
                post = cur_dirs[first_loc:]
772
773
            if post and len(first_fields) >= entry_field_count:
774
                # We have records to look at after the first entry
775
776
                # Parse the last entry
777
                last_entry_num = len(entries)-1
778
                last_fields = entries[last_entry_num].split('\0')
779
                if len(last_fields) < entry_field_count:
780
                    # The very last hunk was not complete,
781
                    # read the previous hunk
782
                    after = mid + len(block) - len(entries[-1])
783
                    last_entry_num -= 1
784
                    last_fields = entries[last_entry_num].split('\0')
785
                else:
786
                    after = mid + len(block)
787
788
                last_dir = last_fields[1]
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
789
                last_loc = bisect.bisect_right(post, last_dir)
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
790
791
                middle_files = post[:last_loc]
792
                post = post[last_loc:]
793
794
                if middle_files:
795
                    # We have files that should occur in this block
796
                    # (>= first, <= last)
797
                    # Either we will find them here, or we can mark them as
798
                    # missing.
799
800
                    if middle_files[0] == first_dir:
801
                        # We might need to go before this location
802
                        pre.append(first_dir)
803
                    if middle_files[-1] == last_dir:
804
                        post.insert(0, last_dir)
805
806
                    # Find out what paths we have
807
                    paths = {first_dir:[first_fields]}
808
                    # last_dir might == first_dir so we need to be
809
                    # careful if we should append rather than overwrite
810
                    if last_entry_num != first_entry_num:
811
                        paths.setdefault(last_dir, []).append(last_fields)
812
                    for num in xrange(first_entry_num+1, last_entry_num):
813
                        # TODO: jam 20070223 We are already splitting here, so
814
                        #       shouldn't we just split the whole thing rather
815
                        #       than doing the split again in add_one_record?
816
                        fields = entries[num].split('\0')
817
                        paths.setdefault(fields[1], []).append(fields)
818
819
                    for cur_dir in middle_files:
820
                        for fields in paths.get(cur_dir, []):
821
                            # offset by 1 because of the opening '\0'
822
                            # consider changing fields_to_entry to avoid the
823
                            # extra list slice
824
                            entry = fields_to_entry(fields[1:])
825
                            found.setdefault(cur_dir, []).append(entry)
826
827
            # Now we have split up everything into pre, middle, and post, and
828
            # we have handled everything that fell in 'middle'.
829
            # We add 'post' first, so that we prefer to seek towards the
830
            # beginning, so that we will tend to go as early as we need, and
831
            # then only seek forward after that.
832
            if post:
833
                pending.append((after, high, post))
834
            if pre:
835
                pending.append((low, start-1, pre))
836
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
837
        return found
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
838
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
839
    def _bisect_recursive(self, paths):
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
840
        """Bisect for entries for all paths and their children.
841
842
        This will use bisect to find all records for the supplied paths. It
843
        will then continue to bisect for any records which are marked as
844
        directories. (and renames?)
845
846
        :param paths: A sorted list of (dir, name) pairs
847
             eg: [('', 'a'), ('', 'f'), ('a/b', 'c')]
848
        :return: A dictionary mapping (dir, name, file_id) => [tree_info]
849
        """
850
        # Map from (dir, name, file_id) => [tree_info]
851
        found = {}
852
853
        found_dir_names = set()
854
855
        # Directories that have been read
856
        processed_dirs = set()
857
        # Get the ball rolling with the first bisect for all entries.
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
858
        newly_found = self._bisect(paths)
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
859
860
        while newly_found:
861
            # Directories that need to be read
862
            pending_dirs = set()
863
            paths_to_search = set()
864
            for entry_list in newly_found.itervalues():
865
                for dir_name_id, trees_info in entry_list:
866
                    found[dir_name_id] = trees_info
867
                    found_dir_names.add(dir_name_id[:2])
868
                    is_dir = False
869
                    for tree_info in trees_info:
870
                        minikind = tree_info[0]
871
                        if minikind == 'd':
872
                            if is_dir:
873
                                # We already processed this one as a directory,
874
                                # we don't need to do the extra work again.
875
                                continue
876
                            subdir, name, file_id = dir_name_id
877
                            path = osutils.pathjoin(subdir, name)
878
                            is_dir = True
879
                            if path not in processed_dirs:
880
                                pending_dirs.add(path)
881
                        elif minikind == 'r':
882
                            # Rename, we need to directly search the target
883
                            # which is contained in the fingerprint column
884
                            dir_name = osutils.split(tree_info[1])
885
                            if dir_name[0] in pending_dirs:
886
                                # This entry will be found in the dir search
887
                                continue
888
                            if dir_name not in found_dir_names:
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
889
                                paths_to_search.add(tree_info[1])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
890
            # Now we have a list of paths to look for directly, and
891
            # directory blocks that need to be read.
892
            # newly_found is mixing the keys between (dir, name) and path
893
            # entries, but that is okay, because we only really care about the
894
            # targets.
895
            newly_found = self._bisect(sorted(paths_to_search))
896
            newly_found.update(self._bisect_dirblocks(sorted(pending_dirs)))
897
            processed_dirs.update(pending_dirs)
898
        return found
899
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
900
    def _discard_merge_parents(self):
901
        """Discard any parents trees beyond the first.
902
        
903
        Note that if this fails the dirstate is corrupted.
904
905
        After this function returns the dirstate contains 2 trees, neither of
906
        which are ghosted.
907
        """
908
        self._read_header_if_needed()
909
        parents = self.get_parent_ids()
910
        if len(parents) < 1:
911
            return
912
        # only require all dirblocks if we are doing a full-pass removal.
913
        self._read_dirblocks_if_needed()
914
        dead_patterns = set([('a', 'r'), ('a', 'a'), ('r', 'r'), ('r', 'a')])
915
        def iter_entries_removable():
916
            for block in self._dirblocks:
917
                deleted_positions = []
918
                for pos, entry in enumerate(block[1]):
919
                    yield entry
920
                    if (entry[1][0][0], entry[1][1][0]) in dead_patterns:
921
                        deleted_positions.append(pos)
922
                if deleted_positions:
2984.1.1 by John Arbash Meinel
Fix bug #161131: Correct DirState._discard_merge_parents logic.
923
                    if len(deleted_positions) == len(block[1]):
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
924
                        del block[1][:]
925
                    else:
926
                        for pos in reversed(deleted_positions):
927
                            del block[1][pos]
928
        # if the first parent is a ghost:
929
        if parents[0] in self.get_ghosts():
930
            empty_parent = [DirState.NULL_PARENT_DETAILS]
931
            for entry in iter_entries_removable():
932
                entry[1][1:] = empty_parent
933
        else:
934
            for entry in iter_entries_removable():
935
                del entry[1][2:]
936
937
        self._ghosts = []
938
        self._parents = [parents[0]]
939
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
940
        self._header_state = DirState.IN_MEMORY_MODIFIED
941
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
942
    def _empty_parent_info(self):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
943
        return [DirState.NULL_PARENT_DETAILS] * (len(self._parents) -
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
944
                                                    len(self._ghosts))
945
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
946
    def _ensure_block(self, parent_block_index, parent_row_index, dirname):
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
947
        """Ensure a block for dirname exists.
948
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
949
        This function exists to let callers which know that there is a
950
        directory dirname ensure that the block for it exists. This block can
951
        fail to exist because of demand loading, or because a directory had no
952
        children. In either case it is not an error. It is however an error to
953
        call this if there is no parent entry for the directory, and thus the
954
        function requires the coordinates of such an entry to be provided.
955
956
        The root row is special cased and can be indicated with a parent block
957
        and row index of -1
958
959
        :param parent_block_index: The index of the block in which dirname's row
960
            exists.
961
        :param parent_row_index: The index in the parent block where the row
962
            exists.
963
        :param dirname: The utf8 dirname to ensure there is a block for.
964
        :return: The index for the block.
965
        """
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
966
        if dirname == '' and parent_row_index == 0 and parent_block_index == 0:
967
            # This is the signature of the root row, and the
968
            # contents-of-root row is always index 1
969
            return 1
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
970
        # the basename of the directory must be the end of its full name.
971
        if not (parent_block_index == -1 and
972
            parent_block_index == -1 and dirname == ''):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
973
            if not dirname.endswith(
974
                    self._dirblocks[parent_block_index][1][parent_row_index][0][1]):
975
                raise AssertionError("bad dirname %r" % dirname)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
976
        block_index, present = self._find_block_index_from_key((dirname, '', ''))
977
        if not present:
978
            ## In future, when doing partial parsing, this should load and 
979
            # populate the entire block.
980
            self._dirblocks.insert(block_index, (dirname, []))
981
        return block_index
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
982
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
983
    def _entries_to_current_state(self, new_entries):
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
984
        """Load new_entries into self.dirblocks.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
985
986
        Process new_entries into the current state object, making them the active
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
987
        state.  The entries are grouped together by directory to form dirblocks.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
988
989
        :param new_entries: A sorted list of entries. This function does not sort
990
            to prevent unneeded overhead when callers have a sorted list already.
991
        :return: Nothing.
992
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
993
        if new_entries[0][0][0:2] != ('', ''):
994
            raise AssertionError(
995
                "Missing root row %r" % (new_entries[0][0],))
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
996
        # The two blocks here are deliberate: the root block and the 
997
        # contents-of-root block.
998
        self._dirblocks = [('', []), ('', [])]
999
        current_block = self._dirblocks[0][1]
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1000
        current_dirname = ''
1001
        root_key = ('', '')
2255.2.112 by John Arbash Meinel
610ms: Optimizing _entries_to_current state brings the 'slow path' down to 610 ms (inlined and uglier fast path is 570-580ms)
1002
        append_entry = current_block.append
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1003
        for entry in new_entries:
1004
            if entry[0][0] != current_dirname:
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1005
                # new block - different dirname
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1006
                current_block = []
2255.2.90 by Robert Collins
Correct DirState._entries_to_current_state to group entries by directory properly.
1007
                current_dirname = entry[0][0]
1008
                self._dirblocks.append((current_dirname, current_block))
2255.2.112 by John Arbash Meinel
610ms: Optimizing _entries_to_current state brings the 'slow path' down to 610 ms (inlined and uglier fast path is 570-580ms)
1009
                append_entry = current_block.append
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1010
            # append the entry to the current block
2255.2.112 by John Arbash Meinel
610ms: Optimizing _entries_to_current state brings the 'slow path' down to 610 ms (inlined and uglier fast path is 570-580ms)
1011
            append_entry(entry)
1012
        self._split_root_dirblock_into_contents()
1013
1014
    def _split_root_dirblock_into_contents(self):
1015
        """Split the root dirblocks into root and contents-of-root.
1016
1017
        After parsing by path, we end up with root entries and contents-of-root
1018
        entries in the same block. This loop splits them out again.
1019
        """
1020
        # The above loop leaves the "root block" entries mixed with the
1021
        # "contents-of-root block". But we don't want an if check on
1022
        # all entries, so instead we just fix it up here.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1023
        if self._dirblocks[1] != ('', []):
1024
            raise ValueError("bad dirblock start %r" % (self._dirblocks[1],))
2255.2.112 by John Arbash Meinel
610ms: Optimizing _entries_to_current state brings the 'slow path' down to 610 ms (inlined and uglier fast path is 570-580ms)
1025
        root_block = []
1026
        contents_of_root_block = []
1027
        for entry in self._dirblocks[0][1]:
1028
            if not entry[0][1]: # This is a root entry
1029
                root_block.append(entry)
1030
            else:
1031
                contents_of_root_block.append(entry)
1032
        self._dirblocks[0] = ('', root_block)
1033
        self._dirblocks[1] = ('', contents_of_root_block)
1034
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1035
    def _entry_to_line(self, entry):
1036
        """Serialize entry to a NULL delimited line ready for _get_output_lines.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1037
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1038
        :param entry: An entry_tuple as defined in the module docstring.
1039
        """
1040
        entire_entry = list(entry[0])
1041
        for tree_number, tree_data in enumerate(entry[1]):
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1042
            # (minikind, fingerprint, size, executable, tree_specific_string)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1043
            entire_entry.extend(tree_data)
1044
            # 3 for the key, 5 for the fields per tree.
1045
            tree_offset = 3 + tree_number * 5
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1046
            # minikind
1047
            entire_entry[tree_offset + 0] = tree_data[0]
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1048
            # size
1049
            entire_entry[tree_offset + 2] = str(tree_data[2])
1050
            # executable
1051
            entire_entry[tree_offset + 3] = DirState._to_yesno[tree_data[3]]
3146.8.8 by Aaron Bentley
Remove debug code
1052
        return '\0'.join(entire_entry)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1053
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1054
    def _fields_per_entry(self):
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1055
        """How many null separated fields should be in each entry row.
1056
1057
        Each line now has an extra '\n' field which is not used
1058
        so we just skip over it
1059
        entry size:
1060
            3 fields for the key
1061
            + number of fields per tree_data (5) * tree count
1062
            + newline
1063
         """
1064
        tree_count = 1 + self._num_present_parents()
1065
        return 3 + 5 * tree_count + 1
1066
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1067
    def _find_block(self, key, add_if_missing=False):
1068
        """Return the block that key should be present in.
1069
1070
        :param key: A dirstate entry key.
1071
        :return: The block tuple.
1072
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1073
        block_index, present = self._find_block_index_from_key(key)
1074
        if not present:
2255.2.99 by Robert Collins
Dirstate - fix _find_block to create missing blocks when the parent is versioned in the current tree, and fix handling of relocated entries in _make_absent.
1075
            if not add_if_missing:
1076
                # check to see if key is versioned itself - we might want to
1077
                # add it anyway, because dirs with no entries dont get a
1078
                # dirblock at parse time.
1079
                # This is an uncommon branch to take: most dirs have children,
1080
                # and most code works with versioned paths.
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
1081
                parent_base, parent_name = osutils.split(key[0])
2255.2.99 by Robert Collins
Dirstate - fix _find_block to create missing blocks when the parent is versioned in the current tree, and fix handling of relocated entries in _make_absent.
1082
                if not self._get_block_entry_index(parent_base, parent_name, 0)[3]:
1083
                    # some parent path has not been added - its an error to add
1084
                    # this child
1085
                    raise errors.NotVersionedError(key[0:2], str(self))
1086
            self._dirblocks.insert(block_index, (key[0], []))
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1087
        return self._dirblocks[block_index]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1088
1089
    def _find_block_index_from_key(self, key):
1090
        """Find the dirblock index for a key.
1091
1092
        :return: The block index, True if the block for the key is present.
1093
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1094
        if key[0:2] == ('', ''):
1095
            return 0, True
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1096
        try:
1097
            if (self._last_block_index is not None and
1098
                self._dirblocks[self._last_block_index][0] == key[0]):
1099
                return self._last_block_index, True
1100
        except IndexError:
1101
            pass
2255.7.20 by John Arbash Meinel
update test for format 3, and enable caching of path split while lock is held.
1102
        block_index = bisect_dirblock(self._dirblocks, key[0], 1,
1103
                                      cache=self._split_path_cache)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1104
        # _right returns one-past-where-key is so we have to subtract
1105
        # one to use it. we use _right here because there are two
1106
        # '' blocks - the root, and the contents of root
1107
        # we always have a minimum of 2 in self._dirblocks: root and
1108
        # root-contents, and for '', we get 2 back, so this is 
1109
        # simple and correct:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1110
        present = (block_index < len(self._dirblocks) and
2255.2.88 by Robert Collins
Significant steps back to operation.
1111
            self._dirblocks[block_index][0] == key[0])
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1112
        self._last_block_index = block_index
2921.1.4 by Robert Collins
Documentation to aid our failing memory in the future.
1113
        # Reset the entry index cache to the beginning of the block.
2921.1.2 by Robert Collins
Reset the dirstate cache pointer for the entry on lookup of a new block, suggested by John.
1114
        self._last_entry_index = -1
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1115
        return block_index, present
1116
1117
    def _find_entry_index(self, key, block):
1118
        """Find the entry index for a key in a block.
1119
1120
        :return: The entry index, True if the entry for the key is present.
1121
        """
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1122
        len_block = len(block)
1123
        try:
1124
            if self._last_entry_index is not None:
1125
                # mini-bisect here.
1126
                entry_index = self._last_entry_index + 1
1127
                # A hit is when the key is after the last slot, and before or
1128
                # equal to the next slot.
2921.1.2 by Robert Collins
Reset the dirstate cache pointer for the entry on lookup of a new block, suggested by John.
1129
                if ((entry_index > 0 and block[entry_index - 1][0] < key) and
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1130
                    key <= block[entry_index][0]):
1131
                    self._last_entry_index = entry_index
2921.1.3 by Robert Collins
Review feedback.
1132
                    present = (block[entry_index][0] == key)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1133
                    return entry_index, present
1134
        except IndexError:
1135
            pass
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1136
        entry_index = bisect.bisect_left(block, (key, []))
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1137
        present = (entry_index < len_block and
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1138
            block[entry_index][0] == key)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1139
        self._last_entry_index = entry_index
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1140
        return entry_index, present
1141
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1142
    @staticmethod
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1143
    def from_tree(tree, dir_state_filename):
1852.13.10 by Robert Collins
Use just the tree api to generate dirstate information.
1144
        """Create a dirstate from a bzr Tree.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1145
1146
        :param tree: The tree which should provide parent information and
1147
            inventory ids.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1148
        :return: a DirState object which is currently locked for writing.
1149
            (it was locked by DirState.initialize)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1150
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1151
        result = DirState.initialize(dir_state_filename)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1152
        try:
1153
            tree.lock_read()
1154
            try:
1155
                parent_ids = tree.get_parent_ids()
1156
                num_parents = len(parent_ids)
1157
                parent_trees = []
1158
                for parent_id in parent_ids:
1159
                    parent_tree = tree.branch.repository.revision_tree(parent_id)
1160
                    parent_trees.append((parent_id, parent_tree))
1161
                    parent_tree.lock_read()
1162
                result.set_parent_trees(parent_trees, [])
1163
                result.set_state_from_inventory(tree.inventory)
1164
            finally:
1165
                for revid, parent_tree in parent_trees:
1166
                    parent_tree.unlock()
1167
                tree.unlock()
1168
        except:
1169
            # The caller won't have a chance to unlock this, so make sure we
1170
            # cleanup ourselves
1171
            result.unlock()
1172
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1173
        return result
1174
3146.8.15 by Aaron Bentley
Cleanup and docs
1175
    def update_by_delta(self, delta):
1176
        """Apply an inventory delta to the dirstate for tree 0
1177
1178
        :param delta: An inventory delta.  See Inventory.apply_delta for
1179
            details.
1180
        """
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1181
        self._read_dirblocks_if_needed()
3146.8.13 by Aaron Bentley
Clean up code
1182
        insertions = {}
1183
        removals = {}
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1184
        for old_path, new_path, file_id, inv_entry in sorted(delta, reverse=True):
1185
            if (file_id in insertions) or (file_id in removals):
1186
                raise AssertionError("repeated file id in delta %r" % (file_id,))
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1187
            if old_path is not None:
1188
                old_path = old_path.encode('utf-8')
3146.8.13 by Aaron Bentley
Clean up code
1189
                removals[file_id] = old_path
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1190
            if new_path is not None:
1191
                new_path = new_path.encode('utf-8')
1192
                dirname, basename = osutils.split(new_path)
1193
                key = (dirname, basename, file_id)
1194
                minikind = DirState._kind_to_minikind[inv_entry.kind]
1195
                if minikind == 't':
1196
                    fingerprint = inv_entry.reference_revision
1197
                else:
1198
                    fingerprint = ''
3146.8.13 by Aaron Bentley
Clean up code
1199
                insertions[file_id] = (key, minikind, inv_entry.executable,
1200
                                       fingerprint, new_path)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1201
            if None not in (old_path, new_path):
1202
                for child in self._iter_child_entries(0, old_path):
3146.8.13 by Aaron Bentley
Clean up code
1203
                    if child[0][2] in insertions or child[0][2] in removals:
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1204
                        continue
3146.8.10 by Aaron Bentley
Clean up some variable names
1205
                    child_dirname = child[0][0]
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1206
                    child_basename = child[0][1]
1207
                    minikind = child[1][0][0]
1208
                    fingerprint = child[1][0][4]
3146.8.9 by Aaron Bentley
Fix child execute bit
1209
                    executable = child[1][0][3]
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1210
                    old_child_path = osutils.pathjoin(child[0][0],
1211
                                                      child[0][1])
3146.8.13 by Aaron Bentley
Clean up code
1212
                    removals[child[0][2]] = old_child_path
3146.8.10 by Aaron Bentley
Clean up some variable names
1213
                    child_suffix = child_dirname[len(old_path):]
1214
                    new_child_dirname = (new_path + child_suffix)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1215
                    key = (new_child_dirname, child_basename, child[0][2])
1216
                    new_child_path = os.path.join(new_child_dirname,
1217
                                                  child_basename)
3146.8.13 by Aaron Bentley
Clean up code
1218
                    insertions[child[0][2]] = (key, minikind, executable,
1219
                                               fingerprint, new_child_path)
1220
        self._apply_removals(removals.values())
1221
        self._apply_insertions(insertions.values())
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1222
1223
    def _apply_removals(self, removals):
3146.8.13 by Aaron Bentley
Clean up code
1224
        for path in sorted(removals, reverse=True):
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1225
            dirname, basename = osutils.split(path)
1226
            block_i, entry_i, d_present, f_present = \
1227
                self._get_block_entry_index(dirname, basename, 0)
1228
            entry = self._dirblocks[block_i][1][entry_i]
3146.8.16 by Aaron Bentley
Updates from review
1229
            self._make_absent(entry)
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1230
1231
    def _apply_insertions(self, adds):
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1232
        for key, minikind, executable, fingerprint, path_utf8 in sorted(adds):
1233
            self.update_minimal(key, minikind, executable, fingerprint,
1234
                                path_utf8=path_utf8)
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1235
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1236
    def update_basis_by_delta(self, delta, new_revid):
1237
        """Update the parents of this tree after a commit.
1238
1239
        This gives the tree one parent, with revision id new_revid. The
1240
        inventory delta is applied to the current basis tree to generate the
1241
        inventory for the parent new_revid, and all other parent trees are
1242
        discarded.
1243
1244
        Note that an exception during the operation of this method will leave
1245
        the dirstate in a corrupt state where it should not be saved.
1246
1247
        Finally, we expect all changes to be synchronising the basis tree with
1248
        the working tree.
1249
1250
        :param new_revid: The new revision id for the trees parent.
1251
        :param delta: An inventory delta (see apply_inventory_delta) describing
1252
            the changes from the current left most parent revision to new_revid.
1253
        """
1254
        self._read_dirblocks_if_needed()
1255
        self._discard_merge_parents()
1256
        if self._ghosts != []:
1257
            raise NotImplementedError(self.update_basis_by_delta)
1258
        if len(self._parents) == 0:
1259
            # setup a blank tree, the most simple way.
1260
            empty_parent = DirState.NULL_PARENT_DETAILS
1261
            for entry in self._iter_entries():
1262
                entry[1].append(empty_parent)
1263
            self._parents.append(new_revid)
1264
1265
        self._parents[0] = new_revid
1266
1267
        delta = sorted(delta, reverse=True)
1268
        adds = []
1269
        changes = []
1270
        deletes = []
1271
        # The paths this function accepts are unicode and must be encoded as we
1272
        # go.
1273
        encode = cache_utf8.encode
1274
        inv_to_entry = self._inv_entry_to_details
1275
        # delta is now (deletes, changes), (adds) in reverse lexographical
1276
        # order.
1277
        # deletes in reverse lexographic order are safe to process in situ.
1278
        # renames are not, as a rename from any path could go to a path
1279
        # lexographically lower, so we transform renames into delete, add pairs,
1280
        # expanding them recursively as needed.
1281
        # At the same time, to reduce interface friction we convert the input
1282
        # inventory entries to dirstate.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1283
        root_only = ('', '')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1284
        for old_path, new_path, file_id, inv_entry in delta:
1285
            if old_path is None:
1286
                adds.append((None, encode(new_path), file_id,
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1287
                    inv_to_entry(inv_entry), True))
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1288
            elif new_path is None:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1289
                deletes.append((encode(old_path), None, file_id, None, True))
1290
            elif (old_path, new_path) != root_only:
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1291
                # Renames:
1292
                # Because renames must preserve their children we must have
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1293
                # processed all relocations and removes before hand. The sort
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1294
                # order ensures we've examined the child paths, but we also
1295
                # have to execute the removals, or the split to an add/delete
1296
                # pair will result in the deleted item being reinserted, or
1297
                # renamed items being reinserted twice - and possibly at the
1298
                # wrong place. Splitting into a delete/add pair also simplifies
1299
                # the handling of entries with ('f', ...), ('r' ...) because
1300
                # the target of the 'r' is old_path here, and we add that to
1301
                # deletes, meaning that the add handler does not need to check
1302
                # for 'r' items on every pass.
1303
                self._update_basis_apply_deletes(deletes)
1304
                deletes = []
1305
                new_path_utf8 = encode(new_path)
1306
                # Split into an add/delete pair recursively.
1307
                adds.append((None, new_path_utf8, file_id,
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1308
                    inv_to_entry(inv_entry), False))
1309
                # Expunge deletes that we've seen so that deleted/renamed
1310
                # children of a rename directory are handled correctly.
1311
                new_deletes = reversed(list(self._iter_child_entries(1,
1312
                    encode(old_path))))
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1313
                # Remove the current contents of the tree at orig_path, and
1314
                # reinsert at the correct new path.
1315
                for entry in new_deletes:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1316
                    if entry[0][0]:
1317
                        source_path = entry[0][0] + '/' + entry[0][1]
1318
                    else:
1319
                        source_path = entry[0][1]
3253.2.1 by John Arbash Meinel
Fix moving directories to root nodes.
1320
                    if new_path_utf8:
1321
                        target_path = new_path_utf8 + source_path[len(old_path):]
1322
                    else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1323
                        if old_path == '':
1324
                            raise AssertionError("cannot rename directory to"
1325
                                " itself")
3253.2.1 by John Arbash Meinel
Fix moving directories to root nodes.
1326
                        target_path = source_path[len(old_path) + 1:]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1327
                    adds.append((None, target_path, entry[0][2], entry[1][1], False))
1328
                    deletes.append(
1329
                        (source_path, target_path, entry[0][2], None, False))
1330
                deletes.append(
1331
                    (encode(old_path), new_path, file_id, None, False))
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1332
            else:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1333
                # changes to just the root should not require remove/insertion
1334
                # of everything.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1335
                changes.append((encode(old_path), encode(new_path), file_id,
1336
                    inv_to_entry(inv_entry)))
1337
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1338
        # Finish expunging deletes/first half of renames.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1339
        self._update_basis_apply_deletes(deletes)
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1340
        # Reinstate second half of renames and new paths.
1341
        self._update_basis_apply_adds(adds)
1342
        # Apply in-situ changes.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1343
        self._update_basis_apply_changes(changes)
1344
1345
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1346
        self._header_state = DirState.IN_MEMORY_MODIFIED
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1347
        self._id_index = None
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1348
        return
1349
1350
    def _update_basis_apply_adds(self, adds):
1351
        """Apply a sequence of adds to tree 1 during update_basis_by_delta.
1352
1353
        They may be adds, or renames that have been split into add/delete
1354
        pairs.
1355
1356
        :param adds: A sequence of adds. Each add is a tuple:
2929.2.3 by Robert Collins
Review feedback.
1357
            (None, new_path_utf8, file_id, (entry_details), real_add). real_add
1358
            is False when the add is the second half of a remove-and-reinsert
1359
            pair created to handle renames and deletes.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1360
        """
1361
        # Adds are accumulated partly from renames, so can be in any input
1362
        # order - sort it.
1363
        adds.sort()
1364
        # adds is now in lexographic order, which places all parents before
1365
        # their children, so we can process it linearly.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1366
        absent = 'ar'
1367
        for old_path, new_path, file_id, new_details, real_add in adds:
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1368
            # the entry for this file_id must be in tree 0.
1369
            entry = self._get_entry(0, file_id, new_path)
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1370
            if entry[0] is None or entry[0][2] != file_id:
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1371
                self._changes_aborted = True
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1372
                raise errors.InconsistentDelta(new_path, file_id,
1373
                    'working tree does not contain new entry')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1374
            if real_add and entry[1][1][0] not in absent:
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1375
                self._changes_aborted = True
1376
                raise errors.InconsistentDelta(new_path, file_id,
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1377
                    'The entry was considered to be a genuinely new record,'
1378
                    ' but there was already an old record for it.')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1379
            # We don't need to update the target of an 'r' because the handling
1380
            # of renames turns all 'r' situations into a delete at the original
1381
            # location.
1382
            entry[1][1] = new_details
1383
1384
    def _update_basis_apply_changes(self, changes):
1385
        """Apply a sequence of changes to tree 1 during update_basis_by_delta.
1386
1387
        :param adds: A sequence of changes. Each change is a tuple:
1388
            (path_utf8, path_utf8, file_id, (entry_details))
1389
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1390
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1391
        for old_path, new_path, file_id, new_details in changes:
1392
            # the entry for this file_id must be in tree 0.
1393
            entry = self._get_entry(0, file_id, new_path)
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1394
            if entry[0] is None or entry[0][2] != file_id:
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1395
                self._changes_aborted = True
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1396
                raise errors.InconsistentDelta(new_path, file_id,
1397
                    'working tree does not contain new entry')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1398
            if (entry[1][0][0] in absent or
1399
                entry[1][1][0] in absent):
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1400
                self._changes_aborted = True
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1401
                raise errors.InconsistentDelta(new_path, file_id,
1402
                    'changed considered absent')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1403
            entry[1][1] = new_details
1404
1405
    def _update_basis_apply_deletes(self, deletes):
1406
        """Apply a sequence of deletes to tree 1 during update_basis_by_delta.
1407
1408
        They may be deletes, or renames that have been split into add/delete
1409
        pairs.
1410
2929.2.3 by Robert Collins
Review feedback.
1411
        :param deletes: A sequence of deletes. Each delete is a tuple:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1412
            (old_path_utf8, new_path_utf8, file_id, None, real_delete).
1413
            real_delete is True when the desired outcome is an actual deletion
1414
            rather than the rename handling logic temporarily deleting a path
1415
            during the replacement of a parent.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1416
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1417
        null = DirState.NULL_PARENT_DETAILS
1418
        for old_path, new_path, file_id, _, real_delete in deletes:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1419
            if real_delete != (new_path is None):
1420
                raise AssertionError("bad delete delta")
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1421
            # the entry for this file_id must be in tree 1.
1422
            dirname, basename = osutils.split(old_path)
1423
            block_index, entry_index, dir_present, file_present = \
1424
                self._get_block_entry_index(dirname, basename, 1)
1425
            if not file_present:
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1426
                self._changes_aborted = True
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1427
                raise errors.InconsistentDelta(old_path, file_id,
1428
                    'basis tree does not contain removed entry')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1429
            entry = self._dirblocks[block_index][1][entry_index]
1430
            if entry[0][2] != file_id:
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1431
                self._changes_aborted = True
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1432
                raise errors.InconsistentDelta(old_path, file_id,
1433
                    'mismatched file_id in tree 1')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1434
            if real_delete:
1435
                if entry[1][0][0] != 'a':
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1436
                    self._changes_aborted = True
3221.1.5 by Martin Pool
Fix incorrect indent in dirstate error handling
1437
                    raise errors.InconsistentDelta(old_path, file_id,
1438
                            'This was marked as a real delete, but the WT state'
1439
                            ' claims that it still exists and is versioned.')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1440
                del self._dirblocks[block_index][1][entry_index]
1441
            else:
1442
                if entry[1][0][0] == 'a':
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1443
                    self._changes_aborted = True
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1444
                    raise errors.InconsistentDelta(old_path, file_id,
1445
                        'The entry was considered a rename, but the source path'
1446
                        ' is marked as absent.')
1447
                    # For whatever reason, we were asked to rename an entry
1448
                    # that was originally marked as deleted. This could be
1449
                    # because we are renaming the parent directory, and the WT
1450
                    # current state has the file marked as deleted.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1451
                elif entry[1][0][0] == 'r':
1452
                    # implement the rename
1453
                    del self._dirblocks[block_index][1][entry_index]
1454
                else:
1455
                    # it is being resurrected here, so blank it out temporarily.
1456
                    self._dirblocks[block_index][1][entry_index][1][1] = null
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1457
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1458
    def update_entry(self, entry, abspath, stat_value,
1459
                     _stat_to_minikind=_stat_to_minikind,
1460
                     _pack_stat=pack_stat):
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1461
        """Update the entry based on what is actually on disk.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1462
1463
        :param entry: This is the dirblock entry for the file in question.
1464
        :param abspath: The path on disk for this file.
1465
        :param stat_value: (optional) if we already have done a stat on the
1466
            file, re-use it.
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1467
        :return: The sha1 hexdigest of the file (40 bytes) or link target of a
1468
                symlink.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1469
        """
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1470
        try:
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1471
            minikind = _stat_to_minikind[stat_value.st_mode & 0170000]
1472
        except KeyError:
1473
            # Unhandled kind
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
1474
            return None
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1475
        packed_stat = _pack_stat(stat_value)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1476
        (saved_minikind, saved_link_or_sha1, saved_file_size,
1477
         saved_executable, saved_packed_stat) = entry[1][0]
1478
1479
        if (minikind == saved_minikind
2485.3.1 by John Arbash Meinel
Fix DirState handling of dir records.
1480
            and packed_stat == saved_packed_stat):
2485.3.11 by John Arbash Meinel
Correct DirState.update_entry to check when caching the sha1
1481
            # The stat hasn't changed since we saved, so we can re-use the
1482
            # saved sha hash.
2255.10.5 by John Arbash Meinel
Fix a small bug when we have a symlink that does not need to be re-read.
1483
            if minikind == 'd':
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1484
                return None
1485
2485.3.1 by John Arbash Meinel
Fix DirState handling of dir records.
1486
            # size should also be in packed_stat
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1487
            if saved_file_size == stat_value.st_size:
2485.3.11 by John Arbash Meinel
Correct DirState.update_entry to check when caching the sha1
1488
                return saved_link_or_sha1
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1489
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1490
        # If we have gotten this far, that means that we need to actually
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1491
        # process this entry.
1492
        link_or_sha1 = None
1493
        if minikind == 'f':
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
1494
            link_or_sha1 = self._sha1_file(abspath)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1495
            executable = self._is_executable(stat_value.st_mode,
1496
                                             saved_executable)
2485.3.11 by John Arbash Meinel
Correct DirState.update_entry to check when caching the sha1
1497
            if self._cutoff_time is None:
1498
                self._sha_cutoff_time()
1499
            if (stat_value.st_mtime < self._cutoff_time
1500
                and stat_value.st_ctime < self._cutoff_time):
1501
                entry[1][0] = ('f', link_or_sha1, stat_value.st_size,
1502
                               executable, packed_stat)
1503
            else:
1504
                entry[1][0] = ('f', '', stat_value.st_size,
1505
                               executable, DirState.NULLSTAT)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1506
        elif minikind == 'd':
1507
            link_or_sha1 = None
1508
            entry[1][0] = ('d', '', 0, False, packed_stat)
1509
            if saved_minikind != 'd':
1510
                # This changed from something into a directory. Make sure we
1511
                # have a directory block for it. This doesn't happen very
1512
                # often, so this doesn't have to be super fast.
1513
                block_index, entry_index, dir_present, file_present = \
1514
                    self._get_block_entry_index(entry[0][0], entry[0][1], 0)
1515
                self._ensure_block(block_index, entry_index,
1516
                                   osutils.pathjoin(entry[0][0], entry[0][1]))
1517
        elif minikind == 'l':
1518
            link_or_sha1 = self._read_link(abspath, saved_link_or_sha1)
2485.3.14 by John Arbash Meinel
Update the code so that symlinks aren't cached at incorrect times
1519
            if self._cutoff_time is None:
1520
                self._sha_cutoff_time()
1521
            if (stat_value.st_mtime < self._cutoff_time
1522
                and stat_value.st_ctime < self._cutoff_time):
1523
                entry[1][0] = ('l', link_or_sha1, stat_value.st_size,
1524
                               False, packed_stat)
1525
            else:
1526
                entry[1][0] = ('l', '', stat_value.st_size,
1527
                               False, DirState.NULLSTAT)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1528
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1529
        return link_or_sha1
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1530
1531
    def _sha_cutoff_time(self):
1532
        """Return cutoff time.
1533
1534
        Files modified more recently than this time are at risk of being
1535
        undetectably modified and so can't be cached.
1536
        """
2255.10.6 by John Arbash Meinel
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
1537
        # Cache the cutoff time as long as we hold a lock.
1538
        # time.time() isn't super expensive (approx 3.38us), but
1539
        # when you call it 50,000 times it adds up.
1540
        # For comparison, os.lstat() costs 7.2us if it is hot.
1541
        self._cutoff_time = int(time.time()) - 3
1542
        return self._cutoff_time
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1543
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1544
    def _lstat(self, abspath, entry):
1545
        """Return the os.lstat value for this path."""
1546
        return os.lstat(abspath)
1547
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
1548
    def _sha1_file_and_mutter(self, abspath):
1549
        # when -Dhashcache is turned on, this is monkey-patched in to log
1550
        # file reads
1551
        trace.mutter("dirstate sha1 " + abspath)
1552
        return osutils.sha_file_by_name(abspath)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1553
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1554
    def _is_executable(self, mode, old_executable):
1555
        """Is this file executable?"""
1556
        return bool(S_IEXEC & mode)
1557
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
1558
    def _is_executable_win32(self, mode, old_executable):
1559
        """On win32 the executable bit is stored in the dirstate."""
1560
        return old_executable
1561
1562
    if sys.platform == 'win32':
1563
        _is_executable = _is_executable_win32
1564
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1565
    def _read_link(self, abspath, old_link):
1566
        """Read the target of a symlink"""
1567
        # TODO: jam 200700301 On Win32, this could just return the value
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
1568
        #       already in memory. However, this really needs to be done at a
1569
        #       higher level, because there either won't be anything on disk,
1570
        #       or the thing on disk will be a file.
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1571
        return os.readlink(abspath)
1572
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1573
    def get_ghosts(self):
1574
        """Return a list of the parent tree revision ids that are ghosts."""
1575
        self._read_header_if_needed()
1576
        return self._ghosts
1577
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1578
    def get_lines(self):
1579
        """Serialise the entire dirstate to a sequence of lines."""
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1580
        if (self._header_state == DirState.IN_MEMORY_UNMODIFIED and
1581
            self._dirblock_state == DirState.IN_MEMORY_UNMODIFIED):
1582
            # read whats on disk.
1583
            self._state_file.seek(0)
1584
            return self._state_file.readlines()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1585
        lines = []
1586
        lines.append(self._get_parents_line(self.get_parent_ids()))
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1587
        lines.append(self._get_ghosts_line(self._ghosts))
1852.13.20 by Robert Collins
Steps toward an object model.
1588
        # append the root line which is special cased
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1589
        lines.extend(map(self._entry_to_line, self._iter_entries()))
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1590
        return self._get_output_lines(lines)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1591
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1592
    def _get_ghosts_line(self, ghost_ids):
1593
        """Create a line for the state file for ghost information."""
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1594
        return '\0'.join([str(len(ghost_ids))] + ghost_ids)
1595
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1596
    def _get_parents_line(self, parent_ids):
1597
        """Create a line for the state file for parents information."""
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1598
        return '\0'.join([str(len(parent_ids))] + parent_ids)
1599
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1600
    def _get_fields_to_entry(self):
1601
        """Get a function which converts entry fields into a entry record.
1602
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1603
        This handles size and executable, as well as parent records.
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1604
1605
        :return: A function which takes a list of fields, and returns an
1606
            appropriate record for storing in memory.
1607
        """
1608
        # This is intentionally unrolled for performance
1609
        num_present_parents = self._num_present_parents()
1610
        if num_present_parents == 0:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1611
            def fields_to_entry_0_parents(fields, _int=int):
2255.2.108 by John Arbash Meinel
tuple(list[:3]) noticablely slower than (list[0], list[1], list[2])
1612
                path_name_file_id_key = (fields[0], fields[1], fields[2])
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1613
                return (path_name_file_id_key, [
1614
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1615
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1616
                        fields[4],                # fingerprint
1617
                        _int(fields[5]),          # size
1618
                        fields[6] == 'y',         # executable
1619
                        fields[7],                # packed_stat or revision_id
1620
                    )])
1621
            return fields_to_entry_0_parents
1622
        elif num_present_parents == 1:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1623
            def fields_to_entry_1_parent(fields, _int=int):
2255.2.108 by John Arbash Meinel
tuple(list[:3]) noticablely slower than (list[0], list[1], list[2])
1624
                path_name_file_id_key = (fields[0], fields[1], fields[2])
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1625
                return (path_name_file_id_key, [
1626
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1627
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1628
                        fields[4],                # fingerprint
1629
                        _int(fields[5]),          # size
1630
                        fields[6] == 'y',         # executable
1631
                        fields[7],                # packed_stat or revision_id
1632
                    ),
1633
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1634
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1635
                        fields[9],                # fingerprint
1636
                        _int(fields[10]),         # size
1637
                        fields[11] == 'y',        # executable
1638
                        fields[12],               # packed_stat or revision_id
1639
                    ),
1640
                    ])
1641
            return fields_to_entry_1_parent
1642
        elif num_present_parents == 2:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1643
            def fields_to_entry_2_parents(fields, _int=int):
2255.2.108 by John Arbash Meinel
tuple(list[:3]) noticablely slower than (list[0], list[1], list[2])
1644
                path_name_file_id_key = (fields[0], fields[1], fields[2])
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1645
                return (path_name_file_id_key, [
1646
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1647
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1648
                        fields[4],                # fingerprint
1649
                        _int(fields[5]),          # size
1650
                        fields[6] == 'y',         # executable
1651
                        fields[7],                # packed_stat or revision_id
1652
                    ),
1653
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1654
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1655
                        fields[9],                # fingerprint
1656
                        _int(fields[10]),         # size
1657
                        fields[11] == 'y',        # executable
1658
                        fields[12],               # packed_stat or revision_id
1659
                    ),
1660
                    ( # Parent 2
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1661
                        fields[13],               # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1662
                        fields[14],               # fingerprint
1663
                        _int(fields[15]),         # size
1664
                        fields[16] == 'y',        # executable
1665
                        fields[17],               # packed_stat or revision_id
1666
                    ),
1667
                    ])
1668
            return fields_to_entry_2_parents
1669
        else:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1670
            def fields_to_entry_n_parents(fields, _int=int):
2255.2.108 by John Arbash Meinel
tuple(list[:3]) noticablely slower than (list[0], list[1], list[2])
1671
                path_name_file_id_key = (fields[0], fields[1], fields[2])
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1672
                trees = [(fields[cur],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1673
                          fields[cur+1],              # fingerprint
1674
                          _int(fields[cur+2]),        # size
1675
                          fields[cur+3] == 'y',       # executable
1676
                          fields[cur+4],              # stat or revision_id
1677
                         ) for cur in xrange(3, len(fields)-1, 5)]
1678
                return path_name_file_id_key, trees
1679
            return fields_to_entry_n_parents
1680
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1681
    def get_parent_ids(self):
1682
        """Return a list of the parent tree ids for the directory state."""
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1683
        self._read_header_if_needed()
2255.2.41 by Robert Collins
Fix Dirstate.get_parent_ids to return a copy of the ids, not a list whose mutation will break us.
1684
        return list(self._parents)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1685
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1686
    def _get_block_entry_index(self, dirname, basename, tree_index):
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1687
        """Get the coordinates for a path in the state structure.
1688
1689
        :param dirname: The utf8 dirname to lookup.
1690
        :param basename: The utf8 basename to lookup.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1691
        :param tree_index: The index of the tree for which this lookup should
1692
            be attempted.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1693
        :return: A tuple describing where the path is located, or should be
1694
            inserted. The tuple contains four fields: the block index, the row
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1695
            index, the directory is present (boolean), the entire path is
1696
            present (boolean).  There is no guarantee that either
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1697
            coordinate is currently reachable unless the found field for it is
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1698
            True. For instance, a directory not present in the searched tree
1699
            may be returned with a value one greater than the current highest
1700
            block offset. The directory present field will always be True when
1701
            the path present field is True. The directory present field does
1702
            NOT indicate that the directory is present in the searched tree,
1703
            rather it indicates that there are at least some files in some
1704
            tree present there.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1705
        """
1706
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1707
        key = dirname, basename, ''
1708
        block_index, present = self._find_block_index_from_key(key)
1709
        if not present:
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1710
            # no such directory - return the dir index and 0 for the row.
1711
            return block_index, 0, False, False
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1712
        block = self._dirblocks[block_index][1] # access the entries only
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1713
        entry_index, present = self._find_entry_index(key, block)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1714
        # linear search through entries at this path to find the one
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1715
        # requested.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1716
        while entry_index < len(block) and block[entry_index][0][1] == basename:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1717
            if block[entry_index][1][tree_index][0] not in 'ar':
1718
                # neither absent or relocated
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1719
                return block_index, entry_index, True, True
1720
            entry_index += 1
1721
        return block_index, entry_index, True, False
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1722
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1723
    def _get_entry(self, tree_index, fileid_utf8=None, path_utf8=None):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1724
        """Get the dirstate entry for path in tree tree_index.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1725
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1726
        If either file_id or path is supplied, it is used as the key to lookup.
1727
        If both are supplied, the fastest lookup is used, and an error is
1728
        raised if they do not both point at the same row.
2255.7.13 by John Arbash Meinel
find an edge case in our _get_entry logic and fix it.
1729
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1730
        :param tree_index: The index of the tree we wish to locate this path
1731
            in. If the path is present in that tree, the entry containing its
1732
            details is returned, otherwise (None, None) is returned
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
1733
            0 is the working tree, higher indexes are successive parent
1734
            trees.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1735
        :param fileid_utf8: A utf8 file_id to look up.
1736
        :param path_utf8: An utf8 path to be looked up.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1737
        :return: The dirstate entry tuple for path, or (None, None)
1738
        """
2255.2.94 by Robert Collins
DirState: handle id lookup redirects correctly.
1739
        self._read_dirblocks_if_needed()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1740
        if path_utf8 is not None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1741
            if not isinstance(path_utf8, str):
1742
                raise AssertionError('path_utf8 is not a str: %s %s'
1743
                    % (type(path_utf8), path_utf8))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1744
            # path lookups are faster
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
1745
            dirname, basename = osutils.split(path_utf8)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1746
            block_index, entry_index, dir_present, file_present = \
1747
                self._get_block_entry_index(dirname, basename, tree_index)
1748
            if not file_present:
1749
                return None, None
1750
            entry = self._dirblocks[block_index][1][entry_index]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1751
            if not (entry[0][2] and entry[1][tree_index][0] not in ('a', 'r')):
1752
                raise AssertionError('unversioned entry?')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1753
            if fileid_utf8:
1754
                if entry[0][2] != fileid_utf8:
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1755
                    self._changes_aborted = True
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
1756
                    raise errors.BzrError('integrity error ? : mismatching'
1757
                                          ' tree_index, file_id and path')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1758
            return entry
1759
        else:
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
1760
            possible_keys = self._get_id_index().get(fileid_utf8, None)
1761
            if not possible_keys:
1762
                return None, None
1763
            for key in possible_keys:
2255.7.76 by Robert Collins
Fix _get_entry, which got broken at some point, this fixes tests now, so it should not be breakable in future.
1764
                block_index, present = \
1765
                    self._find_block_index_from_key(key)
1766
                # strange, probably indicates an out of date
1767
                # id index - for now, allow this.
1768
                if not present:
1769
                    continue
1770
                # WARNING: DO not change this code to use _get_block_entry_index
1771
                # as that function is not suitable: it does not use the key
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1772
                # to lookup, and thus the wrong coordinates are returned.
2255.7.76 by Robert Collins
Fix _get_entry, which got broken at some point, this fixes tests now, so it should not be breakable in future.
1773
                block = self._dirblocks[block_index][1]
1774
                entry_index, present = self._find_entry_index(key, block)
1775
                if present:
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
1776
                    entry = self._dirblocks[block_index][1][entry_index]
2255.2.172 by Martin Pool
Recognize 't' (tree-reference) minikind in DirState._get_entry
1777
                    if entry[1][tree_index][0] in 'fdlt':
2255.7.76 by Robert Collins
Fix _get_entry, which got broken at some point, this fixes tests now, so it should not be breakable in future.
1778
                        # this is the result we are looking for: the  
1779
                        # real home of this file_id in this tree.
1780
                        return entry
1781
                    if entry[1][tree_index][0] == 'a':
1782
                        # there is no home for this entry in this tree
1783
                        return None, None
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1784
                    if entry[1][tree_index][0] != 'r':
1785
                        raise AssertionError(
1786
                            "entry %r has invalid minikind %r for tree %r" \
1787
                            % (entry,
1788
                               entry[1][tree_index][0],
1789
                               tree_index))
2255.7.76 by Robert Collins
Fix _get_entry, which got broken at some point, this fixes tests now, so it should not be breakable in future.
1790
                    real_path = entry[1][tree_index][1]
1791
                    return self._get_entry(tree_index, fileid_utf8=fileid_utf8,
1792
                        path_utf8=real_path)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1793
            return None, None
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1794
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1795
    @classmethod
1796
    def initialize(cls, path):
1852.13.20 by Robert Collins
Steps toward an object model.
1797
        """Create a new dirstate on path.
1798
1799
        The new dirstate will be an empty tree - that is it has no parents,
1800
        and only a root node - which has id ROOT_ID.
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1801
1852.13.20 by Robert Collins
Steps toward an object model.
1802
        :param path: The name of the file for the dirstate.
2425.5.1 by Martin Pool
doc Dirstate.initialize
1803
        :return: A write-locked DirState object.
1852.13.20 by Robert Collins
Steps toward an object model.
1804
        """
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1805
        # This constructs a new DirState object on a path, sets the _state_file
1852.13.20 by Robert Collins
Steps toward an object model.
1806
        # to a new empty file for that path. It then calls _set_data() with our
1807
        # stock empty dirstate information - a root with ROOT_ID, no children,
1808
        # and no parents. Finally it calls save() to ensure that this data will
1809
        # persist.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1810
        result = cls(path)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1811
        # root dir and root dir contents with no children.
1812
        empty_tree_dirblocks = [('', []), ('', [])]
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1813
        # a new root directory, with a NULLSTAT.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1814
        empty_tree_dirblocks[0][1].append(
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1815
            (('', '', inventory.ROOT_ID), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1816
                ('d', '', 0, False, DirState.NULLSTAT),
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1817
            ]))
2255.4.2 by James Westby
(broken) Add the locking methods.
1818
        result.lock_write()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1819
        try:
2255.4.2 by James Westby
(broken) Add the locking methods.
1820
            result._set_data([], empty_tree_dirblocks)
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1821
            result.save()
1822
        except:
2255.4.2 by James Westby
(broken) Add the locking methods.
1823
            result.unlock()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1824
            raise
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1825
        return result
1826
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1827
    def _inv_entry_to_details(self, inv_entry):
1828
        """Convert an inventory entry (from a revision tree) to state details.
1829
1830
        :param inv_entry: An inventory entry whose sha1 and link targets can be
1831
            relied upon, and which has a revision set.
1832
        :return: A details tuple - the details for a single tree at a path +
1833
            id.
1834
        """
1835
        kind = inv_entry.kind
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1836
        minikind = DirState._kind_to_minikind[kind]
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
1837
        tree_data = inv_entry.revision
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1838
        if kind == 'directory':
1839
            fingerprint = ''
1840
            size = 0
1841
            executable = False
1842
        elif kind == 'symlink':
1843
            fingerprint = inv_entry.symlink_target or ''
1844
            size = 0
1845
            executable = False
1846
        elif kind == 'file':
1847
            fingerprint = inv_entry.text_sha1 or ''
1848
            size = inv_entry.text_size or 0
1849
            executable = inv_entry.executable
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1850
        elif kind == 'tree-reference':
1851
            fingerprint = inv_entry.reference_revision or ''
1852
            size = 0
1853
            executable = False
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1854
        else:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1855
            raise Exception("can't pack %s" % inv_entry)
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1856
        return (minikind, fingerprint, size, executable, tree_data)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1857
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1858
    def _iter_child_entries(self, tree_index, path_utf8):
1859
        """Iterate over all the entries that are children of path_utf.
1860
1861
        This only returns entries that are present (not in 'a', 'r') in 
1862
        tree_index. tree_index data is not refreshed, so if tree 0 is used,
1863
        results may differ from that obtained if paths were statted to
1864
        determine what ones were directories.
1865
1866
        Asking for the children of a non-directory will return an empty
1867
        iterator.
1868
        """
1869
        pending_dirs = []
1870
        next_pending_dirs = [path_utf8]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1871
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1872
        while next_pending_dirs:
1873
            pending_dirs = next_pending_dirs
1874
            next_pending_dirs = []
1875
            for path in pending_dirs:
1876
                block_index, present = self._find_block_index_from_key(
1877
                    (path, '', ''))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1878
                if block_index == 0:
1879
                    block_index = 1
1880
                    if len(self._dirblocks) == 1:
1881
                        # asked for the children of the root with no other
1882
                        # contents.
1883
                        return
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1884
                if not present:
1885
                    # children of a non-directory asked for.
1886
                    continue
1887
                block = self._dirblocks[block_index]
1888
                for entry in block[1]:
1889
                    kind = entry[1][tree_index][0]
1890
                    if kind not in absent:
1891
                        yield entry
1892
                    if kind == 'd':
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1893
                        if entry[0][0]:
1894
                            path = entry[0][0] + '/' + entry[0][1]
1895
                        else:
1896
                            path = entry[0][1]
1897
                        next_pending_dirs.append(path)
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1898
    
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1899
    def _iter_entries(self):
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1900
        """Iterate over all the entries in the dirstate.
1901
1902
        Each yelt item is an entry in the standard format described in the
1903
        docstring of bzrlib.dirstate.
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1904
        """
1905
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1906
        for directory in self._dirblocks:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1907
            for entry in directory[1]:
1908
                yield entry
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1909
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1910
    def _get_id_index(self):
1911
        """Get an id index of self._dirblocks."""
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
1912
        if self._id_index is None:
1913
            id_index = {}
1914
            for key, tree_details in self._iter_entries():
1915
                id_index.setdefault(key[2], set()).add(key)
1916
            self._id_index = id_index
1917
        return self._id_index
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1918
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1919
    def _get_output_lines(self, lines):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1920
        """Format lines for final output.
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1921
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1922
        :param lines: A sequence of lines containing the parents list and the
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1923
            path lines.
1924
        """
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
1925
        output_lines = [DirState.HEADER_FORMAT_3]
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1926
        lines.append('') # a final newline
1927
        inventory_text = '\0\n\0'.join(lines)
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
1928
        output_lines.append('crc32: %s\n' % (zlib.crc32(inventory_text),))
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1929
        # -3, 1 for num parents, 1 for ghosts, 1 for final newline
1930
        num_entries = len(lines)-3
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1931
        output_lines.append('num_entries: %s\n' % (num_entries,))
1932
        output_lines.append(inventory_text)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1933
        return output_lines
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1934
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
1935
    def _make_deleted_row(self, fileid_utf8, parents):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1936
        """Return a deleted row for fileid_utf8."""
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
1937
        return ('/', 'RECYCLED.BIN', 'file', fileid_utf8, 0, DirState.NULLSTAT,
1938
            ''), parents
1939
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1940
    def _num_present_parents(self):
1941
        """The number of parent entries in each record row."""
1942
        return len(self._parents) - len(self._ghosts)
1943
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1944
    @staticmethod
1945
    def on_file(path):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1946
        """Construct a DirState on the file at path path.
1947
1948
        :return: An unlocked DirState object, associated with the given path.
1949
        """
2255.4.1 by James Westby
Store the filename of the dirstate in an attribute.
1950
        result = DirState(path)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1951
        return result
1952
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1953
    def _read_dirblocks_if_needed(self):
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1954
        """Read in all the dirblocks from the file if they are not in memory.
1955
        
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1956
        This populates self._dirblocks, and sets self._dirblock_state to
1957
        IN_MEMORY_UNMODIFIED. It is not currently ready for incremental block
1958
        loading.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1959
        """
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1960
        self._read_header_if_needed()
1961
        if self._dirblock_state == DirState.NOT_IN_MEMORY:
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
1962
            _read_dirblocks(self)
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1963
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1964
    def _read_header(self):
1965
        """This reads in the metadata header, and the parent ids.
1966
1967
        After reading in, the file should be positioned at the null
1968
        just before the start of the first record in the file.
1969
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
1970
        :return: (expected crc checksum, number of entries, parent list)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1971
        """
1972
        self._read_prelude()
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1973
        parent_line = self._state_file.readline()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1974
        info = parent_line.split('\0')
1975
        num_parents = int(info[0])
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1976
        self._parents = info[1:-1]
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1977
        ghost_line = self._state_file.readline()
1978
        info = ghost_line.split('\0')
1979
        num_ghosts = int(info[1])
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1980
        self._ghosts = info[2:-1]
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1981
        self._header_state = DirState.IN_MEMORY_UNMODIFIED
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1982
        self._end_of_header = self._state_file.tell()
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1983
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1984
    def _read_header_if_needed(self):
1985
        """Read the header of the dirstate file if needed."""
2255.4.2 by James Westby
(broken) Add the locking methods.
1986
        # inline this as it will be called a lot
1987
        if not self._lock_token:
1988
            raise errors.ObjectNotLocked(self)
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1989
        if self._header_state == DirState.NOT_IN_MEMORY:
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1990
            self._read_header()
1991
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1992
    def _read_prelude(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1993
        """Read in the prelude header of the dirstate file.
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1994
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
1995
        This only reads in the stuff that is not connected to the crc
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1996
        checksum. The position will be correct to read in the rest of
1997
        the file and check the checksum after this point.
1998
        The next entry in the file should be the number of parents,
1999
        and their ids. Followed by a newline.
2000
        """
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2001
        header = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2002
        if header != DirState.HEADER_FORMAT_3:
2003
            raise errors.BzrError(
2004
                'invalid header line: %r' % (header,))
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
2005
        crc_line = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2006
        if not crc_line.startswith('crc32: '):
2007
            raise errors.BzrError('missing crc32 checksum: %r' % crc_line)
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
2008
        self.crc_expected = int(crc_line[len('crc32: '):-1])
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2009
        num_entries_line = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2010
        if not num_entries_line.startswith('num_entries: '):
2011
            raise errors.BzrError('missing num_entries line')
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2012
        self._num_entries = int(num_entries_line[len('num_entries: '):-1])
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2013
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2014
    def sha1_from_stat(self, path, stat_result, _pack_stat=pack_stat):
2015
        """Find a sha1 given a stat lookup."""
2016
        return self._get_packed_stat_index().get(_pack_stat(stat_result), None)
2017
2018
    def _get_packed_stat_index(self):
2019
        """Get a packed_stat index of self._dirblocks."""
2020
        if self._packed_stat_index is None:
2021
            index = {}
2022
            for key, tree_details in self._iter_entries():
2023
                if tree_details[0][0] == 'f':
2929.1.2 by Robert Collins
Review feedback.
2024
                    index[tree_details[0][4]] = tree_details[0][1]
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2025
            self._packed_stat_index = index
2026
        return self._packed_stat_index
2027
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2028
    def save(self):
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2029
        """Save any pending changes created during this session.
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2030
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2031
        We reuse the existing file, because that prevents race conditions with
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2032
        file creation, and use oslocks on it to prevent concurrent modification
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2033
        and reads - because dirstate's incremental data aggregation is not
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2034
        compatible with reading a modified file, and replacing a file in use by
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2035
        another process is impossible on Windows.
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2036
2037
        A dirstate in read only mode should be smart enough though to validate
2038
        that the file has not changed, and otherwise discard its cache and
2039
        start over, to allow for fine grained read lock duration, so 'status'
2040
        wont block 'commit' - for example.
2041
        """
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
2042
        if self._changes_aborted:
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
2043
            # Should this be a warning? For now, I'm expecting that places that
2044
            # mark it inconsistent will warn, making a warning here redundant.
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
2045
            trace.mutter('Not saving DirState because '
2046
                    '_changes_aborted is set.')
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
2047
            return
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2048
        if (self._header_state == DirState.IN_MEMORY_MODIFIED or
2049
            self._dirblock_state == DirState.IN_MEMORY_MODIFIED):
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2050
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2051
            grabbed_write_lock = False
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
2052
            if self._lock_state != 'w':
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2053
                grabbed_write_lock, new_lock = self._lock_token.temporary_write_lock()
2054
                # Switch over to the new lock, as the old one may be closed.
2055
                # TODO: jam 20070315 We should validate the disk file has
2056
                #       not changed contents. Since temporary_write_lock may
2057
                #       not be an atomic operation.
2058
                self._lock_token = new_lock
2059
                self._state_file = new_lock.f
2060
                if not grabbed_write_lock:
2061
                    # We couldn't grab a write lock, so we switch back to a read one
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2062
                    return
2063
            try:
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
2064
                self._state_file.seek(0)
2065
                self._state_file.writelines(self.get_lines())
2066
                self._state_file.truncate()
2067
                self._state_file.flush()
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2068
                self._header_state = DirState.IN_MEMORY_UNMODIFIED
2069
                self._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
2070
            finally:
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2071
                if grabbed_write_lock:
2353.4.8 by John Arbash Meinel
Use the right lock object.
2072
                    self._lock_token = self._lock_token.restore_read_lock()
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
2073
                    self._state_file = self._lock_token.f
2074
                    # TODO: jam 20070315 We should validate the disk file has
2075
                    #       not changed contents. Since restore_read_lock may
2076
                    #       not be an atomic operation.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2077
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2078
    def _set_data(self, parent_ids, dirblocks):
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2079
        """Set the full dirstate data in memory.
1852.13.20 by Robert Collins
Steps toward an object model.
2080
2081
        This is an internal function used to completely replace the objects
2082
        in memory state. It puts the dirstate into state 'full-dirty'.
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2083
2084
        :param parent_ids: A list of parent tree revision ids.
2085
        :param dirblocks: A list containing one tuple for each directory in the
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2086
            tree. Each tuple contains the directory path and a list of entries 
2087
            found in that directory.
1852.13.20 by Robert Collins
Steps toward an object model.
2088
        """
2089
        # our memory copy is now authoritative.
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2090
        self._dirblocks = dirblocks
2091
        self._header_state = DirState.IN_MEMORY_MODIFIED
2092
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2093
        self._parents = list(parent_ids)
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2094
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2095
        self._packed_stat_index = None
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2096
2255.2.4 by Robert Collins
Snapshot dirstate development
2097
    def set_path_id(self, path, new_id):
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2098
        """Change the id of path to new_id in the current working tree.
2255.2.4 by Robert Collins
Snapshot dirstate development
2099
2100
        :param path: The path inside the tree to set - '' is the root, 'foo'
2101
            is the path foo in the root.
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2102
        :param new_id: The new id to assign to the path. This must be a utf8
2103
            file id (not unicode, and not None).
2255.2.4 by Robert Collins
Snapshot dirstate development
2104
        """
2255.2.37 by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
2105
        self._read_dirblocks_if_needed()
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2106
        if len(path):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2107
            # TODO: logic not written
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2108
            raise NotImplementedError(self.set_path_id)
2109
        # TODO: check new id is unique
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2110
        entry = self._get_entry(0, path_utf8=path)
2255.7.14 by John Arbash Meinel
Make set_root_id() a no-op if the id doesn't change,
2111
        if entry[0][2] == new_id:
2112
            # Nothing to change.
2113
            return
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2114
        # mark the old path absent, and insert a new root path
2115
        self._make_absent(entry)
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2116
        self.update_minimal(('', '', new_id), 'd',
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2117
            path_utf8='', packed_stat=entry[1][0][4])
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
2118
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2119
        if self._id_index is not None:
2120
            self._id_index.setdefault(new_id, set()).add(entry[0])
2255.2.4 by Robert Collins
Snapshot dirstate development
2121
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2122
    def set_parent_trees(self, trees, ghosts):
2123
        """Set the parent trees for the dirstate.
2124
2125
        :param trees: A list of revision_id, tree tuples. tree must be provided
2126
            even if the revision_id refers to a ghost: supply an empty tree in 
2127
            this case.
2128
        :param ghosts: A list of the revision_ids that are ghosts at the time
2129
            of setting.
2130
        """ 
2255.2.4 by Robert Collins
Snapshot dirstate development
2131
        # TODO: generate a list of parent indexes to preserve to save 
2132
        # processing specific parent trees. In the common case one tree will
2133
        # be preserved - the left most parent.
2134
        # TODO: if the parent tree is a dirstate, we might want to walk them
2135
        # all by path in parallel for 'optimal' common-case performance.
2136
        # generate new root row.
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2137
        self._read_dirblocks_if_needed()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2138
        # TODO future sketch: Examine the existing parents to generate a change
2139
        # map and then walk the new parent trees only, mapping them into the
2140
        # dirstate. Walk the dirstate at the same time to remove unreferenced
2141
        # entries.
2142
        # for now: 
2143
        # sketch: loop over all entries in the dirstate, cherry picking 
2144
        # entries from the parent trees, if they are not ghost trees.
2255.2.4 by Robert Collins
Snapshot dirstate development
2145
        # after we finish walking the dirstate, all entries not in the dirstate
2146
        # are deletes, so we want to append them to the end as per the design
2147
        # discussions. So do a set difference on ids with the parents to
2148
        # get deletes, and add them to the end.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2149
        # During the update process we need to answer the following questions:
2150
        # - find other keys containing a fileid in order to create cross-path
2151
        #   links. We dont't trivially use the inventory from other trees
2152
        #   because this leads to either double touching, or to accessing
2153
        #   missing keys,
2154
        # - find other keys containing a path 
2155
        # We accumulate each entry via this dictionary, including the root 
2156
        by_path = {}
2157
        id_index = {}
2158
        # we could do parallel iterators, but because file id data may be
2159
        # scattered throughout, we dont save on index overhead: we have to look
2160
        # at everything anyway. We can probably save cycles by reusing parent
2161
        # data and doing an incremental update when adding an additional
2162
        # parent, but for now the common cases are adding a new parent (merge),
2163
        # and replacing completely (commit), and commit is more common: so
2164
        # optimise merge later.
2165
        
2166
        # ---- start generation of full tree mapping data
2167
        # what trees should we use?
2255.2.4 by Robert Collins
Snapshot dirstate development
2168
        parent_trees = [tree for rev_id, tree in trees if rev_id not in ghosts]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2169
        # how many trees do we end up with 
2170
        parent_count = len(parent_trees)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2171
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2172
        # one: the current tree
2173
        for entry in self._iter_entries():
2174
            # skip entries not in the current tree
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2175
            if entry[1][0][0] in 'ar': # absent, relocated
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2176
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2177
            by_path[entry[0]] = [entry[1][0]] + \
2178
                [DirState.NULL_PARENT_DETAILS] * parent_count
2179
            id_index[entry[0][2]] = set([entry[0]])
2180
        
2181
        # now the parent trees:
2182
        for tree_index, tree in enumerate(parent_trees):
2183
            # the index is off by one, adjust it.
2184
            tree_index = tree_index + 1
2185
            # when we add new locations for a fileid we need these ranges for
2186
            # any fileid in this tree as we set the by_path[id] to:
2187
            # already_processed_tree_details + new_details + new_location_suffix
2188
            # the suffix is from tree_index+1:parent_count+1.
2189
            new_location_suffix = [DirState.NULL_PARENT_DETAILS] * (parent_count - tree_index)
2190
            # now stitch in all the entries from this tree
2191
            for path, entry in tree.inventory.iter_entries_by_dir():
2192
                # here we process each trees details for each item in the tree.
2193
                # we first update any existing entries for the id at other paths,
2194
                # then we either create or update the entry for the id at the
2195
                # right path, and finally we add (if needed) a mapping from
2196
                # file_id to this path. We do it in this order to allow us to
2197
                # avoid checking all known paths for the id when generating a
2198
                # new entry at this path: by adding the id->path mapping last,
2199
                # all the mappings are valid and have correct relocation
2200
                # records where needed. 
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2201
                file_id = entry.file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2202
                path_utf8 = path.encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2203
                dirname, basename = osutils.split(path_utf8)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2204
                new_entry_key = (dirname, basename, file_id)
2205
                # tree index consistency: All other paths for this id in this tree
2206
                # index must point to the correct path.
2207
                for entry_key in id_index.setdefault(file_id, set()):
2208
                    # TODO:PROFILING: It might be faster to just update
2209
                    # rather than checking if we need to, and then overwrite
2210
                    # the one we are located at.
2211
                    if entry_key != new_entry_key:
2212
                        # this file id is at a different path in one of the
2213
                        # other trees, so put absent pointers there
2214
                        # This is the vertical axis in the matrix, all pointing
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2215
                        # to the real path.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2216
                        by_path[entry_key][tree_index] = ('r', path_utf8, 0, False, '')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2217
                # by path consistency: Insert into an existing path record (trivial), or 
2218
                # add a new one with relocation pointers for the other tree indexes.
2219
                if new_entry_key in id_index[file_id]:
2220
                    # there is already an entry where this data belongs, just insert it.
2221
                    by_path[new_entry_key][tree_index] = \
2222
                        self._inv_entry_to_details(entry)
2223
                else:
2224
                    # add relocated entries to the horizontal axis - this row
2225
                    # mapping from path,id. We need to look up the correct path
2226
                    # for the indexes from 0 to tree_index -1
2227
                    new_details = []
2228
                    for lookup_index in xrange(tree_index):
2229
                        # boundary case: this is the first occurence of file_id
2230
                        # so there are no id_indexs, possibly take this out of
2231
                        # the loop?
2232
                        if not len(id_index[file_id]):
2233
                            new_details.append(DirState.NULL_PARENT_DETAILS)
2234
                        else:
2235
                            # grab any one entry, use it to find the right path.
2236
                            # TODO: optimise this to reduce memory use in highly 
2237
                            # fragmented situations by reusing the relocation
2238
                            # records.
2239
                            a_key = iter(id_index[file_id]).next()
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2240
                            if by_path[a_key][lookup_index][0] in ('r', 'a'):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2241
                                # its a pointer or missing statement, use it as is.
2242
                                new_details.append(by_path[a_key][lookup_index])
2243
                            else:
2244
                                # we have the right key, make a pointer to it.
2245
                                real_path = ('/'.join(a_key[0:2])).strip('/')
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2246
                                new_details.append(('r', real_path, 0, False, ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2247
                    new_details.append(self._inv_entry_to_details(entry))
2248
                    new_details.extend(new_location_suffix)
2249
                    by_path[new_entry_key] = new_details
2250
                    id_index[file_id].add(new_entry_key)
2251
        # --- end generation of full tree mappings
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
2252
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2253
        # sort and output all the entries
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2254
        new_entries = self._sort_entries(by_path.items())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2255
        self._entries_to_current_state(new_entries)
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2256
        self._parents = [rev_id for rev_id, tree in trees]
2257
        self._ghosts = list(ghosts)
2258
        self._header_state = DirState.IN_MEMORY_MODIFIED
2259
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2260
        self._id_index = id_index
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2261
2262
    def _sort_entries(self, entry_list):
2263
        """Given a list of entries, sort them into the right order.
2264
2265
        This is done when constructing a new dirstate from trees - normally we
2266
        try to keep everything in sorted blocks all the time, but sometimes
2267
        it's easier to sort after the fact.
2268
        """
2269
        def _key(entry):
2270
            # sort by: directory parts, file name, file id
2271
            return entry[0][0].split('/'), entry[0][1], entry[0][2]
2272
        return sorted(entry_list, key=_key)
1852.13.20 by Robert Collins
Steps toward an object model.
2273
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.
2274
    def set_state_from_inventory(self, new_inv):
2275
        """Set new_inv as the current state. 
2276
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2277
        This API is called by tree transform, and will usually occur with
2278
        existing parent trees.
2279
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.
2280
        :param new_inv: The inventory object to set current state from.
2281
        """
2872.4.2 by Martin Pool
Treat set_state_from_inventory as evil, and del dead variables rather than just setting to null
2282
        if 'evil' in debug.debug_flags:
2283
            trace.mutter_callsite(1,
2284
                "set_state_from_inventory called; please mutate the tree instead")
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.
2285
        self._read_dirblocks_if_needed()
2286
        # sketch:
2872.4.11 by Martin Pool
Review documentation cleanups
2287
        # Two iterators: current data and new data, both in dirblock order. 
2288
        # We zip them together, which tells about entries that are new in the
2289
        # inventory, or removed in the inventory, or present in both and
2290
        # possibly changed.  
2291
        #
2292
        # You might think we could just synthesize a new dirstate directly
2293
        # since we're processing it in the right order.  However, we need to
2294
        # also consider there may be any number of parent trees and relocation
2295
        # pointers, and we don't want to duplicate that here.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2296
        new_iterator = new_inv.iter_entries_by_dir()
2255.2.88 by Robert Collins
Significant steps back to operation.
2297
        # we will be modifying the dirstate, so we need a stable iterator. In
2298
        # future we might write one, for now we just clone the state into a
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2299
        # list - which is a shallow copy.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2300
        old_iterator = iter(list(self._iter_entries()))
2301
        # both must have roots so this is safe:
2302
        current_new = new_iterator.next()
2303
        current_old = old_iterator.next()
2304
        def advance(iterator):
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.
2305
            try:
2255.2.88 by Robert Collins
Significant steps back to operation.
2306
                return iterator.next()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2307
            except StopIteration:
2308
                return None
2309
        while current_new or current_old:
2310
            # skip entries in old that are not really there
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2311
            if current_old and current_old[1][0][0] in 'ar':
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2312
                # relocated or absent
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2313
                current_old = advance(old_iterator)
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.
2314
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2315
            if current_new:
2316
                # convert new into dirblock style
2255.2.88 by Robert Collins
Significant steps back to operation.
2317
                new_path_utf8 = current_new[0].encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2318
                new_dirname, new_basename = osutils.split(new_path_utf8)
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2319
                new_id = current_new[1].file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2320
                new_entry_key = (new_dirname, new_basename, new_id)
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2321
                current_new_minikind = \
2322
                    DirState._kind_to_minikind[current_new[1].kind]
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2323
                if current_new_minikind == 't':
2645.2.1 by Wouter van Heyst
The DirState fingerprint for tree-references should be an empty string instead of None
2324
                    fingerprint = current_new[1].reference_revision or ''
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2325
                else:
2872.4.7 by Martin Pool
More cleanups of dirstate work
2326
                    # We normally only insert or remove records, or update
2327
                    # them when it has significantly changed.  Then we want to
2328
                    # erase its fingerprint.  Unaffected records should
2329
                    # normally not be updated at all.
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2330
                    fingerprint = ''
2255.2.88 by Robert Collins
Significant steps back to operation.
2331
            else:
2332
                # for safety disable variables
2872.4.7 by Martin Pool
More cleanups of dirstate work
2333
                new_path_utf8 = new_dirname = new_basename = new_id = \
2872.4.9 by Martin Pool
Use cmp_by_dirs in set_state_from_inventory rather than hardcoding the equivalent
2334
                    new_entry_key = None
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2335
            # 5 cases, we dont have a value that is strictly greater than everything, so
2336
            # we make both end conditions explicit
2872.4.11 by Martin Pool
Review documentation cleanups
2337
            if not current_old:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2338
                # old is finished: insert current_new into the state.
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2339
                self.update_minimal(new_entry_key, current_new_minikind,
2340
                    executable=current_new[1].executable,
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2341
                    path_utf8=new_path_utf8, fingerprint=fingerprint)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2342
                current_new = advance(new_iterator)
2872.4.11 by Martin Pool
Review documentation cleanups
2343
            elif not current_new:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2344
                # new is finished
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2345
                self._make_absent(current_old)
2255.2.88 by Robert Collins
Significant steps back to operation.
2346
                current_old = advance(old_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2347
            elif new_entry_key == current_old[0]:
2348
                # same -  common case
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2349
                # We're looking at the same path and id in both the dirstate
2350
                # and inventory, so just need to update the fields in the
2351
                # dirstate from the one in the inventory.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2352
                # TODO: update the record if anything significant has changed.
2255.2.88 by Robert Collins
Significant steps back to operation.
2353
                # the minimal required trigger is if the execute bit or cached
2354
                # kind has changed.
2355
                if (current_old[1][0][3] != current_new[1].executable or
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2356
                    current_old[1][0][0] != current_new_minikind):
2357
                    self.update_minimal(current_old[0], current_new_minikind,
2255.2.88 by Robert Collins
Significant steps back to operation.
2358
                        executable=current_new[1].executable,
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2359
                        path_utf8=new_path_utf8, fingerprint=fingerprint)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2360
                # both sides are dealt with, move on
2361
                current_old = advance(old_iterator)
2362
                current_new = advance(new_iterator)
2872.4.9 by Martin Pool
Use cmp_by_dirs in set_state_from_inventory rather than hardcoding the equivalent
2363
            elif (cmp_by_dirs(new_dirname, current_old[0][0]) < 0
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2364
                  or (new_dirname == current_old[0][0]
2365
                      and new_entry_key[1:] < current_old[0][1:])):
2255.2.88 by Robert Collins
Significant steps back to operation.
2366
                # new comes before:
2367
                # add a entry for this and advance new
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2368
                self.update_minimal(new_entry_key, current_new_minikind,
2369
                    executable=current_new[1].executable,
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2370
                    path_utf8=new_path_utf8, fingerprint=fingerprint)
2255.2.88 by Robert Collins
Significant steps back to operation.
2371
                current_new = advance(new_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2372
            else:
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2373
                # we've advanced past the place where the old key would be,
2374
                # without seeing it in the new list.  so it must be gone.
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2375
                self._make_absent(current_old)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2376
                current_old = advance(old_iterator)
2377
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2378
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2379
        self._packed_stat_index = None
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2380
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2381
    def _make_absent(self, current_old):
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2382
        """Mark current_old - an entry - as absent for tree 0.
2383
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2384
        :return: True if this was the last details entry for the entry key:
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2385
            that is, if the underlying block has had the entry removed, thus
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
2386
            shrinking in length.
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2387
        """
2388
        # build up paths that this id will be left at after the change is made,
2389
        # so we can update their cross references in tree 0
2390
        all_remaining_keys = set()
2922.2.4 by John Arbash Meinel
Fix bug #114615 by teaching unversion() to not touch renamed entries.
2391
        # Dont check the working tree, because it's going.
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2392
        for details in current_old[1][1:]:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2393
            if details[0] not in 'ar': # absent, relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2394
                all_remaining_keys.add(current_old[0])
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2395
            elif details[0] == 'r': # relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2396
                # record the key for the real path.
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2397
                all_remaining_keys.add(tuple(osutils.split(details[1])) + (current_old[0][2],))
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2398
            # absent rows are not present at any path.
2399
        last_reference = current_old[0] not in all_remaining_keys
2400
        if last_reference:
2401
            # the current row consists entire of the current item (being marked
2402
            # absent), and relocated or absent entries for the other trees:
2403
            # Remove it, its meaningless.
2255.2.88 by Robert Collins
Significant steps back to operation.
2404
            block = self._find_block(current_old[0])
2405
            entry_index, present = self._find_entry_index(current_old[0], block[1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2406
            if not present:
2407
                raise AssertionError('could not find entry for %s' % (current_old,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2408
            block[1].pop(entry_index)
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2409
            # if we have an id_index in use, remove this key from it for this id.
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2410
            if self._id_index is not None:
2411
                self._id_index[current_old[0][2]].remove(current_old[0])
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2412
        # update all remaining keys for this id to record it as absent. The
2922.2.2 by John Arbash Meinel
If THIS is considered renamed, _make_absent needs to remove the renamed target.
2413
        # existing details may either be the record we are marking as deleted
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2414
        # (if there were other trees with the id present at this path), or may
2415
        # be relocations.
2416
        for update_key in all_remaining_keys:
2417
            update_block_index, present = \
2418
                self._find_block_index_from_key(update_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2419
            if not present:
2420
                raise AssertionError('could not find block for %s' % (update_key,))
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2421
            update_entry_index, present = \
2422
                self._find_entry_index(update_key, self._dirblocks[update_block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2423
            if not present:
2424
                raise AssertionError('could not find entry for %s' % (update_key,))
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2425
            update_tree_details = self._dirblocks[update_block_index][1][update_entry_index][1]
2922.2.4 by John Arbash Meinel
Fix bug #114615 by teaching unversion() to not touch renamed entries.
2426
            # it must not be absent at the moment
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2427
            if update_tree_details[0][0] == 'a': # absent
2428
                raise AssertionError('bad row %r' % (update_tree_details,))
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2429
            update_tree_details[0] = DirState.NULL_PARENT_DETAILS
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2430
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2431
        return last_reference
2255.2.88 by Robert Collins
Significant steps back to operation.
2432
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2433
    def update_minimal(self, key, minikind, executable=False, fingerprint='',
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2434
                       packed_stat=None, size=0, path_utf8=None):
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2435
        """Update an entry to the state in tree 0.
2436
2437
        This will either create a new entry at 'key' or update an existing one.
2438
        It also makes sure that any other records which might mention this are
2439
        updated as well.
2440
2441
        :param key: (dir, name, file_id) for the new entry
2442
        :param minikind: The type for the entry ('f' == 'file', 'd' ==
2443
                'directory'), etc.
2444
        :param executable: Should the executable bit be set?
2872.4.7 by Martin Pool
More cleanups of dirstate work
2445
        :param fingerprint: Simple fingerprint for new entry: sha1 for files, 
2446
            referenced revision id for subtrees, etc.
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2447
        :param packed_stat: Packed stat value for new entry.
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2448
        :param size: Size information for new entry
2449
        :param path_utf8: key[0] + '/' + key[1], just passed in to avoid doing
2450
                extra computation.
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2451
2452
        If packed_stat and fingerprint are not given, they're invalidated in
2453
        the entry.
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2454
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2455
        block = self._find_block(key)[1]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2456
        if packed_stat is None:
2457
            packed_stat = DirState.NULLSTAT
2872.4.5 by Martin Pool
doc
2458
        # XXX: Some callers pass '' as the packed_stat, and it seems to be
2459
        # sometimes present in the dirstate - this seems oddly inconsistent.
2460
        # mbp 20071008
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2461
        entry_index, present = self._find_entry_index(key, block)
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2462
        new_details = (minikind, fingerprint, size, executable, packed_stat)
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2463
        id_index = self._get_id_index()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2464
        if not present:
2465
            # new entry, synthesis cross reference here,
2255.2.88 by Robert Collins
Significant steps back to operation.
2466
            existing_keys = id_index.setdefault(key[2], set())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2467
            if not existing_keys:
2468
                # not currently in the state, simplest case
2469
                new_entry = key, [new_details] + self._empty_parent_info()
2470
            else:
2255.2.88 by Robert Collins
Significant steps back to operation.
2471
                # present at one or more existing other paths.
2472
                # grab one of them and use it to generate parent
2473
                # relocation/absent entries.
2474
                new_entry = key, [new_details]
2475
                for other_key in existing_keys:
2476
                    # change the record at other to be a pointer to this new
2477
                    # record. The loop looks similar to the change to
2478
                    # relocations when updating an existing record but its not:
2479
                    # the test for existing kinds is different: this can be
2480
                    # factored out to a helper though.
2481
                    other_block_index, present = self._find_block_index_from_key(other_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2482
                    if not present:
2483
                        raise AssertionError('could not find block for %s' % (other_key,))
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
2484
                    other_entry_index, present = self._find_entry_index(other_key,
2485
                                            self._dirblocks[other_block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2486
                    if not present:
2487
                        raise AssertionError('could not find entry for %s' % (other_key,))
2488
                    if path_utf8 is None:
2489
                        raise AssertionError('no path')
2255.2.88 by Robert Collins
Significant steps back to operation.
2490
                    self._dirblocks[other_block_index][1][other_entry_index][1][0] = \
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2491
                        ('r', path_utf8, 0, False, '')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2492
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2493
                num_present_parents = self._num_present_parents()
2255.2.88 by Robert Collins
Significant steps back to operation.
2494
                for lookup_index in xrange(1, num_present_parents + 1):
2495
                    # grab any one entry, use it to find the right path.
2496
                    # TODO: optimise this to reduce memory use in highly 
2497
                    # fragmented situations by reusing the relocation
2498
                    # records.
2499
                    update_block_index, present = \
2500
                        self._find_block_index_from_key(other_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2501
                    if not present:
2502
                        raise AssertionError('could not find block for %s' % (other_key,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2503
                    update_entry_index, present = \
2504
                        self._find_entry_index(other_key, self._dirblocks[update_block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2505
                    if not present:
2506
                        raise AssertionError('could not find entry for %s' % (other_key,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2507
                    update_details = self._dirblocks[update_block_index][1][update_entry_index][1][lookup_index]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2508
                    if update_details[0] in 'ar': # relocated, absent
2255.2.88 by Robert Collins
Significant steps back to operation.
2509
                        # its a pointer or absent in lookup_index's tree, use
2510
                        # it as is.
2511
                        new_entry[1].append(update_details)
2512
                    else:
2513
                        # we have the right key, make a pointer to it.
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2514
                        pointer_path = osutils.pathjoin(*other_key[0:2])
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2515
                        new_entry[1].append(('r', pointer_path, 0, False, ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2516
            block.insert(entry_index, new_entry)
2517
            existing_keys.add(key)
2518
        else:
2519
            # Does the new state matter? 
2520
            block[entry_index][1][0] = new_details
2255.2.88 by Robert Collins
Significant steps back to operation.
2521
            # parents cannot be affected by what we do.
2522
            # other occurences of this id can be found 
2523
            # from the id index.
2524
            # ---
2525
            # tree index consistency: All other paths for this id in this tree
2526
            # index must point to the correct path. We have to loop here because
2527
            # we may have passed entries in the state with this file id already
2528
            # that were absent - where parent entries are - and they need to be
2529
            # converted to relocated.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2530
            if path_utf8 is None:
2531
                raise AssertionError('no path')
2255.2.88 by Robert Collins
Significant steps back to operation.
2532
            for entry_key in id_index.setdefault(key[2], set()):
2533
                # TODO:PROFILING: It might be faster to just update
2534
                # rather than checking if we need to, and then overwrite
2535
                # the one we are located at.
2536
                if entry_key != key:
2537
                    # this file id is at a different path in one of the
2538
                    # other trees, so put absent pointers there
2539
                    # This is the vertical axis in the matrix, all pointing
2540
                    # to the real path.
2541
                    block_index, present = self._find_block_index_from_key(entry_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2542
                    if not present:
2543
                        raise AssertionError('not present: %r', entry_key)
2255.2.88 by Robert Collins
Significant steps back to operation.
2544
                    entry_index, present = self._find_entry_index(entry_key, self._dirblocks[block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2545
                    if not present:
2546
                        raise AssertionError('not present: %r', entry_key)
2255.2.88 by Robert Collins
Significant steps back to operation.
2547
                    self._dirblocks[block_index][1][entry_index][1][0] = \
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2548
                        ('r', path_utf8, 0, False, '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2549
        # add a containing dirblock if needed.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2550
        if new_details[0] == 'd':
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2551
            subdir_key = (osutils.pathjoin(*key[0:2]), '', '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2552
            block_index, present = self._find_block_index_from_key(subdir_key)
2553
            if not present:
2554
                self._dirblocks.insert(block_index, (subdir_key[0], []))
2255.2.88 by Robert Collins
Significant steps back to operation.
2555
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2556
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2557
2255.2.168 by Martin Pool
merge robert, debugging
2558
    def _validate(self):
2559
        """Check that invariants on the dirblock are correct.
2560
2561
        This can be useful in debugging; it shouldn't be necessary in 
2562
        normal code.
2323.6.13 by Martin Pool
Fix some tests that need to lock dirstate before validating
2563
2564
        This must be called with a lock held.
2255.2.168 by Martin Pool
merge robert, debugging
2565
        """
2323.5.12 by Martin Pool
doc
2566
        # NOTE: This must always raise AssertionError not just assert,
2567
        # otherwise it may not behave properly under python -O
2568
        #
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2569
        # TODO: All entries must have some content that's not 'a' or 'r',
2570
        # otherwise it could just be removed.
2571
        #
2572
        # TODO: All relocations must point directly to a real entry.
2573
        #
2574
        # TODO: No repeated keys.
2575
        #
2576
        # -- mbp 20070325
2255.2.168 by Martin Pool
merge robert, debugging
2577
        from pprint import pformat
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2578
        self._read_dirblocks_if_needed()
2255.2.168 by Martin Pool
merge robert, debugging
2579
        if len(self._dirblocks) > 0:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2580
            if not self._dirblocks[0][0] == '':
2581
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
2582
                    "dirblocks don't start with root block:\n" + \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2583
                    pformat(dirblocks))
2255.2.168 by Martin Pool
merge robert, debugging
2584
        if len(self._dirblocks) > 1:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2585
            if not self._dirblocks[1][0] == '':
2586
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
2587
                    "dirblocks missing root directory:\n" + \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2588
                    pformat(dirblocks))
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2589
        # the dirblocks are sorted by their path components, name, and dir id
2590
        dir_names = [d[0].split('/')
2591
                for d in self._dirblocks[1:]]
2592
        if dir_names != sorted(dir_names):
2593
            raise AssertionError(
2594
                "dir names are not in sorted order:\n" + \
2595
                pformat(self._dirblocks) + \
2596
                "\nkeys:\n" +
2597
                pformat(dir_names))
2255.2.168 by Martin Pool
merge robert, debugging
2598
        for dirblock in self._dirblocks:
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2599
            # within each dirblock, the entries are sorted by filename and
2323.5.12 by Martin Pool
doc
2600
            # then by id.
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2601
            for entry in dirblock[1]:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2602
                if dirblock[0] != entry[0][0]:
2603
                    raise AssertionError(
2604
                        "entry key for %r"
2605
                        "doesn't match directory name in\n%r" %
2606
                        (entry, pformat(dirblock)))
2607
            if dirblock[1] != sorted(dirblock[1]):
2608
                raise AssertionError(
2609
                    "dirblock for %r is not sorted:\n%s" % \
2610
                    (dirblock[0], pformat(dirblock)))
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.
2611
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
2612
        def check_valid_parent():
2613
            """Check that the current entry has a valid parent.
2614
2615
            This makes sure that the parent has a record,
2616
            and that the parent isn't marked as "absent" in the
2617
            current tree. (It is invalid to have a non-absent file in an absent
2618
            directory.)
2619
            """
2620
            if entry[0][0:2] == ('', ''):
2621
                # There should be no parent for the root row
2622
                return
2623
            parent_entry = self._get_entry(tree_index, path_utf8=entry[0][0])
2624
            if parent_entry == (None, None):
2625
                raise AssertionError(
2626
                    "no parent entry for: %s in tree %s"
2627
                    % (this_path, tree_index))
2438.1.15 by John Arbash Meinel
Remove a superfluous 'else' (recommended by Martin)
2628
            if parent_entry[1][tree_index][0] != 'd':
2629
                raise AssertionError(
2630
                    "Parent entry for %s is not marked as a valid"
2631
                    " directory. %s" % (this_path, parent_entry,))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
2632
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2633
        # For each file id, for each tree: either
2634
        # the file id is not present at all; all rows with that id in the
2635
        # key have it marked as 'absent'
2636
        # OR the file id is present under exactly one name; any other entries 
2637
        # that mention that id point to the correct name.
2638
        #
2639
        # We check this with a dict per tree pointing either to the present
2640
        # name, or None if absent.
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2641
        tree_count = self._num_present_parents() + 1
2642
        id_path_maps = [dict() for i in range(tree_count)]
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2643
        # Make sure that all renamed entries point to the correct location.
2644
        for entry in self._iter_entries():
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2645
            file_id = entry[0][2]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2646
            this_path = osutils.pathjoin(entry[0][0], entry[0][1])
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2647
            if len(entry[1]) != tree_count:
2648
                raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2649
                "wrong number of entry details for row\n%s" \
2650
                ",\nexpected %d" % \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2651
                (pformat(entry), tree_count))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2652
            absent_positions = 0
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2653
            for tree_index, tree_state in enumerate(entry[1]):
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2654
                this_tree_map = id_path_maps[tree_index]
2655
                minikind = tree_state[0]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2656
                if minikind in 'ar':
2657
                    absent_positions += 1
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2658
                # have we seen this id before in this column?
2659
                if file_id in this_tree_map:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2660
                    previous_path, previous_loc = this_tree_map[file_id]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2661
                    # any later mention of this file must be consistent with
2662
                    # what was said before
2663
                    if minikind == 'a':
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2664
                        if previous_path is not None:
2665
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2666
                            "file %s is absent in row %r but also present " \
2667
                            "at %r"% \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2668
                            (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2669
                    elif minikind == 'r':
2670
                        target_location = tree_state[1]
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2671
                        if previous_path != target_location:
2672
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2673
                            "file %s relocation in row %r but also at %r" \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2674
                            % (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2675
                    else:
2676
                        # a file, directory, etc - may have been previously
2677
                        # pointed to by a relocation, which must point here
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2678
                        if previous_path != this_path:
2679
                            raise AssertionError(
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2680
                                "entry %r inconsistent with previous path %r "
2681
                                "seen at %r" %
2682
                                (entry, previous_path, previous_loc))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
2683
                        check_valid_parent()
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2684
                else:
2685
                    if minikind == 'a':
2686
                        # absent; should not occur anywhere else
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2687
                        this_tree_map[file_id] = None, this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2688
                    elif minikind == 'r':
2689
                        # relocation, must occur at expected location 
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2690
                        this_tree_map[file_id] = tree_state[1], this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2691
                    else:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2692
                        this_tree_map[file_id] = this_path, this_path
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
2693
                        check_valid_parent()
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2694
            if absent_positions == tree_count:
2695
                raise AssertionError(
2696
                    "entry %r has no data for any tree." % (entry,))
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2697
2255.4.2 by James Westby
(broken) Add the locking methods.
2698
    def _wipe_state(self):
2699
        """Forget all state information about the dirstate."""
2700
        self._header_state = DirState.NOT_IN_MEMORY
2701
        self._dirblock_state = DirState.NOT_IN_MEMORY
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
2702
        self._changes_aborted = False
2255.4.2 by James Westby
(broken) Add the locking methods.
2703
        self._parents = []
2704
        self._ghosts = []
2705
        self._dirblocks = []
2255.10.6 by John Arbash Meinel
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
2706
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2707
        self._packed_stat_index = None
2255.10.6 by John Arbash Meinel
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
2708
        self._end_of_header = None
2709
        self._cutoff_time = None
2710
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
2711
2712
    def lock_read(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2713
        """Acquire a read lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2714
        if self._lock_token is not None:
2715
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2716
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
2717
        #       already in memory, we could read just the header and check for
2718
        #       any modification. If not modified, we can just leave things
2719
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
2720
        self._lock_token = lock.ReadLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2721
        self._lock_state = 'r'
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
2722
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
2723
        self._wipe_state()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
2724
2255.4.2 by James Westby
(broken) Add the locking methods.
2725
    def lock_write(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2726
        """Acquire a write lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2727
        if self._lock_token is not None:
2728
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2729
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
2730
        #       already in memory, we could read just the header and check for
2731
        #       any modification. If not modified, we can just leave things
2732
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
2733
        self._lock_token = lock.WriteLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2734
        self._lock_state = 'w'
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
2735
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
2736
        self._wipe_state()
2737
2738
    def unlock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2739
        """Drop any locks held on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2740
        if self._lock_token is None:
2741
            raise errors.LockNotHeld(self)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2742
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
2743
        #       already in memory, we could read just the header and check for
2744
        #       any modification. If not modified, we can just leave things
2745
        #       alone
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
2746
        self._state_file = None
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2747
        self._lock_state = None
2255.4.2 by James Westby
(broken) Add the locking methods.
2748
        self._lock_token.unlock()
2749
        self._lock_token = None
2255.7.20 by John Arbash Meinel
update test for format 3, and enable caching of path split while lock is held.
2750
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
2751
2752
    def _requires_lock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2753
        """Check that a lock is currently held by someone on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2754
        if not self._lock_token:
2755
            raise errors.ObjectNotLocked(self)
1852.13.20 by Robert Collins
Steps toward an object model.
2756
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
2757
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
2758
# Try to load the compiled form if possible
2759
try:
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
2760
    from bzrlib._dirstate_helpers_c import (
2761
        _read_dirblocks_c as _read_dirblocks,
2762
        bisect_dirblock_c as bisect_dirblock,
2474.1.66 by John Arbash Meinel
Some restructuring.
2763
        _bisect_path_left_c as _bisect_path_left,
2764
        _bisect_path_right_c as _bisect_path_right,
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
2765
        cmp_by_dirs_c as cmp_by_dirs,
2474.1.21 by John Arbash Meinel
Cleanup the multiple testing.
2766
        )
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
2767
except ImportError:
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
2768
    from bzrlib._dirstate_helpers_py import (
2769
        _read_dirblocks_py as _read_dirblocks,
2770
        bisect_dirblock_py as bisect_dirblock,
2474.1.66 by John Arbash Meinel
Some restructuring.
2771
        _bisect_path_left_py as _bisect_path_left,
2772
        _bisect_path_right_py as _bisect_path_right,
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
2773
        cmp_by_dirs_py as cmp_by_dirs,
2774
        )