/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1852.13.20 by Robert Collins
Steps toward an object model.
17
"""DirState objects record the state of a directory and its bzr metadata.
18
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
19
Pseudo EBNF grammar for the state file. Fields are separated by NULLs, and
20
lines by NL. The field delimiters are ommitted in the grammar, line delimiters
21
are not - this is done for clarity of reading. All string data is in utf8.
22
2255.2.172 by Martin Pool
Recognize 't' (tree-reference) minikind in DirState._get_entry
23
MINIKIND = "f" | "d" | "l" | "a" | "r" | "t";
1852.13.20 by Robert Collins
Steps toward an object model.
24
NL = "\n";
25
NULL = "\0";
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
26
WHOLE_NUMBER = {digit}, digit;
27
BOOLEAN = "y" | "n";
28
REVISION_ID = a non-empty utf8 string;
1852.13.20 by Robert Collins
Steps toward an object model.
29
30
dirstate format = header line, full checksum, row count, parent details,
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
31
 ghost_details, entries;
2818.2.2 by Ian Clatworthy
review feedback
32
header line = "#bazaar dirstate flat format 3", NL;
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
33
full checksum = "crc32: ", ["-"], WHOLE_NUMBER, NL;
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
34
row count = "num_entries: ", WHOLE_NUMBER, NL;
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
35
parent_details = WHOLE NUMBER, {REVISION_ID}* NL;
36
ghost_details = WHOLE NUMBER, {REVISION_ID}*, NL;
37
entries = {entry};
38
entry = entry_key, current_entry_details, {parent_entry_details};
39
entry_key = dirname,  basename, fileid;
40
current_entry_details = common_entry_details, working_entry_details;
41
parent_entry_details = common_entry_details, history_entry_details;
42
common_entry_details = MINIKIND, fingerprint, size, executable
43
working_entry_details = packed_stat
44
history_entry_details = REVISION_ID;
45
executable = BOOLEAN;
46
size = WHOLE_NUMBER;
47
fingerprint = a nonempty utf8 sequence with meaning defined by minikind.
48
49
Given this definition, the following is useful to know:
50
entry (aka row) - all the data for a given key.
51
entry[0]: The key (dirname, basename, fileid)
52
entry[0][0]: dirname
53
entry[0][1]: basename
54
entry[0][2]: fileid
55
entry[1]: The tree(s) data for this path and id combination.
56
entry[1][0]: The current tree
57
entry[1][1]: The second tree
58
59
For an entry for a tree, we have (using tree 0 - current tree) to demonstrate:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
60
entry[1][0][0]: minikind
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
61
entry[1][0][1]: fingerprint
62
entry[1][0][2]: size
63
entry[1][0][3]: executable
64
entry[1][0][4]: packed_stat
65
OR (for non tree-0)
66
entry[1][1][4]: revision_id
67
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
68
There may be multiple rows at the root, one per id present in the root, so the
69
in memory root row is now:
70
self._dirblocks[0] -> ('', [entry ...]),
71
and the entries in there are
72
entries[0][0]: ''
73
entries[0][1]: ''
74
entries[0][2]: file_id
75
entries[1][0]: The tree data for the current tree for this fileid at /
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
76
etc.
77
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
78
Kinds:
79
'r' is a relocated entry: This path is not present in this tree with this id,
80
    but the id can be found at another location. The fingerprint is used to
81
    point to the target location.
82
'a' is an absent entry: In that tree the id is not present at this path.
83
'd' is a directory entry: This path in this tree is a directory with the
84
    current file id. There is no fingerprint for directories.
85
'f' is a file entry: As for directory, but its a file. The fingerprint is a
86
    sha1 value.
87
'l' is a symlink entry: As for directory, but a symlink. The fingerprint is the
88
    link target.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
89
't' is a reference to a nested subtree; the fingerprint is the referenced
90
    revision.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
91
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
92
Ordering:
93
94
The entries on disk and in memory are ordered according to the following keys:
95
96
    directory, as a list of components
97
    filename
98
    file-id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
99
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
100
--- Format 1 had the following different definition: ---
1852.13.20 by Robert Collins
Steps toward an object model.
101
rows = dirname, NULL, basename, NULL, MINIKIND, NULL, fileid_utf8, NULL,
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
102
    WHOLE NUMBER (* size *), NULL, packed stat, NULL, sha1|symlink target, 
1852.13.20 by Robert Collins
Steps toward an object model.
103
    {PARENT ROW}
104
PARENT ROW = NULL, revision_utf8, NULL, MINIKIND, NULL, dirname, NULL,
105
    basename, NULL, WHOLE NUMBER (* size *), NULL, "y" | "n", NULL,
106
    SHA1
107
2255.2.4 by Robert Collins
Snapshot dirstate development
108
PARENT ROW's are emitted for every parent that is not in the ghosts details
109
line. That is, if the parents are foo, bar, baz, and the ghosts are bar, then
110
each row will have a PARENT ROW for foo and baz, but not for bar.
111
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
112
113
In any tree, a kind of 'moved' indicates that the fingerprint field
114
(which we treat as opaque data specific to the 'kind' anyway) has the
115
details for the id of this row in that tree.
116
117
I'm strongly tempted to add a id->path index as well, but I think that
118
where we need id->path mapping; we also usually read the whole file, so
119
I'm going to skip that for the moment, as we have the ability to locate
120
via bisect any path in any tree, and if we lookup things by path, we can
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
121
accumulate an id->path mapping as we go, which will tend to match what we
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
122
looked for.
123
124
I plan to implement this asap, so please speak up now to alter/tweak the
125
design - and once we stabilise on this, I'll update the wiki page for
126
it.
127
128
The rationale for all this is that we want fast operations for the
129
common case (diff/status/commit/merge on all files) and extremely fast
130
operations for the less common but still occurs a lot status/diff/commit
131
on specific files). Operations on specific files involve a scan for all
132
the children of a path, *in every involved tree*, which the current
133
format did not accommodate. 
1852.13.20 by Robert Collins
Steps toward an object model.
134
----
135
136
Design priorities:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
137
 1) Fast end to end use for bzr's top 5 uses cases. (commmit/diff/status/merge/???)
1852.13.20 by Robert Collins
Steps toward an object model.
138
 2) fall back current object model as needed.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
139
 3) scale usably to the largest trees known today - say 50K entries. (mozilla
140
    is an example of this)
1852.13.20 by Robert Collins
Steps toward an object model.
141
142
143
Locking:
144
 Eventually reuse dirstate objects across locks IFF the dirstate file has not
145
 been modified, but will require that we flush/ignore cached stat-hit data
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
146
 because we won't want to restat all files on disk just because a lock was
1852.13.20 by Robert Collins
Steps toward an object model.
147
 acquired, yet we cannot trust the data after the previous lock was released.
148
149
Memory representation:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
150
 vector of all directories, and vector of the childen ?
1852.13.20 by Robert Collins
Steps toward an object model.
151
   i.e. 
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
152
     root_entrie = (direntry for root, [parent_direntries_for_root]), 
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
153
     dirblocks = [
1852.13.20 by Robert Collins
Steps toward an object model.
154
     ('', ['data for achild', 'data for bchild', 'data for cchild'])
155
     ('dir', ['achild', 'cchild', 'echild'])
156
     ]
157
    - single bisect to find N subtrees from a path spec
158
    - in-order for serialisation - this is 'dirblock' grouping.
159
    - insertion of a file '/a' affects only the '/' child-vector, that is, to
160
      insert 10K elements from scratch does not generates O(N^2) memoves of a
161
      single vector, rather each individual, which tends to be limited to a 
162
      manageable number. Will scale badly on trees with 10K entries in a 
163
      single directory. compare with Inventory.InventoryDirectory which has
164
      a dictionary for the children. No bisect capability, can only probe for
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
165
      exact matches, or grab all elements and sort.
166
    - What's the risk of error here? Once we have the base format being processed
1852.13.20 by Robert Collins
Steps toward an object model.
167
      we should have a net win regardless of optimality. So we are going to 
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
168
      go with what seems reasonable.
2255.2.4 by Robert Collins
Snapshot dirstate development
169
open questions:
1852.13.20 by Robert Collins
Steps toward an object model.
170
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
171
Maybe we should do a test profile of the core structure - 10K simulated
172
searches/lookups/etc?
1852.13.20 by Robert Collins
Steps toward an object model.
173
174
Objects for each row?
175
The lifetime of Dirstate objects is current per lock, but see above for
176
possible extensions. The lifetime of a row from a dirstate is expected to be
177
very short in the optimistic case: which we are optimising for. For instance,
178
subtree status will determine from analysis of the disk data what rows need to
179
be examined at all, and will be able to determine from a single row whether
180
that file has altered or not, so we are aiming to process tens of thousands of
181
entries each second within the dirstate context, before exposing anything to
182
the larger codebase. This suggests we want the time for a single file
183
comparison to be < 0.1 milliseconds. That would give us 10000 paths per second
184
processed, and to scale to 100 thousand we'll another order of magnitude to do
185
that. Now, as the lifetime for all unchanged entries is the time to parse, stat
186
the file on disk, and then immediately discard, the overhead of object creation
187
becomes a significant cost.
188
189
Figures: Creating a tuple from from 3 elements was profiled at 0.0625
190
microseconds, whereas creating a object which is subclassed from tuple was
191
0.500 microseconds, and creating an object with 3 elements and slots was 3
192
microseconds long. 0.1 milliseconds is 100 microseconds, and ideally we'll get
193
down to 10 microseconds for the total processing - having 33% of that be object
194
creation is a huge overhead. There is a potential cost in using tuples within
195
each row which is that the conditional code to do comparisons may be slower
196
than method invocation, but method invocation is known to be slow due to stack
197
frame creation, so avoiding methods in these tight inner loops in unfortunately
198
desirable. We can consider a pyrex version of this with objects in future if
199
desired.
200
201
"""
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
202
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
203
import bisect
2474.1.40 by John Arbash Meinel
(python-only) Shave a bit of time off by calling binascii.b2a_base64
204
import binascii
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
205
import errno
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
206
import os
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
207
from stat import S_IEXEC
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
208
import stat
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
209
import struct
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
210
import sys
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
211
import time
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
212
import zlib
213
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
214
from bzrlib import (
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
215
    cache_utf8,
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
216
    debug,
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
217
    errors,
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
218
    inventory,
2255.4.2 by James Westby
(broken) Add the locking methods.
219
    lock,
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
220
    osutils,
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
221
    trace,
222
    )
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
223
224
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
225
def pack_stat(st, _encode=binascii.b2a_base64, _pack=struct.pack):
226
    """Convert stat values into a packed representation."""
227
    # jam 20060614 it isn't really worth removing more entries if we
228
    # are going to leave it in packed form.
229
    # With only st_mtime and st_mode filesize is 5.5M and read time is 275ms
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
230
    # With all entries, filesize is 5.9M and read time is maybe 280ms
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
231
    # well within the noise margin
232
2485.3.6 by John Arbash Meinel
Delay calling pathjoin() until we've figured out we're going to use it
233
    # base64 encoding always adds a final newline, so strip it off
2485.3.7 by John Arbash Meinel
Comment on some alternative 'pack_stat'
234
    # The current version
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
235
    return _encode(_pack('>LLLLLL'
236
        , st.st_size, int(st.st_mtime), int(st.st_ctime)
237
        , st.st_dev, st.st_ino & 0xFFFFFFFF, st.st_mode))[:-1]
2485.3.7 by John Arbash Meinel
Comment on some alternative 'pack_stat'
238
    # This is 0.060s / 1.520s faster by not encoding as much information
239
    # return _encode(_pack('>LL', int(st.st_mtime), st.st_mode))[:-1]
