/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
1
# Copyright (C) 2006-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
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.
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
85
'f' is a file entry: As for directory, but it's a file. The fingerprint is the
86
    sha1 value of the file's canonical form, i.e. after any read filters have
87
    been applied to the convenience form stored in the working tree.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
88
'l' is a symlink entry: As for directory, but a symlink. The fingerprint is the
89
    link target.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
90
't' is a reference to a nested subtree; the fingerprint is the referenced
91
    revision.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
92
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
93
Ordering:
94
95
The entries on disk and in memory are ordered according to the following keys:
96
97
    directory, as a list of components
98
    filename
99
    file-id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
100
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
101
--- Format 1 had the following different definition: ---
1852.13.20 by Robert Collins
Steps toward an object model.
102
rows = dirname, NULL, basename, NULL, MINIKIND, NULL, fileid_utf8, NULL,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
103
    WHOLE NUMBER (* size *), NULL, packed stat, NULL, sha1|symlink target,
1852.13.20 by Robert Collins
Steps toward an object model.
104
    {PARENT ROW}
105
PARENT ROW = NULL, revision_utf8, NULL, MINIKIND, NULL, dirname, NULL,
106
    basename, NULL, WHOLE NUMBER (* size *), NULL, "y" | "n", NULL,
107
    SHA1
108
2255.2.4 by Robert Collins
Snapshot dirstate development
109
PARENT ROW's are emitted for every parent that is not in the ghosts details
110
line. That is, if the parents are foo, bar, baz, and the ghosts are bar, then
111
each row will have a PARENT ROW for foo and baz, but not for bar.
112
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
113
114
In any tree, a kind of 'moved' indicates that the fingerprint field
115
(which we treat as opaque data specific to the 'kind' anyway) has the
116
details for the id of this row in that tree.
117
118
I'm strongly tempted to add a id->path index as well, but I think that
119
where we need id->path mapping; we also usually read the whole file, so
120
I'm going to skip that for the moment, as we have the ability to locate
121
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
122
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.
123
looked for.
124
125
I plan to implement this asap, so please speak up now to alter/tweak the
126
design - and once we stabilise on this, I'll update the wiki page for
127
it.
128
129
The rationale for all this is that we want fast operations for the
130
common case (diff/status/commit/merge on all files) and extremely fast
131
operations for the less common but still occurs a lot status/diff/commit
132
on specific files). Operations on specific files involve a scan for all
133
the children of a path, *in every involved tree*, which the current
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
134
format did not accommodate.
1852.13.20 by Robert Collins
Steps toward an object model.
135
----
136
137
Design priorities:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
138
 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.
139
 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.
140
 3) scale usably to the largest trees known today - say 50K entries. (mozilla
141
    is an example of this)
1852.13.20 by Robert Collins
Steps toward an object model.
142
143
144
Locking:
145
 Eventually reuse dirstate objects across locks IFF the dirstate file has not
146
 been modified, but will require that we flush/ignore cached stat-hit data
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
147
 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.
148
 acquired, yet we cannot trust the data after the previous lock was released.
149
150
Memory representation:
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
151
 vector of all directories, and vector of the childen ?
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
152
   i.e.
153
     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.
154
     dirblocks = [
1852.13.20 by Robert Collins
Steps toward an object model.
155
     ('', ['data for achild', 'data for bchild', 'data for cchild'])
156
     ('dir', ['achild', 'cchild', 'echild'])
157
     ]
158
    - single bisect to find N subtrees from a path spec
159
    - in-order for serialisation - this is 'dirblock' grouping.
160
    - insertion of a file '/a' affects only the '/' child-vector, that is, to
161
      insert 10K elements from scratch does not generates O(N^2) memoves of a
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
162
      single vector, rather each individual, which tends to be limited to a
163
      manageable number. Will scale badly on trees with 10K entries in a
1852.13.20 by Robert Collins
Steps toward an object model.
164
      single directory. compare with Inventory.InventoryDirectory which has
165
      a dictionary for the children. No bisect capability, can only probe for
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
166
      exact matches, or grab all elements and sort.
167
    - What's the risk of error here? Once we have the base format being processed
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
168
      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
169
      go with what seems reasonable.
2255.2.4 by Robert Collins
Snapshot dirstate development
170
open questions:
1852.13.20 by Robert Collins
Steps toward an object model.
171
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
172
Maybe we should do a test profile of the core structure - 10K simulated
173
searches/lookups/etc?
1852.13.20 by Robert Collins
Steps toward an object model.
174
175
Objects for each row?
176
The lifetime of Dirstate objects is current per lock, but see above for
177
possible extensions. The lifetime of a row from a dirstate is expected to be
178
very short in the optimistic case: which we are optimising for. For instance,
179
subtree status will determine from analysis of the disk data what rows need to
180
be examined at all, and will be able to determine from a single row whether
181
that file has altered or not, so we are aiming to process tens of thousands of
182
entries each second within the dirstate context, before exposing anything to
183
the larger codebase. This suggests we want the time for a single file
184
comparison to be < 0.1 milliseconds. That would give us 10000 paths per second
185
processed, and to scale to 100 thousand we'll another order of magnitude to do
186
that. Now, as the lifetime for all unchanged entries is the time to parse, stat
187
the file on disk, and then immediately discard, the overhead of object creation
188
becomes a significant cost.
189
4031.3.1 by Frank Aspell
Fixing various typos
190
Figures: Creating a tuple from 3 elements was profiled at 0.0625
1852.13.20 by Robert Collins
Steps toward an object model.
191
microseconds, whereas creating a object which is subclassed from tuple was
192
0.500 microseconds, and creating an object with 3 elements and slots was 3
193
microseconds long. 0.1 milliseconds is 100 microseconds, and ideally we'll get
194
down to 10 microseconds for the total processing - having 33% of that be object
195
creation is a huge overhead. There is a potential cost in using tuples within
196
each row which is that the conditional code to do comparisons may be slower
197
than method invocation, but method invocation is known to be slow due to stack
198
frame creation, so avoiding methods in these tight inner loops in unfortunately
199
desirable. We can consider a pyrex version of this with objects in future if
200
desired.
201
202
"""
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
203
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
204
import bisect
2474.1.40 by John Arbash Meinel
(python-only) Shave a bit of time off by calling binascii.b2a_base64
205
import binascii
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
206
import errno
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
207
import operator
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
208
import os
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
209
from stat import S_IEXEC
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
210
import stat
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
211
import struct
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
212
import sys
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
213
import time
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
214
import zlib
215
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
216
from bzrlib import (
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
217
    cache_utf8,
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
218
    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.
219
    errors,
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
220
    inventory,
2255.4.2 by James Westby
(broken) Add the locking methods.
221
    lock,
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
222
    osutils,
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
223
    static_tuple,
2255.2.23 by John Arbash Meinel
When parsing the contents, ghosts are not records, so should not be included in the line parsing.
224
    trace,
225
    )
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
226
227
228
# This is the Windows equivalent of ENOTDIR
229
# It is defined in pywin32.winerror, but we don't want a strong dependency for
230
# just an error code.
231
ERROR_PATH_NOT_FOUND = 3
232
ERROR_DIRECTORY = 267
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
233
234
3696.4.14 by Robert Collins
Python 2.4 support reinstatement.
235
if not getattr(struct, '_compile', None):
236
    # Cannot pre-compile the dirstate pack_stat
237
    def pack_stat(st, _encode=binascii.b2a_base64, _pack=struct.pack):
238
        """Convert stat values into a packed representation."""
239
        return _encode(_pack('>LLLLLL', st.st_size, int(st.st_mtime),
240
            int(st.st_ctime), st.st_dev, st.st_ino & 0xFFFFFFFF,
241
            st.st_mode))[:-1]
242
else:
243
    # compile the struct compiler we need, so as to only do it once
244
    from _struct import Struct
245
    _compiled_pack = Struct('>LLLLLL').pack
246
    def pack_stat(st, _encode=binascii.b2a_base64, _pack=_compiled_pack):
247
        """Convert stat values into a packed representation."""
248
        # jam 20060614 it isn't really worth removing more entries if we
249
        # are going to leave it in packed form.
250
        # With only st_mtime and st_mode filesize is 5.5M and read time is 275ms
251
        # With all entries, filesize is 5.9M and read time is maybe 280ms
252
        # well within the noise margin
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
253
3696.4.14 by Robert Collins
Python 2.4 support reinstatement.
254
        # base64 encoding always adds a final newline, so strip it off
255
        # The current version
256
        return _encode(_pack(st.st_size, int(st.st_mtime), int(st.st_ctime),
257
            st.st_dev, st.st_ino & 0xFFFFFFFF, st.st_mode))[:-1]
258
        # This is 0.060s / 1.520s faster by not encoding as much information
259
        # return _encode(_pack('>LL', int(st.st_mtime), st.st_mode))[:-1]
260
        # This is not strictly faster than _encode(_pack())[:-1]
261
        # return '%X.%X.%X.%X.%X.%X' % (
262
        #      st.st_size, int(st.st_mtime), int(st.st_ctime),
263
        #      st.st_dev, st.st_ino, st.st_mode)
264
        # Similar to the _encode(_pack('>LL'))
265
        # 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.
266
267
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
268
def _unpack_stat(packed_stat):
269
    """Turn a packed_stat back into the stat fields.
270
271
    This is meant as a debugging tool, should not be used in real code.
272
    """
273
    (st_size, st_mtime, st_ctime, st_dev, st_ino,
274
     st_mode) = struct.unpack('>LLLLLL', binascii.a2b_base64(packed_stat))
275
    return dict(st_size=st_size, st_mtime=st_mtime, st_ctime=st_ctime,
276
                st_dev=st_dev, st_ino=st_ino, st_mode=st_mode)
277
278
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
279
class SHA1Provider(object):
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
280
    """An interface for getting sha1s of a file."""
281
282
    def sha1(self, abspath):
4241.14.2 by Vincent Ladeuil
Fixed as per John's review feedback.
283
        """Return the sha1 of a file given its absolute path.
284
285
        :param abspath:  May be a filesystem encoded absolute path
286
             or a unicode path.
287
        """
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
288
        raise NotImplementedError(self.sha1)
289
290
    def stat_and_sha1(self, abspath):
4132.2.4 by Ian Clatworthy
John's enhancements/fixes to the tests
291
        """Return the stat and sha1 of a file given its absolute path.
292
        
4241.14.2 by Vincent Ladeuil
Fixed as per John's review feedback.
293
        :param abspath:  May be a filesystem encoded absolute path
294
             or a unicode path.
295
4132.2.4 by Ian Clatworthy
John's enhancements/fixes to the tests
296
        Note: the stat should be the stat of the physical file
297
        while the sha may be the sha of its canonical content.
298
        """
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
299
        raise NotImplementedError(self.stat_and_sha1)
300
301
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
302
class DefaultSHA1Provider(SHA1Provider):
303
    """A SHA1Provider that reads directly from the filesystem."""
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
304
305
    def sha1(self, abspath):
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
306
        """Return the sha1 of a file given its absolute path."""
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
307
        return osutils.sha_file_by_name(abspath)
308
309
    def stat_and_sha1(self, abspath):
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
310
        """Return the stat and sha1 of a file given its absolute path."""
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
311
        file_obj = file(abspath, 'rb')
312
        try:
313
            statvalue = os.fstat(file_obj.fileno())
4132.2.3 by Ian Clatworthy
add test as suggested by poolie's review
314
            sha1 = osutils.sha_file(file_obj)
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
315
        finally:
316
            file_obj.close()
4132.2.3 by Ian Clatworthy
add test as suggested by poolie's review
317
        return statvalue, sha1
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
318
319
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
320
class DirState(object):
321
    """Record directory and metadata state for fast access.
322
323
    A dirstate is a specialised data structure for managing local working
324
    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&/.
325
    specific, and if it is how we detect/parameterize that.
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
326
327
    Dirstates use the usual lock_write, lock_read and unlock mechanisms.
328
    Unlike most bzr disk formats, DirStates must be locked for reading, using
329
    lock_read.  (This is an os file lock internally.)  This is necessary
330
    because the file can be rewritten in place.
331
332
    DirStates must be explicitly written with save() to commit changes; just
333
    unlocking them does not write the changes to disk.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
334
    """
335
2255.2.169 by Martin Pool
(broken) merge dirstate branch
336
    _kind_to_minikind = {
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
337
            'absent': 'a',
338
            'file': 'f',
339
            'directory': 'd',
340
            'relocated': 'r',
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
341
            'symlink': 'l',
342
            'tree-reference': 't',
343
        }
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
344
    _minikind_to_kind = {
345
            'a': 'absent',
346
            'f': 'file',
347
            'd': 'directory',
348
            'l':'symlink',
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
349
            'r': 'relocated',
350
            't': 'tree-reference',
351
        }
2485.3.3 by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code.
352
    _stat_to_minikind = {
353
        stat.S_IFDIR:'d',
354
        stat.S_IFREG:'f',
355
        stat.S_IFLNK:'l',
356
    }
1852.13.20 by Robert Collins
Steps toward an object model.
357
    _to_yesno = {True:'y', False: 'n'} # TODO profile the performance gain
358
     # of using int conversion rather than a dict here. AND BLAME ANDREW IF
359
     # it is faster.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
360
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
361
    # 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
362
    #       the BISECT_PAGE_SIZE. For now, we just have to make it large enough
363
    #       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.
364
    BISECT_PAGE_SIZE = 4096
365
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.
366
    NOT_IN_MEMORY = 0
367
    IN_MEMORY_UNMODIFIED = 1
368
    IN_MEMORY_MODIFIED = 2
5807.4.2 by John Arbash Meinel
TODO entry.
369
    IN_MEMORY_HASH_MODIFIED = 3 # Only hash-cache updates
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.
370
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
371
    # A pack_stat (the x's) that is just noise and will never match the output
372
    # of base64 encode.
2255.2.4 by Robert Collins
Snapshot dirstate development
373
    NULLSTAT = 'x' * 32
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
374
    NULL_PARENT_DETAILS = ('a', '', 0, False, '')
2255.2.4 by Robert Collins
Snapshot dirstate development
375
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
376
    HEADER_FORMAT_2 = '#bazaar dirstate flat format 2\n'
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
377
    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
378
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
379
    def __init__(self, path, sha1_provider, worth_saving_limit=0):
2255.2.4 by Robert Collins
Snapshot dirstate development
380
        """Create a  DirState object.
381
2255.4.1 by James Westby
Store the filename of the dirstate in an attribute.
382
        :param path: The path at which the dirstate file on disk should live.
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
383
        :param sha1_provider: an object meeting the SHA1Provider interface.
4379.5.7 by Ian Clatworthy
apply review feedback
384
        :param worth_saving_limit: when the exact number of hash changed
385
            entries is known, only bother saving the dirstate if more than
5807.4.2 by John Arbash Meinel
TODO entry.
386
            this count of entries have changed.
387
            -1 means never save hash changes, 0 means always save hash changes.
2255.2.4 by Robert Collins
Snapshot dirstate development
388
        """
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.
389
        # _header_state and _dirblock_state represent the current state
390
        # of the dirstate metadata and the per-row data respectiely.
391
        # NOT_IN_MEMORY indicates that no data is in memory
392
        # IN_MEMORY_UNMODIFIED indicates that what we have in memory
393
        #   is the same as is on disk
394
        # IN_MEMORY_MODIFIED indicates that we have a modified version
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
395
        #   of what is on disk.
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.
396
        # In future we will add more granularity, for instance _dirblock_state
397
        # will probably support partially-in-memory as a separate variable,
398
        # allowing for partially-in-memory unmodified and partially-in-memory
399
        # modified states.
400
        self._header_state = DirState.NOT_IN_MEMORY
401
        self._dirblock_state = DirState.NOT_IN_MEMORY
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
402
        # If true, an error has been detected while updating the dirstate, and
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
403
        # for safety we're not going to commit to disk.
404
        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.
405
        self._dirblocks = []
406
        self._ghosts = []
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
407
        self._parents = []
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
408
        self._state_file = None
2255.4.2 by James Westby
(broken) Add the locking methods.
409
        self._filename = path
410
        self._lock_token = None
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
411
        self._lock_state = None
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
412
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
413
        # a map from packed_stat to sha's.
414
        self._packed_stat_index = None
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
415
        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.
416
        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.
417
        self._split_path_cache = {}
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
418
        self._bisect_page_size = DirState.BISECT_PAGE_SIZE
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
419
        self._sha1_provider = sha1_provider
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
420
        if 'hashcache' in debug.debug_flags:
421
            self._sha1_file = self._sha1_file_and_mutter
422
        else:
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
423
            self._sha1_file = self._sha1_provider.sha1
2921.1.4 by Robert Collins
Documentation to aid our failing memory in the future.
424
        # These two attributes provide a simple cache for lookups into the
425
        # dirstate in-memory vectors. By probing respectively for the last
426
        # block, and for the next entry, we save nearly 2 bisections per path
427
        # during commit.
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
428
        self._last_block_index = None
429
        self._last_entry_index = None
4379.5.7 by Ian Clatworthy
apply review feedback
430
        # The set of known hash changes
431
        self._known_hash_changes = set()
432
        # How many hash changed entries can we have without saving
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
433
        self._worth_saving_limit = worth_saving_limit
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
434
2255.2.222 by Martin Pool
Add DirState repr so we get meaningful messages
435
    def __repr__(self):
436
        return "%s(%r)" % \
437
            (self.__class__.__name__, self._filename)
438
5807.4.2 by John Arbash Meinel
TODO entry.
439
    def _mark_modified(self, hash_changed_entries=None, header_modified=False):
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
440
        """Mark this dirstate as modified.
441
4379.5.7 by Ian Clatworthy
apply review feedback
442
        :param hash_changed_entries: if non-None, mark just these entries as
5807.4.2 by John Arbash Meinel
TODO entry.
443
            having their hash modified.
444
        :param header_modified: mark the header modified as well, not just the
445
            dirblocks.
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
446
        """
4379.5.7 by Ian Clatworthy
apply review feedback
447
        #trace.mutter_callsite(3, "modified hash entries: %s", hash_changed_entries)
448
        if hash_changed_entries:
449
            self._known_hash_changes.update([e[0] for e in hash_changed_entries])
5807.4.2 by John Arbash Meinel
TODO entry.
450
            if self._dirblock_state in (DirState.NOT_IN_MEMORY,
451
                                        DirState.IN_MEMORY_UNMODIFIED):
452
                # If the dirstate is already marked a IN_MEMORY_MODIFIED, then
453
                # that takes precedence.
454
                self._dirblock_state = DirState.IN_MEMORY_HASH_MODIFIED
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
455
        else:
5807.4.3 by John Arbash Meinel
Get the test suite to run clean for bt.test_dirstate bt.test__dirstate bt.test_workingtree
456
            # TODO: Since we now have a IN_MEMORY_HASH_MODIFIED state, we
457
            #       should fail noisily if someone tries to set
458
            #       IN_MEMORY_MODIFIED but we don't have a write-lock!
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
459
            # We don't know exactly what changed so disable smart saving
5807.4.2 by John Arbash Meinel
TODO entry.
460
            self._dirblock_state = DirState.IN_MEMORY_MODIFIED
461
        if header_modified:
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
462
            self._header_state = DirState.IN_MEMORY_MODIFIED
463
464
    def _mark_unmodified(self):
465
        """Mark this dirstate as unmodified."""
466
        self._header_state = DirState.IN_MEMORY_UNMODIFIED
467
        self._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
4379.5.7 by Ian Clatworthy
apply review feedback
468
        self._known_hash_changes = set()
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
469
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
470
    def add(self, path, file_id, kind, stat, fingerprint):
2255.2.8 by Robert Collins
First DirState.add() method test passing.
471
        """Add a path to be tracked.
472
473
        :param path: The path within the dirstate - '' is the root, 'foo' is the
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
474
            path foo within the root, 'foo/bar' is the path bar within foo
2255.2.8 by Robert Collins
First DirState.add() method test passing.
475
            within the root.
476
        :param file_id: The file id of the path being added.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
477
        :param kind: The kind of the path, as a string like 'file',
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
478
            'directory', etc.
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
479
        :param stat: The output of os.lstat for the path.
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
480
        :param fingerprint: The sha value of the file's canonical form (i.e.
481
            after any read filters have been applied),
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
482
            or the target of a symlink,
483
            or the referenced revision id for tree-references,
484
            or '' for directories.
2255.2.8 by Robert Collins
First DirState.add() method test passing.
485
        """
486
        # adding a file:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
487
        # find the block its in.
2255.2.8 by Robert Collins
First DirState.add() method test passing.
488
        # find the location in the block.
489
        # check its not there
490
        # add it.
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
491
        #------- copied from inventory.ensure_normalized_name - keep synced.
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
492
        # --- 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.
493
        dirname, basename = osutils.split(path)
494
        # we dont import normalized_filename directly because we want to be
495
        # able to change the implementation at runtime for tests.
496
        norm_name, can_access = osutils.normalized_filename(basename)
497
        if norm_name != basename:
498
            if can_access:
499
                basename = norm_name
500
            else:
501
                raise errors.InvalidNormalization(path)
2255.2.225 by Martin Pool
Prohibit dirstate from getting entries called ..
502
        # you should never have files called . or ..; just add the directory
503
        # in the parent, or according to the special treatment for the root
504
        if basename == '.' or basename == '..':
505
            raise errors.InvalidEntryName(path)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
506
        # now that we've normalised, we need the correct utf8 path and
2255.2.54 by Robert Collins
Add in non-normalized filename sanity check to dirstate add().
507
        # dirname and basename elements. This single encode and split should be
508
        # faster than three separate encodes.
2474.1.74 by John Arbash Meinel
Revert the accidental removal of the Unicode normalization check code.
509
        utf8path = (dirname + '/' + basename).strip('/').encode('utf8')
510
        dirname, basename = osutils.split(utf8path)
3376.2.8 by Martin Pool
Some review cleanups for assertion removal
511
        # uses __class__ for speed; the check is needed for safety
512
        if file_id.__class__ is not str:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
513
            raise AssertionError(
514
                "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.
515
        # Make sure the file_id does not exist in this tree
3923.2.1 by Charles Duffy
Fix bug #314251 (dirstate crash on rename via delete+add)
516
        rename_from = None
517
        file_id_entry = self._get_entry(0, fileid_utf8=file_id, include_deleted=True)
2255.7.16 by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId.
518
        if file_id_entry != (None, None):
3923.2.1 by Charles Duffy
Fix bug #314251 (dirstate crash on rename via delete+add)
519
            if file_id_entry[1][0][0] == 'a':
520
                if file_id_entry[0] != (dirname, basename, file_id):
521
                    # set the old name's current operation to rename
522
                    self.update_minimal(file_id_entry[0],
523
                        'r',
524
                        path_utf8='',
525
                        packed_stat='',
526
                        fingerprint=utf8path
527
                    )
528
                    rename_from = file_id_entry[0][0:2]
529
            else:
530
                path = osutils.pathjoin(file_id_entry[0][0], file_id_entry[0][1])
531
                kind = DirState._minikind_to_kind[file_id_entry[1][0][0]]
532
                info = '%s:%s' % (kind, path)
533
                raise errors.DuplicateFileId(file_id, info)
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
534
        first_key = (dirname, basename, '')
535
        block_index, present = self._find_block_index_from_key(first_key)
536
        if present:
537
            # check the path is not in the tree
538
            block = self._dirblocks[block_index][1]
539
            entry_index, _ = self._find_entry_index(first_key, block)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
540
            while (entry_index < len(block) and
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
541
                block[entry_index][0][0:2] == first_key[0:2]):
542
                if block[entry_index][1][0][0] not in 'ar':
543
                    # this path is in the dirstate in the current tree.
544
                    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.
545
                entry_index += 1
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
546
        else:
2255.7.10 by John Arbash Meinel
Handle the case when we are adding a file to an empty directory.
547
            # The block where we want to put the file is not present. But it
548
            # might be because the directory was empty, or not loaded yet. Look
549
            # for a parent entry, if not found, raise NotVersionedError
550
            parent_dir, parent_base = osutils.split(dirname)
551
            parent_block_idx, parent_entry_idx, _, parent_present = \
552
                self._get_block_entry_index(parent_dir, parent_base, 0)
553
            if not parent_present:
554
                raise errors.NotVersionedError(path, str(self))
555
            self._ensure_block(parent_block_idx, parent_entry_idx, dirname)
2255.2.8 by Robert Collins
First DirState.add() method test passing.
556
        block = self._dirblocks[block_index][1]
2255.7.74 by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4.
557
        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.
558
        if stat is None:
559
            size = 0
560
            packed_stat = DirState.NULLSTAT
561
        else:
562
            size = stat.st_size
563
            packed_stat = pack_stat(stat)
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
564
        parent_info = self._empty_parent_info()
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
565
        minikind = DirState._kind_to_minikind[kind]
3923.2.2 by Charles Duffy
Update fix for #314251 per feedback from Ian
566
        if rename_from is not None:
3923.2.1 by Charles Duffy
Fix bug #314251 (dirstate crash on rename via delete+add)
567
            if rename_from[0]:
568
                old_path_utf8 = '%s/%s' % rename_from
569
            else:
570
                old_path_utf8 = rename_from[1]
571
            parent_info[0] = ('r', old_path_utf8, 0, False, '')
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.
572
        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.
573
            entry_data = entry_key, [
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
574
                (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.
575
                ] + 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.
576
        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.
577
            entry_data = entry_key, [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
578
                (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.
579
                ] + 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.
580
        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.
581
            entry_data = entry_key, [
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
582
                (minikind, fingerprint, size, False, packed_stat),
583
                ] + parent_info
584
        elif kind == 'tree-reference':
585
            entry_data = entry_key, [
586
                (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.
587
                ] + parent_info
2255.2.13 by Robert Collins
Test adding of directories to the root of a dirstate.
588
        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.
589
            raise errors.BzrError('unknown kind %r' % kind)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
590
        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.
591
        if not present:
592
            block.insert(entry_index, entry_data)
593
        else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
594
            if block[entry_index][1][0][0] != 'a':
595
                raise AssertionError(" %r(%r) already added" % (basename, file_id))
2323.4.1 by Robert Collins
dirstate correctness: allow adding paths present in the basis.
596
            block[entry_index][1][0] = entry_data[1][0]
2255.2.8 by Robert Collins
First DirState.add() method test passing.
597
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.
598
        if kind == 'directory':
599
           # 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.
600
           self._ensure_block(block_index, entry_index, utf8path)
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
601
        self._mark_modified()
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
602
        if self._id_index:
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
603
            self._add_to_id_index(self._id_index, entry_key)
2255.2.8 by Robert Collins
First DirState.add() method test passing.
604
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
605
    def _bisect(self, paths):
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
606
        """Bisect through the disk structure for specific rows.
