~bzr-pqm/bzr/bzr.dev

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