240
    # This is not strictly faster than _encode(_pack())[:-1]
241
    # return '%X.%X.%X.%X.%X.%X' % (
242
    #      st.st_size, int(st.st_mtime), int(st.st_ctime),
243
    #      st.st_dev, st.st_ino, st.st_mode)
244
    # Similar to the _encode(_pack('>LL'))
245
    # return '%X.%X' % (int(st.st_mtime), st.st_mode)
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
246
247
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
248
class DirState(object):
249
    """Record directory and metadata state for fast access.
250
251
    A dirstate is a specialised data structure for managing local working
252
    tree state information. Its not yet well defined whether it is platform
3128.1.3 by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/.
253
    specific, and if it is how we detect/parameterize that.
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
254
255
    Dirstates use the usual lock_write, lock_read and unlock mechanisms.
256
    Unlike most bzr disk formats, DirStates must be locked for reading, using
257
    lock_read.  (This is an os file lock internally.)  This is necessary
258
    because the file can be rewritten in place.
259
260
    DirStates must be explicitly written with save() to commit changes; just
261
    unlocking them does not write the changes to disk.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
262
    """
263
2255.2.169 by Martin Pool
(broken) merge dirstate branch
264
    _kind_to_minikind = {
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
265
            'absent': 'a',
266
            'file': 'f',
267
            'directory': 'd',
268
            'relocated': 'r',
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
269
            'symlink': 'l',
270
            'tree-reference': 't',
271
        }
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
272
    _minikind_to_kind = {
273
            'a': 'absent',
274
            'f': 'file',
275
            'd': 'directory',
276
            'l':'symlink',
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
277
            'r': 'relocated',
278
            't': 'tree-reference',
279
        }
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
280
    _stat_to_minikind = {
281
        stat.S_IFDIR:'d',
282
        stat.S_IFREG:'f',
283
        stat.S_IFLNK:'l',
284
    }
1852.13.20 by Robert Collins
Steps toward an object model.
285
    _to_yesno = {True:'y', False: 'n'} # TODO profile the performance gain
286
     # of using int conversion rather than a dict here. AND BLAME ANDREW IF
287
     # it is faster.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
288
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
289
    # TODO: jam 20070221 Figure out what to do if we have a record that exceeds
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
290
    #       the BISECT_PAGE_SIZE. For now, we just have to make it large enough
291
    #       that we are sure a single record will always fit.
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
292
    BISECT_PAGE_SIZE = 4096
293
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
294
    NOT_IN_MEMORY = 0
295
    IN_MEMORY_UNMODIFIED = 1
296
    IN_MEMORY_MODIFIED = 2
297
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
298
    # A pack_stat (the x's) that is just noise and will never match the output
299
    # of base64 encode.
2255.2.4 by Robert Collins
Snapshot dirstate development
300
    NULLSTAT = 'x' * 32
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
301
    NULL_PARENT_DETAILS = ('a', '', 0, False, '')
2255.2.4 by Robert Collins
Snapshot dirstate development
302
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
303
    HEADER_FORMAT_2 = '#bazaar dirstate flat format 2\n'
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
304
    HEADER_FORMAT_3 = '#bazaar dirstate flat format 3\n'
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
305
2255.4.1 by James Westby
Store the filename of the dirstate in an attribute.
306
    def __init__(self, path):
2255.2.4 by Robert Collins
Snapshot dirstate development
307
        """Create a  DirState object.
308
2255.4.1 by James Westby
Store the filename of the dirstate in an attribute.
309
        :param path: The path at which the dirstate file on disk should live.
2255.2.4 by Robert Collins
Snapshot dirstate development
310
        """
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
311
        # _header_state and _dirblock_state represent the current state
312
        # of the dirstate metadata and the per-row data respectiely.
313
        # NOT_IN_MEMORY indicates that no data is in memory
314
        # IN_MEMORY_UNMODIFIED indicates that what we have in memory
315
        #   is the same as is on disk
316
        # IN_MEMORY_MODIFIED indicates that we have a modified version
317
        #   of what is on disk. 
318
        # In future we will add more granularity, for instance _dirblock_state
319
        # will probably support partially-in-memory as a separate variable,
320
        # allowing for partially-in-memory unmodified and partially-in-memory
321
        # modified states.
322
        self._header_state = DirState.NOT_IN_MEMORY
323
        self._dirblock_state = DirState.NOT_IN_MEMORY
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
324
        # If true, an error has been detected while updating the dirstate, and 
325
        # for safety we're not going to commit to disk.
326
        self._changes_aborted = False
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
327
        self._dirblocks = []
328
        self._ghosts = []
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
329
        self._parents = []
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
330
        self._state_file = None
2255.4.2 by James Westby
(broken) Add the locking methods.
331
        self._filename = path
332
        self._lock_token = None
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
333
        self._lock_state = None
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
334
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
335
        # a map from packed_stat to sha's.
336
        self._packed_stat_index = None
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
337
        self._end_of_header = None
2255.10.6 by John Arbash Meinel
Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
338
        self._cutoff_time = None
2255.7.20 by John Arbash Meinel
update test for format 3, and enable caching of path split while lock is held.
339
        self._split_path_cache = {}
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
340
        self._bisect_page_size = DirState.BISECT_PAGE_SIZE
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
341
        if 'hashcache' in debug.debug_flags:
342
            self._sha1_file = self._sha1_file_and_mutter
343
        else:
344
            self._sha1_file = osutils.sha_file_by_name
2921.1.4 by Robert Collins
Documentation to aid our failing memory in the future.
345
        # These two attributes provide a simple cache for lookups into the
346
        # dirstate in-memory vectors. By probing respectively for the last
347
        # block, and for the next entry, we save nearly 2 bisections per path
348
        # during commit.
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
349
        self._last_block_index = None
350
        self._last_entry_index = None
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
351
2255.2.222 by Martin Pool
Add DirState repr so we get meaningful messages
352
    def __repr__(self):
353
        return "%s(%r)" % \
354
            (self.__class__.__name__, self._filename)
355
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
356
    def add(self, path, file_id, kind, stat, fingerprint):
2255.2.8 by Robert Collins
First DirState.add() method test passing.
357
        """Add a path to be tracked.
358
359
        :param path: The path within the dirstate - '' is the root, 'foo' is the
360
            path foo within the root, 'foo/bar' is the path bar within foo 
361
            within the root.
362
        :param file_id: The file id of the path being added.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
363
        :param kind: The kind of the path, as a string like 'file', 
364
            'directory', etc.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
365
        :param stat: The output of os.lstat for the path.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
366
        :param fingerprint: The sha value of the file,
367
            or the target of a symlink,
368
            or the referenced revision id for tree-references,
369
            or '' for directories.
2255.2.8 by Robert Collins
First DirState.add() method test passing.
370
        """
371
        # adding a file:
372
        # find the block its in. 
373
        # find the location in the block.
374
        # check its not there
375
        # add it.
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
376
        #------- copied from inventory.ensure_normalized_name - keep synced.
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
377
        # --- normalized_filename wants a unicode basename only, so get one.
2474.1.74 by John Arbash Meinel
Revert the accidental removal of the Unicode normalization check code.
378
        dirname, basename = osutils.split(path)
379
        # we dont import normalized_filename directly because we want to be
380
        # able to change the implementation at runtime for tests.
381
        norm_name, can_access = osutils.normalized_filename(basename)
382
        if norm_name != basename:
383
            if can_access:
384
                basename = norm_name
385
            else:
386
                raise errors.InvalidNormalization(path)
2255.2.225 by Martin Pool
Prohibit dirstate from getting entries called ..
387
        # you should never have files called . or ..; just add the directory
388
        # in the parent, or according to the special treatment for the root
389
        if basename == '.' or basename == '..':
390
            raise errors.InvalidEntryName(path)
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
391
        # now that we've normalised, we need the correct utf8 path and 
392
        # dirname and basename elements. This single encode and split should be
393
        # faster than three separate encodes.
2474.1.74 by John Arbash Meinel
Revert the accidental removal of the Unicode normalization check code.
394
        utf8path = (dirname + '/' + basename).strip('/').encode('utf8')
395
        dirname, basename = osutils.split(utf8path)
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]]
3146.8.8 by Aaron Bentley
Remove debug code
1046
        return '\0'.join(entire_entry)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
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
3146.8.15 by Aaron Bentley
Cleanup and docs
1169
    def update_by_delta(self, delta):
1170
        """Apply an inventory delta to the dirstate for tree 0
1171
1172
        :param delta: An inventory delta.  See Inventory.apply_delta for
1173
            details.
1174
        """
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1175
        self._read_dirblocks_if_needed()
3146.8.13 by Aaron Bentley
Clean up code
1176
        insertions = {}
1177
        removals = {}
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1178
        for old_path, new_path, file_id, inv_entry in sorted(delta,
1179
                                                             reverse=True):
3146.8.13 by Aaron Bentley
Clean up code
1180
            assert file_id not in insertions
1181
            assert file_id not in removals
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1182
            if old_path is not None:
1183
                old_path = old_path.encode('utf-8')
3146.8.13 by Aaron Bentley
Clean up code
1184
                removals[file_id] = old_path
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1185
            if new_path is not None:
1186
                new_path = new_path.encode('utf-8')
1187
                dirname, basename = osutils.split(new_path)
1188
                key = (dirname, basename, file_id)
1189
                minikind = DirState._kind_to_minikind[inv_entry.kind]
1190
                if minikind == 't':
1191
                    fingerprint = inv_entry.reference_revision
1192
                else:
1193
                    fingerprint = ''
3146.8.13 by Aaron Bentley
Clean up code
1194
                insertions[file_id] = (key, minikind, inv_entry.executable,
1195
                                       fingerprint, new_path)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1196
            if None not in (old_path, new_path):
1197
                for child in self._iter_child_entries(0, old_path):
3146.8.13 by Aaron Bentley
Clean up code
1198
                    if child[0][2] in insertions or child[0][2] in removals:
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1199
                        continue
3146.8.10 by Aaron Bentley
Clean up some variable names
1200
                    child_dirname = child[0][0]
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1201
                    child_basename = child[0][1]
1202
                    minikind = child[1][0][0]
1203
                    fingerprint = child[1][0][4]
3146.8.9 by Aaron Bentley
Fix child execute bit
1204
                    executable = child[1][0][3]
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1205
                    old_child_path = osutils.pathjoin(child[0][0],
1206
                                                      child[0][1])
3146.8.13 by Aaron Bentley
Clean up code
1207
                    removals[child[0][2]] = old_child_path
3146.8.10 by Aaron Bentley
Clean up some variable names
1208
                    child_suffix = child_dirname[len(old_path):]
1209
                    new_child_dirname = (new_path + child_suffix)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1210
                    key = (new_child_dirname, child_basename, child[0][2])
1211
                    new_child_path = os.path.join(new_child_dirname,
1212
                                                  child_basename)
3146.8.13 by Aaron Bentley
Clean up code
1213
                    insertions[child[0][2]] = (key, minikind, executable,
1214
                                               fingerprint, new_child_path)
1215
        self._apply_removals(removals.values())
1216
        self._apply_insertions(insertions.values())
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1217
1218
    def _apply_removals(self, removals):
3146.8.13 by Aaron Bentley
Clean up code
1219
        for path in sorted(removals, reverse=True):
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1220
            dirname, basename = osutils.split(path)
1221
            block_i, entry_i, d_present, f_present = \
1222
                self._get_block_entry_index(dirname, basename, 0)
1223
            entry = self._dirblocks[block_i][1][entry_i]