607
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
608
        :param paths: A list of paths to find
609
        :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
610
                 entries will not be in the map.
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
611
                 The list is not sorted, and entries will be populated
612
                 based on when they were read.
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
613
        """
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
614
        self._requires_lock()
615
        # We need the file pointer to be right after the initial header block
616
        self._read_header_if_needed()
617
        # If _dirblock_state was in memory, we should just return info from
618
        # there, this function is only meant to handle when we want to read
619
        # part of the disk.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
620
        if self._dirblock_state != DirState.NOT_IN_MEMORY:
621
            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.
622
623
        # The disk representation is generally info + '\0\n\0' at the end. But
624
        # for bisecting, it is easier to treat this as '\0' + info + '\0\n'
625
        # Because it means we can sync on the '\n'
626
        state_file = self._state_file
627
        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
628
        # We end up with 2 extra fields, we should have a trailing '\n' to
629
        # ensure that we read the whole record, and we should have a precursur
630
        # '' which ensures that we start after the previous '\n'
631
        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.
632
633
        low = self._end_of_header
634
        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
635
        # Map from (dir, name) => entry
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
636
        found = {}
637
638
        # Avoid infinite seeking
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
639
        max_count = 30*len(paths)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
640
        count = 0
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
641
        # pending is a list of places to look.
642
        # each entry is a tuple of low, high, dir_names
643
        #   low -> the first byte offset to read (inclusive)
644
        #   high -> the last byte offset (inclusive)
645
        #   dir_names -> The list of (dir, name) pairs that should be found in
646
        #                the [low, high] range
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
647
        pending = [(low, high, paths)]
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
648
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
649
        page_size = self._bisect_page_size
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
650
651
        fields_to_entry = self._get_fields_to_entry()
652
653
        while pending:
654
            low, high, cur_files = pending.pop()
655
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
656
            if not cur_files or low >= high:
657
                # Nothing to find
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
658
                continue
659
660
            count += 1
661
            if count > max_count:
662
                raise errors.BzrError('Too many seeks, most likely a bug.')
663
664
            mid = max(low, (low+high-page_size)/2)
665
666
            state_file.seek(mid)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
667
            # limit the read size, so we don't end up reading data that we have
668
            # already read.
669
            read_size = min(page_size, (high-mid)+1)
670
            block = state_file.read(read_size)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
671
672
            start = mid
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
673
            entries = block.split('\n')
674
675
            if len(entries) < 2:
676
                # We didn't find a '\n', so we cannot have found any records.
677
                # So put this range back and try again. But we know we have to
678
                # increase the page size, because a single read did not contain
679
                # 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.
680
                page_size *= 2
681
                pending.append((low, high, cur_files))
682
                continue
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
683
684
            # Check the first and last entries, in case they are partial, or if
685
            # we don't care about the rest of this page
686
            first_entry_num = 0
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
687
            first_fields = entries[0].split('\0')
688
            if len(first_fields) < entry_field_count:
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
689
                # We didn't get the complete first entry
690
                # so move start, and grab the next, which
691
                # should be a full entry
692
                start += len(entries[0])+1
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
693
                first_fields = entries[1].split('\0')
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
694
                first_entry_num = 1
695
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
696
            if len(first_fields) <= 2:
697
                # 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.
698
                # Try a large page size and repeat this query
699
                page_size *= 2
700
                pending.append((low, high, cur_files))
701
                continue
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
702
            else:
703
                # Find what entries we are looking for, which occur before and
704
                # after this first record.
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
705
                after = start
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
706
                if first_fields[1]:
707
                    first_path = first_fields[1] + '/' + first_fields[2]
708
                else:
709
                    first_path = first_fields[2]
2474.1.66 by John Arbash Meinel
Some restructuring.
710
                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
711
712
                # These exist before the current location
713
                pre = cur_files[:first_loc]
714
                # These occur after the current location, which may be in the
715
                # 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
716
                post = cur_files[first_loc:]
717
718
            if post and len(first_fields) >= entry_field_count:
719
                # We have files after the first entry
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
720
721
                # Parse the last entry
722
                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
723
                last_fields = entries[last_entry_num].split('\0')
724
                if len(last_fields) < entry_field_count:
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
725
                    # The very last hunk was not complete,
726
                    # read the previous hunk
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
727
                    after = mid + len(block) - len(entries[-1])
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
728
                    last_entry_num -= 1
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
729
                    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
730
                else:
731
                    after = mid + len(block)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
732
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
733
                if last_fields[1]:
734
                    last_path = last_fields[1] + '/' + last_fields[2]
735
                else:
736
                    last_path = last_fields[2]
2474.1.66 by John Arbash Meinel
Some restructuring.
737
                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.
738
2255.2.129 by John Arbash Meinel
Start cleaning up the code, and fix one more edge case
739
                middle_files = post[:last_loc]
740
                post = post[last_loc:]
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
741
742
                if middle_files:
743
                    # We have files that should occur in this block
744
                    # (>= first, <= last)
745
                    # Either we will find them here, or we can mark them as
746
                    # missing.
747
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
748
                    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
749
                        # We might need to go before this location
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
750
                        pre.append(first_path)
751
                    if middle_files[-1] == last_path:
752
                        post.insert(0, last_path)
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
753
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
754
                    # Find out what paths we have
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
755
                    paths = {first_path:[first_fields]}
756
                    # 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
757
                    # careful if we should append rather than overwrite
758
                    if last_entry_num != first_entry_num:
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
759
                        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
760
                    for num in xrange(first_entry_num+1, last_entry_num):
761
                        # TODO: jam 20070223 We are already splitting here, so
762
                        #       shouldn't we just split the whole thing rather
763
                        #       than doing the split again in add_one_record?
764
                        fields = entries[num].split('\0')
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
765
                        if fields[1]:
766
                            path = fields[1] + '/' + fields[2]
767
                        else:
768
                            path = fields[2]
769
                        paths.setdefault(path, []).append(fields)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
770
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
771
                    for path in middle_files:
772
                        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
773
                            # offset by 1 because of the opening '\0'
774
                            # consider changing fields_to_entry to avoid the
775
                            # extra list slice
776
                            entry = fields_to_entry(fields[1:])
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
777
                            found.setdefault(path, []).append(entry)
2255.2.125 by John Arbash Meinel
Initial effort at adding a basic _bisect function to DirState.
778
779
            # Now we have split up everything into pre, middle, and post, and
780
            # we have handled everything that fell in 'middle'.
781
            # We add 'post' first, so that we prefer to seek towards the
782
            # beginning, so that we will tend to go as early as we need, and
783
            # then only seek forward after that.
784
            if post:
785
                pending.append((after, high, post))
786
            if pre:
787
                pending.append((low, start-1, pre))
788
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
789
        # Consider that we may want to return the directory entries in sorted
790
        # order. For now, we just return them in whatever order we found them,
791
        # 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
792
        return found
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
793
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
794
    def _bisect_dirblocks(self, dir_list):
795
        """Bisect through the disk structure to find entries in given dirs.
796
797
        _bisect_dirblocks is meant to find the contents of directories, which
798
        differs from _bisect, which only finds individual entries.
799
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
800
        :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
801
        :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.
802
        """
803
        # TODO: jam 20070223 A lot of the bisecting logic could be shared
804
        #       between this and _bisect. It would require parameterizing the
805
        #       inner loop with a function, though. We should evaluate the
806
        #       performance difference.
807
        self._requires_lock()
808
        # We need the file pointer to be right after the initial header block
809
        self._read_header_if_needed()
810
        # If _dirblock_state was in memory, we should just return info from
811
        # there, this function is only meant to handle when we want to read
812
        # part of the disk.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
813
        if self._dirblock_state != DirState.NOT_IN_MEMORY:
814
            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.
815
        # The disk representation is generally info + '\0\n\0' at the end. But
816
        # for bisecting, it is easier to treat this as '\0' + info + '\0\n'
817
        # Because it means we can sync on the '\n'
818
        state_file = self._state_file
819
        file_size = os.fstat(state_file.fileno()).st_size
820
        # We end up with 2 extra fields, we should have a trailing '\n' to
821
        # ensure that we read the whole record, and we should have a precursur
822
        # '' which ensures that we start after the previous '\n'
823
        entry_field_count = self._fields_per_entry() + 1
824
825
        low = self._end_of_header
826
        high = file_size - 1 # Ignore the final '\0'
827
        # Map from dir => entry
828
        found = {}
829
830
        # Avoid infinite seeking
831
        max_count = 30*len(dir_list)
832
        count = 0
833
        # pending is a list of places to look.
834
        # each entry is a tuple of low, high, dir_names
835
        #   low -> the first byte offset to read (inclusive)
836
        #   high -> the last byte offset (inclusive)
837
        #   dirs -> The list of directories that should be found in
838
        #                the [low, high] range
839
        pending = [(low, high, dir_list)]
840
841
        page_size = self._bisect_page_size
842
843
        fields_to_entry = self._get_fields_to_entry()
844
845
        while pending:
846
            low, high, cur_dirs = pending.pop()
847
848
            if not cur_dirs or low >= high:
849
                # Nothing to find
850
                continue
851
852
            count += 1
853
            if count > max_count:
854
                raise errors.BzrError('Too many seeks, most likely a bug.')
855
856
            mid = max(low, (low+high-page_size)/2)
857
858
            state_file.seek(mid)
859
            # limit the read size, so we don't end up reading data that we have
860
            # already read.
861
            read_size = min(page_size, (high-mid)+1)
862
            block = state_file.read(read_size)
863
864
            start = mid
865
            entries = block.split('\n')
866
867
            if len(entries) < 2:
868
                # We didn't find a '\n', so we cannot have found any records.
869
                # So put this range back and try again. But we know we have to
870
                # increase the page size, because a single read did not contain
871
                # a record break (so records must be larger than page_size)
872
                page_size *= 2
873
                pending.append((low, high, cur_dirs))
874
                continue
875
876
            # Check the first and last entries, in case they are partial, or if
877
            # we don't care about the rest of this page
878
            first_entry_num = 0
879
            first_fields = entries[0].split('\0')
880
            if len(first_fields) < entry_field_count:
881
                # We didn't get the complete first entry
882
                # so move start, and grab the next, which
883
                # should be a full entry
884
                start += len(entries[0])+1
885
                first_fields = entries[1].split('\0')
886
                first_entry_num = 1
887
888
            if len(first_fields) <= 1:
889
                # We didn't even get a dirname here... what do we do?
890
                # Try a large page size and repeat this query
891
                page_size *= 2
892
                pending.append((low, high, cur_dirs))
893
                continue
894
            else:
895
                # Find what entries we are looking for, which occur before and
896
                # after this first record.
897
                after = start
898
                first_dir = first_fields[1]
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
899
                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.
900
901
                # These exist before the current location
902
                pre = cur_dirs[:first_loc]
903
                # These occur after the current location, which may be in the
904
                # data we read, or might be after the last entry
905
                post = cur_dirs[first_loc:]
906
907
            if post and len(first_fields) >= entry_field_count:
908
                # We have records to look at after the first entry
909
910
                # Parse the last entry
911
                last_entry_num = len(entries)-1
912
                last_fields = entries[last_entry_num].split('\0')
913
                if len(last_fields) < entry_field_count:
914
                    # The very last hunk was not complete,
915
                    # read the previous hunk
916
                    after = mid + len(block) - len(entries[-1])
917
                    last_entry_num -= 1
918
                    last_fields = entries[last_entry_num].split('\0')
919
                else:
920
                    after = mid + len(block)
921
922
                last_dir = last_fields[1]
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
923
                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.
924
925
                middle_files = post[:last_loc]
926
                post = post[last_loc:]
927
928
                if middle_files:
929
                    # We have files that should occur in this block
930
                    # (>= first, <= last)
931
                    # Either we will find them here, or we can mark them as
932
                    # missing.
933
934
                    if middle_files[0] == first_dir:
935
                        # We might need to go before this location
936
                        pre.append(first_dir)
937
                    if middle_files[-1] == last_dir:
938
                        post.insert(0, last_dir)
939
940
                    # Find out what paths we have
941
                    paths = {first_dir:[first_fields]}
942
                    # last_dir might == first_dir so we need to be
943
                    # careful if we should append rather than overwrite
944
                    if last_entry_num != first_entry_num:
945
                        paths.setdefault(last_dir, []).append(last_fields)
946
                    for num in xrange(first_entry_num+1, last_entry_num):
947
                        # TODO: jam 20070223 We are already splitting here, so
948
                        #       shouldn't we just split the whole thing rather
949
                        #       than doing the split again in add_one_record?
950
                        fields = entries[num].split('\0')
951
                        paths.setdefault(fields[1], []).append(fields)
952
953
                    for cur_dir in middle_files:
954
                        for fields in paths.get(cur_dir, []):
955
                            # offset by 1 because of the opening '\0'
956
                            # consider changing fields_to_entry to avoid the
957
                            # extra list slice
958
                            entry = fields_to_entry(fields[1:])
959
                            found.setdefault(cur_dir, []).append(entry)
960
961
            # Now we have split up everything into pre, middle, and post, and
962
            # we have handled everything that fell in 'middle'.
963
            # We add 'post' first, so that we prefer to seek towards the
964
            # beginning, so that we will tend to go as early as we need, and
965
            # then only seek forward after that.
966
            if post:
967
                pending.append((after, high, post))
968
            if pre:
969
                pending.append((low, start-1, pre))
970
2255.2.131 by John Arbash Meinel
Change the return values for bisect functions so they just return
971
        return found
2255.2.130 by John Arbash Meinel
Add a very similar function which grabs everything for a particular directory block.
972
2474.1.58 by John Arbash Meinel
(broken) Try to properly implement DirState._bisect*
973
    def _bisect_recursive(self, paths):
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
974
        """Bisect for entries for all paths and their children.
975
976
        This will use bisect to find all records for the supplied paths. It
977
        will then continue to bisect for any records which are marked as
978
        directories. (and renames?)
979
980
        :param paths: A sorted list of (dir, name) pairs
981
             eg: [('', 'a'), ('', 'f'), ('a/b', 'c')]
982
        :return: A dictionary mapping (dir, name, file_id) => [tree_info]
983
        """
984
        # Map from (dir, name, file_id) => [tree_info]
985
        found = {}
986
987
        found_dir_names = set()
988
989
        # Directories that have been read
990
        processed_dirs = set()
991
        # 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*
992
        newly_found = self._bisect(paths)
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
993
994
        while newly_found:
995
            # Directories that need to be read
996
            pending_dirs = set()
997
            paths_to_search = set()
998
            for entry_list in newly_found.itervalues():
999
                for dir_name_id, trees_info in entry_list:
1000
                    found[dir_name_id] = trees_info
1001
                    found_dir_names.add(dir_name_id[:2])
1002
                    is_dir = False
1003
                    for tree_info in trees_info:
1004
                        minikind = tree_info[0]
1005
                        if minikind == 'd':
1006
                            if is_dir:
1007
                                # We already processed this one as a directory,
1008
                                # we don't need to do the extra work again.
1009
                                continue
1010
                            subdir, name, file_id = dir_name_id
1011
                            path = osutils.pathjoin(subdir, name)
1012
                            is_dir = True
1013
                            if path not in processed_dirs:
1014
                                pending_dirs.add(path)
1015
                        elif minikind == 'r':
1016
                            # Rename, we need to directly search the target
1017
                            # which is contained in the fingerprint column
1018
                            dir_name = osutils.split(tree_info[1])
1019
                            if dir_name[0] in pending_dirs:
1020
                                # This entry will be found in the dir search
1021
                                continue
1022
                            if dir_name not in found_dir_names:
2474.1.61 by John Arbash Meinel
Finish fixing DirState._bisect and the bisect tests
1023
                                paths_to_search.add(tree_info[1])
2255.2.132 by John Arbash Meinel
Implement _bisect_recursive, which uses multiple bisect calls to
1024
            # Now we have a list of paths to look for directly, and
1025
            # directory blocks that need to be read.
1026
            # newly_found is mixing the keys between (dir, name) and path
1027
            # entries, but that is okay, because we only really care about the
1028
            # targets.
1029
            newly_found = self._bisect(sorted(paths_to_search))
1030
            newly_found.update(self._bisect_dirblocks(sorted(pending_dirs)))
1031
            processed_dirs.update(pending_dirs)
1032
        return found
1033
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1034
    def _discard_merge_parents(self):
1035
        """Discard any parents trees beyond the first.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1036
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1037
        Note that if this fails the dirstate is corrupted.
1038
1039
        After this function returns the dirstate contains 2 trees, neither of
1040
        which are ghosted.
1041
        """
1042
        self._read_header_if_needed()
1043
        parents = self.get_parent_ids()
1044
        if len(parents) < 1:
1045
            return
1046
        # only require all dirblocks if we are doing a full-pass removal.
1047
        self._read_dirblocks_if_needed()
1048
        dead_patterns = set([('a', 'r'), ('a', 'a'), ('r', 'r'), ('r', 'a')])
1049
        def iter_entries_removable():
1050
            for block in self._dirblocks:
1051
                deleted_positions = []
1052
                for pos, entry in enumerate(block[1]):
1053
                    yield entry
1054
                    if (entry[1][0][0], entry[1][1][0]) in dead_patterns:
1055
                        deleted_positions.append(pos)
1056
                if deleted_positions:
2984.1.1 by John Arbash Meinel
Fix bug #161131: Correct DirState._discard_merge_parents logic.
1057
                    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
1058
                        del block[1][:]
1059
                    else:
1060
                        for pos in reversed(deleted_positions):
1061
                            del block[1][pos]
1062
        # if the first parent is a ghost:
1063
        if parents[0] in self.get_ghosts():
1064
            empty_parent = [DirState.NULL_PARENT_DETAILS]
1065
            for entry in iter_entries_removable():
1066
                entry[1][1:] = empty_parent
1067
        else:
1068
            for entry in iter_entries_removable():
1069
                del entry[1][2:]
1070
1071
        self._ghosts = []
1072
        self._parents = [parents[0]]
5807.4.2 by John Arbash Meinel
TODO entry.
1073
        self._mark_modified(header_modified=True)
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1074
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
1075
    def _empty_parent_info(self):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1076
        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.
1077
                                                    len(self._ghosts))
1078
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
1079
    def _ensure_block(self, parent_block_index, parent_row_index, dirname):
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
1080
        """Ensure a block for dirname exists.
1081
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
1082
        This function exists to let callers which know that there is a
1083
        directory dirname ensure that the block for it exists. This block can
1084
        fail to exist because of demand loading, or because a directory had no
1085
        children. In either case it is not an error. It is however an error to
1086
        call this if there is no parent entry for the directory, and thus the
1087
        function requires the coordinates of such an entry to be provided.
1088
1089
        The root row is special cased and can be indicated with a parent block
1090
        and row index of -1
1091
1092
        :param parent_block_index: The index of the block in which dirname's row
1093
            exists.
1094
        :param parent_row_index: The index in the parent block where the row
1095
            exists.
1096
        :param dirname: The utf8 dirname to ensure there is a block for.
1097
        :return: The index for the block.
1098
        """
2255.2.138 by John Arbash Meinel
implement several new WorkingTree.move() tests
1099
        if dirname == '' and parent_row_index == 0 and parent_block_index == 0:
1100
            # This is the signature of the root row, and the
1101
            # contents-of-root row is always index 1
1102
            return 1
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
1103
        # the basename of the directory must be the end of its full name.
1104
        if not (parent_block_index == -1 and
1105
            parent_block_index == -1 and dirname == ''):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1106
            if not dirname.endswith(
1107
                    self._dirblocks[parent_block_index][1][parent_row_index][0][1]):
1108
                raise AssertionError("bad dirname %r" % dirname)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1109
        block_index, present = self._find_block_index_from_key((dirname, '', ''))
1110
        if not present:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1111
            ## In future, when doing partial parsing, this should load and
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1112
            # populate the entire block.
1113
            self._dirblocks.insert(block_index, (dirname, []))
1114
        return block_index
2255.2.59 by Robert Collins
All WorkingTree4 and dirstate tests passing.
1115
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1116
    def _entries_to_current_state(self, new_entries):
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1117
        """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.
1118
1119
        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:
1120
        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.
1121
1122
        :param new_entries: A sorted list of entries. This function does not sort
1123
            to prevent unneeded overhead when callers have a sorted list already.
1124
        :return: Nothing.
1125
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1126
        if new_entries[0][0][0:2] != ('', ''):
1127
            raise AssertionError(
1128
                "Missing root row %r" % (new_entries[0][0],))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1129
        # The two blocks here are deliberate: the root block and the
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1130
        # contents-of-root block.
1131
        self._dirblocks = [('', []), ('', [])]
1132
        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.
1133
        current_dirname = ''
1134
        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)
1135
        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.
1136
        for entry in new_entries:
1137
            if entry[0][0] != current_dirname:
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1138
                # 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.
1139
                current_block = []
2255.2.90 by Robert Collins
Correct DirState._entries_to_current_state to group entries by directory properly.
1140
                current_dirname = entry[0][0]
1141
                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)
1142
                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.
1143
            # 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)
1144
            append_entry(entry)
1145
        self._split_root_dirblock_into_contents()
1146
1147
    def _split_root_dirblock_into_contents(self):
1148
        """Split the root dirblocks into root and contents-of-root.
1149
1150
        After parsing by path, we end up with root entries and contents-of-root
1151
        entries in the same block. This loop splits them out again.
1152
        """
1153
        # The above loop leaves the "root block" entries mixed with the
1154
        # "contents-of-root block". But we don't want an if check on
