/brz/remove-bazaar

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