3146.8.16 by Aaron Bentley
Updates from review
1224
            self._make_absent(entry)
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1225
1226
    def _apply_insertions(self, adds):
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1227
        for key, minikind, executable, fingerprint, path_utf8 in sorted(adds):
1228
            self.update_minimal(key, minikind, executable, fingerprint,
1229
                                path_utf8=path_utf8)
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1230
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1231
    def update_basis_by_delta(self, delta, new_revid):
1232
        """Update the parents of this tree after a commit.
1233
1234
        This gives the tree one parent, with revision id new_revid. The
1235
        inventory delta is applied to the current basis tree to generate the
1236
        inventory for the parent new_revid, and all other parent trees are
1237
        discarded.
1238
1239
        Note that an exception during the operation of this method will leave
1240
        the dirstate in a corrupt state where it should not be saved.
1241
1242
        Finally, we expect all changes to be synchronising the basis tree with
1243
        the working tree.
1244
1245
        :param new_revid: The new revision id for the trees parent.
1246
        :param delta: An inventory delta (see apply_inventory_delta) describing
1247
            the changes from the current left most parent revision to new_revid.
1248
        """
1249
        self._read_dirblocks_if_needed()
1250
        self._discard_merge_parents()
1251
        if self._ghosts != []:
1252
            raise NotImplementedError(self.update_basis_by_delta)
1253
        if len(self._parents) == 0:
1254
            # setup a blank tree, the most simple way.
1255
            empty_parent = DirState.NULL_PARENT_DETAILS
1256
            for entry in self._iter_entries():
1257
                entry[1].append(empty_parent)
1258
            self._parents.append(new_revid)
1259
1260
        self._parents[0] = new_revid
1261
1262
        delta = sorted(delta, reverse=True)
1263
        adds = []
1264
        changes = []
1265
        deletes = []
1266
        # The paths this function accepts are unicode and must be encoded as we
1267
        # go.
1268
        encode = cache_utf8.encode
1269
        inv_to_entry = self._inv_entry_to_details
1270
        # delta is now (deletes, changes), (adds) in reverse lexographical
1271
        # order.
1272
        # deletes in reverse lexographic order are safe to process in situ.
1273
        # renames are not, as a rename from any path could go to a path
1274
        # lexographically lower, so we transform renames into delete, add pairs,
1275
        # expanding them recursively as needed.
1276
        # At the same time, to reduce interface friction we convert the input
1277
        # inventory entries to dirstate.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1278
        root_only = ('', '')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1279
        for old_path, new_path, file_id, inv_entry in delta:
1280
            if old_path is None:
1281
                adds.append((None, encode(new_path), file_id,
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1282
                    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
1283
            elif new_path is None:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1284
                deletes.append((encode(old_path), None, file_id, None, True))
1285
            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
1286
                # Renames:
1287
                # Because renames must preserve their children we must have
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1288
                # 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
1289
                # order ensures we've examined the child paths, but we also
1290
                # have to execute the removals, or the split to an add/delete
1291
                # pair will result in the deleted item being reinserted, or
1292
                # renamed items being reinserted twice - and possibly at the
1293
                # wrong place. Splitting into a delete/add pair also simplifies
1294
                # the handling of entries with ('f', ...), ('r' ...) because
1295
                # the target of the 'r' is old_path here, and we add that to
1296
                # deletes, meaning that the add handler does not need to check
1297
                # for 'r' items on every pass.
1298
                self._update_basis_apply_deletes(deletes)
1299
                deletes = []
1300
                new_path_utf8 = encode(new_path)
1301
                # Split into an add/delete pair recursively.
1302
                adds.append((None, new_path_utf8, file_id,
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1303
                    inv_to_entry(inv_entry), False))
1304
                # Expunge deletes that we've seen so that deleted/renamed
1305
                # children of a rename directory are handled correctly.
1306
                new_deletes = reversed(list(self._iter_child_entries(1,
1307
                    encode(old_path))))
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1308
                # Remove the current contents of the tree at orig_path, and
1309
                # reinsert at the correct new path.
1310
                for entry in new_deletes:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1311
                    if entry[0][0]:
1312
                        source_path = entry[0][0] + '/' + entry[0][1]
1313
                    else:
1314
                        source_path = entry[0][1]
3253.2.1 by John Arbash Meinel
Fix moving directories to root nodes.
1315
                    if new_path_utf8:
1316
                        target_path = new_path_utf8 + source_path[len(old_path):]
1317
                    else:
1318
                        assert len(old_path) > 0, ("cannot rename directory to"
1319
                                                   " itself")
1320
                        target_path = source_path[len(old_path) + 1:]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1321
                    adds.append((None, target_path, entry[0][2], entry[1][1], False))
1322
                    deletes.append(
1323
                        (source_path, target_path, entry[0][2], None, False))
1324
                deletes.append(
1325
                    (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
1326
            else:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1327
                # changes to just the root should not require remove/insertion
1328
                # of everything.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1329
                changes.append((encode(old_path), encode(new_path), file_id,
1330
                    inv_to_entry(inv_entry)))
1331
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1332
        # 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
1333
        self._update_basis_apply_deletes(deletes)
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1334
        # Reinstate second half of renames and new paths.
1335
        self._update_basis_apply_adds(adds)
1336
        # Apply in-situ changes.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1337
        self._update_basis_apply_changes(changes)
1338
1339
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1340
        self._header_state = DirState.IN_MEMORY_MODIFIED
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1341
        self._id_index = None
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1342
        return
1343
1344
    def _update_basis_apply_adds(self, adds):
1345
        """Apply a sequence of adds to tree 1 during update_basis_by_delta.
1346
1347
        They may be adds, or renames that have been split into add/delete
1348
        pairs.
1349
1350
        :param adds: A sequence of adds. Each add is a tuple:
2929.2.3 by Robert Collins
Review feedback.
1351
            (None, new_path_utf8, file_id, (entry_details), real_add). real_add
1352
            is False when the add is the second half of a remove-and-reinsert
1353
            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
1354
        """
1355
        # Adds are accumulated partly from renames, so can be in any input
1356
        # order - sort it.
1357
        adds.sort()
1358
        # adds is now in lexographic order, which places all parents before
1359
        # their children, so we can process it linearly.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1360
        absent = 'ar'
1361
        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
1362
            assert old_path is None
1363
            # the entry for this file_id must be in tree 0.
1364
            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
1365
            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
1366
                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
1367
                raise errors.InconsistentDelta(new_path, file_id,
1368
                    'working tree does not contain new entry')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1369
            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
1370
                self._changes_aborted = True
1371
                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
1372
                    'The entry was considered to be a genuinely new record,'
1373
                    ' 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
1374
            # We don't need to update the target of an 'r' because the handling
1375
            # of renames turns all 'r' situations into a delete at the original
1376
            # location.
1377
            entry[1][1] = new_details
1378
1379
    def _update_basis_apply_changes(self, changes):
1380
        """Apply a sequence of changes to tree 1 during update_basis_by_delta.
1381
1382
        :param adds: A sequence of changes. Each change is a tuple:
1383
            (path_utf8, path_utf8, file_id, (entry_details))
1384
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1385
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1386
        for old_path, new_path, file_id, new_details in changes:
1387
            assert old_path == new_path
1388
            # the entry for this file_id must be in tree 0.
1389
            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
1390
            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
1391
                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
1392
                raise errors.InconsistentDelta(new_path, file_id,
1393
                    '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
1394
            if (entry[1][0][0] in absent or
1395
                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
1396
                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
1397
                raise errors.InconsistentDelta(new_path, file_id,
1398
                    'changed considered absent')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1399
            entry[1][1] = new_details
1400
1401
    def _update_basis_apply_deletes(self, deletes):
1402
        """Apply a sequence of deletes to tree 1 during update_basis_by_delta.
1403
1404
        They may be deletes, or renames that have been split into add/delete
1405
        pairs.
1406
2929.2.3 by Robert Collins
Review feedback.
1407
        :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.
1408
            (old_path_utf8, new_path_utf8, file_id, None, real_delete).
1409
            real_delete is True when the desired outcome is an actual deletion
1410
            rather than the rename handling logic temporarily deleting a path
1411
            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
1412
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1413
        null = DirState.NULL_PARENT_DETAILS
1414
        for old_path, new_path, file_id, _, real_delete in deletes:
1415
            if real_delete:
1416
                assert new_path is None
1417
            else:
1418
                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
1419
            # the entry for this file_id must be in tree 1.
1420
            dirname, basename = osutils.split(old_path)
1421
            block_index, entry_index, dir_present, file_present = \
1422
                self._get_block_entry_index(dirname, basename, 1)
1423
            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
1424
                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
1425
                raise errors.InconsistentDelta(old_path, file_id,
1426
                    '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
1427
            entry = self._dirblocks[block_index][1][entry_index]
1428
            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
1429
                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
1430
                raise errors.InconsistentDelta(old_path, file_id,
1431
                    'mismatched file_id in tree 1')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1432
            if real_delete:
1433
                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
1434
                    self._changes_aborted = True
3221.1.5 by Martin Pool
Fix incorrect indent in dirstate error handling
1435
                    raise errors.InconsistentDelta(old_path, file_id,
1436
                            'This was marked as a real delete, but the WT state'
1437
                            ' claims that it still exists and is versioned.')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1438
                del self._dirblocks[block_index][1][entry_index]
1439
            else:
1440
                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
1441
                    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
1442
                    raise errors.InconsistentDelta(old_path, file_id,
1443
                        'The entry was considered a rename, but the source path'
1444
                        ' is marked as absent.')
1445
                    # For whatever reason, we were asked to rename an entry
1446
                    # that was originally marked as deleted. This could be
1447
                    # because we are renaming the parent directory, and the WT
1448
                    # current state has the file marked as deleted.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1449
                elif entry[1][0][0] == 'r':
1450
                    # implement the rename
1451
                    del self._dirblocks[block_index][1][entry_index]
1452
                else:
1453
                    # it is being resurrected here, so blank it out temporarily.
1454
                    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
1455
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1456
    def update_entry(self, entry, abspath, stat_value,
1457
                     _stat_to_minikind=_stat_to_minikind,
1458
                     _pack_stat=pack_stat):
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1459
        """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,
1460
1461
        :param entry: This is the dirblock entry for the file in question.
1462
        :param abspath: The path on disk for this file.
1463
        :param stat_value: (optional) if we already have done a stat on the
1464
            file, re-use it.
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1465
        :return: The sha1 hexdigest of the file (40 bytes) or link target of a
1466
                symlink.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1467
        """
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1468
        try:
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1469
            minikind = _stat_to_minikind[stat_value.st_mode & 0170000]
1470
        except KeyError:
1471
            # Unhandled kind
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
1472
            return None
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1473
        packed_stat = _pack_stat(stat_value)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1474
        (saved_minikind, saved_link_or_sha1, saved_file_size,
1475
         saved_executable, saved_packed_stat) = entry[1][0]
1476
1477
        if (minikind == saved_minikind
2485.3.1 by John Arbash Meinel
Fix DirState handling of dir records.
1478
            and packed_stat == saved_packed_stat):
2485.3.11 by John Arbash Meinel
Correct DirState.update_entry to check when caching the sha1
1479
            # The stat hasn't changed since we saved, so we can re-use the
1480
            # 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.
1481
            if minikind == 'd':
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1482
                return None
1483
2485.3.1 by John Arbash Meinel
Fix DirState handling of dir records.
1484
            # size should also be in packed_stat
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
1485
            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
1486
                return saved_link_or_sha1
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1487
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1488
        # 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
1489
        # process this entry.
1490
        link_or_sha1 = None
1491
        if minikind == 'f':
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
1492
            link_or_sha1 = self._sha1_file(abspath)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1493
            executable = self._is_executable(stat_value.st_mode,
1494
                                             saved_executable)
2485.3.11 by John Arbash Meinel
Correct DirState.update_entry to check when caching the sha1
1495
            if self._cutoff_time is None:
1496
                self._sha_cutoff_time()
1497
            if (stat_value.st_mtime < self._cutoff_time
1498
                and stat_value.st_ctime < self._cutoff_time):
1499
                entry[1][0] = ('f', link_or_sha1, stat_value.st_size,
1500
                               executable, packed_stat)
1501
            else:
1502
                entry[1][0] = ('f', '', stat_value.st_size,
1503
                               executable, DirState.NULLSTAT)
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1504
        elif minikind == 'd':
1505
            link_or_sha1 = None
1506
            entry[1][0] = ('d', '', 0, False, packed_stat)
1507
            if saved_minikind != 'd':
1508
                # This changed from something into a directory. Make sure we
1509
                # have a directory block for it. This doesn't happen very
1510
                # often, so this doesn't have to be super fast.
1511
                block_index, entry_index, dir_present, file_present = \
1512
                    self._get_block_entry_index(entry[0][0], entry[0][1], 0)
1513
                self._ensure_block(block_index, entry_index,
1514
                                   osutils.pathjoin(entry[0][0], entry[0][1]))
1515
        elif minikind == 'l':
1516
            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
1517
            if self._cutoff_time is None:
1518
                self._sha_cutoff_time()
1519
            if (stat_value.st_mtime < self._cutoff_time
1520
                and stat_value.st_ctime < self._cutoff_time):
1521
                entry[1][0] = ('l', link_or_sha1, stat_value.st_size,
1522
                               False, packed_stat)
1523
            else:
1524
                entry[1][0] = ('l', '', stat_value.st_size,
1525
                               False, DirState.NULLSTAT)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1526
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1527
        return link_or_sha1
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1528
1529
    def _sha_cutoff_time(self):
1530
        """Return cutoff time.
1531
1532
        Files modified more recently than this time are at risk of being
1533
        undetectably modified and so can't be cached.
1534
        """
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.
1535
        # Cache the cutoff time as long as we hold a lock.
1536
        # time.time() isn't super expensive (approx 3.38us), but
1537
        # when you call it 50,000 times it adds up.
1538
        # For comparison, os.lstat() costs 7.2us if it is hot.
1539
        self._cutoff_time = int(time.time()) - 3
1540
        return self._cutoff_time
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1541
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1542
    def _lstat(self, abspath, entry):
1543
        """Return the os.lstat value for this path."""
1544
        return os.lstat(abspath)
1545
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
1546
    def _sha1_file_and_mutter(self, abspath):
1547
        # when -Dhashcache is turned on, this is monkey-patched in to log
1548
        # file reads
1549
        trace.mutter("dirstate sha1 " + abspath)
1550
        return osutils.sha_file_by_name(abspath)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1551
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1552
    def _is_executable(self, mode, old_executable):
1553
        """Is this file executable?"""
1554
        return bool(S_IEXEC & mode)
1555
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
1556
    def _is_executable_win32(self, mode, old_executable):
1557
        """On win32 the executable bit is stored in the dirstate."""
1558
        return old_executable
1559
1560
    if sys.platform == 'win32':
1561
        _is_executable = _is_executable_win32
1562
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1563
    def _read_link(self, abspath, old_link):
1564
        """Read the target of a symlink"""
1565
        # 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
1566
        #       already in memory. However, this really needs to be done at a
1567
        #       higher level, because there either won't be anything on disk,
1568
        #       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
1569
        return os.readlink(abspath)
1570
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.
1571
    def get_ghosts(self):
1572
        """Return a list of the parent tree revision ids that are ghosts."""
1573
        self._read_header_if_needed()
1574
        return self._ghosts
1575
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1576
    def get_lines(self):
1577
        """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.
1578
        if (self._header_state == DirState.IN_MEMORY_UNMODIFIED and
1579
            self._dirblock_state == DirState.IN_MEMORY_UNMODIFIED):
1580
            # read whats on disk.
1581
            self._state_file.seek(0)
1582
            return self._state_file.readlines()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1583
        lines = []
1584
        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.
1585
        lines.append(self._get_ghosts_line(self._ghosts))
1852.13.20 by Robert Collins
Steps toward an object model.
1586
        # 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.
1587
        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.
1588
        return self._get_output_lines(lines)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1589
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1590
    def _get_ghosts_line(self, ghost_ids):
1591
        """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.
1592
        return '\0'.join([str(len(ghost_ids))] + ghost_ids)
1593
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1594
    def _get_parents_line(self, parent_ids):
1595
        """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.
1596
        return '\0'.join([str(len(parent_ids))] + parent_ids)
1597
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1598
    def _get_fields_to_entry(self):
1599
        """Get a function which converts entry fields into a entry record.
1600
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1601
        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.
1602
1603
        :return: A function which takes a list of fields, and returns an
1604
            appropriate record for storing in memory.
1605
        """
1606
        # This is intentionally unrolled for performance
1607
        num_present_parents = self._num_present_parents()
1608
        if num_present_parents == 0:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1609
            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])
1610
                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.
1611
                return (path_name_file_id_key, [
1612
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1613
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1614
                        fields[4],                # fingerprint
1615
                        _int(fields[5]),          # size
1616
                        fields[6] == 'y',         # executable
1617
                        fields[7],                # packed_stat or revision_id
1618
                    )])
1619
            return fields_to_entry_0_parents
1620
        elif num_present_parents == 1:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1621
            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])
1622
                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.
1623
                return (path_name_file_id_key, [
1624
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1625
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1626
                        fields[4],                # fingerprint
1627
                        _int(fields[5]),          # size
1628
                        fields[6] == 'y',         # executable
1629
                        fields[7],                # packed_stat or revision_id
1630
                    ),
1631
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1632
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1633
                        fields[9],                # fingerprint
1634
                        _int(fields[10]),         # size
1635
                        fields[11] == 'y',        # executable
1636
                        fields[12],               # packed_stat or revision_id
1637
                    ),
1638
                    ])
1639
            return fields_to_entry_1_parent
1640
        elif num_present_parents == 2:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1641
            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])
1642
                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.
1643
                return (path_name_file_id_key, [
1644
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1645
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1646
                        fields[4],                # fingerprint
1647
                        _int(fields[5]),          # size
1648
                        fields[6] == 'y',         # executable
1649
                        fields[7],                # packed_stat or revision_id
1650
                    ),
1651
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1652
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1653
                        fields[9],                # fingerprint
1654
                        _int(fields[10]),         # size
1655
                        fields[11] == 'y',        # executable
1656
                        fields[12],               # packed_stat or revision_id
1657
                    ),
1658
                    ( # Parent 2
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1659
                        fields[13],               # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1660
                        fields[14],               # fingerprint
1661
                        _int(fields[15]),         # size
1662
                        fields[16] == 'y',        # executable
1663
                        fields[17],               # packed_stat or revision_id
1664
                    ),
1665
                    ])
1666
            return fields_to_entry_2_parents
1667
        else:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1668
            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])
1669
                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
1670
                trees = [(fields[cur],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1671
                          fields[cur+1],              # fingerprint
1672
                          _int(fields[cur+2]),        # size
1673
                          fields[cur+3] == 'y',       # executable
1674
                          fields[cur+4],              # stat or revision_id
1675
                         ) for cur in xrange(3, len(fields)-1, 5)]
1676
                return path_name_file_id_key, trees
1677
            return fields_to_entry_n_parents
1678
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1679
    def get_parent_ids(self):
1680
        """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.
1681
        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.
1682
        return list(self._parents)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1683
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1684
    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.
1685
        """Get the coordinates for a path in the state structure.
1686
1687
        :param dirname: The utf8 dirname to lookup.
1688
        :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.
1689
        :param tree_index: The index of the tree for which this lookup should
1690
            be attempted.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1691
        :return: A tuple describing where the path is located, or should be
1692
            inserted. The tuple contains four fields: the block index, the row
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1693
            index, the directory is present (boolean), the entire path is
1694
            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.
1695
            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.
1696
            True. For instance, a directory not present in the searched tree
1697
            may be returned with a value one greater than the current highest
1698
            block offset. The directory present field will always be True when
1699
            the path present field is True. The directory present field does
1700
            NOT indicate that the directory is present in the searched tree,
1701
            rather it indicates that there are at least some files in some
1702
            tree present there.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1703
        """
1704
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1705
        key = dirname, basename, ''
1706
        block_index, present = self._find_block_index_from_key(key)
1707
        if not present:
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1708
            # no such directory - return the dir index and 0 for the row.
1709
            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.
1710
        block = self._dirblocks[block_index][1] # access the entries only
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1711
        entry_index, present = self._find_entry_index(key, block)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1712
        # 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.
1713
        # requested.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1714
        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.
1715
            if block[entry_index][1][tree_index][0] not in 'ar':
1716
                # neither absent or relocated
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1717
                return block_index, entry_index, True, True
1718
            entry_index += 1
1719
        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.
1720
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1721
    def _get_entry(self, tree_index, fileid_utf8=None, path_utf8=None):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1722
        """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.
1723
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1724
        If either file_id or path is supplied, it is used as the key to lookup.
1725
        If both are supplied, the fastest lookup is used, and an error is
1726
        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.
1727
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1728
        :param tree_index: The index of the tree we wish to locate this path
1729
            in. If the path is present in that tree, the entry containing its
1730
            details is returned, otherwise (None, None) is returned
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
1731
            0 is the working tree, higher indexes are successive parent
1732
            trees.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1733
        :param fileid_utf8: A utf8 file_id to look up.
1734
        :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.
1735
        :return: The dirstate entry tuple for path, or (None, None)
1736
        """
2255.2.94 by Robert Collins
DirState: handle id lookup redirects correctly.
1737
        self._read_dirblocks_if_needed()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1738
        if path_utf8 is not None:
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1739
            assert path_utf8.__class__ == str, ('path_utf8 is not a str: %s %s'
1740
                % (type(path_utf8), path_utf8))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1741
            # path lookups are faster
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
1742
            dirname, basename = osutils.split(path_utf8)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1743
            block_index, entry_index, dir_present, file_present = \
1744
                self._get_block_entry_index(dirname, basename, tree_index)
1745
            if not file_present:
1746
                return None, None
1747
            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
1748
            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.
1749
            if fileid_utf8:
1750
                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
1751
                    self._changes_aborted = True
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
1752
                    raise errors.BzrError('integrity error ? : mismatching'
1753
                                          ' tree_index, file_id and path')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1754
            return entry
1755
        else:
2255.7.13 by John Arbash Meinel
find an edge case in our _get_entry logic and fix it.
1756
            assert fileid_utf8 is not None
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
1757
            possible_keys = self._get_id_index().get(fileid_utf8, None)
1758
            if not possible_keys:
1759
                return None, None
1760
            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.
1761
                block_index, present = \
1762
                    self._find_block_index_from_key(key)
1763
                # strange, probably indicates an out of date
1764
                # id index - for now, allow this.
1765
                if not present:
1766
                    continue
1767
                # WARNING: DO not change this code to use _get_block_entry_index
1768
                # as that function is not suitable: it does not use the key
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1769
                # 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.
1770
                block = self._dirblocks[block_index][1]
1771
                entry_index, present = self._find_entry_index(key, block)
1772
                if present:
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
1773
                    entry = self._dirblocks[block_index][1][entry_index]
2255.2.172 by Martin Pool
Recognize 't' (tree-reference) minikind in DirState._get_entry
1774
                    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.
1775
                        # this is the result we are looking for: the  
1776
                        # real home of this file_id in this tree.
1777
                        return entry
1778
                    if entry[1][tree_index][0] == 'a':
1779
                        # there is no home for this entry in this tree
1780
                        return None, None
2255.2.172 by Martin Pool
Recognize 't' (tree-reference) minikind in DirState._get_entry
1781
                    assert entry[1][tree_index][0] == 'r', \
1782
                        "entry %r has invalid minikind %r for tree %r" \
1783
                        % (entry,
1784
                           entry[1][tree_index][0],
1785
                           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.
1786
                    real_path = entry[1][tree_index][1]
1787
                    return self._get_entry(tree_index, fileid_utf8=fileid_utf8,
1788
                        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.
1789
            return None, None
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1790
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1791
    @classmethod
1792
    def initialize(cls, path):
1852.13.20 by Robert Collins
Steps toward an object model.
1793
        """Create a new dirstate on path.
1794
1795
        The new dirstate will be an empty tree - that is it has no parents,
1796
        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.
1797
1852.13.20 by Robert Collins
Steps toward an object model.
1798
        :param path: The name of the file for the dirstate.
2425.5.1 by Martin Pool
doc Dirstate.initialize
1799
        :return: A write-locked DirState object.
1852.13.20 by Robert Collins
Steps toward an object model.
1800
        """
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.
1801
        # This constructs a new DirState object on a path, sets the _state_file
1852.13.20 by Robert Collins
Steps toward an object model.
1802
        # to a new empty file for that path. It then calls _set_data() with our
1803
        # stock empty dirstate information - a root with ROOT_ID, no children,
1804
        # and no parents. Finally it calls save() to ensure that this data will
1805
        # persist.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1806
        result = cls(path)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1807
        # root dir and root dir contents with no children.
1808
        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.
1809
        # a new root directory, with a NULLSTAT.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1810
        empty_tree_dirblocks[0][1].append(
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
1811
            (('', '', inventory.ROOT_ID), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1812
                ('d', '', 0, False, DirState.NULLSTAT),
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1813
            ]))
2255.4.2 by James Westby
(broken) Add the locking methods.
1814
        result.lock_write()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1815
        try:
2255.4.2 by James Westby
(broken) Add the locking methods.
1816
            result._set_data([], empty_tree_dirblocks)
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1817
            result.save()
1818
        except:
2255.4.2 by James Westby
(broken) Add the locking methods.
1819
            result.unlock()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1820
            raise
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1821
        return result
1822
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1823
    def _inv_entry_to_details(self, inv_entry):
1824
        """Convert an inventory entry (from a revision tree) to state details.
1825
1826
        :param inv_entry: An inventory entry whose sha1 and link targets can be
1827
            relied upon, and which has a revision set.
1828
        :return: A details tuple - the details for a single tree at a path +
1829
            id.
1830
        """
1831
        kind = inv_entry.kind
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1832
        minikind = DirState._kind_to_minikind[kind]
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
1833
        tree_data = inv_entry.revision
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
1834
        assert tree_data, 'empty revision for the inv_entry %s.' % \
1835
            inv_entry.file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1836
        if kind == 'directory':
1837
            fingerprint = ''
1838
            size = 0
1839
            executable = False
1840
        elif kind == 'symlink':
1841
            fingerprint = inv_entry.symlink_target or ''
1842
            size = 0
1843
            executable = False
1844
        elif kind == 'file':
1845
            fingerprint = inv_entry.text_sha1 or ''
1846
            size = inv_entry.text_size or 0
1847
            executable = inv_entry.executable
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1848
        elif kind == 'tree-reference':
1849
            fingerprint = inv_entry.reference_revision or ''
1850
            size = 0
1851
            executable = False
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1852
        else:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
1853
            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
1854
        return (minikind, fingerprint, size, executable, tree_data)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1855
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1856
    def _iter_child_entries(self, tree_index, path_utf8):
1857
        """Iterate over all the entries that are children of path_utf.
1858
1859
        This only returns entries that are present (not in 'a', 'r') in 
1860
        tree_index. tree_index data is not refreshed, so if tree 0 is used,
1861
        results may differ from that obtained if paths were statted to
1862
        determine what ones were directories.
1863
1864
        Asking for the children of a non-directory will return an empty
1865
        iterator.
1866
        """
1867
        pending_dirs = []
1868
        next_pending_dirs = [path_utf8]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1869
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1870
        while next_pending_dirs:
1871
            pending_dirs = next_pending_dirs
1872
            next_pending_dirs = []
1873
            for path in pending_dirs:
1874
                block_index, present = self._find_block_index_from_key(
1875
                    (path, '', ''))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1876
                if block_index == 0:
1877
                    block_index = 1
1878
                    if len(self._dirblocks) == 1:
1879
                        # asked for the children of the root with no other
1880
                        # contents.
1881
                        return
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1882
                if not present:
1883
                    # children of a non-directory asked for.
1884
                    continue
1885
                block = self._dirblocks[block_index]
1886
                for entry in block[1]:
1887
                    kind = entry[1][tree_index][0]
1888
                    if kind not in absent:
1889
                        yield entry
1890
                    if kind == 'd':
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1891
                        if entry[0][0]:
1892
                            path = entry[0][0] + '/' + entry[0][1]
1893
                        else:
1894
                            path = entry[0][1]
1895
                        next_pending_dirs.append(path)
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1896
    
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1897
    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.
1898
        """Iterate over all the entries in the dirstate.
1899
1900
        Each yelt item is an entry in the standard format described in the
1901
        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.
1902
        """
1903
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1904
        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.
1905
            for entry in directory[1]:
1906
                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.
1907
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1908
    def _get_id_index(self):
1909
        """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
1910
        if self._id_index is None:
1911
            id_index = {}
1912
            for key, tree_details in self._iter_entries():
1913
                id_index.setdefault(key[2], set()).add(key)
1914
            self._id_index = id_index
1915
        return self._id_index
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1916
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1917
    def _get_output_lines(self, lines):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1918
        """Format lines for final output.
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
1919
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1920
        :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.
1921
            path lines.
1922
        """
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
1923
        output_lines = [DirState.HEADER_FORMAT_3]
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1924
        lines.append('') # a final newline
1925
        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.
1926
        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.
1927
        # -3, 1 for num parents, 1 for ghosts, 1 for final newline
1928
        num_entries = len(lines)-3
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1929
        output_lines.append('num_entries: %s\n' % (num_entries,))
1930
        output_lines.append(inventory_text)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1931
        return output_lines
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1932
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
1933
    def _make_deleted_row(self, fileid_utf8, parents):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1934
        """Return a deleted row for fileid_utf8."""
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
1935
        return ('/', 'RECYCLED.BIN', 'file', fileid_utf8, 0, DirState.NULLSTAT,
1936
            ''), parents
1937
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1938
    def _num_present_parents(self):
1939
        """The number of parent entries in each record row."""
1940
        return len(self._parents) - len(self._ghosts)
1941
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1942
    @staticmethod
1943
    def on_file(path):
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1944
        """Construct a DirState on the file at path path.
1945
1946
        :return: An unlocked DirState object, associated with the given path.
1947
        """
2255.4.1 by James Westby
Store the filename of the dirstate in an attribute.
1948
        result = DirState(path)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1949
        return result
1950
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.
1951
    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.
1952
        """Read in all the dirblocks from the file if they are not in memory.
1953
        
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1954
        This populates self._dirblocks, and sets self._dirblock_state to
1955
        IN_MEMORY_UNMODIFIED. It is not currently ready for incremental block
1956
        loading.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1957
        """
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.
1958
        self._read_header_if_needed()
1959
        if self._dirblock_state == DirState.NOT_IN_MEMORY:
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
1960
            _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.
1961
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1962
    def _read_header(self):
1963
        """This reads in the metadata header, and the parent ids.
1964
1965
        After reading in, the file should be positioned at the null
1966
        just before the start of the first record in the file.
1967
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.
1968
        :return: (expected crc checksum, number of entries, parent list)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1969
        """
1970
        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.
1971
        parent_line = self._state_file.readline()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1972
        info = parent_line.split('\0')
1973
        num_parents = int(info[0])
1974
        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.
1975
        self._parents = info[1:-1]
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1976
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
1977
        ghost_line = self._state_file.readline()
1978
        info = ghost_line.split('\0')
1979
        num_ghosts = int(info[1])
1980
        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.
1981
        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.
1982
        self._header_state = DirState.IN_MEMORY_UNMODIFIED
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
1983
        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.
1984
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1985
    def _read_header_if_needed(self):
1986
        """Read the header of the dirstate file if needed."""
2255.4.2 by James Westby
(broken) Add the locking methods.
1987
        # inline this as it will be called a lot
1988
        if not self._lock_token:
1989
            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.
1990
        if self._header_state == DirState.NOT_IN_MEMORY:
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1991
            self._read_header()
1992
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1993
    def _read_prelude(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1994
        """Read in the prelude header of the dirstate file.
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1995
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.
1996
        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.
1997
        checksum. The position will be correct to read in the rest of
1998
        the file and check the checksum after this point.
1999
        The next entry in the file should be the number of parents,
2000
        and their ids. Followed by a newline.
2001
        """
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.
2002
        header = self._state_file.readline()
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
2003
        assert header == DirState.HEADER_FORMAT_3, \
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2004
            'invalid header line: %r' % (header,)
2255.2.239 by Robert Collins
Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
2005
        crc_line = self._state_file.readline()
2006
        assert crc_line.startswith('crc32: '), 'missing crc32 checksum'
2007
        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.
2008
        num_entries_line = self._state_file.readline()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2009
        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.
2010
        self._num_entries = int(num_entries_line[len('num_entries: '):-1])
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2011
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2012
    def sha1_from_stat(self, path, stat_result, _pack_stat=pack_stat):
2013
        """Find a sha1 given a stat lookup."""
2014
        return self._get_packed_stat_index().get(_pack_stat(stat_result), None)
2015
2016
    def _get_packed_stat_index(self):
2017
        """Get a packed_stat index of self._dirblocks."""
2018
        if self._packed_stat_index is None:
2019
            index = {}
2020
            for key, tree_details in self._iter_entries():
2021
                if tree_details[0][0] == 'f':
2929.1.2 by Robert Collins
Review feedback.
2022
                    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.
2023
            self._packed_stat_index = index
2024
        return self._packed_stat_index
2025
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2026
    def save(self):
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2027
        """Save any pending changes created during this session.
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2028
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2029
        We reuse the existing file, because that prevents race conditions with
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2030
        file creation, and use oslocks on it to prevent concurrent modification
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2031
        and reads - because dirstate's incremental data aggregation is not
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2032
        compatible with reading a modified file, and replacing a file in use by
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2033
        another process is impossible on Windows.
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2034
2035
        A dirstate in read only mode should be smart enough though to validate
2036
        that the file has not changed, and otherwise discard its cache and
2037
        start over, to allow for fine grained read lock duration, so 'status'
2038
        wont block 'commit' - for example.
2039
        """
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
2040
        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
2041
            # Should this be a warning? For now, I'm expecting that places that
2042
            # 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
2043
            trace.mutter('Not saving DirState because '
2044
                    '_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
2045
            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.
2046
        if (self._header_state == DirState.IN_MEMORY_MODIFIED or
2047
            self._dirblock_state == DirState.IN_MEMORY_MODIFIED):
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2048
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2049
            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.
2050
            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,
2051
                grabbed_write_lock, new_lock = self._lock_token.temporary_write_lock()
2052
                # Switch over to the new lock, as the old one may be closed.
2053
                # TODO: jam 20070315 We should validate the disk file has
2054
                #       not changed contents. Since temporary_write_lock may
2055
                #       not be an atomic operation.
2056
                self._lock_token = new_lock
2057
                self._state_file = new_lock.f
2058
                if not grabbed_write_lock:
2059
                    # 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.
2060
                    return
2061
            try:
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
2062
                self._state_file.seek(0)
2063
                self._state_file.writelines(self.get_lines())
2064
                self._state_file.truncate()
2065
                self._state_file.flush()
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2066
                self._header_state = DirState.IN_MEMORY_UNMODIFIED
2067
                self._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
2068
            finally:
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2069
                if grabbed_write_lock:
2353.4.8 by John Arbash Meinel
Use the right lock object.
2070
                    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.
2071
                    self._state_file = self._lock_token.f
2072
                    # TODO: jam 20070315 We should validate the disk file has
2073
                    #       not changed contents. Since restore_read_lock may
2074
                    #       not be an atomic operation.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2075
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2076
    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.
2077
        """Set the full dirstate data in memory.
1852.13.20 by Robert Collins
Steps toward an object model.
2078
2079
        This is an internal function used to completely replace the objects
2080
        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.
2081
2082
        :param parent_ids: A list of parent tree revision ids.
2083
        :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.
2084
            tree. Each tuple contains the directory path and a list of entries 
2085
            found in that directory.
1852.13.20 by Robert Collins
Steps toward an object model.
2086
        """
2087
        # 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.
2088
        self._dirblocks = dirblocks
2089
        self._header_state = DirState.IN_MEMORY_MODIFIED
2090
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2091
        self._parents = list(parent_ids)
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2092
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2093
        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.
2094
2255.2.4 by Robert Collins
Snapshot dirstate development
2095
    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.
2096
        """Change the id of path to new_id in the current working tree.
2255.2.4 by Robert Collins
Snapshot dirstate development
2097
2098
        :param path: The path inside the tree to set - '' is the root, 'foo'
2099
            is the path foo in the root.
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2100
        :param new_id: The new id to assign to the path. This must be a utf8
2101
            file id (not unicode, and not None).
2255.2.4 by Robert Collins
Snapshot dirstate development
2102
        """
2255.2.236 by Martin Pool
Review cleanups: mostly updating or removing todo comments.
2103
        assert new_id.__class__ == str, \
2104
            "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.
2105
        self._read_dirblocks_if_needed()
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2106
        if len(path):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2107
            # TODO: logic not written
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2108
            raise NotImplementedError(self.set_path_id)
2109
        # TODO: check new id is unique
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2110
        entry = self._get_entry(0, path_utf8=path)
2255.7.14 by John Arbash Meinel
Make set_root_id() a no-op if the id doesn't change,
2111
        if entry[0][2] == new_id:
2112
            # Nothing to change.
2113
            return
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2114
        # mark the old path absent, and insert a new root path
2115
        self._make_absent(entry)
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2116
        self.update_minimal(('', '', new_id), 'd',
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2117
            path_utf8='', packed_stat=entry[1][0][4])
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
2118
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2119
        if self._id_index is not None:
2120
            self._id_index.setdefault(new_id, set()).add(entry[0])
2255.2.4 by Robert Collins
Snapshot dirstate development
2121
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2122
    def set_parent_trees(self, trees, ghosts):
2123
        """Set the parent trees for the dirstate.
2124
2125
        :param trees: A list of revision_id, tree tuples. tree must be provided
2126
            even if the revision_id refers to a ghost: supply an empty tree in 
2127
            this case.
2128
        :param ghosts: A list of the revision_ids that are ghosts at the time
2129
            of setting.
2130
        """ 
2255.2.4 by Robert Collins
Snapshot dirstate development
2131
        # TODO: generate a list of parent indexes to preserve to save 
2132
        # processing specific parent trees. In the common case one tree will
2133
        # be preserved - the left most parent.
2134
        # TODO: if the parent tree is a dirstate, we might want to walk them
2135
        # all by path in parallel for 'optimal' common-case performance.
2136
        # generate new root row.
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2137
        self._read_dirblocks_if_needed()
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2138
        # TODO future sketch: Examine the existing parents to generate a change
2139
        # map and then walk the new parent trees only, mapping them into the
2140
        # dirstate. Walk the dirstate at the same time to remove unreferenced
2141
        # entries.
2142
        # for now: 
2143
        # sketch: loop over all entries in the dirstate, cherry picking 
2144
        # entries from the parent trees, if they are not ghost trees.
2255.2.4 by Robert Collins
Snapshot dirstate development
2145
        # after we finish walking the dirstate, all entries not in the dirstate
2146
        # are deletes, so we want to append them to the end as per the design
2147
        # discussions. So do a set difference on ids with the parents to
2148
        # get deletes, and add them to the end.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2149
        # During the update process we need to answer the following questions:
2150
        # - find other keys containing a fileid in order to create cross-path
2151
        #   links. We dont't trivially use the inventory from other trees
2152
        #   because this leads to either double touching, or to accessing
2153
        #   missing keys,
2154
        # - find other keys containing a path 
2155
        # We accumulate each entry via this dictionary, including the root 
2156
        by_path = {}
2157
        id_index = {}
2158
        # we could do parallel iterators, but because file id data may be
2159
        # scattered throughout, we dont save on index overhead: we have to look
2160
        # at everything anyway. We can probably save cycles by reusing parent
2161
        # data and doing an incremental update when adding an additional
2162
        # parent, but for now the common cases are adding a new parent (merge),
2163
        # and replacing completely (commit), and commit is more common: so
2164
        # optimise merge later.
2165
        
2166
        # ---- start generation of full tree mapping data
2167
        # what trees should we use?
2255.2.4 by Robert Collins
Snapshot dirstate development
2168
        parent_trees = [tree for rev_id, tree in trees if rev_id not in ghosts]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2169
        # how many trees do we end up with 
2170
        parent_count = len(parent_trees)
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2171
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2172
        # one: the current tree
2173
        for entry in self._iter_entries():
2174
            # skip entries not in the current tree
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2175
            if entry[1][0][0] in 'ar': # absent, relocated
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2176
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2177
            by_path[entry[0]] = [entry[1][0]] + \
2178
                [DirState.NULL_PARENT_DETAILS] * parent_count
2179
            id_index[entry[0][2]] = set([entry[0]])
2180
        
2181
        # now the parent trees:
2182
        for tree_index, tree in enumerate(parent_trees):
2183
            # the index is off by one, adjust it.
2184
            tree_index = tree_index + 1
2185
            # when we add new locations for a fileid we need these ranges for
2186
            # any fileid in this tree as we set the by_path[id] to:
2187
            # already_processed_tree_details + new_details + new_location_suffix
2188
            # the suffix is from tree_index+1:parent_count+1.
2189
            new_location_suffix = [DirState.NULL_PARENT_DETAILS] * (parent_count - tree_index)
2190
            # now stitch in all the entries from this tree
2191
            for path, entry in tree.inventory.iter_entries_by_dir():
2192
                # here we process each trees details for each item in the tree.
2193
                # we first update any existing entries for the id at other paths,
2194
                # then we either create or update the entry for the id at the
2195
                # right path, and finally we add (if needed) a mapping from
2196
                # file_id to this path. We do it in this order to allow us to
2197
                # avoid checking all known paths for the id when generating a
2198
                # new entry at this path: by adding the id->path mapping last,
2199
                # all the mappings are valid and have correct relocation
2200
                # records where needed. 
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2201
                file_id = entry.file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2202
                path_utf8 = path.encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2203
                dirname, basename = osutils.split(path_utf8)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2204
                new_entry_key = (dirname, basename, file_id)
2205
                # tree index consistency: All other paths for this id in this tree
2206
                # index must point to the correct path.
2207
                for entry_key in id_index.setdefault(file_id, set()):
2208
                    # TODO:PROFILING: It might be faster to just update
2209
                    # rather than checking if we need to, and then overwrite
2210
                    # the one we are located at.
2211
                    if entry_key != new_entry_key:
2212
                        # this file id is at a different path in one of the
2213
                        # other trees, so put absent pointers there
2214
                        # This is the vertical axis in the matrix, all pointing
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2215
                        # to the real path.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2216
                        by_path[entry_key][tree_index] = ('r', path_utf8, 0, False, '')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2217
                # by path consistency: Insert into an existing path record (trivial), or 
2218
                # add a new one with relocation pointers for the other tree indexes.
2219
                if new_entry_key in id_index[file_id]:
2220
                    # there is already an entry where this data belongs, just insert it.
2221
                    by_path[new_entry_key][tree_index] = \
2222
                        self._inv_entry_to_details(entry)
2223
                else:
2224
                    # add relocated entries to the horizontal axis - this row
2225
                    # mapping from path,id. We need to look up the correct path
2226
                    # for the indexes from 0 to tree_index -1
2227
                    new_details = []
2228
                    for lookup_index in xrange(tree_index):
2229
                        # boundary case: this is the first occurence of file_id
2230
                        # so there are no id_indexs, possibly take this out of
2231
                        # the loop?
2232
                        if not len(id_index[file_id]):
2233
                            new_details.append(DirState.NULL_PARENT_DETAILS)
2234
                        else:
2235
                            # grab any one entry, use it to find the right path.
2236
                            # TODO: optimise this to reduce memory use in highly 
2237
                            # fragmented situations by reusing the relocation
2238
                            # records.
2239
                            a_key = iter(id_index[file_id]).next()
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2240
                            if by_path[a_key][lookup_index][0] in ('r', 'a'):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2241
                                # its a pointer or missing statement, use it as is.
2242
                                new_details.append(by_path[a_key][lookup_index])
2243
                            else:
2244
                                # we have the right key, make a pointer to it.
2245
                                real_path = ('/'.join(a_key[0:2])).strip('/')
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2246
                                new_details.append(('r', real_path, 0, False, ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2247
                    new_details.append(self._inv_entry_to_details(entry))
2248
                    new_details.extend(new_location_suffix)
2249
                    by_path[new_entry_key] = new_details
2250
                    id_index[file_id].add(new_entry_key)
2251
        # --- end generation of full tree mappings
2255.2.9 by Robert Collins
Dirstate: Fix setting of parent trees to record data about entries not in
2252
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2253
        # sort and output all the entries
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2254
        new_entries = self._sort_entries(by_path.items())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2255
        self._entries_to_current_state(new_entries)
1852.13.24 by Robert Collins
Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
2256
        self._parents = [rev_id for rev_id, tree in trees]
2257
        self._ghosts = list(ghosts)
2258
        self._header_state = DirState.IN_MEMORY_MODIFIED
2259
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2260
        self._id_index = id_index
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2261
2262
    def _sort_entries(self, entry_list):
2263
        """Given a list of entries, sort them into the right order.
2264
2265
        This is done when constructing a new dirstate from trees - normally we
2266
        try to keep everything in sorted blocks all the time, but sometimes
2267
        it's easier to sort after the fact.
2268
        """
2269
        def _key(entry):
2270
            # sort by: directory parts, file name, file id
2271
            return entry[0][0].split('/'), entry[0][1], entry[0][2]
2272
        return sorted(entry_list, key=_key)
1852.13.20 by Robert Collins
Steps toward an object model.
2273
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
2274
    def set_state_from_inventory(self, new_inv):
2275
        """Set new_inv as the current state. 
2276
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2277
        This API is called by tree transform, and will usually occur with
2278
        existing parent trees.
2279
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
2280
        :param new_inv: The inventory object to set current state from.
2281
        """
2872.4.2 by Martin Pool
Treat set_state_from_inventory as evil, and del dead variables rather than just setting to null
2282
        if 'evil' in debug.debug_flags:
2283
            trace.mutter_callsite(1,
2284
                "set_state_from_inventory called; please mutate the tree instead")
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
2285
        self._read_dirblocks_if_needed()
2286
        # sketch:
2872.4.11 by Martin Pool
Review documentation cleanups
2287
        # Two iterators: current data and new data, both in dirblock order. 
2288
        # We zip them together, which tells about entries that are new in the
2289
        # inventory, or removed in the inventory, or present in both and
2290
        # possibly changed.  
2291
        #
2292
        # You might think we could just synthesize a new dirstate directly
2293
        # since we're processing it in the right order.  However, we need to
2294
        # also consider there may be any number of parent trees and relocation
2295
        # pointers, and we don't want to duplicate that here.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2296
        new_iterator = new_inv.iter_entries_by_dir()
2255.2.88 by Robert Collins
Significant steps back to operation.
2297
        # we will be modifying the dirstate, so we need a stable iterator. In
2298
        # future we might write one, for now we just clone the state into a
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2299
        # list - which is a shallow copy.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2300
        old_iterator = iter(list(self._iter_entries()))
2301
        # both must have roots so this is safe:
2302
        current_new = new_iterator.next()
2303
        current_old = old_iterator.next()
2304
        def advance(iterator):
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
2305
            try:
2255.2.88 by Robert Collins
Significant steps back to operation.
2306
                return iterator.next()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2307
            except StopIteration:
2308
                return None
2309
        while current_new or current_old:
2310
            # skip entries in old that are not really there
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2311
            if current_old and current_old[1][0][0] in 'ar':
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2312
                # relocated or absent
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2313
                current_old = advance(old_iterator)
2255.2.16 by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
2314
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2315
            if current_new:
2316
                # convert new into dirblock style
2255.2.88 by Robert Collins
Significant steps back to operation.
2317
                new_path_utf8 = current_new[0].encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2318
                new_dirname, new_basename = osutils.split(new_path_utf8)
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2319
                new_id = current_new[1].file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2320
                new_entry_key = (new_dirname, new_basename, new_id)
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2321
                current_new_minikind = \
2322
                    DirState._kind_to_minikind[current_new[1].kind]
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2323
                if current_new_minikind == 't':
2645.2.1 by Wouter van Heyst
The DirState fingerprint for tree-references should be an empty string instead of None
2324
                    fingerprint = current_new[1].reference_revision or ''
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2325
                else:
2872.4.7 by Martin Pool
More cleanups of dirstate work
2326
                    # We normally only insert or remove records, or update
2327
                    # them when it has significantly changed.  Then we want to
2328
                    # erase its fingerprint.  Unaffected records should
2329
                    # normally not be updated at all.
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2330
                    fingerprint = ''
2255.2.88 by Robert Collins
Significant steps back to operation.
2331
            else:
2332
                # for safety disable variables
2872.4.7 by Martin Pool
More cleanups of dirstate work
2333
                new_path_utf8 = new_dirname = new_basename = new_id = \
2872.4.9 by Martin Pool
Use cmp_by_dirs in set_state_from_inventory rather than hardcoding the equivalent
2334
                    new_entry_key = None
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2335
            # 5 cases, we dont have a value that is strictly greater than everything, so
2336
            # we make both end conditions explicit
2872.4.11 by Martin Pool
Review documentation cleanups
2337
            if not current_old:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2338
                # old is finished: insert current_new into the state.
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2339
                self.update_minimal(new_entry_key, current_new_minikind,
2340
                    executable=current_new[1].executable,
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2341
                    path_utf8=new_path_utf8, fingerprint=fingerprint)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2342
                current_new = advance(new_iterator)
2872.4.11 by Martin Pool
Review documentation cleanups
2343
            elif not current_new:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2344
                # new is finished
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2345
                self._make_absent(current_old)
2255.2.88 by Robert Collins
Significant steps back to operation.
2346
                current_old = advance(old_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2347
            elif new_entry_key == current_old[0]:
2348
                # same -  common case
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2349
                # We're looking at the same path and id in both the dirstate
2350
                # and inventory, so just need to update the fields in the
2351
                # dirstate from the one in the inventory.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2352
                # TODO: update the record if anything significant has changed.
2255.2.88 by Robert Collins
Significant steps back to operation.
2353
                # the minimal required trigger is if the execute bit or cached
2354
                # kind has changed.
2355
                if (current_old[1][0][3] != current_new[1].executable or
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2356
                    current_old[1][0][0] != current_new_minikind):
2357
                    self.update_minimal(current_old[0], current_new_minikind,
2255.2.88 by Robert Collins
Significant steps back to operation.
2358
                        executable=current_new[1].executable,
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2359
                        path_utf8=new_path_utf8, fingerprint=fingerprint)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2360
                # both sides are dealt with, move on
2361
                current_old = advance(old_iterator)
2362
                current_new = advance(new_iterator)
2872.4.9 by Martin Pool
Use cmp_by_dirs in set_state_from_inventory rather than hardcoding the equivalent
2363
            elif (cmp_by_dirs(new_dirname, current_old[0][0]) < 0
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2364
                  or (new_dirname == current_old[0][0]
2365
                      and new_entry_key[1:] < current_old[0][1:])):
2255.2.88 by Robert Collins
Significant steps back to operation.
2366
                # new comes before:
2367
                # add a entry for this and advance new
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2368
                self.update_minimal(new_entry_key, current_new_minikind,
2369
                    executable=current_new[1].executable,
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2370
                    path_utf8=new_path_utf8, fingerprint=fingerprint)
2255.2.88 by Robert Collins
Significant steps back to operation.
2371
                current_new = advance(new_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2372
            else:
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2373
                # we've advanced past the place where the old key would be,
2374
                # without seeing it in the new list.  so it must be gone.
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2375
                self._make_absent(current_old)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2376
                current_old = advance(old_iterator)
2377
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2378
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2379
        self._packed_stat_index = None
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2380
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2381
    def _make_absent(self, current_old):
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2382
        """Mark current_old - an entry - as absent for tree 0.
2383
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2384
        :return: True if this was the last details entry for the entry key:
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2385
            that is, if the underlying block has had the entry removed, thus
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
2386
            shrinking in length.
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2387
        """
2388
        # build up paths that this id will be left at after the change is made,
2389
        # so we can update their cross references in tree 0
2390
        all_remaining_keys = set()
2922.2.4 by John Arbash Meinel
Fix bug #114615 by teaching unversion() to not touch renamed entries.
2391
        # Dont check the working tree, because it's going.
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2392
        for details in current_old[1][1:]:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2393
            if details[0] not in 'ar': # absent, relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2394
                all_remaining_keys.add(current_old[0])
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2395
            elif details[0] == 'r': # relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2396
                # record the key for the real path.
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2397
                all_remaining_keys.add(tuple(osutils.split(details[1])) + (current_old[0][2],))
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2398
            # absent rows are not present at any path.
2399
        last_reference = current_old[0] not in all_remaining_keys
2400
        if last_reference:
2401
            # the current row consists entire of the current item (being marked
2402
            # absent), and relocated or absent entries for the other trees:
2403
            # Remove it, its meaningless.
2255.2.88 by Robert Collins
Significant steps back to operation.
2404
            block = self._find_block(current_old[0])
2405
            entry_index, present = self._find_entry_index(current_old[0], block[1])
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
2406
            assert present, 'could not find entry for %s' % (current_old,)
2255.2.88 by Robert Collins
Significant steps back to operation.
2407
            block[1].pop(entry_index)
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2408
            # 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
2409
            if self._id_index is not None:
2410
                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.
2411
        # 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.
2412
        # 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.
2413
        # (if there were other trees with the id present at this path), or may
2414
        # be relocations.
2415
        for update_key in all_remaining_keys:
2416
            update_block_index, present = \
2417
                self._find_block_index_from_key(update_key)
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
2418
            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.
2419
            update_entry_index, present = \
2420
                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
2421
            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.
2422
            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.
2423
            # it must not be absent at the moment
2424
            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.
2425
            update_tree_details[0] = DirState.NULL_PARENT_DETAILS
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2426
        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.
2427
        return last_reference
2255.2.88 by Robert Collins
Significant steps back to operation.
2428
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2429
    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
2430
                       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.
2431
        """Update an entry to the state in tree 0.
2432
2433
        This will either create a new entry at 'key' or update an existing one.
2434
        It also makes sure that any other records which might mention this are
2435
        updated as well.
2436
2437
        :param key: (dir, name, file_id) for the new entry
2438
        :param minikind: The type for the entry ('f' == 'file', 'd' ==
2439
                'directory'), etc.
2440
        :param executable: Should the executable bit be set?
2872.4.7 by Martin Pool
More cleanups of dirstate work
2441
        :param fingerprint: Simple fingerprint for new entry: sha1 for files, 
2442
            referenced revision id for subtrees, etc.
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2443
        :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.
2444
        :param size: Size information for new entry
2445
        :param path_utf8: key[0] + '/' + key[1], just passed in to avoid doing
2446
                extra computation.
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2447
2448
        If packed_stat and fingerprint are not given, they're invalidated in
2449
        the entry.
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2450
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2451
        block = self._find_block(key)[1]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2452
        if packed_stat is None:
2453
            packed_stat = DirState.NULLSTAT
2872.4.5 by Martin Pool
doc
2454
        # XXX: Some callers pass '' as the packed_stat, and it seems to be
2455
        # sometimes present in the dirstate - this seems oddly inconsistent.
2456
        # mbp 20071008
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2457
        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
2458
        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
2459
        id_index = self._get_id_index()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2460
        if not present:
2461
            # new entry, synthesis cross reference here,
2255.2.88 by Robert Collins
Significant steps back to operation.
2462
            existing_keys = id_index.setdefault(key[2], set())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2463
            if not existing_keys:
2464
                # not currently in the state, simplest case
2465
                new_entry = key, [new_details] + self._empty_parent_info()
2466
            else:
2255.2.88 by Robert Collins
Significant steps back to operation.
2467
                # present at one or more existing other paths.
2468
                # grab one of them and use it to generate parent
2469
                # relocation/absent entries.
2470
                new_entry = key, [new_details]
2471
                for other_key in existing_keys:
2472
                    # change the record at other to be a pointer to this new
2473
                    # record. The loop looks similar to the change to
2474
                    # relocations when updating an existing record but its not:
2475
                    # the test for existing kinds is different: this can be
2476
                    # factored out to a helper though.
2477
                    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
2478
                    assert present, 'could not find block for %s' % (other_key,)
2479
                    other_entry_index, present = self._find_entry_index(other_key,
2480
                                            self._dirblocks[other_block_index][1])
2481
                    assert present, 'could not find entry for %s' % (other_key,)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2482
                    assert path_utf8 is not None
2255.2.88 by Robert Collins
Significant steps back to operation.
2483
                    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
2484
                        ('r', path_utf8, 0, False, '')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2485
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2486
                num_present_parents = self._num_present_parents()
2255.2.88 by Robert Collins
Significant steps back to operation.
2487
                for lookup_index in xrange(1, num_present_parents + 1):
2488
                    # grab any one entry, use it to find the right path.
2489
                    # TODO: optimise this to reduce memory use in highly 
2490
                    # fragmented situations by reusing the relocation
2491
                    # records.
2492
                    update_block_index, present = \
2493
                        self._find_block_index_from_key(other_key)
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
2494
                    assert present, 'could not find block for %s' % (other_key,)
2255.2.88 by Robert Collins
Significant steps back to operation.
2495
                    update_entry_index, present = \
2496
                        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
2497
                    assert present, 'could not find entry for %s' % (other_key,)
2255.2.88 by Robert Collins
Significant steps back to operation.
2498
                    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.
2499
                    if update_details[0] in 'ar': # relocated, absent
2255.2.88 by Robert Collins
Significant steps back to operation.
2500
                        # its a pointer or absent in lookup_index's tree, use
2501
                        # it as is.
2502
                        new_entry[1].append(update_details)
2503
                    else:
2504
                        # 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
2505
                        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
2506
                        new_entry[1].append(('r', pointer_path, 0, False, ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2507
            block.insert(entry_index, new_entry)
2508
            existing_keys.add(key)
2509
        else:
2510
            # Does the new state matter? 
2511
            block[entry_index][1][0] = new_details
2255.2.88 by Robert Collins
Significant steps back to operation.
2512
            # parents cannot be affected by what we do.
2513
            # other occurences of this id can be found 
2514
            # from the id index.
2515
            # ---
2516
            # tree index consistency: All other paths for this id in this tree
2517
            # index must point to the correct path. We have to loop here because
2518
            # we may have passed entries in the state with this file id already
2519
            # that were absent - where parent entries are - and they need to be
2520
            # converted to relocated.
2521
            assert path_utf8 is not None
2522
            for entry_key in id_index.setdefault(key[2], set()):
2523
                # TODO:PROFILING: It might be faster to just update
2524
                # rather than checking if we need to, and then overwrite
2525
                # the one we are located at.
2526
                if entry_key != key:
2527
                    # this file id is at a different path in one of the
2528
                    # other trees, so put absent pointers there
2529
                    # This is the vertical axis in the matrix, all pointing
2530
                    # to the real path.
2531
                    block_index, present = self._find_block_index_from_key(entry_key)
2532
                    assert present
2533
                    entry_index, present = self._find_entry_index(entry_key, self._dirblocks[block_index][1])
2534
                    assert present
2535
                    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
2536
                        ('r', path_utf8, 0, False, '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2537
        # add a containing dirblock if needed.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2538
        if new_details[0] == 'd':
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2539
            subdir_key = (osutils.pathjoin(*key[0:2]), '', '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2540
            block_index, present = self._find_block_index_from_key(subdir_key)
2541
            if not present:
2542
                self._dirblocks.insert(block_index, (subdir_key[0], []))
2255.2.88 by Robert Collins
Significant steps back to operation.
2543
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2544
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2545
2255.2.168 by Martin Pool
merge robert, debugging
2546
    def _validate(self):
2547
        """Check that invariants on the dirblock are correct.
2548
2549
        This can be useful in debugging; it shouldn't be necessary in 
2550
        normal code.
2323.6.13 by Martin Pool
Fix some tests that need to lock dirstate before validating
2551
2552
        This must be called with a lock held.
2255.2.168 by Martin Pool
merge robert, debugging
2553
        """
2323.5.12 by Martin Pool
doc
2554
        # NOTE: This must always raise AssertionError not just assert,
2555
        # otherwise it may not behave properly under python -O
2556
        #
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2557
        # TODO: All entries must have some content that's not 'a' or 'r',
2558
        # otherwise it could just be removed.
2559
        #
2560
        # TODO: All relocations must point directly to a real entry.
2561
        #
2562
        # TODO: No repeated keys.
2563
        #
2564
        # -- mbp 20070325
2255.2.168 by Martin Pool
merge robert, debugging
2565
        from pprint import pformat
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2566
        self._read_dirblocks_if_needed()
2255.2.168 by Martin Pool
merge robert, debugging
2567
        if len(self._dirblocks) > 0:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2568
            if not self._dirblocks[0][0] == '':
2569
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
2570
                    "dirblocks don't start with root block:\n" + \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2571
                    pformat(dirblocks))
2255.2.168 by Martin Pool
merge robert, debugging
2572
        if len(self._dirblocks) > 1:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2573
            if not self._dirblocks[1][0] == '':
2574
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
2575
                    "dirblocks missing root directory:\n" + \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2576
                    pformat(dirblocks))
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2577
        # the dirblocks are sorted by their path components, name, and dir id
2578
        dir_names = [d[0].split('/')
2579
                for d in self._dirblocks[1:]]
2580
        if dir_names != sorted(dir_names):
2581
            raise AssertionError(
2582
                "dir names are not in sorted order:\n" + \
2583
                pformat(self._dirblocks) + \
2584
                "\nkeys:\n" +
2585
                pformat(dir_names))
2255.2.168 by Martin Pool
merge robert, debugging
2586
        for dirblock in self._dirblocks:
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2587
            # within each dirblock, the entries are sorted by filename and
2323.5.12 by Martin Pool
doc
2588
            # then by id.
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2589
            for entry in dirblock[1]:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2590
                if dirblock[0] != entry[0][0]:
2591
                    raise AssertionError(
2592
                        "entry key for %r"
2593
                        "doesn't match directory name in\n%r" %
2594
                        (entry, pformat(dirblock)))
2595
            if dirblock[1] != sorted(dirblock[1]):
2596
                raise AssertionError(
2597
                    "dirblock for %r is not sorted:\n%s" % \
2598
                    (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.
2599
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
2600
        def check_valid_parent():
2601
            """Check that the current entry has a valid parent.
2602
2603
            This makes sure that the parent has a record,
2604
            and that the parent isn't marked as "absent" in the
2605
            current tree. (It is invalid to have a non-absent file in an absent
2606
            directory.)
2607
            """
2608
            if entry[0][0:2] == ('', ''):
2609
                # There should be no parent for the root row
2610
                return
2611
            parent_entry = self._get_entry(tree_index, path_utf8=entry[0][0])
2612
            if parent_entry == (None, None):
2613
                raise AssertionError(
2614
                    "no parent entry for: %s in tree %s"
2615
                    % (this_path, tree_index))
2438.1.15 by John Arbash Meinel
Remove a superfluous 'else' (recommended by Martin)
2616
            if parent_entry[1][tree_index][0] != 'd':
2617
                raise AssertionError(
2618
                    "Parent entry for %s is not marked as a valid"
2619
                    " directory. %s" % (this_path, parent_entry,))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
2620
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2621
        # For each file id, for each tree: either
2622
        # the file id is not present at all; all rows with that id in the
2623
        # key have it marked as 'absent'
2624
        # OR the file id is present under exactly one name; any other entries 
2625
        # that mention that id point to the correct name.
2626
        #
2627
        # We check this with a dict per tree pointing either to the present
2628
        # name, or None if absent.
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2629
        tree_count = self._num_present_parents() + 1
2630
        id_path_maps = [dict() for i in range(tree_count)]
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2631
        # Make sure that all renamed entries point to the correct location.
2632
        for entry in self._iter_entries():
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
2633
            file_id = entry[0][2]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2634
            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
2635
            if len(entry[1]) != tree_count:
2636
                raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2637
                "wrong number of entry details for row\n%s" \
2638
                ",\nexpected %d" % \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2639
                (pformat(entry), tree_count))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2640
            absent_positions = 0
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2641
            for tree_index, tree_state in enumerate(entry[1]):
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2642
                this_tree_map = id_path_maps[tree_index]
2643
                minikind = tree_state[0]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2644
                if minikind in 'ar':
2645
                    absent_positions += 1
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2646
                # have we seen this id before in this column?
2647
                if file_id in this_tree_map:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2648
                    previous_path, previous_loc = this_tree_map[file_id]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2649
                    # any later mention of this file must be consistent with
2650
                    # what was said before
2651
                    if minikind == 'a':
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2652
                        if previous_path is not None:
2653
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2654
                            "file %s is absent in row %r but also present " \
2655
                            "at %r"% \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2656
                            (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2657
                    elif minikind == 'r':
2658
                        target_location = tree_state[1]
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2659
                        if previous_path != target_location:
2660
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2661
                            "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
2662
                            % (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2663
                    else:
2664
                        # a file, directory, etc - may have been previously
2665
                        # pointed to by a relocation, which must point here
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
2666
                        if previous_path != this_path:
2667
                            raise AssertionError(
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2668
                                "entry %r inconsistent with previous path %r "
2669
                                "seen at %r" %
2670
                                (entry, previous_path, previous_loc))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
2671
                        check_valid_parent()
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2672
                else:
2673
                    if minikind == 'a':
2674
                        # absent; should not occur anywhere else
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2675
                        this_tree_map[file_id] = None, this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2676
                    elif minikind == 'r':
2677
                        # relocation, must occur at expected location 
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2678
                        this_tree_map[file_id] = tree_state[1], this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
2679
                    else:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2680
                        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.
2681
                        check_valid_parent()
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2682
            if absent_positions == tree_count:
2683
                raise AssertionError(
2684
                    "entry %r has no data for any tree." % (entry,))
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2685
2255.4.2 by James Westby
(broken) Add the locking methods.
2686
    def _wipe_state(self):
2687
        """Forget all state information about the dirstate."""
2688
        self._header_state = DirState.NOT_IN_MEMORY
2689
        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
2690
        self._changes_aborted = False
2255.4.2 by James Westby
(broken) Add the locking methods.
2691
        self._parents = []
2692
        self._ghosts = []
2693
        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.
2694
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2695
        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.
2696
        self._end_of_header = None
2697
        self._cutoff_time = None
2698
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
2699
2700
    def lock_read(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2701
        """Acquire a read lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2702
        if self._lock_token is not None:
2703
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2704
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
2705
        #       already in memory, we could read just the header and check for
2706
        #       any modification. If not modified, we can just leave things
2707
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
2708
        self._lock_token = lock.ReadLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2709
        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
2710
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
2711
        self._wipe_state()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
2712
2255.4.2 by James Westby
(broken) Add the locking methods.
2713
    def lock_write(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2714
        """Acquire a write lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2715
        if self._lock_token is not None:
2716
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2717
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
2718
        #       already in memory, we could read just the header and check for
2719
        #       any modification. If not modified, we can just leave things
2720
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
2721
        self._lock_token = lock.WriteLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2722
        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
2723
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
2724
        self._wipe_state()
2725
2726
    def unlock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2727
        """Drop any locks held on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2728
        if self._lock_token is None:
2729
            raise errors.LockNotHeld(self)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2730
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
2731
        #       already in memory, we could read just the header and check for
2732
        #       any modification. If not modified, we can just leave things
2733
        #       alone
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
2734
        self._state_file = None
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2735
        self._lock_state = None
2255.4.2 by James Westby
(broken) Add the locking methods.
2736
        self._lock_token.unlock()
2737
        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.
2738
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
2739
2740
    def _requires_lock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2741
        """Check that a lock is currently held by someone on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2742
        if not self._lock_token:
2743
            raise errors.ObjectNotLocked(self)
1852.13.20 by Robert Collins
Steps toward an object model.
2744
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
2745
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
2746
# Try to load the compiled form if possible
2747
try:
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
2748
    from bzrlib._dirstate_helpers_c import (
2749
        _read_dirblocks_c as _read_dirblocks,
2750
        bisect_dirblock_c as bisect_dirblock,
2474.1.66 by John Arbash Meinel
Some restructuring.
2751
        _bisect_path_left_c as _bisect_path_left,
2752
        _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.
2753
        cmp_by_dirs_c as cmp_by_dirs,
2474.1.21 by John Arbash Meinel
Cleanup the multiple testing.
2754
        )
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
2755
except ImportError:
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
2756
    from bzrlib._dirstate_helpers_py import (
2757
        _read_dirblocks_py as _read_dirblocks,
2758
        bisect_dirblock_py as bisect_dirblock,
2474.1.66 by John Arbash Meinel
Some restructuring.
2759
        _bisect_path_left_py as _bisect_path_left,
2760
        _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.
2761
        cmp_by_dirs_py as cmp_by_dirs,
2762
        )