1155
        # all entries, so instead we just fix it up here.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1156
        if self._dirblocks[1] != ('', []):
1157
            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)
1158
        root_block = []
1159
        contents_of_root_block = []
1160
        for entry in self._dirblocks[0][1]:
1161
            if not entry[0][1]: # This is a root entry
1162
                root_block.append(entry)
1163
            else:
1164
                contents_of_root_block.append(entry)
1165
        self._dirblocks[0] = ('', root_block)
1166
        self._dirblocks[1] = ('', contents_of_root_block)
1167
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
1168
    def _entries_for_path(self, path):
1169
        """Return a list with all the entries that match path for all ids."""
1170
        dirname, basename = os.path.split(path)
1171
        key = (dirname, basename, '')
1172
        block_index, present = self._find_block_index_from_key(key)
1173
        if not present:
1174
            # the block which should contain path is absent.
1175
            return []
1176
        result = []
1177
        block = self._dirblocks[block_index][1]
1178
        entry_index, _ = self._find_entry_index(key, block)
1179
        # we may need to look at multiple entries at this path: walk while the specific_files match.
1180
        while (entry_index < len(block) and
1181
            block[entry_index][0][0:2] == key[0:2]):
1182
            result.append(block[entry_index])
1183
            entry_index += 1
1184
        return result
1185
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1186
    def _entry_to_line(self, entry):
1187
        """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,
1188
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1189
        :param entry: An entry_tuple as defined in the module docstring.
1190
        """
1191
        entire_entry = list(entry[0])
1192
        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
1193
            # (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.
1194
            entire_entry.extend(tree_data)
1195
            # 3 for the key, 5 for the fields per tree.
1196
            tree_offset = 3 + tree_number * 5
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1197
            # minikind
1198
            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.
1199
            # size
1200
            entire_entry[tree_offset + 2] = str(tree_data[2])
1201
            # executable
1202
            entire_entry[tree_offset + 3] = DirState._to_yesno[tree_data[3]]
3146.8.8 by Aaron Bentley
Remove debug code
1203
        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.
1204
2255.2.126 by John Arbash Meinel
Switch the bisect code to support the fact that we can have
1205
    def _fields_per_entry(self):
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1206
        """How many null separated fields should be in each entry row.
1207
1208
        Each line now has an extra '\n' field which is not used
1209
        so we just skip over it
1210
        entry size:
1211
            3 fields for the key
1212
            + number of fields per tree_data (5) * tree count
1213
            + newline
1214
         """
1215
        tree_count = 1 + self._num_present_parents()
1216
        return 3 + 5 * tree_count + 1
1217
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1218
    def _find_block(self, key, add_if_missing=False):
1219
        """Return the block that key should be present in.
1220
1221
        :param key: A dirstate entry key.
1222
        :return: The block tuple.
1223
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1224
        block_index, present = self._find_block_index_from_key(key)
1225
        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.
1226
            if not add_if_missing:
1227
                # check to see if key is versioned itself - we might want to
1228
                # add it anyway, because dirs with no entries dont get a
1229
                # dirblock at parse time.
1230
                # This is an uncommon branch to take: most dirs have children,
1231
                # and most code works with versioned paths.
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
1232
                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.
1233
                if not self._get_block_entry_index(parent_base, parent_name, 0)[3]:
1234
                    # some parent path has not been added - its an error to add
1235
                    # this child
1236
                    raise errors.NotVersionedError(key[0:2], str(self))
1237
            self._dirblocks.insert(block_index, (key[0], []))
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1238
        return self._dirblocks[block_index]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1239
1240
    def _find_block_index_from_key(self, key):
1241
        """Find the dirblock index for a key.
1242
1243
        :return: The block index, True if the block for the key is present.
1244
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1245
        if key[0:2] == ('', ''):
1246
            return 0, True
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1247
        try:
1248
            if (self._last_block_index is not None and
1249
                self._dirblocks[self._last_block_index][0] == key[0]):
1250
                return self._last_block_index, True
1251
        except IndexError:
1252
            pass
2255.7.20 by John Arbash Meinel
update test for format 3, and enable caching of path split while lock is held.
1253
        block_index = bisect_dirblock(self._dirblocks, key[0], 1,
1254
                                      cache=self._split_path_cache)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1255
        # _right returns one-past-where-key is so we have to subtract
1256
        # one to use it. we use _right here because there are two
1257
        # '' blocks - the root, and the contents of root
1258
        # we always have a minimum of 2 in self._dirblocks: root and
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1259
        # root-contents, and for '', we get 2 back, so this is
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1260
        # simple and correct:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1261
        present = (block_index < len(self._dirblocks) and
2255.2.88 by Robert Collins
Significant steps back to operation.
1262
            self._dirblocks[block_index][0] == key[0])
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1263
        self._last_block_index = block_index
2921.1.4 by Robert Collins
Documentation to aid our failing memory in the future.
1264
        # 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.
1265
        self._last_entry_index = -1
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1266
        return block_index, present
1267
1268
    def _find_entry_index(self, key, block):
1269
        """Find the entry index for a key in a block.
1270
1271
        :return: The entry index, True if the entry for the key is present.
1272
        """
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1273
        len_block = len(block)
1274
        try:
1275
            if self._last_entry_index is not None:
1276
                # mini-bisect here.
1277
                entry_index = self._last_entry_index + 1
1278
                # A hit is when the key is after the last slot, and before or
1279
                # 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.
1280
                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.
1281
                    key <= block[entry_index][0]):
1282
                    self._last_entry_index = entry_index
2921.1.3 by Robert Collins
Review feedback.
1283
                    present = (block[entry_index][0] == key)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1284
                    return entry_index, present
1285
        except IndexError:
1286
            pass
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1287
        entry_index = bisect.bisect_left(block, (key, []))
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1288
        present = (entry_index < len_block and
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1289
            block[entry_index][0] == key)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1290
        self._last_entry_index = entry_index
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1291
        return entry_index, present
1292
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1293
    @staticmethod
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
1294
    def from_tree(tree, dir_state_filename, sha1_provider=None):
1852.13.10 by Robert Collins
Use just the tree api to generate dirstate information.
1295
        """Create a dirstate from a bzr Tree.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1296
1297
        :param tree: The tree which should provide parent information and
1298
            inventory ids.
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
1299
        :param sha1_provider: an object meeting the SHA1Provider interface.
1300
            If None, a DefaultSHA1Provider is used.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1301
        :return: a DirState object which is currently locked for writing.
1302
            (it was locked by DirState.initialize)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
1303
        """
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
1304
        result = DirState.initialize(dir_state_filename,
1305
            sha1_provider=sha1_provider)
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
1306
        try:
1307
            tree.lock_read()
1308
            try:
1309
                parent_ids = tree.get_parent_ids()
1310
                num_parents = len(parent_ids)
1311
                parent_trees = []
1312
                for parent_id in parent_ids:
1313
                    parent_tree = tree.branch.repository.revision_tree(parent_id)
1314
                    parent_trees.append((parent_id, parent_tree))
1315
                    parent_tree.lock_read()
1316
                result.set_parent_trees(parent_trees, [])
1317
                result.set_state_from_inventory(tree.inventory)
1318
            finally:
1319
                for revid, parent_tree in parent_trees:
1320
                    parent_tree.unlock()
1321
                tree.unlock()
1322
        except:
1323
            # The caller won't have a chance to unlock this, so make sure we
1324
            # cleanup ourselves
1325
            result.unlock()
1326
            raise
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1327
        return result
1328
5876.1.1 by John Arbash Meinel
Fix bug #781168, and allow WT.update_basis_by_delta
1329
    def _check_delta_is_valid(self, delta):
1330
        return list(inventory._check_delta_unique_ids(
1331
                    inventory._check_delta_unique_old_paths(
1332
                    inventory._check_delta_unique_new_paths(
1333
                    inventory._check_delta_ids_match_entry(
1334
                    inventory._check_delta_ids_are_valid(
1335
                    inventory._check_delta_new_path_entry_both_or_None(delta)))))))
1336
3146.8.15 by Aaron Bentley
Cleanup and docs
1337
    def update_by_delta(self, delta):
1338
        """Apply an inventory delta to the dirstate for tree 0
1339
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1340
        This is the workhorse for apply_inventory_delta in dirstate based
1341
        trees.
1342
3146.8.15 by Aaron Bentley
Cleanup and docs
1343
        :param delta: An inventory delta.  See Inventory.apply_delta for
1344
            details.
1345
        """
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1346
        self._read_dirblocks_if_needed()
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1347
        encode = cache_utf8.encode
3146.8.13 by Aaron Bentley
Clean up code
1348
        insertions = {}
1349
        removals = {}
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1350
        # Accumulate parent references (path_utf8, id), to check for parentless
1351
        # items or items placed under files/links/tree-references. We get
1352
        # references from every item in the delta that is not a deletion and
1353
        # is not itself the root.
1354
        parents = set()
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1355
        # Added ids must not be in the dirstate already. This set holds those
1356
        # ids.
1357
        new_ids = set()
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
1358
        # This loop transforms the delta to single atomic operations that can
1359
        # be executed and validated.
5876.1.1 by John Arbash Meinel
Fix bug #781168, and allow WT.update_basis_by_delta
1360
        delta = sorted(self._check_delta_is_valid(delta), reverse=True)
1361
        for old_path, new_path, file_id, inv_entry in delta:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1362
            if (file_id in insertions) or (file_id in removals):
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1363
                raise errors.InconsistentDelta(old_path or new_path, file_id,
1364
                    "repeated file_id")
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1365
            if old_path is not None:
1366
                old_path = old_path.encode('utf-8')
3146.8.13 by Aaron Bentley
Clean up code
1367
                removals[file_id] = old_path
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1368
            else:
1369
                new_ids.add(file_id)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1370
            if new_path is not None:
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
1371
                if inv_entry is None:
1372
                    raise errors.InconsistentDelta(new_path, file_id,
1373
                        "new_path with no entry")
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1374
                new_path = new_path.encode('utf-8')
4526.9.20 by Robert Collins
Don't double-decode directory names in dirstate delta applications.
1375
                dirname_utf8, basename = osutils.split(new_path)
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1376
                if basename:
1377
                    parents.add((dirname_utf8, inv_entry.parent_id))
4526.9.20 by Robert Collins
Don't double-decode directory names in dirstate delta applications.
1378
                key = (dirname_utf8, basename, file_id)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1379
                minikind = DirState._kind_to_minikind[inv_entry.kind]
1380
                if minikind == 't':
4634.59.3 by Robert Collins
Bugfix tree reference support in dirstate update_by_delta.
1381
                    fingerprint = inv_entry.reference_revision or ''
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1382
                else:
1383
                    fingerprint = ''
3146.8.13 by Aaron Bentley
Clean up code
1384
                insertions[file_id] = (key, minikind, inv_entry.executable,
1385
                                       fingerprint, new_path)
3585.2.3 by Robert Collins
Teach dirstate.update_by_delta to detect corrupt deltas which do not remove children explicitly.
1386
            # Transform moves into delete+add pairs
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1387
            if None not in (old_path, new_path):
1388
                for child in self._iter_child_entries(0, old_path):
3146.8.13 by Aaron Bentley
Clean up code
1389
                    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
1390
                        continue
3146.8.10 by Aaron Bentley
Clean up some variable names
1391
                    child_dirname = child[0][0]
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1392
                    child_basename = child[0][1]
1393
                    minikind = child[1][0][0]
1394
                    fingerprint = child[1][0][4]
3146.8.9 by Aaron Bentley
Fix child execute bit
1395
                    executable = child[1][0][3]
4789.19.1 by John Arbash Meinel
Found an actual bug.
1396
                    old_child_path = osutils.pathjoin(child_dirname,
1397
                                                      child_basename)
3146.8.13 by Aaron Bentley
Clean up code
1398
                    removals[child[0][2]] = old_child_path
3146.8.10 by Aaron Bentley
Clean up some variable names
1399
                    child_suffix = child_dirname[len(old_path):]
1400
                    new_child_dirname = (new_path + child_suffix)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1401
                    key = (new_child_dirname, child_basename, child[0][2])
4789.19.1 by John Arbash Meinel
Found an actual bug.
1402
                    new_child_path = osutils.pathjoin(new_child_dirname,
1403
                                                      child_basename)
3146.8.13 by Aaron Bentley
Clean up code
1404
                    insertions[child[0][2]] = (key, minikind, executable,
1405
                                               fingerprint, new_child_path)
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1406
        self._check_delta_ids_absent(new_ids, delta, 0)
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1407
        try:
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1408
            self._apply_removals(removals.iteritems())
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1409
            self._apply_insertions(insertions.values())
1410
            # Validate parents
1411
            self._after_delta_check_parents(parents, 0)
1412
        except errors.BzrError, e:
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1413
            self._changes_aborted = True
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1414
            if 'integrity error' not in str(e):
1415
                raise
1416
            # _get_entry raises BzrError when a request is inconsistent; we
1417
            # want such errors to be shown as InconsistentDelta - and that 
1418
            # fits the behaviour we trigger.
1419
            raise errors.InconsistentDeltaDelta(delta, "error from _get_entry.")
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1420
1421
    def _apply_removals(self, removals):
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1422
        for file_id, path in sorted(removals, reverse=True,
1423
            key=operator.itemgetter(1)):
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1424
            dirname, basename = osutils.split(path)
1425
            block_i, entry_i, d_present, f_present = \
1426
                self._get_block_entry_index(dirname, basename, 0)
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1427
            try:
1428
                entry = self._dirblocks[block_i][1][entry_i]
1429
            except IndexError:
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1430
                self._changes_aborted = True
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1431
                raise errors.InconsistentDelta(path, file_id,
1432
                    "Wrong path for old path.")
1433
            if not f_present or entry[1][0][0] in 'ar':
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1434
                self._changes_aborted = True
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1435
                raise errors.InconsistentDelta(path, file_id,
1436
                    "Wrong path for old path.")
1437
            if file_id != entry[0][2]:
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1438
                self._changes_aborted = True
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1439
                raise errors.InconsistentDelta(path, file_id,
4526.9.14 by Robert Collins
Review feedback on dirstate.
1440
                    "Attempt to remove path has wrong id - found %r."
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1441
                    % entry[0][2])
3146.8.16 by Aaron Bentley
Updates from review
1442
            self._make_absent(entry)
3585.2.3 by Robert Collins
Teach dirstate.update_by_delta to detect corrupt deltas which do not remove children explicitly.
1443
            # See if we have a malformed delta: deleting a directory must not
1444
            # leave crud behind. This increases the number of bisects needed
1445
            # substantially, but deletion or renames of large numbers of paths
1446
            # is rare enough it shouldn't be an issue (famous last words?) RBC
1447
            # 20080730.
1448
            block_i, entry_i, d_present, f_present = \
1449
                self._get_block_entry_index(path, '', 0)
1450
            if d_present:
1451
                # The dir block is still present in the dirstate; this could
1452
                # be due to it being in a parent tree, or a corrupt delta.
1453
                for child_entry in self._dirblocks[block_i][1]:
1454
                    if child_entry[1][0][0] not in ('r', 'a'):
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1455
                        self._changes_aborted = True
3585.2.3 by Robert Collins
Teach dirstate.update_by_delta to detect corrupt deltas which do not remove children explicitly.
1456
                        raise errors.InconsistentDelta(path, entry[0][2],
1457
                            "The file id was deleted but its children were "
1458
                            "not deleted.")
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1459
1460
    def _apply_insertions(self, adds):
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1461
        try:
1462
            for key, minikind, executable, fingerprint, path_utf8 in sorted(adds):
1463
                self.update_minimal(key, minikind, executable, fingerprint,
1464
                                    path_utf8=path_utf8)
1465
        except errors.NotVersionedError:
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1466
            self._changes_aborted = True
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1467
            raise errors.InconsistentDelta(path_utf8.decode('utf8'), key[2],
1468
                "Missing parent")
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1469
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1470
    def update_basis_by_delta(self, delta, new_revid):
1471
        """Update the parents of this tree after a commit.
1472
1473
        This gives the tree one parent, with revision id new_revid. The
1474
        inventory delta is applied to the current basis tree to generate the
1475
        inventory for the parent new_revid, and all other parent trees are
1476
        discarded.
1477
1478
        Note that an exception during the operation of this method will leave
1479
        the dirstate in a corrupt state where it should not be saved.
1480
1481
        :param new_revid: The new revision id for the trees parent.
1482
        :param delta: An inventory delta (see apply_inventory_delta) describing
1483
            the changes from the current left most parent revision to new_revid.
1484
        """
1485
        self._read_dirblocks_if_needed()
1486
        self._discard_merge_parents()
1487
        if self._ghosts != []:
1488
            raise NotImplementedError(self.update_basis_by_delta)
1489
        if len(self._parents) == 0:
1490
            # setup a blank tree, the most simple way.
1491
            empty_parent = DirState.NULL_PARENT_DETAILS
1492
            for entry in self._iter_entries():
1493
                entry[1].append(empty_parent)
1494
            self._parents.append(new_revid)
1495
1496
        self._parents[0] = new_revid
1497
5876.1.1 by John Arbash Meinel
Fix bug #781168, and allow WT.update_basis_by_delta
1498
        delta = sorted(self._check_delta_is_valid(delta), reverse=True)
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1499
        adds = []
1500
        changes = []
1501
        deletes = []
1502
        # The paths this function accepts are unicode and must be encoded as we
1503
        # go.
1504
        encode = cache_utf8.encode
1505
        inv_to_entry = self._inv_entry_to_details
1506
        # delta is now (deletes, changes), (adds) in reverse lexographical
1507
        # order.
1508
        # deletes in reverse lexographic order are safe to process in situ.
1509
        # renames are not, as a rename from any path could go to a path
1510
        # lexographically lower, so we transform renames into delete, add pairs,
1511
        # expanding them recursively as needed.
1512
        # At the same time, to reduce interface friction we convert the input
1513
        # inventory entries to dirstate.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1514
        root_only = ('', '')
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1515
        # Accumulate parent references (path_utf8, id), to check for parentless
4505.5.9 by Robert Collins
Review feedback.
1516
        # items or items placed under files/links/tree-references. We get
1517
        # references from every item in the delta that is not a deletion and
1518
        # is not itself the root.
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1519
        parents = set()
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1520
        # Added ids must not be in the dirstate already. This set holds those
1521
        # ids.
1522
        new_ids = set()
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1523
        for old_path, new_path, file_id, inv_entry in delta:
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
1524
            if inv_entry is not None and file_id != inv_entry.file_id:
1525
                raise errors.InconsistentDelta(new_path, file_id,
1526
                    "mismatched entry file_id %r" % inv_entry)
4505.5.7 by Robert Collins
Handle unicode parents correctly in dirstate parent checking.
1527
            if new_path is not None:
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
1528
                if inv_entry is None:
1529
                    raise errors.InconsistentDelta(new_path, file_id,
1530
                        "new_path with no entry")
4505.5.7 by Robert Collins
Handle unicode parents correctly in dirstate parent checking.
1531
                new_path_utf8 = encode(new_path)
1532
                # note the parent for validation
4505.5.9 by Robert Collins
Review feedback.
1533
                dirname_utf8, basename_utf8 = osutils.split(new_path_utf8)
1534
                if basename_utf8:
1535
                    parents.add((dirname_utf8, inv_entry.parent_id))
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1536
            if old_path is None:
1537
                adds.append((None, encode(new_path), file_id,
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1538
                    inv_to_entry(inv_entry), True))
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1539
                new_ids.add(file_id)
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1540
            elif new_path is None:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1541
                deletes.append((encode(old_path), None, file_id, None, True))
1542
            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
1543
                # Renames:
1544
                # Because renames must preserve their children we must have
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1545
                # 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
1546
                # order ensures we've examined the child paths, but we also
1547
                # have to execute the removals, or the split to an add/delete
1548
                # pair will result in the deleted item being reinserted, or
1549
                # renamed items being reinserted twice - and possibly at the
1550
                # wrong place. Splitting into a delete/add pair also simplifies
1551
                # the handling of entries with ('f', ...), ('r' ...) because
1552
                # the target of the 'r' is old_path here, and we add that to
1553
                # deletes, meaning that the add handler does not need to check
1554
                # for 'r' items on every pass.
1555
                self._update_basis_apply_deletes(deletes)
1556
                deletes = []
1557
                # Split into an add/delete pair recursively.
1558
                adds.append((None, new_path_utf8, file_id,
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1559
                    inv_to_entry(inv_entry), False))
1560
                # Expunge deletes that we've seen so that deleted/renamed
1561
                # children of a rename directory are handled correctly.
1562
                new_deletes = reversed(list(self._iter_child_entries(1,
1563
                    encode(old_path))))
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1564
                # Remove the current contents of the tree at orig_path, and
1565
                # reinsert at the correct new path.
1566
                for entry in new_deletes:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1567
                    if entry[0][0]:
1568
                        source_path = entry[0][0] + '/' + entry[0][1]
1569
                    else:
1570
                        source_path = entry[0][1]
3253.2.1 by John Arbash Meinel
Fix moving directories to root nodes.
1571
                    if new_path_utf8:
1572
                        target_path = new_path_utf8 + source_path[len(old_path):]
1573
                    else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1574
                        if old_path == '':
1575
                            raise AssertionError("cannot rename directory to"
1576
                                " itself")
3253.2.1 by John Arbash Meinel
Fix moving directories to root nodes.
1577
                        target_path = source_path[len(old_path) + 1:]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1578
                    adds.append((None, target_path, entry[0][2], entry[1][1], False))
1579
                    deletes.append(
1580
                        (source_path, target_path, entry[0][2], None, False))
1581
                deletes.append(
1582
                    (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
1583
            else:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1584
                # changes to just the root should not require remove/insertion
1585
                # of everything.
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1586
                changes.append((encode(old_path), encode(new_path), file_id,
1587
                    inv_to_entry(inv_entry)))
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1588
        self._check_delta_ids_absent(new_ids, delta, 1)
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
1589
        try:
1590
            # Finish expunging deletes/first half of renames.
1591
            self._update_basis_apply_deletes(deletes)
1592
            # Reinstate second half of renames and new paths.
1593
            self._update_basis_apply_adds(adds)
1594
            # Apply in-situ changes.
1595
            self._update_basis_apply_changes(changes)
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1596
            # Validate parents
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1597
            self._after_delta_check_parents(parents, 1)
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1598
        except errors.BzrError, e:
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1599
            self._changes_aborted = True
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1600
            if 'integrity error' not in str(e):
1601
                raise
4505.5.4 by Robert Collins
Repeated path/id corruption detected.
1602
            # _get_entry raises BzrError when a request is inconsistent; we
1603
            # want such errors to be shown as InconsistentDelta - and that 
1604
            # fits the behaviour we trigger. Partof this is driven by dirstate
1605
            # only supporting deltas that turn the basis into a closer fit to
1606
            # the active tree.
1607
            raise errors.InconsistentDeltaDelta(delta, "error from _get_entry.")
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1608
5807.4.2 by John Arbash Meinel
TODO entry.
1609
        self._mark_modified(header_modified=True)
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1610
        self._id_index = None
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1611
        return
1612
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1613
    def _check_delta_ids_absent(self, new_ids, delta, tree_index):
1614
        """Check that none of the file_ids in new_ids are present in a tree."""
1615
        if not new_ids:
1616
            return
1617
        id_index = self._get_id_index()
1618
        for file_id in new_ids:
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
1619
            for key in id_index.get(file_id, ()):
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1620
                block_i, entry_i, d_present, f_present = \
1621
                    self._get_block_entry_index(key[0], key[1], tree_index)
1622
                if not f_present:
1623
                    # In a different tree
1624
                    continue
1625
                entry = self._dirblocks[block_i][1][entry_i]
1626
                if entry[0][2] != file_id:
1627
                    # Different file_id, so not what we want.
1628
                    continue
1629
                # NB: No changes made before this helper is called, so no need
1630
                # to set the _changes_aborted flag.
1631
                raise errors.InconsistentDelta(
1632
                    ("%s/%s" % key[0:2]).decode('utf8'), file_id,
1633
                    "This file_id is new in the delta but already present in "
1634
                    "the target")
1635
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1636
    def _update_basis_apply_adds(self, adds):
1637
        """Apply a sequence of adds to tree 1 during update_basis_by_delta.
1638
1639
        They may be adds, or renames that have been split into add/delete
1640
        pairs.
1641
1642
        :param adds: A sequence of adds. Each add is a tuple:
2929.2.3 by Robert Collins
Review feedback.
1643
            (None, new_path_utf8, file_id, (entry_details), real_add). real_add
1644
            is False when the add is the second half of a remove-and-reinsert
1645
            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
1646
        """
1647
        # Adds are accumulated partly from renames, so can be in any input
1648
        # order - sort it.
1649
        adds.sort()
1650
        # adds is now in lexographic order, which places all parents before
1651
        # their children, so we can process it linearly.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1652
        absent = 'ar'
1653
        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
1654
            # the entry for this file_id must be in tree 0.
1655
            entry = self._get_entry(0, file_id, new_path)
5876.1.1 by John Arbash Meinel
Fix bug #781168, and allow WT.update_basis_by_delta
1656
            if entry[0] is None:
1657
                # new_path is not versioned in the active WT state,
1658
                # but we are adding it to the basis tree state, we
1659
                # need to create a new entry record for it.
1660
                dirname, basename = osutils.split(new_path)
1661
                entry_key = (dirname, basename, file_id)
1662
                _, block = self._find_block(entry_key, add_if_missing=True)
5876.1.2 by John Arbash Meinel
Remove an assertion check that wouldn't actually help people.
1663
                index, _ = self._find_entry_index(entry_key, block)
1664
                entry = (entry_key, [DirState.NULL_PARENT_DETAILS]*2)
1665
                block.insert(index, entry)
5876.1.1 by John Arbash Meinel
Fix bug #781168, and allow WT.update_basis_by_delta
1666
            elif 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
1667
                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
1668
                raise errors.InconsistentDelta(new_path, file_id,
1669
                    'working tree does not contain new entry')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1670
            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
1671
                self._changes_aborted = True
1672
                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
1673
                    'The entry was considered to be a genuinely new record,'
1674
                    ' 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
1675
            # We don't need to update the target of an 'r' because the handling
1676
            # of renames turns all 'r' situations into a delete at the original
1677
            # location.
1678
            entry[1][1] = new_details
1679
1680
    def _update_basis_apply_changes(self, changes):
1681
        """Apply a sequence of changes to tree 1 during update_basis_by_delta.
1682
1683
        :param adds: A sequence of changes. Each change is a tuple:
1684
            (path_utf8, path_utf8, file_id, (entry_details))
1685
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1686
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1687
        for old_path, new_path, file_id, new_details in changes:
1688
            # the entry for this file_id must be in tree 0.
1689
            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
1690
            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
1691
                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
1692
                raise errors.InconsistentDelta(new_path, file_id,
1693
                    '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
1694
            if (entry[1][0][0] in absent or
1695
                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
1696
                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
1697
                raise errors.InconsistentDelta(new_path, file_id,
1698
                    'changed considered absent')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1699
            entry[1][1] = new_details
1700
1701
    def _update_basis_apply_deletes(self, deletes):
1702
        """Apply a sequence of deletes to tree 1 during update_basis_by_delta.
1703
1704
        They may be deletes, or renames that have been split into add/delete
1705
        pairs.
1706
2929.2.3 by Robert Collins
Review feedback.
1707
        :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.
1708
            (old_path_utf8, new_path_utf8, file_id, None, real_delete).
1709
            real_delete is True when the desired outcome is an actual deletion
1710
            rather than the rename handling logic temporarily deleting a path
1711
            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
1712
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1713
        null = DirState.NULL_PARENT_DETAILS
1714
        for old_path, new_path, file_id, _, real_delete in deletes:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1715
            if real_delete != (new_path is None):
4526.9.18 by Robert Collins
Be more comprehensive about marking dirstate as changes aborted when exceptions are raised when errors are raised.
1716
                self._changes_aborted = True
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1717
                raise AssertionError("bad delete delta")
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1718
            # the entry for this file_id must be in tree 1.
1719
            dirname, basename = osutils.split(old_path)
1720
            block_index, entry_index, dir_present, file_present = \
1721
                self._get_block_entry_index(dirname, basename, 1)
1722
            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
1723
                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
1724
                raise errors.InconsistentDelta(old_path, file_id,
1725
                    '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
1726
            entry = self._dirblocks[block_index][1][entry_index]
1727
            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
1728
                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
1729
                raise errors.InconsistentDelta(old_path, file_id,
1730
                    'mismatched file_id in tree 1')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1731
            if real_delete:
5876.1.1 by John Arbash Meinel
Fix bug #781168, and allow WT.update_basis_by_delta
1732
                if entry[1][0][0] == 'a':
1733
                    # The file was marked as deleted in the active
1734
                    # state, and it is now deleted in the basis state,
1735
                    # so just remove the record entirely
1736
                    del self._dirblocks[block_index][1][entry_index]
1737
                else:
1738
                    # The basis entry needs to be marked deleted
1739
                    entry[1][1] = null
1740
                # If we are deleting a directory, we need to make sure
1741
                # that all of its children are already deleted
1742
                block_i, entry_i, d_present, f_present = \
1743
                    self._get_block_entry_index(old_path, '', 0)
1744
                if d_present:
1745
                    # The dir block is still present in the dirstate; this could
1746
                    # be due to it being in a parent tree, or a corrupt delta.
1747
                    for child_entry in self._dirblocks[block_i][1]:
1748
                        if child_entry[1][1][0] not in ('r', 'a'):
1749
                            self._changes_aborted = True
1750
                            raise errors.InconsistentDelta(old_path, entry[0][2],
1751
                                "The file id was deleted but its children were "
1752
                                "not deleted.")
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1753
            else:
1754
                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
1755
                    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
1756
                    raise errors.InconsistentDelta(old_path, file_id,
1757
                        'The entry was considered a rename, but the source path'
1758
                        ' is marked as absent.')
1759
                    # For whatever reason, we were asked to rename an entry
1760
                    # that was originally marked as deleted. This could be
1761
                    # because we are renaming the parent directory, and the WT
1762
                    # current state has the file marked as deleted.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1763
                elif entry[1][0][0] == 'r':
1764
                    # implement the rename
1765
                    del self._dirblocks[block_index][1][entry_index]
1766
                else:
1767
                    # it is being resurrected here, so blank it out temporarily.
5876.1.1 by John Arbash Meinel
Fix bug #781168, and allow WT.update_basis_by_delta
1768
                    # should be equivalent to entry[1][1] = null
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1769
                    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
1770
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1771
    def _after_delta_check_parents(self, parents, index):
1772
        """Check that parents required by the delta are all intact.
1773
        
1774
        :param parents: An iterable of (path_utf8, file_id) tuples which are
1775
            required to be present in tree 'index' at path_utf8 with id file_id
1776
            and be a directory.
1777
        :param index: The column in the dirstate to check for parents in.
1778
        """
4505.5.9 by Robert Collins
Review feedback.
1779
        for dirname_utf8, file_id in parents:
1780
            # Get the entry - the ensures that file_id, dirname_utf8 exists and
1781
            # has the right file id.
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1782
            entry = self._get_entry(index, file_id, dirname_utf8)
4505.5.6 by Robert Collins
Check for missing parents in deltas.
1783
            if entry[1] is None:
1784
                self._changes_aborted = True
4505.5.9 by Robert Collins
Review feedback.
1785
                raise errors.InconsistentDelta(dirname_utf8.decode('utf8'),
1786
                    file_id, "This parent is not present.")
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1787
            # Parents of things must be directories
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1788
            if entry[1][index][0] != 'd':
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1789
                self._changes_aborted = True
4505.5.9 by Robert Collins
Review feedback.
1790
                raise errors.InconsistentDelta(dirname_utf8.decode('utf8'),
1791
                    file_id, "This parent is not a directory.")
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1792
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
1793
    def _observed_sha1(self, entry, sha1, stat_value,
1794
        _stat_to_minikind=_stat_to_minikind, _pack_stat=pack_stat):
1795
        """Note the sha1 of a file.
1796
1797
        :param entry: The entry the sha1 is for.
1798
        :param sha1: The observed sha1.
1799
        :param stat_value: The os.lstat for the file.
1800
        """
1801
        try:
1802
            minikind = _stat_to_minikind[stat_value.st_mode & 0170000]
1803
        except KeyError:
1804
            # Unhandled kind
1805
            return None
1806
        packed_stat = _pack_stat(stat_value)
1807
        if minikind == 'f':
1808
            if self._cutoff_time is None:
1809
                self._sha_cutoff_time()
1810
            if (stat_value.st_mtime < self._cutoff_time
1811
                and stat_value.st_ctime < self._cutoff_time):
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
1812
                entry[1][0] = ('f', sha1, stat_value.st_size, entry[1][0][3],
1813
                               packed_stat)
5807.4.3 by John Arbash Meinel
Get the test suite to run clean for bt.test_dirstate bt.test__dirstate bt.test_workingtree
1814
                self._mark_modified([entry])
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
1815
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1816
    def _sha_cutoff_time(self):
1817
        """Return cutoff time.
1818
1819
        Files modified more recently than this time are at risk of being
1820
        undetectably modified and so can't be cached.
1821
        """
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.
1822
        # Cache the cutoff time as long as we hold a lock.
1823
        # time.time() isn't super expensive (approx 3.38us), but
1824
        # when you call it 50,000 times it adds up.
1825
        # For comparison, os.lstat() costs 7.2us if it is hot.
1826
        self._cutoff_time = int(time.time()) - 3
1827
        return self._cutoff_time
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1828
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1829
    def _lstat(self, abspath, entry):
1830
        """Return the os.lstat value for this path."""
1831
        return os.lstat(abspath)
1832
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
1833
    def _sha1_file_and_mutter(self, abspath):
1834
        # when -Dhashcache is turned on, this is monkey-patched in to log
1835
        # file reads
1836
        trace.mutter("dirstate sha1 " + abspath)
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
1837
        return self._sha1_provider.sha1(abspath)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1838
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1839
    def _is_executable(self, mode, old_executable):
1840
        """Is this file executable?"""
1841
        return bool(S_IEXEC & mode)
1842
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
1843
    def _is_executable_win32(self, mode, old_executable):
1844
        """On win32 the executable bit is stored in the dirstate."""
1845
        return old_executable
1846
1847
    if sys.platform == 'win32':
1848
        _is_executable = _is_executable_win32
1849
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1850
    def _read_link(self, abspath, old_link):
1851
        """Read the target of a symlink"""
1852
        # 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
1853
        #       already in memory. However, this really needs to be done at a
1854
        #       higher level, because there either won't be anything on disk,
1855
        #       or the thing on disk will be a file.
4095.3.3 by Vincent Ladeuil
Fixed as per John's review.
1856
        fs_encoding = osutils._fs_enc
4095.3.2 by Vincent Ladeuil
Better fix covering more code paths.
1857
        if isinstance(abspath, unicode):
1858
            # abspath is defined as the path to pass to lstat. readlink is
1859
            # buggy in python < 2.6 (it doesn't encode unicode path into FS
1860
            # encoding), so we need to encode ourselves knowing that unicode
1861
            # paths are produced by UnicodeDirReader on purpose.
4095.3.3 by Vincent Ladeuil
Fixed as per John's review.
1862
            abspath = abspath.encode(fs_encoding)
1863
        target = os.readlink(abspath)
1864
        if fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
1865
            # Change encoding if needed
1866
            target = target.decode(fs_encoding).encode('UTF-8')
1867
        return target
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1868
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.
1869
    def get_ghosts(self):
1870
        """Return a list of the parent tree revision ids that are ghosts."""
1871
        self._read_header_if_needed()
1872
        return self._ghosts
1873
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1874
    def get_lines(self):
1875
        """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.
1876
        if (self._header_state == DirState.IN_MEMORY_UNMODIFIED and
1877
            self._dirblock_state == DirState.IN_MEMORY_UNMODIFIED):
4379.5.2 by Ian Clatworthy
speed up dirstate serialisation, making status faster
1878
            # read what's on disk.
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.
1879
            self._state_file.seek(0)
1880
            return self._state_file.readlines()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1881
        lines = []
1882
        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.
1883
        lines.append(self._get_ghosts_line(self._ghosts))
4379.5.4 by Ian Clatworthy
unroll smart saving logic into one loop in one routine
1884
        lines.extend(self._get_entry_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.
1885
        return self._get_output_lines(lines)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1886
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.
1887
    def _get_ghosts_line(self, ghost_ids):
1888
        """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.
1889
        return '\0'.join([str(len(ghost_ids))] + ghost_ids)
1890
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1891
    def _get_parents_line(self, parent_ids):
1892
        """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.
1893
        return '\0'.join([str(len(parent_ids))] + parent_ids)
1894
4379.5.4 by Ian Clatworthy
unroll smart saving logic into one loop in one routine
1895
    def _get_entry_lines(self):
1896
        """Create lines for entries."""
4379.5.7 by Ian Clatworthy
apply review feedback
1897
        return map(self._entry_to_line, self._iter_entries())
4379.5.4 by Ian Clatworthy
unroll smart saving logic into one loop in one routine
1898
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1899
    def _get_fields_to_entry(self):
1900
        """Get a function which converts entry fields into a entry record.
1901
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1902
        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.
1903
1904
        :return: A function which takes a list of fields, and returns an
1905
            appropriate record for storing in memory.
1906
        """
1907
        # This is intentionally unrolled for performance
1908
        num_present_parents = self._num_present_parents()
1909
        if num_present_parents == 0:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1910
            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])
1911
                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.
1912
                return (path_name_file_id_key, [
1913
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1914
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1915
                        fields[4],                # fingerprint
1916
                        _int(fields[5]),          # size
1917
                        fields[6] == 'y',         # executable
1918
                        fields[7],                # packed_stat or revision_id
1919
                    )])
1920
            return fields_to_entry_0_parents
1921
        elif num_present_parents == 1:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1922
            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])
1923
                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.
1924
                return (path_name_file_id_key, [
1925
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1926
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1927
                        fields[4],                # fingerprint
1928
                        _int(fields[5]),          # size
1929
                        fields[6] == 'y',         # executable
1930
                        fields[7],                # packed_stat or revision_id
1931
                    ),
1932
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1933
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1934
                        fields[9],                # fingerprint
1935
                        _int(fields[10]),         # size
1936
                        fields[11] == 'y',        # executable
1937
                        fields[12],               # packed_stat or revision_id
1938
                    ),
1939
                    ])
1940
            return fields_to_entry_1_parent
1941
        elif num_present_parents == 2:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1942
            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])
1943
                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.
1944
                return (path_name_file_id_key, [
1945
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1946
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1947
                        fields[4],                # fingerprint
1948
                        _int(fields[5]),          # size
1949
                        fields[6] == 'y',         # executable
1950
                        fields[7],                # packed_stat or revision_id
1951
                    ),
1952
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1953
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1954
                        fields[9],                # fingerprint
1955
                        _int(fields[10]),         # size
1956
                        fields[11] == 'y',        # executable
1957
                        fields[12],               # packed_stat or revision_id
1958
                    ),
1959
                    ( # Parent 2
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1960
                        fields[13],               # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1961
                        fields[14],               # fingerprint
1962
                        _int(fields[15]),         # size
1963
                        fields[16] == 'y',        # executable
1964
                        fields[17],               # packed_stat or revision_id
1965
                    ),
1966
                    ])
1967
            return fields_to_entry_2_parents
1968
        else:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1969
            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])
1970
                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
1971
                trees = [(fields[cur],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1972
                          fields[cur+1],              # fingerprint
1973
                          _int(fields[cur+2]),        # size
1974
                          fields[cur+3] == 'y',       # executable
1975
                          fields[cur+4],              # stat or revision_id
1976
                         ) for cur in xrange(3, len(fields)-1, 5)]
1977
                return path_name_file_id_key, trees
1978
            return fields_to_entry_n_parents
1979
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1980
    def get_parent_ids(self):
1981
        """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.
1982
        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.
1983
        return list(self._parents)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1984
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1985
    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.
1986
        """Get the coordinates for a path in the state structure.
1987
1988
        :param dirname: The utf8 dirname to lookup.
1989
        :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.
1990
        :param tree_index: The index of the tree for which this lookup should
1991
            be attempted.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1992
        :return: A tuple describing where the path is located, or should be
1993
            inserted. The tuple contains four fields: the block index, the row
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1994
            index, the directory is present (boolean), the entire path is
1995
            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.
1996
            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.
1997
            True. For instance, a directory not present in the searched tree
1998
            may be returned with a value one greater than the current highest
1999
            block offset. The directory present field will always be True when
2000
            the path present field is True. The directory present field does
2001
            NOT indicate that the directory is present in the searched tree,
2002
            rather it indicates that there are at least some files in some
2003
            tree present there.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
2004
        """
2005
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2006
        key = dirname, basename, ''
2007
        block_index, present = self._find_block_index_from_key(key)
2008
        if not present:
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
2009
            # no such directory - return the dir index and 0 for the row.
2010
            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.
2011
        block = self._dirblocks[block_index][1] # access the entries only
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2012
        entry_index, present = self._find_entry_index(key, block)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
2013
        # 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.
2014
        # requested.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2015
        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.
2016
            if block[entry_index][1][tree_index][0] not in 'ar':
2017
                # neither absent or relocated
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2018
                return block_index, entry_index, True, True
2019
            entry_index += 1
2020
        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.
2021
3923.2.1 by Charles Duffy
Fix bug #314251 (dirstate crash on rename via delete+add)
2022
    def _get_entry(self, tree_index, fileid_utf8=None, path_utf8=None, include_deleted=False):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2023
        """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.
2024
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2025
        If either file_id or path is supplied, it is used as the key to lookup.
2026
        If both are supplied, the fastest lookup is used, and an error is
2027
        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.
2028
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2029
        :param tree_index: The index of the tree we wish to locate this path
2030
            in. If the path is present in that tree, the entry containing its
2031
            details is returned, otherwise (None, None) is returned
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
2032
            0 is the working tree, higher indexes are successive parent
2033
            trees.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2034
        :param fileid_utf8: A utf8 file_id to look up.
2035
        :param path_utf8: An utf8 path to be looked up.
3923.2.2 by Charles Duffy
Update fix for #314251 per feedback from Ian
2036
        :param include_deleted: If True, and performing a lookup via
2037
            fileid_utf8 rather than path_utf8, return an entry for deleted
2038
            (absent) paths.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2039
        :return: The dirstate entry tuple for path, or (None, None)
2040
        """
2255.2.94 by Robert Collins
DirState: handle id lookup redirects correctly.
2041
        self._read_dirblocks_if_needed()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2042
        if path_utf8 is not None:
3376.2.8 by Martin Pool
Some review cleanups for assertion removal
2043
            if type(path_utf8) is not str:
4505.5.8 by Robert Collins
Fix fallout from the delta checking work, don't error on deltas containing the root inventory item in CHK delta application, and clean up Inventory docs.
2044
                raise errors.BzrError('path_utf8 is not a str: %s %r'
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2045
                    % (type(path_utf8), path_utf8))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2046
            # path lookups are faster
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2047
            dirname, basename = osutils.split(path_utf8)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2048
            block_index, entry_index, dir_present, file_present = \
2049
                self._get_block_entry_index(dirname, basename, tree_index)
2050
            if not file_present:
2051
                return None, None
2052
            entry = self._dirblocks[block_index][1][entry_index]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2053
            if not (entry[0][2] and entry[1][tree_index][0] not in ('a', 'r')):
2054
                raise AssertionError('unversioned entry?')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2055
            if fileid_utf8:
2056
                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
2057
                    self._changes_aborted = True
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2058
                    raise errors.BzrError('integrity error ? : mismatching'
2059
                                          ' tree_index, file_id and path')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2060
            return entry
2061
        else:
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
2062
            possible_keys = self._get_id_index().get(fileid_utf8, ())
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2063
            if not possible_keys:
2064
                return None, None
2065
            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.
2066
                block_index, present = \
2067
                    self._find_block_index_from_key(key)
2068
                # strange, probably indicates an out of date
2069
                # id index - for now, allow this.
2070
                if not present:
2071
                    continue
2072
                # WARNING: DO not change this code to use _get_block_entry_index
2073
                # as that function is not suitable: it does not use the key
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2074
                # 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.
2075
                block = self._dirblocks[block_index][1]
2076
                entry_index, present = self._find_entry_index(key, block)
2077
                if present:
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2078
                    entry = self._dirblocks[block_index][1][entry_index]
4634.123.9 by John Arbash Meinel
Fix a bug in the dirstate logic for 'set_path_id'.
2079
                    # TODO: We might want to assert that entry[0][2] ==
2080
                    #       fileid_utf8.
2255.2.172 by Martin Pool
Recognize 't' (tree-reference) minikind in DirState._get_entry
2081
                    if entry[1][tree_index][0] in 'fdlt':
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2082
                        # this is the result we are looking for: the
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.
2083
                        # real home of this file_id in this tree.
2084
                        return entry
2085
                    if entry[1][tree_index][0] == 'a':
2086
                        # there is no home for this entry in this tree
3923.2.1 by Charles Duffy
Fix bug #314251 (dirstate crash on rename via delete+add)
2087
                        if include_deleted:
2088
                            return entry
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.
2089
                        return None, None
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2090
                    if entry[1][tree_index][0] != 'r':
2091
                        raise AssertionError(
2092
                            "entry %r has invalid minikind %r for tree %r" \
2093
                            % (entry,
2094
                               entry[1][tree_index][0],
2095
                               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.
2096
                    real_path = entry[1][tree_index][1]
2097
                    return self._get_entry(tree_index, fileid_utf8=fileid_utf8,
2098
                        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.
2099
            return None, None
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
2100
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
2101
    @classmethod
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2102
    def initialize(cls, path, sha1_provider=None):
1852.13.20 by Robert Collins
Steps toward an object model.
2103
        """Create a new dirstate on path.
2104
2105
        The new dirstate will be an empty tree - that is it has no parents,
2106
        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.
2107
1852.13.20 by Robert Collins
Steps toward an object model.
2108
        :param path: The name of the file for the dirstate.
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2109
        :param sha1_provider: an object meeting the SHA1Provider interface.
2110
            If None, a DefaultSHA1Provider is used.
2425.5.1 by Martin Pool
doc Dirstate.initialize
2111
        :return: A write-locked DirState object.
1852.13.20 by Robert Collins
Steps toward an object model.
2112
        """
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.
2113
        # This constructs a new DirState object on a path, sets the _state_file
1852.13.20 by Robert Collins
Steps toward an object model.
2114
        # to a new empty file for that path. It then calls _set_data() with our
2115
        # stock empty dirstate information - a root with ROOT_ID, no children,
2116
        # and no parents. Finally it calls save() to ensure that this data will
2117
        # persist.
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2118
        if sha1_provider is None:
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2119
            sha1_provider = DefaultSHA1Provider()
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2120
        result = cls(path, sha1_provider)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2121
        # root dir and root dir contents with no children.
2122
        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.
2123
        # a new root directory, with a NULLSTAT.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2124
        empty_tree_dirblocks[0][1].append(
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
2125
            (('', '', inventory.ROOT_ID), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2126
                ('d', '', 0, False, DirState.NULLSTAT),
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2127
            ]))
2255.4.2 by James Westby
(broken) Add the locking methods.
2128
        result.lock_write()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2129
        try:
2255.4.2 by James Westby
(broken) Add the locking methods.
2130
            result._set_data([], empty_tree_dirblocks)
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2131
            result.save()
2132
        except:
2255.4.2 by James Westby
(broken) Add the locking methods.
2133
            result.unlock()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2134
            raise
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2135
        return result
2136
3477.2.1 by John Arbash Meinel
Assert that we properly encode inv_entry.symlink_target, (bug #135320)
2137
    @staticmethod
2138
    def _inv_entry_to_details(inv_entry):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2139
        """Convert an inventory entry (from a revision tree) to state details.
2140
2141
        :param inv_entry: An inventory entry whose sha1 and link targets can be
2142
            relied upon, and which has a revision set.
2143
        :return: A details tuple - the details for a single tree at a path +
2144
            id.
2145
        """
2146
        kind = inv_entry.kind
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2147
        minikind = DirState._kind_to_minikind[kind]
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2148
        tree_data = inv_entry.revision
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2149
        if kind == 'directory':
2150
            fingerprint = ''
2151
            size = 0
2152
            executable = False
2153
        elif kind == 'symlink':
4095.3.3 by Vincent Ladeuil
Fixed as per John's review.
2154
            if inv_entry.symlink_target is None:
2155
                fingerprint = ''
2156
            else:
2157
                fingerprint = inv_entry.symlink_target.encode('utf8')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2158
            size = 0
2159
            executable = False
2160
        elif kind == 'file':
2161
            fingerprint = inv_entry.text_sha1 or ''
2162
            size = inv_entry.text_size or 0
2163
            executable = inv_entry.executable
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2164
        elif kind == 'tree-reference':
2165
            fingerprint = inv_entry.reference_revision or ''
2166
            size = 0
2167
            executable = False
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2168
        else:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2169
            raise Exception("can't pack %s" % inv_entry)
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2170
        return static_tuple.StaticTuple(minikind, fingerprint, size,
2171
                                        executable, tree_data)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2172
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
2173
    def _iter_child_entries(self, tree_index, path_utf8):
2174
        """Iterate over all the entries that are children of path_utf.
2175
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2176
        This only returns entries that are present (not in 'a', 'r') in
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
2177
        tree_index. tree_index data is not refreshed, so if tree 0 is used,
2178
        results may differ from that obtained if paths were statted to
2179
        determine what ones were directories.
2180
2181
        Asking for the children of a non-directory will return an empty
2182
        iterator.
2183
        """
2184
        pending_dirs = []
2185
        next_pending_dirs = [path_utf8]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2186
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
2187
        while next_pending_dirs:
2188
            pending_dirs = next_pending_dirs
2189
            next_pending_dirs = []
2190
            for path in pending_dirs:
2191
                block_index, present = self._find_block_index_from_key(
2192
                    (path, '', ''))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2193
                if block_index == 0:
2194
                    block_index = 1
2195
                    if len(self._dirblocks) == 1:
2196
                        # asked for the children of the root with no other
2197
                        # contents.
2198
                        return
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
2199
                if not present:
2200
                    # children of a non-directory asked for.
2201
                    continue
2202
                block = self._dirblocks[block_index]
2203
                for entry in block[1]:
2204
                    kind = entry[1][tree_index][0]
2205
                    if kind not in absent:
2206
                        yield entry
2207
                    if kind == 'd':
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2208
                        if entry[0][0]:
2209
                            path = entry[0][0] + '/' + entry[0][1]
2210
                        else:
2211
                            path = entry[0][1]
2212
                        next_pending_dirs.append(path)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2213
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2214
    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.
2215
        """Iterate over all the entries in the dirstate.
2216
2217
        Each yelt item is an entry in the standard format described in the
2218
        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.
2219
        """
2220
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2221
        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.
2222
            for entry in directory[1]:
2223
                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.
2224
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2225
    def _get_id_index(self):
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2226
        """Get an id index of self._dirblocks.
2227
        
2228
        This maps from file_id => [(directory, name, file_id)] entries where
2229
        that file_id appears in one of the trees.
2230
        """
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2231
        if self._id_index is None:
2232
            id_index = {}
2233
            for key, tree_details in self._iter_entries():
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2234
                self._add_to_id_index(id_index, key)
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2235
            self._id_index = id_index
2236
        return self._id_index
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2237
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2238
    def _add_to_id_index(self, id_index, entry_key):
2239
        """Add this entry to the _id_index mapping."""
2240
        # This code used to use a set for every entry in the id_index. However,
2241
        # it is *rare* to have more than one entry. So a set is a large
2242
        # overkill. And even when we do, we won't ever have more than the
2243
        # number of parent trees. Which is still a small number (rarely >2). As
2244
        # such, we use a simple tuple, and do our own uniqueness checks. While
2245
        # the 'in' check is O(N) since N is nicely bounded it shouldn't ever
2246
        # cause quadratic failure.
2247
        # TODO: This should use StaticTuple
2248
        file_id = entry_key[2]
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
2249
        entry_key = static_tuple.StaticTuple.from_sequence(entry_key)
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2250
        if file_id not in id_index:
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
2251
            id_index[file_id] = static_tuple.StaticTuple(entry_key,)
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2252
        else:
2253
            entry_keys = id_index[file_id]
2254
            if entry_key not in entry_keys:
2255
                id_index[file_id] = entry_keys + (entry_key,)
2256
2257
    def _remove_from_id_index(self, id_index, entry_key):
2258
        """Remove this entry from the _id_index mapping.
2259
2260
        It is an programming error to call this when the entry_key is not
2261
        already present.
2262
        """
2263
        file_id = entry_key[2]
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
2264
        entry_keys = list(id_index[file_id])
2265
        entry_keys.remove(entry_key)
2266
        id_index[file_id] = static_tuple.StaticTuple.from_sequence(entry_keys)
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2267
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2268
    def _get_output_lines(self, lines):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2269
        """Format lines for final output.
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
2270
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2271
        :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.
2272
            path lines.
2273
        """
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
2274
        output_lines = [DirState.HEADER_FORMAT_3]
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2275
        lines.append('') # a final newline
2276
        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.
2277
        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.
2278
        # -3, 1 for num parents, 1 for ghosts, 1 for final newline
2279
        num_entries = len(lines)-3
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2280
        output_lines.append('num_entries: %s\n' % (num_entries,))
2281
        output_lines.append(inventory_text)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2282
        return output_lines
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2283
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
2284
    def _make_deleted_row(self, fileid_utf8, parents):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2285
        """Return a deleted row for fileid_utf8."""
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
2286
        return ('/', 'RECYCLED.BIN', 'file', fileid_utf8, 0, DirState.NULLSTAT,
2287
            ''), parents
2288
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
2289
    def _num_present_parents(self):
2290
        """The number of parent entries in each record row."""
2291
        return len(self._parents) - len(self._ghosts)
2292
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
2293
    @classmethod
2294
    def on_file(cls, path, sha1_provider=None, worth_saving_limit=0):
4031.3.1 by Frank Aspell
Fixing various typos
2295
        """Construct a DirState on the file at path "path".
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
2296
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2297
        :param path: The path at which the dirstate file on disk should live.
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2298
        :param sha1_provider: an object meeting the SHA1Provider interface.
2299
            If None, a DefaultSHA1Provider is used.
4379.5.7 by Ian Clatworthy
apply review feedback
2300
        :param worth_saving_limit: when the exact number of hash changed
2301
            entries is known, only bother saving the dirstate if more than
2302
            this count of entries have changed. -1 means never save.
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
2303
        :return: An unlocked DirState object, associated with the given path.
2304
        """
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2305
        if sha1_provider is None:
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2306
            sha1_provider = DefaultSHA1Provider()
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
2307
        result = cls(path, sha1_provider,
2308
                     worth_saving_limit=worth_saving_limit)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2309
        return result
2310
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.
2311
    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.
2312
        """Read in all the dirblocks from the file if they are not in memory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2313
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2314
        This populates self._dirblocks, and sets self._dirblock_state to
2315
        IN_MEMORY_UNMODIFIED. It is not currently ready for incremental block
2316
        loading.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2317
        """
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.
2318
        self._read_header_if_needed()
2319
        if self._dirblock_state == DirState.NOT_IN_MEMORY:
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
2320
            _read_dirblocks(self)
4379.5.2 by Ian Clatworthy
speed up dirstate serialisation, making status faster
2321
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2322
    def _read_header(self):
2323
        """This reads in the metadata header, and the parent ids.
2324
2325
        After reading in, the file should be positioned at the null
2326
        just before the start of the first record in the file.
2327
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.
2328
        :return: (expected crc checksum, number of entries, parent list)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2329
        """
2330
        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.
2331
        parent_line = self._state_file.readline()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2332
        info = parent_line.split('\0')
2333
        num_parents = int(info[0])
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
2334
        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.
2335
        ghost_line = self._state_file.readline()
2336
        info = ghost_line.split('\0')
2337
        num_ghosts = int(info[1])
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
2338
        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.
2339
        self._header_state = DirState.IN_MEMORY_UNMODIFIED
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
2340
        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.
2341
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2342
    def _read_header_if_needed(self):
2343
        """Read the header of the dirstate file if needed."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2344
        # inline this as it will be called a lot
2345
        if not self._lock_token:
2346
            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.
2347
        if self._header_state == DirState.NOT_IN_MEMORY:
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2348
            self._read_header()
2349
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2350
    def _read_prelude(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2351
        """Read in the prelude header of the dirstate file.
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2352
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.
2353
        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.
2354
        checksum. The position will be correct to read in the rest of
2355
        the file and check the checksum after this point.
2356
        The next entry in the file should be the number of parents,
2357
        and their ids. Followed by a newline.
2358
        """
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.
2359
        header = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2360
        if header != DirState.HEADER_FORMAT_3:
2361
            raise errors.BzrError(
2362
                '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.
2363
        crc_line = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2364
        if not crc_line.startswith('crc32: '):
2365
            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.
2366
        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.
2367
        num_entries_line = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2368
        if not num_entries_line.startswith('num_entries: '):
2369
            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.
2370
        self._num_entries = int(num_entries_line[len('num_entries: '):-1])
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2371
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2372
    def sha1_from_stat(self, path, stat_result, _pack_stat=pack_stat):
2373
        """Find a sha1 given a stat lookup."""
2374
        return self._get_packed_stat_index().get(_pack_stat(stat_result), None)
2375
2376
    def _get_packed_stat_index(self):
2377
        """Get a packed_stat index of self._dirblocks."""
2378
        if self._packed_stat_index is None:
2379
            index = {}
2380
            for key, tree_details in self._iter_entries():
2381
                if tree_details[0][0] == 'f':
2929.1.2 by Robert Collins
Review feedback.
2382
                    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.
2383
            self._packed_stat_index = index
2384
        return self._packed_stat_index
2385
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2386
    def save(self):
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2387
        """Save any pending changes created during this session.
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2388
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2389
        We reuse the existing file, because that prevents race conditions with
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2390
        file creation, and use oslocks on it to prevent concurrent modification
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2391
        and reads - because dirstate's incremental data aggregation is not
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2392
        compatible with reading a modified file, and replacing a file in use by
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2393
        another process is impossible on Windows.
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2394
2395
        A dirstate in read only mode should be smart enough though to validate
2396
        that the file has not changed, and otherwise discard its cache and
2397
        start over, to allow for fine grained read lock duration, so 'status'
2398
        wont block 'commit' - for example.
2399
        """
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
2400
        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
2401
            # Should this be a warning? For now, I'm expecting that places that
2402
            # 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
2403
            trace.mutter('Not saving DirState because '
2404
                    '_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
2405
            return
5807.4.3 by John Arbash Meinel
Get the test suite to run clean for bt.test_dirstate bt.test__dirstate bt.test_workingtree
2406
        # TODO: Since we now distinguish IN_MEMORY_MODIFIED from
2407
        #       IN_MEMORY_HASH_MODIFIED, we should only fail quietly if we fail
2408
        #       to save an IN_MEMORY_HASH_MODIFIED, and fail *noisily* if we
2409
        #       fail to save IN_MEMORY_MODIFIED
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2410
        if self._worth_saving():
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2411
            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.
2412
            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,
2413
                grabbed_write_lock, new_lock = self._lock_token.temporary_write_lock()
2414
                # Switch over to the new lock, as the old one may be closed.
2415
                # TODO: jam 20070315 We should validate the disk file has
2416
                #       not changed contents. Since temporary_write_lock may
2417
                #       not be an atomic operation.
2418
                self._lock_token = new_lock
2419
                self._state_file = new_lock.f
2420
                if not grabbed_write_lock:
2421
                    # 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.
2422
                    return
2423
            try:
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2424
                lines = self.get_lines()
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
2425
                self._state_file.seek(0)
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2426
                self._state_file.writelines(lines)
2353.4.5 by John Arbash Meinel
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
2427
                self._state_file.truncate()
2428
                self._state_file.flush()
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2429
                self._mark_unmodified()
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2430
            finally:
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2431
                if grabbed_write_lock:
2353.4.8 by John Arbash Meinel
Use the right lock object.
2432
                    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.
2433
                    self._state_file = self._lock_token.f
2434
                    # TODO: jam 20070315 We should validate the disk file has
2435
                    #       not changed contents. Since restore_read_lock may
2436
                    #       not be an atomic operation.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2437
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2438
    def _worth_saving(self):
2439
        """Is it worth saving the dirstate or not?"""
5807.4.2 by John Arbash Meinel
TODO entry.
2440
        if (self._header_state == DirState.IN_MEMORY_MODIFIED
2441
            or self._dirblock_state == DirState.IN_MEMORY_MODIFIED):
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2442
            return True
5807.4.2 by John Arbash Meinel
TODO entry.
2443
        if self._dirblock_state == DirState.IN_MEMORY_HASH_MODIFIED:
2444
            if self._worth_saving_limit == -1:
2445
                # We never save hash changes when the limit is -1
2446
                return False
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2447
            # If we're using smart saving and only a small number of
4379.5.7 by Ian Clatworthy
apply review feedback
2448
            # entries have changed their hash, don't bother saving. John has
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2449
            # suggested using a heuristic here based on the size of the
2450
            # changed files and/or tree. For now, we go with a configurable
2451
            # number of changes, keeping the calculation time
2452
            # as low overhead as possible. (This also keeps all existing
2453
            # tests passing as the default is 0, i.e. always save.)
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
2454
            if len(self._known_hash_changes) >= self._worth_saving_limit:
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2455
                return True
2456
        return False
2457
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2458
    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.
2459
        """Set the full dirstate data in memory.
1852.13.20 by Robert Collins
Steps toward an object model.
2460
2461
        This is an internal function used to completely replace the objects
2462
        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.
2463
2464
        :param parent_ids: A list of parent tree revision ids.
2465
        :param dirblocks: A list containing one tuple for each directory in the
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2466
            tree. Each tuple contains the directory path and a list of entries
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2467
            found in that directory.
1852.13.20 by Robert Collins
Steps toward an object model.
2468
        """
2469
        # 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.
2470
        self._dirblocks = dirblocks
5807.4.2 by John Arbash Meinel
TODO entry.
2471
        self._mark_modified(header_modified=True)
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.
2472
        self._parents = list(parent_ids)
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2473
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2474
        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.
2475
2255.2.4 by Robert Collins
Snapshot dirstate development
2476
    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.
2477
        """Change the id of path to new_id in the current working tree.
2255.2.4 by Robert Collins
Snapshot dirstate development
2478
2479
        :param path: The path inside the tree to set - '' is the root, 'foo'
2480
            is the path foo in the root.
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2481
        :param new_id: The new id to assign to the path. This must be a utf8
2482
            file id (not unicode, and not None).
2255.2.4 by Robert Collins
Snapshot dirstate development
2483
        """
2255.2.37 by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
2484
        self._read_dirblocks_if_needed()
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2485
        if len(path):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2486
            # TODO: logic not written
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2487
            raise NotImplementedError(self.set_path_id)
2488
        # TODO: check new id is unique
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2489
        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,
2490
        if entry[0][2] == new_id:
2491
            # Nothing to change.
2492
            return
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2493
        # mark the old path absent, and insert a new root path
2494
        self._make_absent(entry)
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2495
        self.update_minimal(('', '', new_id), 'd',
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2496
            path_utf8='', packed_stat=entry[1][0][4])
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2497
        self._mark_modified()
5807.4.2 by John Arbash Meinel
TODO entry.
2498
        # XXX: This was added by Ian, we need to make sure there
2499
        #      are tests for it, because it isn't in bzr.dev TRUNK
2500
        #      It looks like the only place it is called is in setting the root
2501
        #      id of the tree. So probably we never had an _id_index when we
2502
        #      don't even have a root yet.
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2503
        if self._id_index is not None:
5807.4.2 by John Arbash Meinel
TODO entry.
2504
            self._add_to_id_index(self._id_index, entry[0])
2255.2.4 by Robert Collins
Snapshot dirstate development
2505
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.
2506
    def set_parent_trees(self, trees, ghosts):
2507
        """Set the parent trees for the dirstate.
2508
2509
        :param trees: A list of revision_id, tree tuples. tree must be provided
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2510
            even if the revision_id refers to a ghost: supply an empty tree in
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.
2511
            this case.
2512
        :param ghosts: A list of the revision_ids that are ghosts at the time
2513
            of setting.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2514
        """
2515
        # TODO: generate a list of parent indexes to preserve to save
2255.2.4 by Robert Collins
Snapshot dirstate development
2516
        # processing specific parent trees. In the common case one tree will
2517
        # be preserved - the left most parent.
2518
        # TODO: if the parent tree is a dirstate, we might want to walk them
2519
        # all by path in parallel for 'optimal' common-case performance.
2520
        # 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.
2521
        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.
2522
        # TODO future sketch: Examine the existing parents to generate a change
2523
        # map and then walk the new parent trees only, mapping them into the
2524
        # dirstate. Walk the dirstate at the same time to remove unreferenced
2525
        # entries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2526
        # for now:
2527
        # sketch: loop over all entries in the dirstate, cherry picking
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2528
        # entries from the parent trees, if they are not ghost trees.
2255.2.4 by Robert Collins
Snapshot dirstate development
2529
        # after we finish walking the dirstate, all entries not in the dirstate
2530
        # are deletes, so we want to append them to the end as per the design
2531
        # discussions. So do a set difference on ids with the parents to
2532
        # get deletes, and add them to the end.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2533
        # During the update process we need to answer the following questions:
2534
        # - find other keys containing a fileid in order to create cross-path
2535
        #   links. We dont't trivially use the inventory from other trees
2536
        #   because this leads to either double touching, or to accessing
2537
        #   missing keys,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2538
        # - find other keys containing a path
2539
        # We accumulate each entry via this dictionary, including the root
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2540
        by_path = {}
2541
        id_index = {}
2542
        # we could do parallel iterators, but because file id data may be
2543
        # scattered throughout, we dont save on index overhead: we have to look
2544
        # at everything anyway. We can probably save cycles by reusing parent
2545
        # data and doing an incremental update when adding an additional
2546
        # parent, but for now the common cases are adding a new parent (merge),
2547
        # and replacing completely (commit), and commit is more common: so
2548
        # optimise merge later.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2549
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2550
        # ---- start generation of full tree mapping data
2551
        # what trees should we use?
2255.2.4 by Robert Collins
Snapshot dirstate development
2552
        parent_trees = [tree for rev_id, tree in trees if rev_id not in ghosts]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2553
        # how many trees do we end up with
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2554
        parent_count = len(parent_trees)
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2555
        st = static_tuple.StaticTuple
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2556
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2557
        # one: the current tree
2558
        for entry in self._iter_entries():
2559
            # skip entries not in the current tree
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2560
            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.
2561
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2562
            by_path[entry[0]] = [entry[1][0]] + \
2563
                [DirState.NULL_PARENT_DETAILS] * parent_count
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2564
            # TODO: Possibly inline this, since we know it isn't present yet
2565
            #       id_index[entry[0][2]] = (entry[0],)
2566
            self._add_to_id_index(id_index, entry[0])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2567
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2568
        # now the parent trees:
2569
        for tree_index, tree in enumerate(parent_trees):
2570
            # the index is off by one, adjust it.
2571
            tree_index = tree_index + 1
2572
            # when we add new locations for a fileid we need these ranges for
2573
            # any fileid in this tree as we set the by_path[id] to:
2574
            # already_processed_tree_details + new_details + new_location_suffix
2575
            # the suffix is from tree_index+1:parent_count+1.
2576
            new_location_suffix = [DirState.NULL_PARENT_DETAILS] * (parent_count - tree_index)
2577
            # now stitch in all the entries from this tree
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2578
            last_dirname = None
5807.1.4 by Jelmer Vernooij
Use tree.iter_entries_by_dir rather than tree.inventory.entries_by_dir.
2579
            for path, entry in tree.iter_entries_by_dir():
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2580
                # here we process each trees details for each item in the tree.
2581
                # we first update any existing entries for the id at other paths,
2582
                # then we either create or update the entry for the id at the
2583
                # right path, and finally we add (if needed) a mapping from
2584
                # file_id to this path. We do it in this order to allow us to
2585
                # avoid checking all known paths for the id when generating a
2586
                # new entry at this path: by adding the id->path mapping last,
2587
                # all the mappings are valid and have correct relocation
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2588
                # records where needed.
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2589
                file_id = entry.file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2590
                path_utf8 = path.encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2591
                dirname, basename = osutils.split(path_utf8)
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2592
                if dirname == last_dirname:
2593
                    # Try to re-use objects as much as possible
2594
                    dirname = last_dirname
2595
                else:
2596
                    last_dirname = dirname
2597
                new_entry_key = st(dirname, basename, file_id)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2598
                # tree index consistency: All other paths for this id in this tree
2599
                # index must point to the correct path.
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2600
                entry_keys = id_index.get(file_id, ())
2601
                for entry_key in entry_keys:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2602
                    # TODO:PROFILING: It might be faster to just update
2603
                    # rather than checking if we need to, and then overwrite
2604
                    # the one we are located at.
2605
                    if entry_key != new_entry_key:
2606
                        # this file id is at a different path in one of the
2607
                        # other trees, so put absent pointers there
2608
                        # This is the vertical axis in the matrix, all pointing
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2609
                        # to the real path.
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2610
                        by_path[entry_key][tree_index] = st('r', path_utf8, 0,
2611
                                                            False, '')
2612
                # by path consistency: Insert into an existing path record
2613
                # (trivial), or add a new one with relocation pointers for the
2614
                # other tree indexes.
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2615
                if new_entry_key in entry_keys:
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2616
                    # there is already an entry where this data belongs, just
2617
                    # insert it.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2618
                    by_path[new_entry_key][tree_index] = \
2619
                        self._inv_entry_to_details(entry)
2620
                else:
2621
                    # add relocated entries to the horizontal axis - this row
2622
                    # mapping from path,id. We need to look up the correct path
2623
                    # for the indexes from 0 to tree_index -1
2624
                    new_details = []
2625
                    for lookup_index in xrange(tree_index):
2626
                        # boundary case: this is the first occurence of file_id
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2627
                        # so there are no id_indexes, possibly take this out of
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2628
                        # the loop?
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2629
                        if not len(entry_keys):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2630
                            new_details.append(DirState.NULL_PARENT_DETAILS)
2631
                        else:
2632
                            # grab any one entry, use it to find the right path.
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2633
                            a_key = iter(entry_keys).next()
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2634
                            if by_path[a_key][lookup_index][0] in ('r', 'a'):
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2635
                                # its a pointer or missing statement, use it as
2636
                                # is.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2637
                                new_details.append(by_path[a_key][lookup_index])
2638
                            else:
2639
                                # we have the right key, make a pointer to it.
2640
                                real_path = ('/'.join(a_key[0:2])).strip('/')
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2641
                                new_details.append(st('r', real_path, 0, False,
2642
                                                      ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2643
                    new_details.append(self._inv_entry_to_details(entry))
2644
                    new_details.extend(new_location_suffix)
2645
                    by_path[new_entry_key] = new_details
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2646
                    self._add_to_id_index(id_index, new_entry_key)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2647
        # --- 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
2648
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2649
        # sort and output all the entries
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2650
        new_entries = self._sort_entries(by_path.items())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2651
        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.
2652
        self._parents = [rev_id for rev_id, tree in trees]
2653
        self._ghosts = list(ghosts)
5807.4.2 by John Arbash Meinel
TODO entry.
2654
        self._mark_modified(header_modified=True)
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2655
        self._id_index = id_index
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2656
2657
    def _sort_entries(self, entry_list):
2658
        """Given a list of entries, sort them into the right order.
2659
2660
        This is done when constructing a new dirstate from trees - normally we
2661
        try to keep everything in sorted blocks all the time, but sometimes
2662
        it's easier to sort after the fact.
2663
        """
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2664
        # When sorting, we usually have 10x more entries than directories. (69k
2665
        # total entries, 4k directories). So cache the results of splitting.
2666
        # Saving time and objects. Also, use StaticTuple to avoid putting all
2667
        # of these object into python's garbage collector.
5847.1.1 by John Arbash Meinel
DirState._sort_entries was showing up for 'uncommit' times.
2668
        split_dirs = {}
5847.1.5 by John Arbash Meinel
We don't need a second named parameter.
2669
        def _key(entry, _split_dirs=split_dirs, _st=static_tuple.StaticTuple):
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2670
            # sort by: directory parts, file name, file id
5847.1.1 by John Arbash Meinel
DirState._sort_entries was showing up for 'uncommit' times.
2671
            dirpath, fname, file_id = entry[0]
2672
            try:
2673
                split = _split_dirs[dirpath]
2674
            except KeyError:
5847.1.5 by John Arbash Meinel
We don't need a second named parameter.
2675
                split = _st.from_sequence(dirpath.split('/'))
5847.1.1 by John Arbash Meinel
DirState._sort_entries was showing up for 'uncommit' times.
2676
                _split_dirs[dirpath] = split
5847.1.5 by John Arbash Meinel
We don't need a second named parameter.
2677
            return _st(split, fname, file_id)
5847.1.4 by John Arbash Meinel
Remove the profiling code, down to 390ms in the function, 15.163s overall.
2678
        return sorted(entry_list, key=_key)
1852.13.20 by Robert Collins
Steps toward an object model.
2679
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.
2680
    def set_state_from_inventory(self, new_inv):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2681
        """Set new_inv as the current state.
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.
2682
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2683
        This API is called by tree transform, and will usually occur with
2684
        existing parent trees.
2685
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.
2686
        :param new_inv: The inventory object to set current state from.
2687
        """
2872.4.2 by Martin Pool
Treat set_state_from_inventory as evil, and del dead variables rather than just setting to null
2688
        if 'evil' in debug.debug_flags:
2689
            trace.mutter_callsite(1,
2690
                "set_state_from_inventory called; please mutate the tree instead")
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2691
        tracing = 'dirstate' in debug.debug_flags
2692
        if tracing:
2693
            trace.mutter("set_state_from_inventory trace:")
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.
2694
        self._read_dirblocks_if_needed()
2695
        # sketch:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2696
        # Two iterators: current data and new data, both in dirblock order.
2872.4.11 by Martin Pool
Review documentation cleanups
2697
        # We zip them together, which tells about entries that are new in the
2698
        # inventory, or removed in the inventory, or present in both and
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2699
        # possibly changed.
2872.4.11 by Martin Pool
Review documentation cleanups
2700
        #
2701
        # You might think we could just synthesize a new dirstate directly
2702
        # since we're processing it in the right order.  However, we need to
2703
        # also consider there may be any number of parent trees and relocation
2704
        # pointers, and we don't want to duplicate that here.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2705
        new_iterator = new_inv.iter_entries_by_dir()
2255.2.88 by Robert Collins
Significant steps back to operation.
2706
        # we will be modifying the dirstate, so we need a stable iterator. In
2707
        # future we might write one, for now we just clone the state into a
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2708
        # list using a copy so that we see every original item and don't have
2709
        # to adjust the position when items are inserted or deleted in the
2710
        # underlying dirstate.
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2711
        old_iterator = iter(list(self._iter_entries()))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2712
        # both must have roots so this is safe:
2713
        current_new = new_iterator.next()
2714
        current_old = old_iterator.next()
2715
        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.
2716
            try:
2255.2.88 by Robert Collins
Significant steps back to operation.
2717
                return iterator.next()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2718
            except StopIteration:
2719
                return None
2720
        while current_new or current_old:
2721
            # skip entries in old that are not really there
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2722
            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
2723
                # relocated or absent
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2724
                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.
2725
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2726
            if current_new:
2727
                # convert new into dirblock style
2255.2.88 by Robert Collins
Significant steps back to operation.
2728
                new_path_utf8 = current_new[0].encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2729
                new_dirname, new_basename = osutils.split(new_path_utf8)
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2730
                new_id = current_new[1].file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2731
                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.
2732
                current_new_minikind = \
2733
                    DirState._kind_to_minikind[current_new[1].kind]
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2734
                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
2735
                    fingerprint = current_new[1].reference_revision or ''
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2736
                else:
2872.4.7 by Martin Pool
More cleanups of dirstate work
2737
                    # We normally only insert or remove records, or update
2738
                    # them when it has significantly changed.  Then we want to
2739
                    # erase its fingerprint.  Unaffected records should
2740
                    # normally not be updated at all.
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2741
                    fingerprint = ''
2255.2.88 by Robert Collins
Significant steps back to operation.
2742
            else:
2743
                # for safety disable variables
2872.4.7 by Martin Pool
More cleanups of dirstate work
2744
                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
2745
                    new_entry_key = None
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2746
            # 5 cases, we dont have a value that is strictly greater than everything, so
2747
            # we make both end conditions explicit
2872.4.11 by Martin Pool
Review documentation cleanups
2748
            if not current_old:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2749
                # old is finished: insert current_new into the state.
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2750
                if tracing:
2751
                    trace.mutter("Appending from new '%s'.",
2752
                        new_path_utf8.decode('utf8'))
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2753
                self.update_minimal(new_entry_key, current_new_minikind,
2754
                    executable=current_new[1].executable,
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2755
                    path_utf8=new_path_utf8, fingerprint=fingerprint,
2756
                    fullscan=True)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2757
                current_new = advance(new_iterator)
2872.4.11 by Martin Pool
Review documentation cleanups
2758
            elif not current_new:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2759
                # new is finished
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2760
                if tracing:
2761
                    trace.mutter("Truncating from old '%s/%s'.",
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2762
                        current_old[0][0].decode('utf8'),
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2763
                        current_old[0][1].decode('utf8'))
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2764
                self._make_absent(current_old)
2255.2.88 by Robert Collins
Significant steps back to operation.
2765
                current_old = advance(old_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2766
            elif new_entry_key == current_old[0]:
2767
                # same -  common case
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2768
                # We're looking at the same path and id in both the dirstate
2769
                # and inventory, so just need to update the fields in the
2770
                # dirstate from the one in the inventory.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2771
                # TODO: update the record if anything significant has changed.
2255.2.88 by Robert Collins
Significant steps back to operation.
2772
                # the minimal required trigger is if the execute bit or cached
2773
                # kind has changed.
2774
                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.
2775
                    current_old[1][0][0] != current_new_minikind):
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2776
                    if tracing:
2777
                        trace.mutter("Updating in-place change '%s'.",
2778
                            new_path_utf8.decode('utf8'))
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2779
                    self.update_minimal(current_old[0], current_new_minikind,
2255.2.88 by Robert Collins
Significant steps back to operation.
2780
                        executable=current_new[1].executable,
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2781
                        path_utf8=new_path_utf8, fingerprint=fingerprint,
2782
                        fullscan=True)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2783
                # both sides are dealt with, move on
2784
                current_old = advance(old_iterator)
2785
                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
2786
            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
2787
                  or (new_dirname == current_old[0][0]
2788
                      and new_entry_key[1:] < current_old[0][1:])):
2255.2.88 by Robert Collins
Significant steps back to operation.
2789
                # new comes before:
2790
                # add a entry for this and advance new
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2791
                if tracing:
2792
                    trace.mutter("Inserting from new '%s'.",
2793
                        new_path_utf8.decode('utf8'))
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2794
                self.update_minimal(new_entry_key, current_new_minikind,
2795
                    executable=current_new[1].executable,
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2796
                    path_utf8=new_path_utf8, fingerprint=fingerprint,
2797
                    fullscan=True)
2255.2.88 by Robert Collins
Significant steps back to operation.
2798
                current_new = advance(new_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2799
            else:
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2800
                # we've advanced past the place where the old key would be,
2801
                # without seeing it in the new list.  so it must be gone.
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2802
                if tracing:
2803
                    trace.mutter("Deleting from old '%s/%s'.",
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2804
                        current_old[0][0].decode('utf8'),
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2805
                        current_old[0][1].decode('utf8'))
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2806
                self._make_absent(current_old)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2807
                current_old = advance(old_iterator)
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2808
        self._mark_modified()
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2809
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2810
        self._packed_stat_index = None
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2811
        if tracing:
2812
            trace.mutter("set_state_from_inventory complete.")
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2813
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
2814
    def set_state_from_scratch(self, working_inv, parent_trees, parent_ghosts):
2815
        """Wipe the currently stored state and set it to something new.
2816
2817
        This is a hard-reset for the data we are working with.
2818
        """
2819
        # Technically, we really want a write lock, but until we write, we
2820
        # don't really need it.
2821
        self._requires_lock()
2822
        # root dir and root dir contents with no children. We have to have a
2823
        # root for set_state_from_inventory to work correctly.
2824
        empty_root = (('', '', inventory.ROOT_ID),
2825
                      [('d', '', 0, False, DirState.NULLSTAT)])
2826
        empty_tree_dirblocks = [('', [empty_root]), ('', [])]
2827
        self._set_data([], empty_tree_dirblocks)
2828
        self.set_state_from_inventory(working_inv)
2829
        self.set_parent_trees(parent_trees, parent_ghosts)
2830
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2831
    def _make_absent(self, current_old):
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2832
        """Mark current_old - an entry - as absent for tree 0.
2833
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2834
        :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.
2835
            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
2836
            shrinking in length.
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2837
        """
2838
        # build up paths that this id will be left at after the change is made,
2839
        # so we can update their cross references in tree 0
2840
        all_remaining_keys = set()
2922.2.4 by John Arbash Meinel
Fix bug #114615 by teaching unversion() to not touch renamed entries.
2841
        # 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.
2842
        for details in current_old[1][1:]:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2843
            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.
2844
                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
2845
            elif details[0] == 'r': # relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2846
                # record the key for the real path.
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2847
                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.
2848
            # absent rows are not present at any path.
2849
        last_reference = current_old[0] not in all_remaining_keys
2850
        if last_reference:
2851
            # the current row consists entire of the current item (being marked
2852
            # absent), and relocated or absent entries for the other trees:
2853
            # Remove it, its meaningless.
2255.2.88 by Robert Collins
Significant steps back to operation.
2854
            block = self._find_block(current_old[0])
2855
            entry_index, present = self._find_entry_index(current_old[0], block[1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2856
            if not present:
2857
                raise AssertionError('could not find entry for %s' % (current_old,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2858
            block[1].pop(entry_index)
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2859
            # 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
2860
            if self._id_index is not None:
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2861
                self._remove_from_id_index(self._id_index, current_old[0])
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2862
        # 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.
2863
        # 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.
2864
        # (if there were other trees with the id present at this path), or may
2865
        # be relocations.
2866
        for update_key in all_remaining_keys:
2867
            update_block_index, present = \
2868
                self._find_block_index_from_key(update_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2869
            if not present:
2870
                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.
2871
            update_entry_index, present = \
2872
                self._find_entry_index(update_key, self._dirblocks[update_block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2873
            if not present:
2874
                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.
2875
            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.
2876
            # it must not be absent at the moment
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2877
            if update_tree_details[0][0] == 'a': # absent
2878
                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.
2879
            update_tree_details[0] = DirState.NULL_PARENT_DETAILS
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2880
        self._mark_modified()
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2881
        return last_reference
2255.2.88 by Robert Collins
Significant steps back to operation.
2882
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2883
    def update_minimal(self, key, minikind, executable=False, fingerprint='',
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2884
        packed_stat=None, size=0, path_utf8=None, fullscan=False):
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2885
        """Update an entry to the state in tree 0.
2886
2887
        This will either create a new entry at 'key' or update an existing one.
2888
        It also makes sure that any other records which might mention this are
2889
        updated as well.
2890
2891
        :param key: (dir, name, file_id) for the new entry
2892
        :param minikind: The type for the entry ('f' == 'file', 'd' ==
2893
                'directory'), etc.
2894
        :param executable: Should the executable bit be set?
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2895
        :param fingerprint: Simple fingerprint for new entry: canonical-form
2896
            sha1 for files, referenced revision id for subtrees, etc.
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2897
        :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.
2898
        :param size: Size information for new entry
2899
        :param path_utf8: key[0] + '/' + key[1], just passed in to avoid doing
2900
                extra computation.
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2901
        :param fullscan: If True then a complete scan of the dirstate is being
2902
            done and checking for duplicate rows should not be done. This
2903
            should only be set by set_state_from_inventory and similar methods.
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2904
2905
        If packed_stat and fingerprint are not given, they're invalidated in
2906
        the entry.
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2907
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2908
        block = self._find_block(key)[1]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2909
        if packed_stat is None:
2910
            packed_stat = DirState.NULLSTAT
2872.4.5 by Martin Pool
doc
2911
        # XXX: Some callers pass '' as the packed_stat, and it seems to be
2912
        # sometimes present in the dirstate - this seems oddly inconsistent.
2913
        # mbp 20071008
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2914
        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
2915
        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
2916
        id_index = self._get_id_index()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2917
        if not present:
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2918
            # New record. Check there isn't a entry at this path already.
2919
            if not fullscan:
2920
                low_index, _ = self._find_entry_index(key[0:2] + ('',), block)
2921
                while low_index < len(block):
2922
                    entry = block[low_index]
2923
                    if entry[0][0:2] == key[0:2]:
2924
                        if entry[1][0][0] not in 'ar':
2925
                            # This entry has the same path (but a different id) as
2926
                            # the new entry we're adding, and is present in ths
2927
                            # tree.
2928
                            raise errors.InconsistentDelta(
2929
                                ("%s/%s" % key[0:2]).decode('utf8'), key[2],
2930
                                "Attempt to add item at path already occupied by "
2931
                                "id %r" % entry[0][2])
4526.9.14 by Robert Collins
Review feedback on dirstate.
2932
                        low_index += 1
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2933
                    else:
2934
                        break
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2935
            # new entry, synthesis cross reference here,
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2936
            existing_keys = id_index.get(key[2], ())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2937
            if not existing_keys:
2938
                # not currently in the state, simplest case
2939
                new_entry = key, [new_details] + self._empty_parent_info()
2940
            else:
2255.2.88 by Robert Collins
Significant steps back to operation.
2941
                # present at one or more existing other paths.
2942
                # grab one of them and use it to generate parent
2943
                # relocation/absent entries.
2944
                new_entry = key, [new_details]
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2945
                # existing_keys can be changed as we iterate.
2946
                for other_key in tuple(existing_keys):
2255.2.88 by Robert Collins
Significant steps back to operation.
2947
                    # change the record at other to be a pointer to this new
2948
                    # record. The loop looks similar to the change to
2949
                    # relocations when updating an existing record but its not:
2950
                    # the test for existing kinds is different: this can be
2951
                    # factored out to a helper though.
4536.4.3 by Robert Collins
Move the fix for bug 395556 to update_minimal, avoiding fallout in other set_state_from_inventory calls, as aliasing is actually needed.
2952
                    other_block_index, present = self._find_block_index_from_key(
2953
                        other_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2954
                    if not present:
4536.4.3 by Robert Collins
Move the fix for bug 395556 to update_minimal, avoiding fallout in other set_state_from_inventory calls, as aliasing is actually needed.
2955
                        raise AssertionError('could not find block for %s' % (
2956
                            other_key,))
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2957
                    other_block = self._dirblocks[other_block_index][1]
2958
                    other_entry_index, present = self._find_entry_index(
2959
                        other_key, other_block)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2960
                    if not present:
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2961
                        raise AssertionError(
2962
                            'update_minimal: could not find other entry for %s'
2963
                            % (other_key,))
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2964
                    if path_utf8 is None:
2965
                        raise AssertionError('no path')
4536.4.3 by Robert Collins
Move the fix for bug 395556 to update_minimal, avoiding fallout in other set_state_from_inventory calls, as aliasing is actually needed.
2966
                    # Turn this other location into a reference to the new
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2967
                    # location. This also updates the aliased iterator
2968
                    # (current_old in set_state_from_inventory) so that the old
2969
                    # entry, if not already examined, is skipped over by that
2970
                    # loop.
2971
                    other_entry = other_block[other_entry_index]
2972
                    other_entry[1][0] = ('r', path_utf8, 0, False, '')
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
2973
                    if self._maybe_remove_row(other_block, other_entry_index,
2974
                                              id_index):
2975
                        # If the row holding this was removed, we need to
2976
                        # recompute where this entry goes
2977
                        entry_index, _ = self._find_entry_index(key, block)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2978
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2979
                # This loop:
2980
                # adds a tuple to the new details for each column
2981
                #  - either by copying an existing relocation pointer inside that column
2982
                #  - or by creating a new pointer to the right row inside that column
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2983
                num_present_parents = self._num_present_parents()
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2984
                if num_present_parents:
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2985
                    # TODO: This re-evaluates the existing_keys set, do we need
2986
                    #       to do that ourselves?
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2987
                    other_key = list(existing_keys)[0]
2255.2.88 by Robert Collins
Significant steps back to operation.
2988
                for lookup_index in xrange(1, num_present_parents + 1):
2989
                    # grab any one entry, use it to find the right path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2990
                    # TODO: optimise this to reduce memory use in highly
2255.2.88 by Robert Collins
Significant steps back to operation.
2991
                    # fragmented situations by reusing the relocation
2992
                    # records.
2993
                    update_block_index, present = \
2994
                        self._find_block_index_from_key(other_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2995
                    if not present:
2996
                        raise AssertionError('could not find block for %s' % (other_key,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2997
                    update_entry_index, present = \
2998
                        self._find_entry_index(other_key, self._dirblocks[update_block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2999
                    if not present:
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
3000
                        raise AssertionError('update_minimal: could not find entry for %s' % (other_key,))
2255.2.88 by Robert Collins
Significant steps back to operation.
3001
                    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.
3002
                    if update_details[0] in 'ar': # relocated, absent
2255.2.88 by Robert Collins
Significant steps back to operation.
3003
                        # its a pointer or absent in lookup_index's tree, use
3004
                        # it as is.
3005
                        new_entry[1].append(update_details)
3006
                    else:
3007
                        # 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
3008
                        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
3009
                        new_entry[1].append(('r', pointer_path, 0, False, ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
3010
            block.insert(entry_index, new_entry)
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
3011
            self._add_to_id_index(id_index, key)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
3012
        else:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3013
            # Does the new state matter?
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
3014
            block[entry_index][1][0] = new_details
2255.2.88 by Robert Collins
Significant steps back to operation.
3015
            # parents cannot be affected by what we do.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3016
            # other occurences of this id can be found
2255.2.88 by Robert Collins
Significant steps back to operation.
3017
            # from the id index.
3018
            # ---
3019
            # tree index consistency: All other paths for this id in this tree
3020
            # index must point to the correct path. We have to loop here because
3021
            # we may have passed entries in the state with this file id already
3022
            # that were absent - where parent entries are - and they need to be
3023
            # converted to relocated.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
3024
            if path_utf8 is None:
3025
                raise AssertionError('no path')
5418.1.1 by Andrew Bennetts
Merge lp:bzr/2.2, including fixes for #619872, #631350, #633745.
3026
            existing_keys = id_index.get(key[2], ())
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
3027
            if key not in existing_keys:
3028
                raise AssertionError('We found the entry in the blocks, but'
3029
                    ' the key is not in the id_index.'
3030
                    ' key: %s, existing_keys: %s' % (key, existing_keys))
5418.1.1 by Andrew Bennetts
Merge lp:bzr/2.2, including fixes for #619872, #631350, #633745.
3031
            for entry_key in existing_keys:
2255.2.88 by Robert Collins
Significant steps back to operation.
3032
                # TODO:PROFILING: It might be faster to just update
3033
                # rather than checking if we need to, and then overwrite
3034
                # the one we are located at.
3035
                if entry_key != key:
3036
                    # this file id is at a different path in one of the
3037
                    # other trees, so put absent pointers there
3038
                    # This is the vertical axis in the matrix, all pointing
3039
                    # to the real path.
3040
                    block_index, present = self._find_block_index_from_key(entry_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
3041
                    if not present:
3042
                        raise AssertionError('not present: %r', entry_key)
2255.2.88 by Robert Collins
Significant steps back to operation.
3043
                    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!
3044
                    if not present:
3045
                        raise AssertionError('not present: %r', entry_key)
2255.2.88 by Robert Collins
Significant steps back to operation.
3046
                    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
3047
                        ('r', path_utf8, 0, False, '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
3048
        # add a containing dirblock if needed.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
3049
        if new_details[0] == 'd':
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
3050
            subdir_key = (osutils.pathjoin(*key[0:2]), '', '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
3051
            block_index, present = self._find_block_index_from_key(subdir_key)
3052
            if not present:
3053
                self._dirblocks.insert(block_index, (subdir_key[0], []))
2255.2.88 by Robert Collins
Significant steps back to operation.
3054
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
3055
        self._mark_modified()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
3056
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
3057
    def _maybe_remove_row(self, block, index, id_index):
3058
        """Remove index if it is absent or relocated across the row.
3059
        
3060
        id_index is updated accordingly.
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
3061
        :return: True if we removed the row, False otherwise
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
3062
        """
3063
        present_in_row = False
3064
        entry = block[index]
3065
        for column in entry[1]:
3066
            if column[0] not in 'ar':
3067
                present_in_row = True
3068
                break
3069
        if not present_in_row:
3070
            block.pop(index)
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
3071
            self._remove_from_id_index(id_index, entry[0])
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
3072
            return True
3073
        return False
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
3074
2255.2.168 by Martin Pool
merge robert, debugging
3075
    def _validate(self):
3076
        """Check that invariants on the dirblock are correct.
3077
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3078
        This can be useful in debugging; it shouldn't be necessary in
2255.2.168 by Martin Pool
merge robert, debugging
3079
        normal code.
2323.6.13 by Martin Pool
Fix some tests that need to lock dirstate before validating
3080
3081
        This must be called with a lock held.
2255.2.168 by Martin Pool
merge robert, debugging
3082
        """
2323.5.12 by Martin Pool
doc
3083
        # NOTE: This must always raise AssertionError not just assert,
3084
        # otherwise it may not behave properly under python -O
3085
        #
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3086
        # TODO: All entries must have some content that's not 'a' or 'r',
3087
        # otherwise it could just be removed.
3088
        #
3089
        # TODO: All relocations must point directly to a real entry.
3090
        #
3091
        # TODO: No repeated keys.
3092
        #
3093
        # -- mbp 20070325
2255.2.168 by Martin Pool
merge robert, debugging
3094
        from pprint import pformat
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3095
        self._read_dirblocks_if_needed()
2255.2.168 by Martin Pool
merge robert, debugging
3096
        if len(self._dirblocks) > 0:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3097
            if not self._dirblocks[0][0] == '':
3098
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
3099
                    "dirblocks don't start with root block:\n" + \
3376.2.8 by Martin Pool
Some review cleanups for assertion removal
3100
                    pformat(self._dirblocks))
2255.2.168 by Martin Pool
merge robert, debugging
3101
        if len(self._dirblocks) > 1:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3102
            if not self._dirblocks[1][0] == '':
3103
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
3104
                    "dirblocks missing root directory:\n" + \
3376.2.8 by Martin Pool
Some review cleanups for assertion removal
3105
                    pformat(self._dirblocks))
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
3106
        # the dirblocks are sorted by their path components, name, and dir id
3107
        dir_names = [d[0].split('/')
3108
                for d in self._dirblocks[1:]]
3109
        if dir_names != sorted(dir_names):
3110
            raise AssertionError(
3111
                "dir names are not in sorted order:\n" + \
3112
                pformat(self._dirblocks) + \
3113
                "\nkeys:\n" +
3114
                pformat(dir_names))
2255.2.168 by Martin Pool
merge robert, debugging
3115
        for dirblock in self._dirblocks:
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
3116
            # within each dirblock, the entries are sorted by filename and
2323.5.12 by Martin Pool
doc
3117
            # then by id.
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
3118
            for entry in dirblock[1]:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3119
                if dirblock[0] != entry[0][0]:
3120
                    raise AssertionError(
3121
                        "entry key for %r"
3122
                        "doesn't match directory name in\n%r" %
3123
                        (entry, pformat(dirblock)))
3124
            if dirblock[1] != sorted(dirblock[1]):
3125
                raise AssertionError(
3126
                    "dirblock for %r is not sorted:\n%s" % \
3127
                    (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.
3128
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
3129
        def check_valid_parent():
3130
            """Check that the current entry has a valid parent.
3131
3132
            This makes sure that the parent has a record,
3133
            and that the parent isn't marked as "absent" in the
3134
            current tree. (It is invalid to have a non-absent file in an absent
3135
            directory.)
3136
            """
3137
            if entry[0][0:2] == ('', ''):
3138
                # There should be no parent for the root row
3139
                return
3140
            parent_entry = self._get_entry(tree_index, path_utf8=entry[0][0])
3141
            if parent_entry == (None, None):
3142
                raise AssertionError(
3143
                    "no parent entry for: %s in tree %s"
3144
                    % (this_path, tree_index))
2438.1.15 by John Arbash Meinel
Remove a superfluous 'else' (recommended by Martin)
3145
            if parent_entry[1][tree_index][0] != 'd':
3146
                raise AssertionError(
3147
                    "Parent entry for %s is not marked as a valid"
3148
                    " directory. %s" % (this_path, parent_entry,))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
3149
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
3150
        # For each file id, for each tree: either
3151
        # the file id is not present at all; all rows with that id in the
3152
        # key have it marked as 'absent'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3153
        # OR the file id is present under exactly one name; any other entries
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
3154
        # that mention that id point to the correct name.
3155
        #
3156
        # We check this with a dict per tree pointing either to the present
3157
        # name, or None if absent.
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3158
        tree_count = self._num_present_parents() + 1
3159
        id_path_maps = [dict() for i in range(tree_count)]
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
3160
        # Make sure that all renamed entries point to the correct location.
3161
        for entry in self._iter_entries():
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
3162
            file_id = entry[0][2]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3163
            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
3164
            if len(entry[1]) != tree_count:
3165
                raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3166
                "wrong number of entry details for row\n%s" \
3167
                ",\nexpected %d" % \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3168
                (pformat(entry), tree_count))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3169
            absent_positions = 0
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
3170
            for tree_index, tree_state in enumerate(entry[1]):
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3171
                this_tree_map = id_path_maps[tree_index]
3172
                minikind = tree_state[0]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3173
                if minikind in 'ar':
3174
                    absent_positions += 1
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3175
                # have we seen this id before in this column?
3176
                if file_id in this_tree_map:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3177
                    previous_path, previous_loc = this_tree_map[file_id]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3178
                    # any later mention of this file must be consistent with
3179
                    # what was said before
3180
                    if minikind == 'a':
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3181
                        if previous_path is not None:
3182
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3183
                            "file %s is absent in row %r but also present " \
3184
                            "at %r"% \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3185
                            (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3186
                    elif minikind == 'r':
3187
                        target_location = tree_state[1]
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3188
                        if previous_path != target_location:
3189
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3190
                            "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
3191
                            % (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3192
                    else:
3193
                        # a file, directory, etc - may have been previously
3194
                        # pointed to by a relocation, which must point here
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3195
                        if previous_path != this_path:
3196
                            raise AssertionError(
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3197
                                "entry %r inconsistent with previous path %r "
3198
                                "seen at %r" %
3199
                                (entry, previous_path, previous_loc))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
3200
                        check_valid_parent()
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3201
                else:
3202
                    if minikind == 'a':
3203
                        # absent; should not occur anywhere else
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3204
                        this_tree_map[file_id] = None, this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3205
                    elif minikind == 'r':
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3206
                        # relocation, must occur at expected location
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3207
                        this_tree_map[file_id] = tree_state[1], this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3208
                    else:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3209
                        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.
3210
                        check_valid_parent()
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3211
            if absent_positions == tree_count:
3212
                raise AssertionError(
3213
                    "entry %r has no data for any tree." % (entry,))
4634.123.12 by John Arbash Meinel
Add a check in _validate that would have caught this bug.
3214
        if self._id_index is not None:
3215
            for file_id, entry_keys in self._id_index.iteritems():
3216
                for entry_key in entry_keys:
3217
                    if entry_key[2] != file_id:
3218
                        raise AssertionError(
3219
                            'file_id %r did not match entry key %s'
3220
                            % (file_id, entry_key))
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
3221
                if len(entry_keys) != len(set(entry_keys)):
3222
                    raise AssertionError(
3223
                        'id_index contained non-unique data for %s'
3224
                        % (entry_keys,))
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
3225
2255.4.2 by James Westby
(broken) Add the locking methods.
3226
    def _wipe_state(self):
3227
        """Forget all state information about the dirstate."""
3228
        self._header_state = DirState.NOT_IN_MEMORY
3229
        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
3230
        self._changes_aborted = False
2255.4.2 by James Westby
(broken) Add the locking methods.
3231
        self._parents = []
3232
        self._ghosts = []
3233
        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.
3234
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
3235
        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.
3236
        self._end_of_header = None
3237
        self._cutoff_time = None
3238
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
3239
3240
    def lock_read(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3241
        """Acquire a read lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3242
        if self._lock_token is not None:
3243
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3244
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
3245
        #       already in memory, we could read just the header and check for
3246
        #       any modification. If not modified, we can just leave things
3247
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
3248
        self._lock_token = lock.ReadLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3249
        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
3250
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
3251
        self._wipe_state()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
3252
2255.4.2 by James Westby
(broken) Add the locking methods.
3253
    def lock_write(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3254
        """Acquire a write lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3255
        if self._lock_token is not None:
3256
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3257
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
3258
        #       already in memory, we could read just the header and check for
3259
        #       any modification. If not modified, we can just leave things
3260
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
3261
        self._lock_token = lock.WriteLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3262
        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
3263
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
3264
        self._wipe_state()
3265
3266
    def unlock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3267
        """Drop any locks held on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3268
        if self._lock_token is None:
3269
            raise errors.LockNotHeld(self)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3270
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
3271
        #       already in memory, we could read just the header and check for
3272
        #       any modification. If not modified, we can just leave things
3273
        #       alone
2255.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
3274
        self._state_file = None
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3275
        self._lock_state = None
2255.4.2 by James Westby
(broken) Add the locking methods.
3276
        self._lock_token.unlock()
3277
        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.
3278
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
3279
3280
    def _requires_lock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3281
        """Check that a lock is currently held by someone on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3282
        if not self._lock_token:
3283
            raise errors.ObjectNotLocked(self)
1852.13.20 by Robert Collins
Steps toward an object model.
3284
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
3285
3696.4.17 by Robert Collins
Review feedback.
3286
def py_update_entry(state, entry, abspath, stat_value,
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3287
                 _stat_to_minikind=DirState._stat_to_minikind,
3288
                 _pack_stat=pack_stat):
3289
    """Update the entry based on what is actually on disk.
3290
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
3291
    This function only calculates the sha if it needs to - if the entry is
3292
    uncachable, or clearly different to the first parent's entry, no sha
3293
    is calculated, and None is returned.
3294
3696.4.17 by Robert Collins
Review feedback.
3295
    :param state: The dirstate this entry is in.
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3296
    :param entry: This is the dirblock entry for the file in question.
3297
    :param abspath: The path on disk for this file.
3696.4.17 by Robert Collins
Review feedback.
3298
    :param stat_value: The stat value done on the path.
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
3299
    :return: None, or The sha1 hexdigest of the file (40 bytes) or link
3300
        target of a symlink.
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3301
    """
3302
    try:
3303
        minikind = _stat_to_minikind[stat_value.st_mode & 0170000]
3304
    except KeyError:
3305
        # Unhandled kind
3306
        return None
3307
    packed_stat = _pack_stat(stat_value)
3308
    (saved_minikind, saved_link_or_sha1, saved_file_size,
3309
     saved_executable, saved_packed_stat) = entry[1][0]
3310
4100.2.5 by Aaron Bentley
Stop resetting minikind to 'd' when comparing.
3311
    if minikind == 'd' and saved_minikind == 't':
3312
        minikind = 't'
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3313
    if (minikind == saved_minikind
3314
        and packed_stat == saved_packed_stat):
3315
        # The stat hasn't changed since we saved, so we can re-use the
3316
        # saved sha hash.
3317
        if minikind == 'd':
3318
            return None
3319
3320
        # size should also be in packed_stat
3321
        if saved_file_size == stat_value.st_size:
3322
            return saved_link_or_sha1
3323
3324
    # If we have gotten this far, that means that we need to actually
3325
    # process this entry.
3326
    link_or_sha1 = None
5802.3.1 by John Arbash Meinel
Fix bug #765881. Having a file added on disk was skipping
3327
    worth_saving = True
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3328
    if minikind == 'f':
3696.4.17 by Robert Collins
Review feedback.
3329
        executable = state._is_executable(stat_value.st_mode,
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3330
                                         saved_executable)
3696.4.17 by Robert Collins
Review feedback.
3331
        if state._cutoff_time is None:
3332
            state._sha_cutoff_time()
3333
        if (stat_value.st_mtime < state._cutoff_time
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
3334
            and stat_value.st_ctime < state._cutoff_time
3335
            and len(entry[1]) > 1
3336
            and entry[1][1][0] != 'a'):
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
3337
            # Could check for size changes for further optimised
3338
            # avoidance of sha1's. However the most prominent case of
3339
            # over-shaing is during initial add, which this catches.
3340
            # Besides, if content filtering happens, size and sha
3341
            # are calculated at the same time, so checking just the size
3342
            # gains nothing w.r.t. performance.
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
3343
            link_or_sha1 = state._sha1_file(abspath)
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3344
            entry[1][0] = ('f', link_or_sha1, stat_value.st_size,
3345
                           executable, packed_stat)
3346
        else:
3347
            entry[1][0] = ('f', '', stat_value.st_size,
3348
                           executable, DirState.NULLSTAT)
5802.3.1 by John Arbash Meinel
Fix bug #765881. Having a file added on disk was skipping
3349
            worth_saving = False
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3350
    elif minikind == 'd':
3351
        link_or_sha1 = None
3352
        entry[1][0] = ('d', '', 0, False, packed_stat)
3353
        if saved_minikind != 'd':
3354
            # This changed from something into a directory. Make sure we
3355
            # have a directory block for it. This doesn't happen very
3356
            # often, so this doesn't have to be super fast.
3357
            block_index, entry_index, dir_present, file_present = \
3696.4.17 by Robert Collins
Review feedback.
3358
                state._get_block_entry_index(entry[0][0], entry[0][1], 0)
3359
            state._ensure_block(block_index, entry_index,
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3360
                               osutils.pathjoin(entry[0][0], entry[0][1]))
5802.3.1 by John Arbash Meinel
Fix bug #765881. Having a file added on disk was skipping
3361
        else:
3362
            worth_saving = False
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3363
    elif minikind == 'l':
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
3364
        if saved_minikind == 'l':
3365
            worth_saving = False
3696.4.17 by Robert Collins
Review feedback.
3366
        link_or_sha1 = state._read_link(abspath, saved_link_or_sha1)
3367
        if state._cutoff_time is None:
3368
            state._sha_cutoff_time()
3369
        if (stat_value.st_mtime < state._cutoff_time
3370
            and stat_value.st_ctime < state._cutoff_time):
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3371
            entry[1][0] = ('l', link_or_sha1, stat_value.st_size,
3372
                           False, packed_stat)
3373
        else:
3374
            entry[1][0] = ('l', '', stat_value.st_size,
3375
                           False, DirState.NULLSTAT)
5802.3.1 by John Arbash Meinel
Fix bug #765881. Having a file added on disk was skipping
3376
    if worth_saving:
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
3377
        state._mark_modified([entry])
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3378
    return link_or_sha1
3379
3380
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3381
class ProcessEntryPython(object):
3382
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3383
    __slots__ = ["old_dirname_to_file_id", "new_dirname_to_file_id",
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3384
        "last_source_parent", "last_target_parent", "include_unchanged",
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3385
        "partial", "use_filesystem_for_exec", "utf8_decode",
3386
        "searched_specific_files", "search_specific_files",
3387
        "searched_exact_paths", "search_specific_file_parents", "seen_ids",
3388
        "state", "source_index", "target_index", "want_unversioned", "tree"]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3389
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3390
    def __init__(self, include_unchanged, use_filesystem_for_exec,
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3391
        search_specific_files, state, source_index, target_index,
3392
        want_unversioned, tree):
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3393
        self.old_dirname_to_file_id = {}
3394
        self.new_dirname_to_file_id = {}
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3395
        # Are we doing a partial iter_changes?
3396
        self.partial = search_specific_files != set([''])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3397
        # Using a list so that we can access the values and change them in
3398
        # nested scope. Each one is [path, file_id, entry]
3399
        self.last_source_parent = [None, None]
3400
        self.last_target_parent = [None, None]
3401
        self.include_unchanged = include_unchanged
3402
        self.use_filesystem_for_exec = use_filesystem_for_exec
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3403
        self.utf8_decode = cache_utf8._utf8_decode
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3404
        # for all search_indexs in each path at or under each element of
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3405
        # search_specific_files, if the detail is relocated: add the id, and
3406
        # add the relocated path as one to search if its not searched already.
3407
        # If the detail is not relocated, add the id.
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3408
        self.searched_specific_files = set()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3409
        # When we search exact paths without expanding downwards, we record
3410
        # that here.
3411
        self.searched_exact_paths = set()
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3412
        self.search_specific_files = search_specific_files
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3413
        # The parents up to the root of the paths we are searching.
3414
        # After all normal paths are returned, these specific items are returned.
3415
        self.search_specific_file_parents = set()
3416
        # The ids we've sent out in the delta.
3417
        self.seen_ids = set()
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3418
        self.state = state
3419
        self.source_index = source_index
3420
        self.target_index = target_index
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3421
        if target_index != 0:
3422
            # A lot of code in here depends on target_index == 0
3423
            raise errors.BzrError('unsupported target index')
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3424
        self.want_unversioned = want_unversioned
3425
        self.tree = tree
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3426
3696.4.17 by Robert Collins
Review feedback.
3427
    def _process_entry(self, entry, path_info, pathjoin=osutils.pathjoin):
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3428
        """Compare an entry and real disk to generate delta information.
3429
3430
        :param path_info: top_relpath, basename, kind, lstat, abspath for
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3431
            the path of entry. If None, then the path is considered absent in 
3432
            the target (Perhaps we should pass in a concrete entry for this ?)
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3433
            Basename is returned as a utf8 string because we expect this
3434
            tuple will be ignored, and don't want to take the time to
3435
            decode.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3436
        :return: (iter_changes_result, changed). If the entry has not been
3437
            handled then changed is None. Otherwise it is False if no content
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3438
            or metadata changes have occurred, and True if any content or
3439
            metadata change has occurred. If self.include_unchanged is True then
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3440
            if changed is not None, iter_changes_result will always be a result
3441
            tuple. Otherwise, iter_changes_result is None unless changed is
3442
            True.
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3443
        """
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3444
        if self.source_index is None:
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3445
            source_details = DirState.NULL_PARENT_DETAILS
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3446
        else:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3447
            source_details = entry[1][self.source_index]
3448
        target_details = entry[1][self.target_index]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3449
        target_minikind = target_details[0]
3450
        if path_info is not None and target_minikind in 'fdlt':
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3451
            if not (self.target_index == 0):
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3452
                raise AssertionError()
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
3453
            link_or_sha1 = update_entry(self.state, entry,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3454
                abspath=path_info[4], stat_value=path_info[3])
3455
            # The entry may have been modified by update_entry
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3456
            target_details = entry[1][self.target_index]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3457
            target_minikind = target_details[0]
3458
        else:
3459
            link_or_sha1 = None
3460
        file_id = entry[0][2]
3461
        source_minikind = source_details[0]
3462
        if source_minikind in 'fdltr' and target_minikind in 'fdlt':
3463
            # claimed content in both: diff
3464
            #   r    | fdlt   |      | add source to search, add id path move and perform
3465
            #        |        |      | diff check on source-target
3466
            #   r    | fdlt   |  a   | dangling file that was present in the basis.
3467
            #        |        |      | ???
3468
            if source_minikind in 'r':
3469
                # add the source to the search path to find any children it
3470
                # has.  TODO ? : only add if it is a container ?
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3471
                if not osutils.is_inside_any(self.searched_specific_files,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3472
                                             source_details[1]):
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
3473
                    self.search_specific_files.add(source_details[1])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3474
                # generate the old path; this is needed for stating later
3475
                # as well.
3476
                old_path = source_details[1]
3477
                old_dirname, old_basename = os.path.split(old_path)
3478
                path = pathjoin(entry[0][0], entry[0][1])
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3479
                old_entry = self.state._get_entry(self.source_index,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3480
                                             path_utf8=old_path)
3481
                # update the source details variable to be the real
3482
                # location.
3483
                if old_entry == (None, None):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3484
                    raise errors.CorruptDirstate(self.state._filename,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3485
                        "entry '%s/%s' is considered renamed from %r"
3486
                        " but source does not exist\n"
3487
                        "entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3488
                source_details = old_entry[1][self.source_index]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3489
                source_minikind = source_details[0]
3490
            else:
3491
                old_dirname = entry[0][0]
3492
                old_basename = entry[0][1]
3493
                old_path = path = None
3494
            if path_info is None:
3495
                # the file is missing on disk, show as removed.
3496
                content_change = True
3497
                target_kind = None
3498
                target_exec = False
3499
            else:
3500
                # source and target are both versioned and disk file is present.
3501
                target_kind = path_info[2]
3502
                if target_kind == 'directory':
3503
                    if path is None:
3504
                        old_path = path = pathjoin(old_dirname, old_basename)
3505
                    self.new_dirname_to_file_id[path] = file_id
3506
                    if source_minikind != 'd':
3507
                        content_change = True
3508
                    else:
3509
                        # directories have no fingerprint
3510
                        content_change = False
3511
                    target_exec = False
3512
                elif target_kind == 'file':
3513
                    if source_minikind != 'f':
3514
                        content_change = True
3515
                    else:
4393.3.1 by Ian Clatworthy
fix status & commit issue reported by Frits Jalvingh
3516
                        # Check the sha. We can't just rely on the size as
3517
                        # content filtering may mean differ sizes actually
3518
                        # map to the same content
3519
                        if link_or_sha1 is None:
3520
                            # Stat cache miss:
3521
                            statvalue, link_or_sha1 = \
3522
                                self.state._sha1_provider.stat_and_sha1(
3523
                                path_info[4])
3524
                            self.state._observed_sha1(entry, link_or_sha1,
3525
                                statvalue)
3526
                        content_change = (link_or_sha1 != source_details[1])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3527
                    # Target details is updated at update_entry time
3528
                    if self.use_filesystem_for_exec:
3529
                        # We don't need S_ISREG here, because we are sure
3530
                        # we are dealing with a file.
3531
                        target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
3532
                    else:
3533
                        target_exec = target_details[3]
3534
                elif target_kind == 'symlink':
3535
                    if source_minikind != 'l':
3536
                        content_change = True
3537
                    else:
3538
                        content_change = (link_or_sha1 != source_details[1])
3539
                    target_exec = False
3540
                elif target_kind == 'tree-reference':
3541
                    if source_minikind != 't':
3542
                        content_change = True
3543
                    else:
3544
                        content_change = False
3545
                    target_exec = False
3546
                else:
4634.58.1 by Robert Collins
Show a sensible error when a previously versionable path becomes a FIFO or other unversionable file.
3547
                    if path is None:
3548
                        path = pathjoin(old_dirname, old_basename)
3549
                    raise errors.BadFileKindError(path, path_info[2])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3550
            if source_minikind == 'd':
3551
                if path is None:
3552
                    old_path = path = pathjoin(old_dirname, old_basename)
3553
                self.old_dirname_to_file_id[old_path] = file_id
3554
            # parent id is the entry for the path in the target tree
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3555
            if old_basename and old_dirname == self.last_source_parent[0]:
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3556
                source_parent_id = self.last_source_parent[1]
3557
            else:
3558
                try:
3559
                    source_parent_id = self.old_dirname_to_file_id[old_dirname]
3560
                except KeyError:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3561
                    source_parent_entry = self.state._get_entry(self.source_index,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3562
                                                           path_utf8=old_dirname)
3563
                    source_parent_id = source_parent_entry[0][2]
3564
                if source_parent_id == entry[0][2]:
3565
                    # This is the root, so the parent is None
3566
                    source_parent_id = None
3567
                else:
3568
                    self.last_source_parent[0] = old_dirname
3569
                    self.last_source_parent[1] = source_parent_id
3570
            new_dirname = entry[0][0]
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3571
            if entry[0][1] and new_dirname == self.last_target_parent[0]:
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3572
                target_parent_id = self.last_target_parent[1]
3573
            else:
3574
                try:
3575
                    target_parent_id = self.new_dirname_to_file_id[new_dirname]
3576
                except KeyError:
3577
                    # TODO: We don't always need to do the lookup, because the
3578
                    #       parent entry will be the same as the source entry.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3579
                    target_parent_entry = self.state._get_entry(self.target_index,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3580
                                                           path_utf8=new_dirname)
3581
                    if target_parent_entry == (None, None):
3582
                        raise AssertionError(
3583
                            "Could not find target parent in wt: %s\nparent of: %s"
3584
                            % (new_dirname, entry))
3585
                    target_parent_id = target_parent_entry[0][2]
3586
                if target_parent_id == entry[0][2]:
3587
                    # This is the root, so the parent is None
3588
                    target_parent_id = None
3589
                else:
3590
                    self.last_target_parent[0] = new_dirname
3591
                    self.last_target_parent[1] = target_parent_id
3592
3593
            source_exec = source_details[3]
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3594
            changed = (content_change
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3595
                or source_parent_id != target_parent_id
3596
                or old_basename != entry[0][1]
3597
                or source_exec != target_exec
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3598
                )
3599
            if not changed and not self.include_unchanged:
3600
                return None, False
3601
            else:
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3602
                if old_path is None:
3603
                    old_path = path = pathjoin(old_dirname, old_basename)
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3604
                    old_path_u = self.utf8_decode(old_path)[0]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3605
                    path_u = old_path_u
3606
                else:
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3607
                    old_path_u = self.utf8_decode(old_path)[0]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3608
                    if old_path == path:
3609
                        path_u = old_path_u
3610
                    else:
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3611
                        path_u = self.utf8_decode(path)[0]
3612
                source_kind = DirState._minikind_to_kind[source_minikind]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3613
                return (entry[0][2],
3614
                       (old_path_u, path_u),
3615
                       content_change,
3616
                       (True, True),
3617
                       (source_parent_id, target_parent_id),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3618
                       (self.utf8_decode(old_basename)[0], self.utf8_decode(entry[0][1])[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3619
                       (source_kind, target_kind),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3620
                       (source_exec, target_exec)), changed
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3621
        elif source_minikind in 'a' and target_minikind in 'fdlt':
3622
            # looks like a new file
3623
            path = pathjoin(entry[0][0], entry[0][1])
3624
            # parent id is the entry for the path in the target tree
3625
            # TODO: these are the same for an entire directory: cache em.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3626
            parent_id = self.state._get_entry(self.target_index,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3627
                                         path_utf8=entry[0][0])[0][2]
3628
            if parent_id == entry[0][2]:
3629
                parent_id = None
3630
            if path_info is not None:
3631
                # Present on disk:
3632
                if self.use_filesystem_for_exec:
3633
                    # We need S_ISREG here, because we aren't sure if this
3634
                    # is a file or not.
3635
                    target_exec = bool(
3636
                        stat.S_ISREG(path_info[3].st_mode)
3637
                        and stat.S_IEXEC & path_info[3].st_mode)
3638
                else:
3639
                    target_exec = target_details[3]
3640
                return (entry[0][2],
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3641
                       (None, self.utf8_decode(path)[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3642
                       True,
3643
                       (False, True),
3644
                       (None, parent_id),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3645
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3646
                       (None, path_info[2]),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3647
                       (None, target_exec)), True
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3648
            else:
3649
                # Its a missing file, report it as such.
3650
                return (entry[0][2],
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3651
                       (None, self.utf8_decode(path)[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3652
                       False,
3653
                       (False, True),
3654
                       (None, parent_id),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3655
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3656
                       (None, None),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3657
                       (None, False)), True
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3658
        elif source_minikind in 'fdlt' and target_minikind in 'a':
3659
            # unversioned, possibly, or possibly not deleted: we dont care.
3660
            # if its still on disk, *and* theres no other entry at this
3661
            # path [we dont know this in this routine at the moment -
3662
            # perhaps we should change this - then it would be an unknown.
3663
            old_path = pathjoin(entry[0][0], entry[0][1])
3664
            # parent id is the entry for the path in the target tree
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3665
            parent_id = self.state._get_entry(self.source_index, path_utf8=entry[0][0])[0][2]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3666
            if parent_id == entry[0][2]:
3667
                parent_id = None
3668
            return (entry[0][2],
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3669
                   (self.utf8_decode(old_path)[0], None),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3670
                   True,
3671
                   (True, False),
3672
                   (parent_id, None),
3696.4.6 by Robert Collins
Fixes for the relocated code, and use _update_entry within the C accelerated code, another 8 percent saving.
3673
                   (self.utf8_decode(entry[0][1])[0], None),
3674
                   (DirState._minikind_to_kind[source_minikind], None),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3675
                   (source_details[3], None)), True
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3676
        elif source_minikind in 'fdlt' and target_minikind in 'r':
3677
            # a rename; could be a true rename, or a rename inherited from
3678
            # a renamed parent. TODO: handle this efficiently. Its not
3679
            # common case to rename dirs though, so a correct but slow
3680
            # implementation will do.
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3681
            if not osutils.is_inside_any(self.searched_specific_files, target_details[1]):
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
3682
                self.search_specific_files.add(target_details[1])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3683
        elif source_minikind in 'ra' and target_minikind in 'ra':
3684
            # neither of the selected trees contain this file,
3685
            # so skip over it. This is not currently directly tested, but
3686
            # is indirectly via test_too_much.TestCommands.test_conflicts.
3687
            pass
3688
        else:
3689
            raise AssertionError("don't know how to compare "
3690
                "source_minikind=%r, target_minikind=%r"
3691
                % (source_minikind, target_minikind))
3692
            ## import pdb;pdb.set_trace()
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3693
        return None, None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3694
3695
    def __iter__(self):
3696
        return self
3697
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3698
    def _gather_result_for_consistency(self, result):
3699
        """Check a result we will yield to make sure we are consistent later.
3700
        
3701
        This gathers result's parents into a set to output later.
3702
3703
        :param result: A result tuple.
3704
        """
3705
        if not self.partial or not result[0]:
3706
            return
3707
        self.seen_ids.add(result[0])
3708
        new_path = result[1][1]
3709
        if new_path:
3710
            # Not the root and not a delete: queue up the parents of the path.
3711
            self.search_specific_file_parents.update(
3712
                osutils.parent_directories(new_path.encode('utf8')))
3713
            # Add the root directory which parent_directories does not
3714
            # provide.
3715
            self.search_specific_file_parents.add('')
3716
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3717
    def iter_changes(self):
3718
        """Iterate over the changes."""
3719
        utf8_decode = cache_utf8._utf8_decode
3696.4.17 by Robert Collins
Review feedback.
3720
        _cmp_by_dirs = cmp_by_dirs
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3721
        _process_entry = self._process_entry
3722
        search_specific_files = self.search_specific_files
3723
        searched_specific_files = self.searched_specific_files
3696.4.17 by Robert Collins
Review feedback.
3724
        splitpath = osutils.splitpath
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3725
        # sketch:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3726
        # compare source_index and target_index at or under each element of search_specific_files.
3727
        # follow the following comparison table. Note that we only want to do diff operations when
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3728
        # the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3729
        # for the target.
3730
        # cases:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3731
        #
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3732
        # Source | Target | disk | action
3733
        #   r    | fdlt   |      | add source to search, add id path move and perform
3734
        #        |        |      | diff check on source-target
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3735
        #   r    | fdlt   |  a   | dangling file that was present in the basis.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3736
        #        |        |      | ???
3737
        #   r    |  a     |      | add source to search
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3738
        #   r    |  a     |  a   |
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3739
        #   r    |  r     |      | this path is present in a non-examined tree, skip.
3740
        #   r    |  r     |  a   | this path is present in a non-examined tree, skip.
3741
        #   a    | fdlt   |      | add new id
3742
        #   a    | fdlt   |  a   | dangling locally added file, skip
3743
        #   a    |  a     |      | not present in either tree, skip
3744
        #   a    |  a     |  a   | not present in any tree, skip
3745
        #   a    |  r     |      | not present in either tree at this path, skip as it
3746
        #        |        |      | may not be selected by the users list of paths.
3747
        #   a    |  r     |  a   | not present in either tree at this path, skip as it
3748
        #        |        |      | may not be selected by the users list of paths.
3749
        #  fdlt  | fdlt   |      | content in both: diff them
3750
        #  fdlt  | fdlt   |  a   | deleted locally, but not unversioned - show as deleted ?
3751
        #  fdlt  |  a     |      | unversioned: output deleted id for now
3752
        #  fdlt  |  a     |  a   | unversioned and deleted: output deleted id
3753
        #  fdlt  |  r     |      | relocated in this tree, so add target to search.
3754
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
3755
        #        |        |      | this id at the other path.
3756
        #  fdlt  |  r     |  a   | relocated in this tree, so add target to search.
3757
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
3758
        #        |        |      | this id at the other path.
3759
3760
        # TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
3761
        #       keeping a cache of directories that we have seen.
3762
3763
        while search_specific_files:
3764
            # TODO: the pending list should be lexically sorted?  the
3765
            # interface doesn't require it.
3766
            current_root = search_specific_files.pop()
3767
            current_root_unicode = current_root.decode('utf8')
3768
            searched_specific_files.add(current_root)
3769
            # process the entries for this containing directory: the rest will be
3770
            # found by their parents recursively.
3771
            root_entries = self.state._entries_for_path(current_root)
3772
            root_abspath = self.tree.abspath(current_root_unicode)
3773
            try:
3774
                root_stat = os.lstat(root_abspath)
3775
            except OSError, e:
3776
                if e.errno == errno.ENOENT:
3777
                    # the path does not exist: let _process_entry know that.
3778
                    root_dir_info = None
3779
                else:
3780
                    # some other random error: hand it up.
3781
                    raise
3782
            else:
3783
                root_dir_info = ('', current_root,
3784
                    osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
3785
                    root_abspath)
3786
                if root_dir_info[2] == 'directory':
3787
                    if self.tree._directory_is_tree_reference(
3788
                        current_root.decode('utf8')):
3789
                        root_dir_info = root_dir_info[:2] + \
3790
                            ('tree-reference',) + root_dir_info[3:]
3791
3792
            if not root_entries and not root_dir_info:
3793
                # this specified path is not present at all, skip it.
3794
                continue
3795
            path_handled = False
3796
            for entry in root_entries:
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3797
                result, changed = _process_entry(entry, root_dir_info)
3798
                if changed is not None:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3799
                    path_handled = True
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3800
                    if changed:
3801
                        self._gather_result_for_consistency(result)
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3802
                    if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3803
                        yield result
3804
            if self.want_unversioned and not path_handled and root_dir_info:
3805
                new_executable = bool(
3806
                    stat.S_ISREG(root_dir_info[3].st_mode)
3807
                    and stat.S_IEXEC & root_dir_info[3].st_mode)
3808
                yield (None,
3809
                       (None, current_root_unicode),
3810
                       True,
3811
                       (False, False),
3812
                       (None, None),
3813
                       (None, splitpath(current_root_unicode)[-1]),
3814
                       (None, root_dir_info[2]),
3815
                       (None, new_executable)
3816
                      )
3817
            initial_key = (current_root, '', '')
3818
            block_index, _ = self.state._find_block_index_from_key(initial_key)
3819
            if block_index == 0:
3820
                # we have processed the total root already, but because the
3821
                # initial key matched it we should skip it here.
3822
                block_index +=1
3823
            if root_dir_info and root_dir_info[2] == 'tree-reference':
3824
                current_dir_info = None
3825
            else:
3826
                dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
3827
                try:
3828
                    current_dir_info = dir_iterator.next()
3829
                except OSError, e:
3830
                    # on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
3831
                    # python 2.5 has e.errno == EINVAL,
3832
                    #            and e.winerror == ERROR_DIRECTORY
3833
                    e_winerror = getattr(e, 'winerror', None)
3834
                    win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
3835
                    # there may be directories in the inventory even though
3836
                    # this path is not a file on disk: so mark it as end of
3837
                    # iterator
3838
                    if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
3839
                        current_dir_info = None
3840
                    elif (sys.platform == 'win32'
3841
                          and (e.errno in win_errors
3842
                               or e_winerror in win_errors)):
3843
                        current_dir_info = None
3844
                    else:
3845
                        raise
3846
                else:
3847
                    if current_dir_info[0][0] == '':
3848
                        # remove .bzr from iteration
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
3849
                        bzr_index = bisect.bisect_left(current_dir_info[1], ('.bzr',))
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3850
                        if current_dir_info[1][bzr_index][0] != '.bzr':
3851
                            raise AssertionError()
3852
                        del current_dir_info[1][bzr_index]
3853
            # walk until both the directory listing and the versioned metadata
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3854
            # are exhausted.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3855
            if (block_index < len(self.state._dirblocks) and
3856
                osutils.is_inside(current_root, self.state._dirblocks[block_index][0])):
3857
                current_block = self.state._dirblocks[block_index]
3858
            else:
3859
                current_block = None
3860
            while (current_dir_info is not None or
3861
                   current_block is not None):
3862
                if (current_dir_info and current_block
3863
                    and current_dir_info[0][0] != current_block[0]):
3696.4.17 by Robert Collins
Review feedback.
3864
                    if _cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3865
                        # filesystem data refers to paths not covered by the dirblock.
3866
                        # this has two possibilities:
3867
                        # A) it is versioned but empty, so there is no block for it
3868
                        # B) it is not versioned.
3869
3870
                        # if (A) then we need to recurse into it to check for
3871
                        # new unknown files or directories.
3872
                        # if (B) then we should ignore it, because we don't
3873
                        # recurse into unknown directories.
3874
                        path_index = 0
3875
                        while path_index < len(current_dir_info[1]):
3876
                                current_path_info = current_dir_info[1][path_index]
3877
                                if self.want_unversioned:
3878
                                    if current_path_info[2] == 'directory':
3879
                                        if self.tree._directory_is_tree_reference(
3880
                                            current_path_info[0].decode('utf8')):
3881
                                            current_path_info = current_path_info[:2] + \
3882
                                                ('tree-reference',) + current_path_info[3:]
3883
                                    new_executable = bool(
3884
                                        stat.S_ISREG(current_path_info[3].st_mode)
3885
                                        and stat.S_IEXEC & current_path_info[3].st_mode)
3886
                                    yield (None,
3887
                                        (None, utf8_decode(current_path_info[0])[0]),
3888
                                        True,
3889
                                        (False, False),
3890
                                        (None, None),
3891
                                        (None, utf8_decode(current_path_info[1])[0]),
3892
                                        (None, current_path_info[2]),
3893
                                        (None, new_executable))
3894
                                # dont descend into this unversioned path if it is
3895
                                # a dir
3896
                                if current_path_info[2] in ('directory',
3897
                                                            'tree-reference'):
3898
                                    del current_dir_info[1][path_index]
3899
                                    path_index -= 1
3900
                                path_index += 1
3901
3902
                        # This dir info has been handled, go to the next
3903
                        try:
3904
                            current_dir_info = dir_iterator.next()
3905
                        except StopIteration:
3906
                            current_dir_info = None
3907
                    else:
3908
                        # We have a dirblock entry for this location, but there
3909
                        # is no filesystem path for this. This is most likely
3910
                        # because a directory was removed from the disk.
3911
                        # We don't have to report the missing directory,
3912
                        # because that should have already been handled, but we
3913
                        # need to handle all of the files that are contained
3914
                        # within.
3915
                        for current_entry in current_block[1]:
3916
                            # entry referring to file not present on disk.
3917
                            # advance the entry only, after processing.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3918
                            result, changed = _process_entry(current_entry, None)
3919
                            if changed is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3920
                                if changed:
3921
                                    self._gather_result_for_consistency(result)
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3922
                                if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3923
                                    yield result
3924
                        block_index +=1
3925
                        if (block_index < len(self.state._dirblocks) and
3926
                            osutils.is_inside(current_root,
3927
                                              self.state._dirblocks[block_index][0])):
3928
                            current_block = self.state._dirblocks[block_index]
3929
                        else:
3930
                            current_block = None
3931
                    continue
3932
                entry_index = 0
3933
                if current_block and entry_index < len(current_block[1]):
3934
                    current_entry = current_block[1][entry_index]
3935
                else:
3936
                    current_entry = None
3937
                advance_entry = True
3938
                path_index = 0
3939
                if current_dir_info and path_index < len(current_dir_info[1]):
3940
                    current_path_info = current_dir_info[1][path_index]
3941
                    if current_path_info[2] == 'directory':
3942
                        if self.tree._directory_is_tree_reference(
3943
                            current_path_info[0].decode('utf8')):
3944
                            current_path_info = current_path_info[:2] + \
3945
                                ('tree-reference',) + current_path_info[3:]
3946
                else:
3947
                    current_path_info = None
3948
                advance_path = True
3949
                path_handled = False
3950
                while (current_entry is not None or
3951
                    current_path_info is not None):
3952
                    if current_entry is None:
4095.3.2 by Vincent Ladeuil
Better fix covering more code paths.
3953
                        # the check for path_handled when the path is advanced
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3954
                        # will yield this path if needed.
3955
                        pass
3956
                    elif current_path_info is None:
3957
                        # no path is fine: the per entry code will handle it.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3958
                        result, changed = _process_entry(current_entry, current_path_info)
3959
                        if changed is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3960
                            if changed:
3961
                                self._gather_result_for_consistency(result)
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3962
                            if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3963
                                yield result
3964
                    elif (current_entry[0][1] != current_path_info[1]
3965
                          or current_entry[1][self.target_index][0] in 'ar'):
3966
                        # The current path on disk doesn't match the dirblock
3967
                        # record. Either the dirblock is marked as absent, or
3968
                        # the file on disk is not present at all in the
3969
                        # dirblock. Either way, report about the dirblock
3970
                        # entry, and let other code handle the filesystem one.
3971
3972
                        # Compare the basename for these files to determine
3973
                        # which comes first
3974
                        if current_path_info[1] < current_entry[0][1]:
3975
                            # extra file on disk: pass for now, but only
3976
                            # increment the path, not the entry
3977
                            advance_entry = False
3978
                        else:
3979
                            # entry referring to file not present on disk.
3980
                            # advance the entry only, after processing.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3981
                            result, changed = _process_entry(current_entry, None)
3982
                            if changed is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3983
                                if changed:
3984
                                    self._gather_result_for_consistency(result)
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3985
                                if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3986
                                    yield result
3987
                            advance_path = False
3988
                    else:
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3989
                        result, changed = _process_entry(current_entry, current_path_info)
3990
                        if changed is not None:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3991
                            path_handled = True
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3992
                            if changed:
3993
                                self._gather_result_for_consistency(result)
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3994
                            if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3995
                                yield result
3996
                    if advance_entry and current_entry is not None:
3997
                        entry_index += 1
3998
                        if entry_index < len(current_block[1]):
3999
                            current_entry = current_block[1][entry_index]
4000
                        else:
4001
                            current_entry = None
4002
                    else:
4003
                        advance_entry = True # reset the advance flaga
4004
                    if advance_path and current_path_info is not None:
4005
                        if not path_handled:
4006
                            # unversioned in all regards
4007
                            if self.want_unversioned:
4008
                                new_executable = bool(
4009
                                    stat.S_ISREG(current_path_info[3].st_mode)
4010
                                    and stat.S_IEXEC & current_path_info[3].st_mode)
4011
                                try:
4012
                                    relpath_unicode = utf8_decode(current_path_info[0])[0]
4013
                                except UnicodeDecodeError:
4014
                                    raise errors.BadFilenameEncoding(
4015
                                        current_path_info[0], osutils._fs_enc)
4016
                                yield (None,
4017
                                    (None, relpath_unicode),
4018
                                    True,
4019
                                    (False, False),
4020
                                    (None, None),
4021
                                    (None, utf8_decode(current_path_info[1])[0]),
4022
                                    (None, current_path_info[2]),
4023
                                    (None, new_executable))
4024
                            # dont descend into this unversioned path if it is
4025
                            # a dir
4026
                            if current_path_info[2] in ('directory'):
4027
                                del current_dir_info[1][path_index]
4028
                                path_index -= 1
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4029
                        # dont descend the disk iterator into any tree
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
4030
                        # paths.
4031
                        if current_path_info[2] == 'tree-reference':
4032
                            del current_dir_info[1][path_index]
4033
                            path_index -= 1
4034
                        path_index += 1
4035
                        if path_index < len(current_dir_info[1]):
4036
                            current_path_info = current_dir_info[1][path_index]
4037
                            if current_path_info[2] == 'directory':
4038
                                if self.tree._directory_is_tree_reference(
4039
                                    current_path_info[0].decode('utf8')):
4040
                                    current_path_info = current_path_info[:2] + \
4041
                                        ('tree-reference',) + current_path_info[3:]
4042
                        else:
4043
                            current_path_info = None
4044
                        path_handled = False
4045
                    else:
4046
                        advance_path = True # reset the advance flagg.
4047
                if current_block is not None:
4048
                    block_index += 1
4049
                    if (block_index < len(self.state._dirblocks) and
4050
                        osutils.is_inside(current_root, self.state._dirblocks[block_index][0])):
4051
                        current_block = self.state._dirblocks[block_index]
4052
                    else:
4053
                        current_block = None
4054
                if current_dir_info is not None:
4055
                    try:
4056
                        current_dir_info = dir_iterator.next()
4057
                    except StopIteration:
4058
                        current_dir_info = None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
4059
        for result in self._iter_specific_file_parents():
4060
            yield result
4061
4062
    def _iter_specific_file_parents(self):
4063
        """Iter over the specific file parents."""
4064
        while self.search_specific_file_parents:
4065
            # Process the parent directories for the paths we were iterating.
4066
            # Even in extremely large trees this should be modest, so currently
4067
            # no attempt is made to optimise.
4068
            path_utf8 = self.search_specific_file_parents.pop()
4069
            if osutils.is_inside_any(self.searched_specific_files, path_utf8):
4070
                # We've examined this path.
4071
                continue
4072
            if path_utf8 in self.searched_exact_paths:
4073
                # We've examined this path.
4074
                continue
4075
            path_entries = self.state._entries_for_path(path_utf8)
4076
            # We need either one or two entries. If the path in
4077
            # self.target_index has moved (so the entry in source_index is in
4078
            # 'ar') then we need to also look for the entry for this path in
4079
            # self.source_index, to output the appropriate delete-or-rename.
4080
            selected_entries = []
4081
            found_item = False
4082
            for candidate_entry in path_entries:
4083
                # Find entries present in target at this path:
4084
                if candidate_entry[1][self.target_index][0] not in 'ar':
4085
                    found_item = True
4086
                    selected_entries.append(candidate_entry)
4087
                # Find entries present in source at this path:
4088
                elif (self.source_index is not None and
4089
                    candidate_entry[1][self.source_index][0] not in 'ar'):
4090
                    found_item = True
4091
                    if candidate_entry[1][self.target_index][0] == 'a':
4092
                        # Deleted, emit it here.
4093
                        selected_entries.append(candidate_entry)
4094
                    else:
4095
                        # renamed, emit it when we process the directory it
4096
                        # ended up at.
4097
                        self.search_specific_file_parents.add(
4098
                            candidate_entry[1][self.target_index][1])
4099
            if not found_item:
4100
                raise AssertionError(
4101
                    "Missing entry for specific path parent %r, %r" % (
4102
                    path_utf8, path_entries))
4103
            path_info = self._path_info(path_utf8, path_utf8.decode('utf8'))
4104
            for entry in selected_entries:
4105
                if entry[0][2] in self.seen_ids:
4106
                    continue
4107
                result, changed = self._process_entry(entry, path_info)
4108
                if changed is None:
4109
                    raise AssertionError(
4110
                        "Got entry<->path mismatch for specific path "
4111
                        "%r entry %r path_info %r " % (
4112
                        path_utf8, entry, path_info))
4113
                # Only include changes - we're outside the users requested
4114
                # expansion.
4115
                if changed:
4116
                    self._gather_result_for_consistency(result)
4117
                    if (result[6][0] == 'directory' and
4118
                        result[6][1] != 'directory'):
4119
                        # This stopped being a directory, the old children have
4120
                        # to be included.
4121
                        if entry[1][self.source_index][0] == 'r':
4122
                            # renamed, take the source path
4123
                            entry_path_utf8 = entry[1][self.source_index][1]
4124
                        else:
4125
                            entry_path_utf8 = path_utf8
4126
                        initial_key = (entry_path_utf8, '', '')
4127
                        block_index, _ = self.state._find_block_index_from_key(
4128
                            initial_key)
4129
                        if block_index == 0:
4130
                            # The children of the root are in block index 1.
4131
                            block_index +=1
4132
                        current_block = None
4133
                        if block_index < len(self.state._dirblocks):
4134
                            current_block = self.state._dirblocks[block_index]
4135
                            if not osutils.is_inside(
4136
                                entry_path_utf8, current_block[0]):
4137
                                # No entries for this directory at all.
4138
                                current_block = None
4139
                        if current_block is not None:
4140
                            for entry in current_block[1]:
4141
                                if entry[1][self.source_index][0] in 'ar':
4142
                                    # Not in the source tree, so doesn't have to be
4143
                                    # included.
4144
                                    continue
4145
                                # Path of the entry itself.
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
4146
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
4147
                                self.search_specific_file_parents.add(
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
4148
                                    osutils.pathjoin(*entry[0][:2]))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
4149
                if changed or self.include_unchanged:
4150
                    yield result
4151
            self.searched_exact_paths.add(path_utf8)
4152
4153
    def _path_info(self, utf8_path, unicode_path):
4154
        """Generate path_info for unicode_path.
4155
4156
        :return: None if unicode_path does not exist, or a path_info tuple.
4157
        """
4158
        abspath = self.tree.abspath(unicode_path)
4159
        try:
4160
            stat = os.lstat(abspath)
4161
        except OSError, e:
4162
            if e.errno == errno.ENOENT:
4163
                # the path does not exist.
4164
                return None
4165
            else:
4166
                raise
4167
        utf8_basename = utf8_path.rsplit('/', 1)[-1]
4168
        dir_info = (utf8_path, utf8_basename,
4169
            osutils.file_kind_from_stat_mode(stat.st_mode), stat,
4170
            abspath)
4171
        if dir_info[2] == 'directory':
4172
            if self.tree._directory_is_tree_reference(
4173
                unicode_path):
4174
                self.root_dir_info = self.root_dir_info[:2] + \
4175
                    ('tree-reference',) + self.root_dir_info[3:]
4176
        return dir_info
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
4177
4178
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
4179
# Try to load the compiled form if possible
4180
try:
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
4181
    from bzrlib._dirstate_helpers_pyx import (
4182
        _read_dirblocks,
4183
        bisect_dirblock,
4184
        _bisect_path_left,
4185
        _bisect_path_right,
4186
        cmp_by_dirs,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
4187
        ProcessEntryC as _process_entry,
3696.4.17 by Robert Collins
Review feedback.
4188
        update_entry as update_entry,
2474.1.21 by John Arbash Meinel
Cleanup the multiple testing.
4189
        )
4574.3.6 by Martin Pool
More warnings when failing to load extensions
4190
except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
4191
    osutils.failed_to_load_extension(e)
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
4192
    from bzrlib._dirstate_helpers_py import (
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
4193
        _read_dirblocks,
4194
        bisect_dirblock,
4195
        _bisect_path_left,
4196
        _bisect_path_right,
4197
        cmp_by_dirs,
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
4198
        )
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
4199
    # FIXME: It would be nice to be able to track moved lines so that the
4200
    # corresponding python code can be moved to the _dirstate_helpers_py
4201
    # module. I don't want to break the history for this important piece of
4202
    # code so I left the code here -- vila 20090622
4203
    update_entry = py_update_entry
4204
    _process_entry = ProcessEntryPython