/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
3146.8.15 by Aaron Bentley
Cleanup and docs
1329
    def update_by_delta(self, delta):
1330
        """Apply an inventory delta to the dirstate for tree 0
1331
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1332
        This is the workhorse for apply_inventory_delta in dirstate based
1333
        trees.
1334
3146.8.15 by Aaron Bentley
Cleanup and docs
1335
        :param delta: An inventory delta.  See Inventory.apply_delta for
1336
            details.
1337
        """
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1338
        self._read_dirblocks_if_needed()
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1339
        encode = cache_utf8.encode
3146.8.13 by Aaron Bentley
Clean up code
1340
        insertions = {}
1341
        removals = {}
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1342
        # Accumulate parent references (path_utf8, id), to check for parentless
1343
        # items or items placed under files/links/tree-references. We get
1344
        # references from every item in the delta that is not a deletion and
1345
        # is not itself the root.
1346
        parents = set()
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1347
        # Added ids must not be in the dirstate already. This set holds those
1348
        # ids.
1349
        new_ids = set()
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
1350
        # This loop transforms the delta to single atomic operations that can
1351
        # be executed and validated.
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1352
        for old_path, new_path, file_id, inv_entry in sorted(
1353
            inventory._check_delta_unique_old_paths(
1354
            inventory._check_delta_unique_new_paths(
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
1355
            inventory._check_delta_ids_match_entry(
4526.9.22 by Robert Collins
Check fileids in inventory deltas are not None and are strings.
1356
            inventory._check_delta_ids_are_valid(
1357
            inventory._check_delta_new_path_entry_both_or_None(delta))))),
4526.9.4 by Robert Collins
Look for trivial issues with new_path and entry being out of sync in deltas.
1358
            reverse=True):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1359
            if (file_id in insertions) or (file_id in removals):
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1360
                raise errors.InconsistentDelta(old_path or new_path, file_id,
1361
                    "repeated file_id")
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1362
            if old_path is not None:
1363
                old_path = old_path.encode('utf-8')
3146.8.13 by Aaron Bentley
Clean up code
1364
                removals[file_id] = old_path
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1365
            else:
1366
                new_ids.add(file_id)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1367
            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.
1368
                if inv_entry is None:
1369
                    raise errors.InconsistentDelta(new_path, file_id,
1370
                        "new_path with no entry")
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1371
                new_path = new_path.encode('utf-8')
4526.9.20 by Robert Collins
Don't double-decode directory names in dirstate delta applications.
1372
                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.
1373
                if basename:
1374
                    parents.add((dirname_utf8, inv_entry.parent_id))
4526.9.20 by Robert Collins
Don't double-decode directory names in dirstate delta applications.
1375
                key = (dirname_utf8, basename, file_id)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1376
                minikind = DirState._kind_to_minikind[inv_entry.kind]
1377
                if minikind == 't':
4634.59.3 by Robert Collins
Bugfix tree reference support in dirstate update_by_delta.
1378
                    fingerprint = inv_entry.reference_revision or ''
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1379
                else:
1380
                    fingerprint = ''
3146.8.13 by Aaron Bentley
Clean up code
1381
                insertions[file_id] = (key, minikind, inv_entry.executable,
1382
                                       fingerprint, new_path)
3585.2.3 by Robert Collins
Teach dirstate.update_by_delta to detect corrupt deltas which do not remove children explicitly.
1383
            # Transform moves into delete+add pairs
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1384
            if None not in (old_path, new_path):
1385
                for child in self._iter_child_entries(0, old_path):
3146.8.13 by Aaron Bentley
Clean up code
1386
                    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
1387
                        continue
3146.8.10 by Aaron Bentley
Clean up some variable names
1388
                    child_dirname = child[0][0]
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1389
                    child_basename = child[0][1]
1390
                    minikind = child[1][0][0]
1391
                    fingerprint = child[1][0][4]
3146.8.9 by Aaron Bentley
Fix child execute bit
1392
                    executable = child[1][0][3]
4789.19.1 by John Arbash Meinel
Found an actual bug.
1393
                    old_child_path = osutils.pathjoin(child_dirname,
1394
                                                      child_basename)
3146.8.13 by Aaron Bentley
Clean up code
1395
                    removals[child[0][2]] = old_child_path
3146.8.10 by Aaron Bentley
Clean up some variable names
1396
                    child_suffix = child_dirname[len(old_path):]
1397
                    new_child_dirname = (new_path + child_suffix)
3146.8.6 by Aaron Bentley
Get apply_inventory_delta almost working properly
1398
                    key = (new_child_dirname, child_basename, child[0][2])
4789.19.1 by John Arbash Meinel
Found an actual bug.
1399
                    new_child_path = osutils.pathjoin(new_child_dirname,
1400
                                                      child_basename)
3146.8.13 by Aaron Bentley
Clean up code
1401
                    insertions[child[0][2]] = (key, minikind, executable,
1402
                                               fingerprint, new_child_path)
4526.9.5 by Robert Collins
Require that added ids in inventory deltas be new.
1403
        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.
1404
        try:
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1405
            self._apply_removals(removals.iteritems())
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1406
            self._apply_insertions(insertions.values())
1407
            # Validate parents
1408
            self._after_delta_check_parents(parents, 0)
1409
        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.
1410
            self._changes_aborted = True
4526.9.2 by Robert Collins
Handle deltas with new paths not matching the actual path.
1411
            if 'integrity error' not in str(e):
1412
                raise
1413
            # _get_entry raises BzrError when a request is inconsistent; we
1414
            # want such errors to be shown as InconsistentDelta - and that 
1415
            # fits the behaviour we trigger.
1416
            raise errors.InconsistentDeltaDelta(delta, "error from _get_entry.")
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1417
1418
    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.
1419
        for file_id, path in sorted(removals, reverse=True,
1420
            key=operator.itemgetter(1)):
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1421
            dirname, basename = osutils.split(path)
1422
            block_i, entry_i, d_present, f_present = \
1423
                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.
1424
            try:
1425
                entry = self._dirblocks[block_i][1][entry_i]
1426
            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.
1427
                self._changes_aborted = True
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1428
                raise errors.InconsistentDelta(path, file_id,
1429
                    "Wrong path for old path.")
1430
            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.
1431
                self._changes_aborted = True
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1432
                raise errors.InconsistentDelta(path, file_id,
1433
                    "Wrong path for old path.")
1434
            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.
1435
                self._changes_aborted = True
4526.9.3 by Robert Collins
Handle mismatches between inventory delta paths and actual paths found by traversing parent pointers.
1436
                raise errors.InconsistentDelta(path, file_id,
4526.9.14 by Robert Collins
Review feedback on dirstate.
1437
                    "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.
1438
                    % entry[0][2])
3146.8.16 by Aaron Bentley
Updates from review
1439
            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.
1440
            # See if we have a malformed delta: deleting a directory must not
1441
            # leave crud behind. This increases the number of bisects needed
1442
            # substantially, but deletion or renames of large numbers of paths
1443
            # is rare enough it shouldn't be an issue (famous last words?) RBC
1444
            # 20080730.
1445
            block_i, entry_i, d_present, f_present = \
1446
                self._get_block_entry_index(path, '', 0)
1447
            if d_present:
1448
                # The dir block is still present in the dirstate; this could
1449
                # be due to it being in a parent tree, or a corrupt delta.
1450
                for child_entry in self._dirblocks[block_i][1]:
1451
                    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.
1452
                        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.
1453
                        raise errors.InconsistentDelta(path, entry[0][2],
1454
                            "The file id was deleted but its children were "
1455
                            "not deleted.")
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1456
1457
    def _apply_insertions(self, adds):
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1458
        try:
1459
            for key, minikind, executable, fingerprint, path_utf8 in sorted(adds):
1460
                self.update_minimal(key, minikind, executable, fingerprint,
1461
                                    path_utf8=path_utf8)
1462
        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.
1463
            self._changes_aborted = True
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1464
            raise errors.InconsistentDelta(path_utf8.decode('utf8'), key[2],
1465
                "Missing parent")
3146.8.5 by Aaron Bentley
Get apply_inventory_delta kinda working, but not children
1466
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1467
    def update_basis_by_delta(self, delta, new_revid):
1468
        """Update the parents of this tree after a commit.
1469
1470
        This gives the tree one parent, with revision id new_revid. The
1471
        inventory delta is applied to the current basis tree to generate the
1472
        inventory for the parent new_revid, and all other parent trees are
1473
        discarded.
1474
1475
        Note that an exception during the operation of this method will leave
1476
        the dirstate in a corrupt state where it should not be saved.
1477
1478
        Finally, we expect all changes to be synchronising the basis tree with
1479
        the working tree.
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
1498
        delta = sorted(delta, reverse=True)
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)
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
1656
            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
1657
                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
1658
                raise errors.InconsistentDelta(new_path, file_id,
1659
                    'working tree does not contain new entry')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1660
            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
1661
                self._changes_aborted = True
1662
                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
1663
                    'The entry was considered to be a genuinely new record,'
1664
                    ' 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
1665
            # We don't need to update the target of an 'r' because the handling
1666
            # of renames turns all 'r' situations into a delete at the original
1667
            # location.
1668
            entry[1][1] = new_details
1669
1670
    def _update_basis_apply_changes(self, changes):
1671
        """Apply a sequence of changes to tree 1 during update_basis_by_delta.
1672
1673
        :param adds: A sequence of changes. Each change is a tuple:
1674
            (path_utf8, path_utf8, file_id, (entry_details))
1675
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1676
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1677
        for old_path, new_path, file_id, new_details in changes:
1678
            # the entry for this file_id must be in tree 0.
1679
            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
1680
            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
1681
                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
1682
                raise errors.InconsistentDelta(new_path, file_id,
1683
                    '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
1684
            if (entry[1][0][0] in absent or
1685
                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
1686
                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
1687
                raise errors.InconsistentDelta(new_path, file_id,
1688
                    'changed considered absent')
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1689
            entry[1][1] = new_details
1690
1691
    def _update_basis_apply_deletes(self, deletes):
1692
        """Apply a sequence of deletes to tree 1 during update_basis_by_delta.
1693
1694
        They may be deletes, or renames that have been split into add/delete
1695
        pairs.
1696
2929.2.3 by Robert Collins
Review feedback.
1697
        :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.
1698
            (old_path_utf8, new_path_utf8, file_id, None, real_delete).
1699
            real_delete is True when the desired outcome is an actual deletion
1700
            rather than the rename handling logic temporarily deleting a path
1701
            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
1702
        """
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1703
        null = DirState.NULL_PARENT_DETAILS
1704
        for old_path, new_path, file_id, _, real_delete in deletes:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1705
            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.
1706
                self._changes_aborted = True
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1707
                raise AssertionError("bad delete delta")
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
1708
            # the entry for this file_id must be in tree 1.
1709
            dirname, basename = osutils.split(old_path)
1710
            block_index, entry_index, dir_present, file_present = \
1711
                self._get_block_entry_index(dirname, basename, 1)
1712
            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
1713
                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
1714
                raise errors.InconsistentDelta(old_path, file_id,
1715
                    '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
1716
            entry = self._dirblocks[block_index][1][entry_index]
1717
            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
1718
                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
1719
                raise errors.InconsistentDelta(old_path, file_id,
1720
                    'mismatched file_id in tree 1')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1721
            if real_delete:
1722
                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
1723
                    self._changes_aborted = True
3221.1.5 by Martin Pool
Fix incorrect indent in dirstate error handling
1724
                    raise errors.InconsistentDelta(old_path, file_id,
1725
                            'This was marked as a real delete, but the WT state'
1726
                            ' claims that it still exists and is versioned.')
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1727
                del self._dirblocks[block_index][1][entry_index]
1728
            else:
1729
                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
1730
                    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
1731
                    raise errors.InconsistentDelta(old_path, file_id,
1732
                        'The entry was considered a rename, but the source path'
1733
                        ' is marked as absent.')
1734
                    # For whatever reason, we were asked to rename an entry
1735
                    # that was originally marked as deleted. This could be
1736
                    # because we are renaming the parent directory, and the WT
1737
                    # current state has the file marked as deleted.
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
1738
                elif entry[1][0][0] == 'r':
1739
                    # implement the rename
1740
                    del self._dirblocks[block_index][1][entry_index]
1741
                else:
1742
                    # it is being resurrected here, so blank it out temporarily.
1743
                    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
1744
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1745
    def _after_delta_check_parents(self, parents, index):
1746
        """Check that parents required by the delta are all intact.
1747
        
1748
        :param parents: An iterable of (path_utf8, file_id) tuples which are
1749
            required to be present in tree 'index' at path_utf8 with id file_id
1750
            and be a directory.
1751
        :param index: The column in the dirstate to check for parents in.
1752
        """
4505.5.9 by Robert Collins
Review feedback.
1753
        for dirname_utf8, file_id in parents:
1754
            # Get the entry - the ensures that file_id, dirname_utf8 exists and
1755
            # has the right file id.
4526.9.1 by Robert Collins
Add WorkingTree.apply_inventory_delta to the set of delta implementations interface tested.
1756
            entry = self._get_entry(index, file_id, dirname_utf8)
4505.5.6 by Robert Collins
Check for missing parents in deltas.
1757
            if entry[1] is None:
1758
                self._changes_aborted = True
4505.5.9 by Robert Collins
Review feedback.
1759
                raise errors.InconsistentDelta(dirname_utf8.decode('utf8'),
1760
                    file_id, "This parent is not present.")
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1761
            # 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.
1762
            if entry[1][index][0] != 'd':
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1763
                self._changes_aborted = True
4505.5.9 by Robert Collins
Review feedback.
1764
                raise errors.InconsistentDelta(dirname_utf8.decode('utf8'),
1765
                    file_id, "This parent is not a directory.")
4505.5.5 by Robert Collins
Parents used in a delta must be directories.
1766
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
1767
    def _observed_sha1(self, entry, sha1, stat_value,
1768
        _stat_to_minikind=_stat_to_minikind, _pack_stat=pack_stat):
1769
        """Note the sha1 of a file.
1770
1771
        :param entry: The entry the sha1 is for.
1772
        :param sha1: The observed sha1.
1773
        :param stat_value: The os.lstat for the file.
1774
        """
1775
        try:
1776
            minikind = _stat_to_minikind[stat_value.st_mode & 0170000]
1777
        except KeyError:
1778
            # Unhandled kind
1779
            return None
1780
        packed_stat = _pack_stat(stat_value)
1781
        if minikind == 'f':
1782
            if self._cutoff_time is None:
1783
                self._sha_cutoff_time()
1784
            if (stat_value.st_mtime < self._cutoff_time
1785
                and stat_value.st_ctime < self._cutoff_time):
5752.5.1 by John Arbash Meinel
Merge up transform-create-file
1786
                entry[1][0] = ('f', sha1, stat_value.st_size, entry[1][0][3],
1787
                               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
1788
                self._mark_modified([entry])
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
1789
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1790
    def _sha_cutoff_time(self):
1791
        """Return cutoff time.
1792
1793
        Files modified more recently than this time are at risk of being
1794
        undetectably modified and so can't be cached.
1795
        """
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.
1796
        # Cache the cutoff time as long as we hold a lock.
1797
        # time.time() isn't super expensive (approx 3.38us), but
1798
        # when you call it 50,000 times it adds up.
1799
        # For comparison, os.lstat() costs 7.2us if it is hot.
1800
        self._cutoff_time = int(time.time()) - 3
1801
        return self._cutoff_time
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1802
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1803
    def _lstat(self, abspath, entry):
1804
        """Return the os.lstat value for this path."""
1805
        return os.lstat(abspath)
1806
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
1807
    def _sha1_file_and_mutter(self, abspath):
1808
        # when -Dhashcache is turned on, this is monkey-patched in to log
1809
        # file reads
1810
        trace.mutter("dirstate sha1 " + abspath)
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
1811
        return self._sha1_provider.sha1(abspath)
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
1812
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1813
    def _is_executable(self, mode, old_executable):
1814
        """Is this file executable?"""
1815
        return bool(S_IEXEC & mode)
1816
2255.10.7 by John Arbash Meinel
Some updates to how we handle the executable bit. In preparation for supporting Win32
1817
    def _is_executable_win32(self, mode, old_executable):
1818
        """On win32 the executable bit is stored in the dirstate."""
1819
        return old_executable
1820
1821
    if sys.platform == 'win32':
1822
        _is_executable = _is_executable_win32
1823
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1824
    def _read_link(self, abspath, old_link):
1825
        """Read the target of a symlink"""
1826
        # 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
1827
        #       already in memory. However, this really needs to be done at a
1828
        #       higher level, because there either won't be anything on disk,
1829
        #       or the thing on disk will be a file.
4095.3.3 by Vincent Ladeuil
Fixed as per John's review.
1830
        fs_encoding = osutils._fs_enc
4095.3.2 by Vincent Ladeuil
Better fix covering more code paths.
1831
        if isinstance(abspath, unicode):
1832
            # abspath is defined as the path to pass to lstat. readlink is
1833
            # buggy in python < 2.6 (it doesn't encode unicode path into FS
1834
            # encoding), so we need to encode ourselves knowing that unicode
1835
            # paths are produced by UnicodeDirReader on purpose.
4095.3.3 by Vincent Ladeuil
Fixed as per John's review.
1836
            abspath = abspath.encode(fs_encoding)
1837
        target = os.readlink(abspath)
1838
        if fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
1839
            # Change encoding if needed
1840
            target = target.decode(fs_encoding).encode('UTF-8')
1841
        return target
2255.10.3 by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry
1842
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.
1843
    def get_ghosts(self):
1844
        """Return a list of the parent tree revision ids that are ghosts."""
1845
        self._read_header_if_needed()
1846
        return self._ghosts
1847
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1848
    def get_lines(self):
1849
        """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.
1850
        if (self._header_state == DirState.IN_MEMORY_UNMODIFIED and
1851
            self._dirblock_state == DirState.IN_MEMORY_UNMODIFIED):
4379.5.2 by Ian Clatworthy
speed up dirstate serialisation, making status faster
1852
            # 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.
1853
            self._state_file.seek(0)
1854
            return self._state_file.readlines()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
1855
        lines = []
1856
        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.
1857
        lines.append(self._get_ghosts_line(self._ghosts))
4379.5.4 by Ian Clatworthy
unroll smart saving logic into one loop in one routine
1858
        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.
1859
        return self._get_output_lines(lines)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1860
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.
1861
    def _get_ghosts_line(self, ghost_ids):
1862
        """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.
1863
        return '\0'.join([str(len(ghost_ids))] + ghost_ids)
1864
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1865
    def _get_parents_line(self, parent_ids):
1866
        """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.
1867
        return '\0'.join([str(len(parent_ids))] + parent_ids)
1868
4379.5.4 by Ian Clatworthy
unroll smart saving logic into one loop in one routine
1869
    def _get_entry_lines(self):
1870
        """Create lines for entries."""
4379.5.7 by Ian Clatworthy
apply review feedback
1871
        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
1872
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1873
    def _get_fields_to_entry(self):
1874
        """Get a function which converts entry fields into a entry record.
1875
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1876
        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.
1877
1878
        :return: A function which takes a list of fields, and returns an
1879
            appropriate record for storing in memory.
1880
        """
1881
        # This is intentionally unrolled for performance
1882
        num_present_parents = self._num_present_parents()
1883
        if num_present_parents == 0:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1884
            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])
1885
                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.
1886
                return (path_name_file_id_key, [
1887
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1888
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1889
                        fields[4],                # fingerprint
1890
                        _int(fields[5]),          # size
1891
                        fields[6] == 'y',         # executable
1892
                        fields[7],                # packed_stat or revision_id
1893
                    )])
1894
            return fields_to_entry_0_parents
1895
        elif num_present_parents == 1:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1896
            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])
1897
                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.
1898
                return (path_name_file_id_key, [
1899
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1900
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1901
                        fields[4],                # fingerprint
1902
                        _int(fields[5]),          # size
1903
                        fields[6] == 'y',         # executable
1904
                        fields[7],                # packed_stat or revision_id
1905
                    ),
1906
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1907
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1908
                        fields[9],                # fingerprint
1909
                        _int(fields[10]),         # size
1910
                        fields[11] == 'y',        # executable
1911
                        fields[12],               # packed_stat or revision_id
1912
                    ),
1913
                    ])
1914
            return fields_to_entry_1_parent
1915
        elif num_present_parents == 2:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1916
            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])
1917
                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.
1918
                return (path_name_file_id_key, [
1919
                    ( # Current tree
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1920
                        fields[3],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1921
                        fields[4],                # fingerprint
1922
                        _int(fields[5]),          # size
1923
                        fields[6] == 'y',         # executable
1924
                        fields[7],                # packed_stat or revision_id
1925
                    ),
1926
                    ( # Parent 1
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1927
                        fields[8],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1928
                        fields[9],                # fingerprint
1929
                        _int(fields[10]),         # size
1930
                        fields[11] == 'y',        # executable
1931
                        fields[12],               # packed_stat or revision_id
1932
                    ),
1933
                    ( # Parent 2
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1934
                        fields[13],               # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1935
                        fields[14],               # fingerprint
1936
                        _int(fields[15]),         # size
1937
                        fields[16] == 'y',        # executable
1938
                        fields[17],               # packed_stat or revision_id
1939
                    ),
1940
                    ])
1941
            return fields_to_entry_2_parents
1942
        else:
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
1943
            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])
1944
                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
1945
                trees = [(fields[cur],                # minikind
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
1946
                          fields[cur+1],              # fingerprint
1947
                          _int(fields[cur+2]),        # size
1948
                          fields[cur+3] == 'y',       # executable
1949
                          fields[cur+4],              # stat or revision_id
1950
                         ) for cur in xrange(3, len(fields)-1, 5)]
1951
                return path_name_file_id_key, trees
1952
            return fields_to_entry_n_parents
1953
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1954
    def get_parent_ids(self):
1955
        """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.
1956
        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.
1957
        return list(self._parents)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
1958
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
1959
    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.
1960
        """Get the coordinates for a path in the state structure.
1961
1962
        :param dirname: The utf8 dirname to lookup.
1963
        :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.
1964
        :param tree_index: The index of the tree for which this lookup should
1965
            be attempted.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1966
        :return: A tuple describing where the path is located, or should be
1967
            inserted. The tuple contains four fields: the block index, the row
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
1968
            index, the directory is present (boolean), the entire path is
1969
            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.
1970
            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.
1971
            True. For instance, a directory not present in the searched tree
1972
            may be returned with a value one greater than the current highest
1973
            block offset. The directory present field will always be True when
1974
            the path present field is True. The directory present field does
1975
            NOT indicate that the directory is present in the searched tree,
1976
            rather it indicates that there are at least some files in some
1977
            tree present there.
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1978
        """
1979
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1980
        key = dirname, basename, ''
1981
        block_index, present = self._find_block_index_from_key(key)
1982
        if not present:
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
1983
            # no such directory - return the dir index and 0 for the row.
1984
            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.
1985
        block = self._dirblocks[block_index][1] # access the entries only
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1986
        entry_index, present = self._find_entry_index(key, block)
2921.1.1 by Robert Collins
Add a cache for dirstate entry lookups.
1987
        # 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.
1988
        # requested.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1989
        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.
1990
            if block[entry_index][1][tree_index][0] not in 'ar':
1991
                # neither absent or relocated
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
1992
                return block_index, entry_index, True, True
1993
            entry_index += 1
1994
        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.
1995
3923.2.1 by Charles Duffy
Fix bug #314251 (dirstate crash on rename via delete+add)
1996
    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
1997
        """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.
1998
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
1999
        If either file_id or path is supplied, it is used as the key to lookup.
2000
        If both are supplied, the fastest lookup is used, and an error is
2001
        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.
2002
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2003
        :param tree_index: The index of the tree we wish to locate this path
2004
            in. If the path is present in that tree, the entry containing its
2005
            details is returned, otherwise (None, None) is returned
2255.7.93 by Martin Pool
Add support for tree-references in dirstate
2006
            0 is the working tree, higher indexes are successive parent
2007
            trees.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2008
        :param fileid_utf8: A utf8 file_id to look up.
2009
        :param path_utf8: An utf8 path to be looked up.
3923.2.2 by Charles Duffy
Update fix for #314251 per feedback from Ian
2010
        :param include_deleted: If True, and performing a lookup via
2011
            fileid_utf8 rather than path_utf8, return an entry for deleted
2012
            (absent) paths.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2013
        :return: The dirstate entry tuple for path, or (None, None)
2014
        """
2255.2.94 by Robert Collins
DirState: handle id lookup redirects correctly.
2015
        self._read_dirblocks_if_needed()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2016
        if path_utf8 is not None:
3376.2.8 by Martin Pool
Some review cleanups for assertion removal
2017
            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.
2018
                raise errors.BzrError('path_utf8 is not a str: %s %r'
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2019
                    % (type(path_utf8), path_utf8))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2020
            # path lookups are faster
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2021
            dirname, basename = osutils.split(path_utf8)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2022
            block_index, entry_index, dir_present, file_present = \
2023
                self._get_block_entry_index(dirname, basename, tree_index)
2024
            if not file_present:
2025
                return None, None
2026
            entry = self._dirblocks[block_index][1][entry_index]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2027
            if not (entry[0][2] and entry[1][tree_index][0] not in ('a', 'r')):
2028
                raise AssertionError('unversioned entry?')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2029
            if fileid_utf8:
2030
                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
2031
                    self._changes_aborted = True
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2032
                    raise errors.BzrError('integrity error ? : mismatching'
2033
                                          ' tree_index, file_id and path')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2034
            return entry
2035
        else:
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
2036
            possible_keys = self._get_id_index().get(fileid_utf8, ())
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2037
            if not possible_keys:
2038
                return None, None
2039
            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.
2040
                block_index, present = \
2041
                    self._find_block_index_from_key(key)
2042
                # strange, probably indicates an out of date
2043
                # id index - for now, allow this.
2044
                if not present:
2045
                    continue
2046
                # WARNING: DO not change this code to use _get_block_entry_index
2047
                # as that function is not suitable: it does not use the key
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2048
                # 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.
2049
                block = self._dirblocks[block_index][1]
2050
                entry_index, present = self._find_entry_index(key, block)
2051
                if present:
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2052
                    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'.
2053
                    # TODO: We might want to assert that entry[0][2] ==
2054
                    #       fileid_utf8.
2255.2.172 by Martin Pool
Recognize 't' (tree-reference) minikind in DirState._get_entry
2055
                    if entry[1][tree_index][0] in 'fdlt':
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2056
                        # 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.
2057
                        # real home of this file_id in this tree.
2058
                        return entry
2059
                    if entry[1][tree_index][0] == 'a':
2060
                        # 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)
2061
                        if include_deleted:
2062
                            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.
2063
                        return None, None
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2064
                    if entry[1][tree_index][0] != 'r':
2065
                        raise AssertionError(
2066
                            "entry %r has invalid minikind %r for tree %r" \
2067
                            % (entry,
2068
                               entry[1][tree_index][0],
2069
                               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.
2070
                    real_path = entry[1][tree_index][1]
2071
                    return self._get_entry(tree_index, fileid_utf8=fileid_utf8,
2072
                        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.
2073
            return None, None
2255.2.66 by John Arbash Meinel
Move _get_row and _get_block_row_index into Dirstate itself.
2074
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
2075
    @classmethod
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2076
    def initialize(cls, path, sha1_provider=None):
1852.13.20 by Robert Collins
Steps toward an object model.
2077
        """Create a new dirstate on path.
2078
2079
        The new dirstate will be an empty tree - that is it has no parents,
2080
        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.
2081
1852.13.20 by Robert Collins
Steps toward an object model.
2082
        :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
2083
        :param sha1_provider: an object meeting the SHA1Provider interface.
2084
            If None, a DefaultSHA1Provider is used.
2425.5.1 by Martin Pool
doc Dirstate.initialize
2085
        :return: A write-locked DirState object.
1852.13.20 by Robert Collins
Steps toward an object model.
2086
        """
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.
2087
        # This constructs a new DirState object on a path, sets the _state_file
1852.13.20 by Robert Collins
Steps toward an object model.
2088
        # to a new empty file for that path. It then calls _set_data() with our
2089
        # stock empty dirstate information - a root with ROOT_ID, no children,
2090
        # and no parents. Finally it calls save() to ensure that this data will
2091
        # persist.
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2092
        if sha1_provider is None:
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2093
            sha1_provider = DefaultSHA1Provider()
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2094
        result = cls(path, sha1_provider)
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2095
        # root dir and root dir contents with no children.
2096
        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.
2097
        # a new root directory, with a NULLSTAT.
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2098
        empty_tree_dirblocks[0][1].append(
2255.8.4 by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks
2099
            (('', '', inventory.ROOT_ID), [
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2100
                ('d', '', 0, False, DirState.NULLSTAT),
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2101
            ]))
2255.4.2 by James Westby
(broken) Add the locking methods.
2102
        result.lock_write()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2103
        try:
2255.4.2 by James Westby
(broken) Add the locking methods.
2104
            result._set_data([], empty_tree_dirblocks)
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2105
            result.save()
2106
        except:
2255.4.2 by James Westby
(broken) Add the locking methods.
2107
            result.unlock()
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2108
            raise
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2109
        return result
2110
3477.2.1 by John Arbash Meinel
Assert that we properly encode inv_entry.symlink_target, (bug #135320)
2111
    @staticmethod
2112
    def _inv_entry_to_details(inv_entry):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2113
        """Convert an inventory entry (from a revision tree) to state details.
2114
2115
        :param inv_entry: An inventory entry whose sha1 and link targets can be
2116
            relied upon, and which has a revision set.
2117
        :return: A details tuple - the details for a single tree at a path +
2118
            id.
2119
        """
2120
        kind = inv_entry.kind
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2121
        minikind = DirState._kind_to_minikind[kind]
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2122
        tree_data = inv_entry.revision
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2123
        if kind == 'directory':
2124
            fingerprint = ''
2125
            size = 0
2126
            executable = False
2127
        elif kind == 'symlink':
4095.3.3 by Vincent Ladeuil
Fixed as per John's review.
2128
            if inv_entry.symlink_target is None:
2129
                fingerprint = ''
2130
            else:
2131
                fingerprint = inv_entry.symlink_target.encode('utf8')
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2132
            size = 0
2133
            executable = False
2134
        elif kind == 'file':
2135
            fingerprint = inv_entry.text_sha1 or ''
2136
            size = inv_entry.text_size or 0
2137
            executable = inv_entry.executable
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2138
        elif kind == 'tree-reference':
2139
            fingerprint = inv_entry.reference_revision or ''
2140
            size = 0
2141
            executable = False
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2142
        else:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2143
            raise Exception("can't pack %s" % inv_entry)
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2144
        return static_tuple.StaticTuple(minikind, fingerprint, size,
2145
                                        executable, tree_data)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2146
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
2147
    def _iter_child_entries(self, tree_index, path_utf8):
2148
        """Iterate over all the entries that are children of path_utf.
2149
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2150
        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
2151
        tree_index. tree_index data is not refreshed, so if tree 0 is used,
2152
        results may differ from that obtained if paths were statted to
2153
        determine what ones were directories.
2154
2155
        Asking for the children of a non-directory will return an empty
2156
        iterator.
2157
        """
2158
        pending_dirs = []
2159
        next_pending_dirs = [path_utf8]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2160
        absent = 'ar'
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
2161
        while next_pending_dirs:
2162
            pending_dirs = next_pending_dirs
2163
            next_pending_dirs = []
2164
            for path in pending_dirs:
2165
                block_index, present = self._find_block_index_from_key(
2166
                    (path, '', ''))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2167
                if block_index == 0:
2168
                    block_index = 1
2169
                    if len(self._dirblocks) == 1:
2170
                        # asked for the children of the root with no other
2171
                        # contents.
2172
                        return
2929.2.1 by Robert Collins
* Commit updates the state of the working tree via a delta rather than
2173
                if not present:
2174
                    # children of a non-directory asked for.
2175
                    continue
2176
                block = self._dirblocks[block_index]
2177
                for entry in block[1]:
2178
                    kind = entry[1][tree_index][0]
2179
                    if kind not in absent:
2180
                        yield entry
2181
                    if kind == 'd':
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2182
                        if entry[0][0]:
2183
                            path = entry[0][0] + '/' + entry[0][1]
2184
                        else:
2185
                            path = entry[0][1]
2186
                        next_pending_dirs.append(path)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2187
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2188
    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.
2189
        """Iterate over all the entries in the dirstate.
2190
2191
        Each yelt item is an entry in the standard format described in the
2192
        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.
2193
        """
2194
        self._read_dirblocks_if_needed()
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2195
        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.
2196
            for entry in directory[1]:
2197
                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.
2198
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2199
    def _get_id_index(self):
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2200
        """Get an id index of self._dirblocks.
2201
        
2202
        This maps from file_id => [(directory, name, file_id)] entries where
2203
        that file_id appears in one of the trees.
2204
        """
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2205
        if self._id_index is None:
2206
            id_index = {}
2207
            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.
2208
                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
2209
            self._id_index = id_index
2210
        return self._id_index
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2211
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2212
    def _add_to_id_index(self, id_index, entry_key):
2213
        """Add this entry to the _id_index mapping."""
2214
        # This code used to use a set for every entry in the id_index. However,
2215
        # it is *rare* to have more than one entry. So a set is a large
2216
        # overkill. And even when we do, we won't ever have more than the
2217
        # number of parent trees. Which is still a small number (rarely >2). As
2218
        # such, we use a simple tuple, and do our own uniqueness checks. While
2219
        # the 'in' check is O(N) since N is nicely bounded it shouldn't ever
2220
        # cause quadratic failure.
2221
        # TODO: This should use StaticTuple
2222
        file_id = entry_key[2]
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
2223
        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.
2224
        if file_id not in id_index:
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
2225
            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.
2226
        else:
2227
            entry_keys = id_index[file_id]
2228
            if entry_key not in entry_keys:
2229
                id_index[file_id] = entry_keys + (entry_key,)
2230
2231
    def _remove_from_id_index(self, id_index, entry_key):
2232
        """Remove this entry from the _id_index mapping.
2233
2234
        It is an programming error to call this when the entry_key is not
2235
        already present.
2236
        """
2237
        file_id = entry_key[2]
5361.3.4 by John Arbash Meinel
id_index size drops to 230kB with StaticTuples.
2238
        entry_keys = list(id_index[file_id])
2239
        entry_keys.remove(entry_key)
2240
        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.
2241
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2242
    def _get_output_lines(self, lines):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2243
        """Format lines for final output.
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
2244
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2245
        :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.
2246
            path lines.
2247
        """
2255.8.6 by John Arbash Meinel
Because the disk format (sorting) has now changed
2248
        output_lines = [DirState.HEADER_FORMAT_3]
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2249
        lines.append('') # a final newline
2250
        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.
2251
        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.
2252
        # -3, 1 for num parents, 1 for ghosts, 1 for final newline
2253
        num_entries = len(lines)-3
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2254
        output_lines.append('num_entries: %s\n' % (num_entries,))
2255
        output_lines.append(inventory_text)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2256
        return output_lines
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2257
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
2258
    def _make_deleted_row(self, fileid_utf8, parents):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2259
        """Return a deleted row for fileid_utf8."""
2255.2.36 by Robert Collins
Fix Dirstate unversioning of entries which are in a parent.
2260
        return ('/', 'RECYCLED.BIN', 'file', fileid_utf8, 0, DirState.NULLSTAT,
2261
            ''), parents
2262
2255.3.1 by John Arbash Meinel
Rewrite the inner parsing loop, needs performance testing.
2263
    def _num_present_parents(self):
2264
        """The number of parent entries in each record row."""
2265
        return len(self._parents) - len(self._ghosts)
2266
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
2267
    @classmethod
2268
    def on_file(cls, path, sha1_provider=None, worth_saving_limit=0):
4031.3.1 by Frank Aspell
Fixing various typos
2269
        """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.
2270
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2271
        :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
2272
        :param sha1_provider: an object meeting the SHA1Provider interface.
2273
            If None, a DefaultSHA1Provider is used.
4379.5.7 by Ian Clatworthy
apply review feedback
2274
        :param worth_saving_limit: when the exact number of hash changed
2275
            entries is known, only bother saving the dirstate if more than
2276
            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.
2277
        :return: An unlocked DirState object, associated with the given path.
2278
        """
4132.2.2 by Ian Clatworthy
make sha1_provider a mandatory param for DirState.__init__()
2279
        if sha1_provider is None:
4132.2.5 by Ian Clatworthy
feedback from poolie - use SHA, not Sha, in class names
2280
            sha1_provider = DefaultSHA1Provider()
5807.4.5 by John Arbash Meinel
Start adding tests that _worth_saving_limit works as expected.
2281
        result = cls(path, sha1_provider,
2282
                     worth_saving_limit=worth_saving_limit)
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2283
        return result
2284
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.
2285
    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.
2286
        """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
2287
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2288
        This populates self._dirblocks, and sets self._dirblock_state to
2289
        IN_MEMORY_UNMODIFIED. It is not currently ready for incremental block
2290
        loading.
2255.2.85 by Robert Collins
[BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
2291
        """
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.
2292
        self._read_header_if_needed()
2293
        if self._dirblock_state == DirState.NOT_IN_MEMORY:
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
2294
            _read_dirblocks(self)
4379.5.2 by Ian Clatworthy
speed up dirstate serialisation, making status faster
2295
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2296
    def _read_header(self):
2297
        """This reads in the metadata header, and the parent ids.
2298
2299
        After reading in, the file should be positioned at the null
2300
        just before the start of the first record in the file.
2301
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.
2302
        :return: (expected crc checksum, number of entries, parent list)
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2303
        """
2304
        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.
2305
        parent_line = self._state_file.readline()
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2306
        info = parent_line.split('\0')
2307
        num_parents = int(info[0])
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
2308
        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.
2309
        ghost_line = self._state_file.readline()
2310
        info = ghost_line.split('\0')
2311
        num_ghosts = int(info[1])
2255.2.84 by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids.
2312
        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.
2313
        self._header_state = DirState.IN_MEMORY_UNMODIFIED
2255.3.2 by John Arbash Meinel
(broken) some basic work on adding bisect functionality to dirstate.
2314
        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.
2315
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2316
    def _read_header_if_needed(self):
2317
        """Read the header of the dirstate file if needed."""
2255.4.2 by James Westby
(broken) Add the locking methods.
2318
        # inline this as it will be called a lot
2319
        if not self._lock_token:
2320
            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.
2321
        if self._header_state == DirState.NOT_IN_MEMORY:
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2322
            self._read_header()
2323
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2324
    def _read_prelude(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2325
        """Read in the prelude header of the dirstate file.
1852.13.15 by Robert Collins
Ensure Format4 working trees start with a dirstate.
2326
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.
2327
        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.
2328
        checksum. The position will be correct to read in the rest of
2329
        the file and check the checksum after this point.
2330
        The next entry in the file should be the number of parents,
2331
        and their ids. Followed by a newline.
2332
        """
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.
2333
        header = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2334
        if header != DirState.HEADER_FORMAT_3:
2335
            raise errors.BzrError(
2336
                '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.
2337
        crc_line = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2338
        if not crc_line.startswith('crc32: '):
2339
            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.
2340
        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.
2341
        num_entries_line = self._state_file.readline()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2342
        if not num_entries_line.startswith('num_entries: '):
2343
            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.
2344
        self._num_entries = int(num_entries_line[len('num_entries: '):-1])
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2345
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2346
    def sha1_from_stat(self, path, stat_result, _pack_stat=pack_stat):
2347
        """Find a sha1 given a stat lookup."""
2348
        return self._get_packed_stat_index().get(_pack_stat(stat_result), None)
2349
2350
    def _get_packed_stat_index(self):
2351
        """Get a packed_stat index of self._dirblocks."""
2352
        if self._packed_stat_index is None:
2353
            index = {}
2354
            for key, tree_details in self._iter_entries():
2355
                if tree_details[0][0] == 'f':
2929.1.2 by Robert Collins
Review feedback.
2356
                    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.
2357
            self._packed_stat_index = index
2358
        return self._packed_stat_index
2359
1852.13.19 by Robert Collins
Get DirState objects roundtripping an add of a ghost tree.
2360
    def save(self):
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2361
        """Save any pending changes created during this session.
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2362
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2363
        We reuse the existing file, because that prevents race conditions with
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2364
        file creation, and use oslocks on it to prevent concurrent modification
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2365
        and reads - because dirstate's incremental data aggregation is not
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2366
        compatible with reading a modified file, and replacing a file in use by
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2367
        another process is impossible on Windows.
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
2368
2369
        A dirstate in read only mode should be smart enough though to validate
2370
        that the file has not changed, and otherwise discard its cache and
2371
        start over, to allow for fine grained read lock duration, so 'status'
2372
        wont block 'commit' - for example.
2373
        """
3221.1.2 by Martin Pool
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
2374
        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
2375
            # Should this be a warning? For now, I'm expecting that places that
2376
            # 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
2377
            trace.mutter('Not saving DirState because '
2378
                    '_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
2379
            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
2380
        # TODO: Since we now distinguish IN_MEMORY_MODIFIED from
2381
        #       IN_MEMORY_HASH_MODIFIED, we should only fail quietly if we fail
2382
        #       to save an IN_MEMORY_HASH_MODIFIED, and fail *noisily* if we
2383
        #       fail to save IN_MEMORY_MODIFIED
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2384
        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,
2385
            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.
2386
            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,
2387
                grabbed_write_lock, new_lock = self._lock_token.temporary_write_lock()
2388
                # Switch over to the new lock, as the old one may be closed.
2389
                # TODO: jam 20070315 We should validate the disk file has
2390
                #       not changed contents. Since temporary_write_lock may
2391
                #       not be an atomic operation.
2392
                self._lock_token = new_lock
2393
                self._state_file = new_lock.f
2394
                if not grabbed_write_lock:
2395
                    # 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.
2396
                    return
2397
            try:
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2398
                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.
2399
                self._state_file.seek(0)
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2400
                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.
2401
                self._state_file.truncate()
2402
                self._state_file.flush()
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2403
                self._mark_unmodified()
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
2404
            finally:
2353.4.7 by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object,
2405
                if grabbed_write_lock:
2353.4.8 by John Arbash Meinel
Use the right lock object.
2406
                    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.
2407
                    self._state_file = self._lock_token.f
2408
                    # TODO: jam 20070315 We should validate the disk file has
2409
                    #       not changed contents. Since restore_read_lock may
2410
                    #       not be an atomic operation.
1852.13.6 by Robert Collins
start hooking in the prototype dirstate serialiser.
2411
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2412
    def _worth_saving(self):
2413
        """Is it worth saving the dirstate or not?"""
5807.4.2 by John Arbash Meinel
TODO entry.
2414
        if (self._header_state == DirState.IN_MEMORY_MODIFIED
2415
            or self._dirblock_state == DirState.IN_MEMORY_MODIFIED):
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2416
            return True
5807.4.2 by John Arbash Meinel
TODO entry.
2417
        if self._dirblock_state == DirState.IN_MEMORY_HASH_MODIFIED:
2418
            if self._worth_saving_limit == -1:
2419
                # We never save hash changes when the limit is -1
2420
                return False
4379.5.5 by Ian Clatworthy
support a configurable limit of changes before dirstate saving
2421
            # If we're using smart saving and only a small number of
4379.5.7 by Ian Clatworthy
apply review feedback
2422
            # 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
2423
            # suggested using a heuristic here based on the size of the
2424
            # changed files and/or tree. For now, we go with a configurable
2425
            # number of changes, keeping the calculation time
2426
            # as low overhead as possible. (This also keeps all existing
2427
            # 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.
2428
            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
2429
                return True
2430
        return False
2431
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2432
    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.
2433
        """Set the full dirstate data in memory.
1852.13.20 by Robert Collins
Steps toward an object model.
2434
2435
        This is an internal function used to completely replace the objects
2436
        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.
2437
2438
        :param parent_ids: A list of parent tree revision ids.
2439
        :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
2440
            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.
2441
            found in that directory.
1852.13.20 by Robert Collins
Steps toward an object model.
2442
        """
2443
        # 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.
2444
        self._dirblocks = dirblocks
5807.4.2 by John Arbash Meinel
TODO entry.
2445
        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.
2446
        self._parents = list(parent_ids)
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2447
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2448
        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.
2449
2255.2.4 by Robert Collins
Snapshot dirstate development
2450
    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.
2451
        """Change the id of path to new_id in the current working tree.
2255.2.4 by Robert Collins
Snapshot dirstate development
2452
2453
        :param path: The path inside the tree to set - '' is the root, 'foo'
2454
            is the path foo in the root.
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2455
        :param new_id: The new id to assign to the path. This must be a utf8
2456
            file id (not unicode, and not None).
2255.2.4 by Robert Collins
Snapshot dirstate development
2457
        """
2255.2.37 by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
2458
        self._read_dirblocks_if_needed()
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2459
        if len(path):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2460
            # TODO: logic not written
2255.2.75 by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents.
2461
            raise NotImplementedError(self.set_path_id)
2462
        # TODO: check new id is unique
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2463
        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,
2464
        if entry[0][2] == new_id:
2465
            # Nothing to change.
2466
            return
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2467
        # mark the old path absent, and insert a new root path
2468
        self._make_absent(entry)
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2469
        self.update_minimal(('', '', new_id), 'd',
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2470
            path_utf8='', packed_stat=entry[1][0][4])
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2471
        self._mark_modified()
5807.4.2 by John Arbash Meinel
TODO entry.
2472
        # XXX: This was added by Ian, we need to make sure there
2473
        #      are tests for it, because it isn't in bzr.dev TRUNK
2474
        #      It looks like the only place it is called is in setting the root
2475
        #      id of the tree. So probably we never had an _id_index when we
2476
        #      don't even have a root yet.
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2477
        if self._id_index is not None:
5807.4.2 by John Arbash Meinel
TODO entry.
2478
            self._add_to_id_index(self._id_index, entry[0])
2255.2.4 by Robert Collins
Snapshot dirstate development
2479
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.
2480
    def set_parent_trees(self, trees, ghosts):
2481
        """Set the parent trees for the dirstate.
2482
2483
        :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
2484
            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.
2485
            this case.
2486
        :param ghosts: A list of the revision_ids that are ghosts at the time
2487
            of setting.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2488
        """
2489
        # TODO: generate a list of parent indexes to preserve to save
2255.2.4 by Robert Collins
Snapshot dirstate development
2490
        # processing specific parent trees. In the common case one tree will
2491
        # be preserved - the left most parent.
2492
        # TODO: if the parent tree is a dirstate, we might want to walk them
2493
        # all by path in parallel for 'optimal' common-case performance.
2494
        # 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.
2495
        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.
2496
        # TODO future sketch: Examine the existing parents to generate a change
2497
        # map and then walk the new parent trees only, mapping them into the
2498
        # dirstate. Walk the dirstate at the same time to remove unreferenced
2499
        # entries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2500
        # for now:
2501
        # 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.
2502
        # entries from the parent trees, if they are not ghost trees.
2255.2.4 by Robert Collins
Snapshot dirstate development
2503
        # after we finish walking the dirstate, all entries not in the dirstate
2504
        # are deletes, so we want to append them to the end as per the design
2505
        # discussions. So do a set difference on ids with the parents to
2506
        # get deletes, and add them to the end.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2507
        # During the update process we need to answer the following questions:
2508
        # - find other keys containing a fileid in order to create cross-path
2509
        #   links. We dont't trivially use the inventory from other trees
2510
        #   because this leads to either double touching, or to accessing
2511
        #   missing keys,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2512
        # - find other keys containing a path
2513
        # We accumulate each entry via this dictionary, including the root
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2514
        by_path = {}
2515
        id_index = {}
2516
        # we could do parallel iterators, but because file id data may be
2517
        # scattered throughout, we dont save on index overhead: we have to look
2518
        # at everything anyway. We can probably save cycles by reusing parent
2519
        # data and doing an incremental update when adding an additional
2520
        # parent, but for now the common cases are adding a new parent (merge),
2521
        # and replacing completely (commit), and commit is more common: so
2522
        # optimise merge later.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2523
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2524
        # ---- start generation of full tree mapping data
2525
        # what trees should we use?
2255.2.4 by Robert Collins
Snapshot dirstate development
2526
        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
2527
        # how many trees do we end up with
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2528
        parent_count = len(parent_trees)
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2529
        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.
2530
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2531
        # one: the current tree
2532
        for entry in self._iter_entries():
2533
            # skip entries not in the current tree
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2534
            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.
2535
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2536
            by_path[entry[0]] = [entry[1][0]] + \
2537
                [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.
2538
            # TODO: Possibly inline this, since we know it isn't present yet
2539
            #       id_index[entry[0][2]] = (entry[0],)
2540
            self._add_to_id_index(id_index, entry[0])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2541
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2542
        # now the parent trees:
2543
        for tree_index, tree in enumerate(parent_trees):
2544
            # the index is off by one, adjust it.
2545
            tree_index = tree_index + 1
2546
            # when we add new locations for a fileid we need these ranges for
2547
            # any fileid in this tree as we set the by_path[id] to:
2548
            # already_processed_tree_details + new_details + new_location_suffix
2549
            # the suffix is from tree_index+1:parent_count+1.
2550
            new_location_suffix = [DirState.NULL_PARENT_DETAILS] * (parent_count - tree_index)
2551
            # now stitch in all the entries from this tree
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2552
            last_dirname = None
5807.1.4 by Jelmer Vernooij
Use tree.iter_entries_by_dir rather than tree.inventory.entries_by_dir.
2553
            for path, entry in tree.iter_entries_by_dir():
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2554
                # here we process each trees details for each item in the tree.
2555
                # we first update any existing entries for the id at other paths,
2556
                # then we either create or update the entry for the id at the
2557
                # right path, and finally we add (if needed) a mapping from
2558
                # file_id to this path. We do it in this order to allow us to
2559
                # avoid checking all known paths for the id when generating a
2560
                # new entry at this path: by adding the id->path mapping last,
2561
                # all the mappings are valid and have correct relocation
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2562
                # records where needed.
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2563
                file_id = entry.file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2564
                path_utf8 = path.encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2565
                dirname, basename = osutils.split(path_utf8)
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2566
                if dirname == last_dirname:
2567
                    # Try to re-use objects as much as possible
2568
                    dirname = last_dirname
2569
                else:
2570
                    last_dirname = dirname
2571
                new_entry_key = st(dirname, basename, file_id)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2572
                # tree index consistency: All other paths for this id in this tree
2573
                # index must point to the correct path.
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2574
                entry_keys = id_index.get(file_id, ())
2575
                for entry_key in entry_keys:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2576
                    # TODO:PROFILING: It might be faster to just update
2577
                    # rather than checking if we need to, and then overwrite
2578
                    # the one we are located at.
2579
                    if entry_key != new_entry_key:
2580
                        # this file id is at a different path in one of the
2581
                        # other trees, so put absent pointers there
2582
                        # This is the vertical axis in the matrix, all pointing
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2583
                        # to the real path.
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2584
                        by_path[entry_key][tree_index] = st('r', path_utf8, 0,
2585
                                                            False, '')
2586
                # by path consistency: Insert into an existing path record
2587
                # (trivial), or add a new one with relocation pointers for the
2588
                # other tree indexes.
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2589
                if new_entry_key in entry_keys:
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2590
                    # there is already an entry where this data belongs, just
2591
                    # insert it.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2592
                    by_path[new_entry_key][tree_index] = \
2593
                        self._inv_entry_to_details(entry)
2594
                else:
2595
                    # add relocated entries to the horizontal axis - this row
2596
                    # mapping from path,id. We need to look up the correct path
2597
                    # for the indexes from 0 to tree_index -1
2598
                    new_details = []
2599
                    for lookup_index in xrange(tree_index):
2600
                        # 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.
2601
                        # so there are no id_indexes, possibly take this out of
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2602
                        # the loop?
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2603
                        if not len(entry_keys):
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2604
                            new_details.append(DirState.NULL_PARENT_DETAILS)
2605
                        else:
2606
                            # 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.
2607
                            a_key = iter(entry_keys).next()
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
2608
                            if by_path[a_key][lookup_index][0] in ('r', 'a'):
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2609
                                # its a pointer or missing statement, use it as
2610
                                # is.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2611
                                new_details.append(by_path[a_key][lookup_index])
2612
                            else:
2613
                                # we have the right key, make a pointer to it.
2614
                                real_path = ('/'.join(a_key[0:2])).strip('/')
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2615
                                new_details.append(st('r', real_path, 0, False,
2616
                                                      ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2617
                    new_details.append(self._inv_entry_to_details(entry))
2618
                    new_details.extend(new_location_suffix)
2619
                    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.
2620
                    self._add_to_id_index(id_index, new_entry_key)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2621
        # --- 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
2622
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2623
        # sort and output all the entries
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2624
        new_entries = self._sort_entries(by_path.items())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2625
        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.
2626
        self._parents = [rev_id for rev_id, tree in trees]
2627
        self._ghosts = list(ghosts)
5807.4.2 by John Arbash Meinel
TODO entry.
2628
        self._mark_modified(header_modified=True)
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2629
        self._id_index = id_index
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
2630
2631
    def _sort_entries(self, entry_list):
2632
        """Given a list of entries, sort them into the right order.
2633
2634
        This is done when constructing a new dirstate from trees - normally we
2635
        try to keep everything in sorted blocks all the time, but sometimes
2636
        it's easier to sort after the fact.
2637
        """
5847.1.6 by John Arbash Meinel
Document the split_dirs reason.
2638
        # When sorting, we usually have 10x more entries than directories. (69k
2639
        # total entries, 4k directories). So cache the results of splitting.
2640
        # Saving time and objects. Also, use StaticTuple to avoid putting all
2641
        # of these object into python's garbage collector.
5847.1.1 by John Arbash Meinel
DirState._sort_entries was showing up for 'uncommit' times.
2642
        split_dirs = {}
5847.1.5 by John Arbash Meinel
We don't need a second named parameter.
2643
        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:
2644
            # sort by: directory parts, file name, file id
5847.1.1 by John Arbash Meinel
DirState._sort_entries was showing up for 'uncommit' times.
2645
            dirpath, fname, file_id = entry[0]
2646
            try:
2647
                split = _split_dirs[dirpath]
2648
            except KeyError:
5847.1.5 by John Arbash Meinel
We don't need a second named parameter.
2649
                split = _st.from_sequence(dirpath.split('/'))
5847.1.1 by John Arbash Meinel
DirState._sort_entries was showing up for 'uncommit' times.
2650
                _split_dirs[dirpath] = split
5847.1.5 by John Arbash Meinel
We don't need a second named parameter.
2651
            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.
2652
        return sorted(entry_list, key=_key)
1852.13.20 by Robert Collins
Steps toward an object model.
2653
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.
2654
    def set_state_from_inventory(self, new_inv):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2655
        """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.
2656
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2657
        This API is called by tree transform, and will usually occur with
2658
        existing parent trees.
2659
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.
2660
        :param new_inv: The inventory object to set current state from.
2661
        """
2872.4.2 by Martin Pool
Treat set_state_from_inventory as evil, and del dead variables rather than just setting to null
2662
        if 'evil' in debug.debug_flags:
2663
            trace.mutter_callsite(1,
2664
                "set_state_from_inventory called; please mutate the tree instead")
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2665
        tracing = 'dirstate' in debug.debug_flags
2666
        if tracing:
2667
            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.
2668
        self._read_dirblocks_if_needed()
2669
        # sketch:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2670
        # Two iterators: current data and new data, both in dirblock order.
2872.4.11 by Martin Pool
Review documentation cleanups
2671
        # We zip them together, which tells about entries that are new in the
2672
        # inventory, or removed in the inventory, or present in both and
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2673
        # possibly changed.
2872.4.11 by Martin Pool
Review documentation cleanups
2674
        #
2675
        # You might think we could just synthesize a new dirstate directly
2676
        # since we're processing it in the right order.  However, we need to
2677
        # also consider there may be any number of parent trees and relocation
2678
        # pointers, and we don't want to duplicate that here.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2679
        new_iterator = new_inv.iter_entries_by_dir()
2255.2.88 by Robert Collins
Significant steps back to operation.
2680
        # we will be modifying the dirstate, so we need a stable iterator. In
2681
        # 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.
2682
        # list using a copy so that we see every original item and don't have
2683
        # to adjust the position when items are inserted or deleted in the
2684
        # underlying dirstate.
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2685
        old_iterator = iter(list(self._iter_entries()))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2686
        # both must have roots so this is safe:
2687
        current_new = new_iterator.next()
2688
        current_old = old_iterator.next()
2689
        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.
2690
            try:
2255.2.88 by Robert Collins
Significant steps back to operation.
2691
                return iterator.next()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2692
            except StopIteration:
2693
                return None
2694
        while current_new or current_old:
2695
            # skip entries in old that are not really there
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2696
            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
2697
                # relocated or absent
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2698
                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.
2699
                continue
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2700
            if current_new:
2701
                # convert new into dirblock style
2255.2.88 by Robert Collins
Significant steps back to operation.
2702
                new_path_utf8 = current_new[0].encode('utf8')
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2703
                new_dirname, new_basename = osutils.split(new_path_utf8)
2255.2.107 by John Arbash Meinel
(working), fix dirstate to use utf8 file ids.
2704
                new_id = current_new[1].file_id
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2705
                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.
2706
                current_new_minikind = \
2707
                    DirState._kind_to_minikind[current_new[1].kind]
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2708
                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
2709
                    fingerprint = current_new[1].reference_revision or ''
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2710
                else:
2872.4.7 by Martin Pool
More cleanups of dirstate work
2711
                    # We normally only insert or remove records, or update
2712
                    # them when it has significantly changed.  Then we want to
2713
                    # erase its fingerprint.  Unaffected records should
2714
                    # normally not be updated at all.
2255.2.195 by Robert Collins
Fix set_reference_revision on dirstate format trees.
2715
                    fingerprint = ''
2255.2.88 by Robert Collins
Significant steps back to operation.
2716
            else:
2717
                # for safety disable variables
2872.4.7 by Martin Pool
More cleanups of dirstate work
2718
                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
2719
                    new_entry_key = None
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2720
            # 5 cases, we dont have a value that is strictly greater than everything, so
2721
            # we make both end conditions explicit
2872.4.11 by Martin Pool
Review documentation cleanups
2722
            if not current_old:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2723
                # old is finished: insert current_new into the state.
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2724
                if tracing:
2725
                    trace.mutter("Appending from new '%s'.",
2726
                        new_path_utf8.decode('utf8'))
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2727
                self.update_minimal(new_entry_key, current_new_minikind,
2728
                    executable=current_new[1].executable,
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2729
                    path_utf8=new_path_utf8, fingerprint=fingerprint,
2730
                    fullscan=True)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2731
                current_new = advance(new_iterator)
2872.4.11 by Martin Pool
Review documentation cleanups
2732
            elif not current_new:
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2733
                # new is finished
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2734
                if tracing:
2735
                    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.
2736
                        current_old[0][0].decode('utf8'),
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2737
                        current_old[0][1].decode('utf8'))
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2738
                self._make_absent(current_old)
2255.2.88 by Robert Collins
Significant steps back to operation.
2739
                current_old = advance(old_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2740
            elif new_entry_key == current_old[0]:
2741
                # same -  common case
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2742
                # We're looking at the same path and id in both the dirstate
2743
                # and inventory, so just need to update the fields in the
2744
                # dirstate from the one in the inventory.
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2745
                # TODO: update the record if anything significant has changed.
2255.2.88 by Robert Collins
Significant steps back to operation.
2746
                # the minimal required trigger is if the execute bit or cached
2747
                # kind has changed.
2748
                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.
2749
                    current_old[1][0][0] != current_new_minikind):
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2750
                    if tracing:
2751
                        trace.mutter("Updating in-place change '%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(current_old[0], current_new_minikind,
2255.2.88 by Robert Collins
Significant steps back to operation.
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
                # both sides are dealt with, move on
2758
                current_old = advance(old_iterator)
2759
                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
2760
            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
2761
                  or (new_dirname == current_old[0][0]
2762
                      and new_entry_key[1:] < current_old[0][1:])):
2255.2.88 by Robert Collins
Significant steps back to operation.
2763
                # new comes before:
2764
                # add a entry for this and advance new
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2765
                if tracing:
2766
                    trace.mutter("Inserting from new '%s'.",
2767
                        new_path_utf8.decode('utf8'))
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2768
                self.update_minimal(new_entry_key, current_new_minikind,
2769
                    executable=current_new[1].executable,
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2770
                    path_utf8=new_path_utf8, fingerprint=fingerprint,
2771
                    fullscan=True)
2255.2.88 by Robert Collins
Significant steps back to operation.
2772
                current_new = advance(new_iterator)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2773
            else:
2872.4.3 by Martin Pool
Fix comparison for merge sort in Dirstate.set_state_from_inventory
2774
                # we've advanced past the place where the old key would be,
2775
                # without seeing it in the new list.  so it must be gone.
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2776
                if tracing:
2777
                    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.
2778
                        current_old[0][0].decode('utf8'),
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2779
                        current_old[0][1].decode('utf8'))
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2780
                self._make_absent(current_old)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2781
                current_old = advance(old_iterator)
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2782
        self._mark_modified()
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
2783
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
2784
        self._packed_stat_index = None
4536.4.2 by Robert Collins
Instrument dirstate.set_state_from_inventory.
2785
        if tracing:
2786
            trace.mutter("set_state_from_inventory complete.")
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2787
5630.2.6 by John Arbash Meinel
Implement a reset-to-known-state ability for DirState.
2788
    def set_state_from_scratch(self, working_inv, parent_trees, parent_ghosts):
2789
        """Wipe the currently stored state and set it to something new.
2790
2791
        This is a hard-reset for the data we are working with.
2792
        """
2793
        # Technically, we really want a write lock, but until we write, we
2794
        # don't really need it.
2795
        self._requires_lock()
2796
        # root dir and root dir contents with no children. We have to have a
2797
        # root for set_state_from_inventory to work correctly.
2798
        empty_root = (('', '', inventory.ROOT_ID),
2799
                      [('d', '', 0, False, DirState.NULLSTAT)])
2800
        empty_tree_dirblocks = [('', [empty_root]), ('', [])]
2801
        self._set_data([], empty_tree_dirblocks)
2802
        self.set_state_from_inventory(working_inv)
2803
        self.set_parent_trees(parent_trees, parent_ghosts)
2804
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
2805
    def _make_absent(self, current_old):
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2806
        """Mark current_old - an entry - as absent for tree 0.
2807
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
2808
        :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.
2809
            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
2810
            shrinking in length.
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2811
        """
2812
        # build up paths that this id will be left at after the change is made,
2813
        # so we can update their cross references in tree 0
2814
        all_remaining_keys = set()
2922.2.4 by John Arbash Meinel
Fix bug #114615 by teaching unversion() to not touch renamed entries.
2815
        # 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.
2816
        for details in current_old[1][1:]:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
2817
            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.
2818
                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
2819
            elif details[0] == 'r': # relocated
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2820
                # record the key for the real path.
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
2821
                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.
2822
            # absent rows are not present at any path.
2823
        last_reference = current_old[0] not in all_remaining_keys
2824
        if last_reference:
2825
            # the current row consists entire of the current item (being marked
2826
            # absent), and relocated or absent entries for the other trees:
2827
            # Remove it, its meaningless.
2255.2.88 by Robert Collins
Significant steps back to operation.
2828
            block = self._find_block(current_old[0])
2829
            entry_index, present = self._find_entry_index(current_old[0], block[1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2830
            if not present:
2831
                raise AssertionError('could not find entry for %s' % (current_old,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2832
            block[1].pop(entry_index)
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2833
            # 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
2834
            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.
2835
                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.
2836
        # 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.
2837
        # 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.
2838
        # (if there were other trees with the id present at this path), or may
2839
        # be relocations.
2840
        for update_key in all_remaining_keys:
2841
            update_block_index, present = \
2842
                self._find_block_index_from_key(update_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2843
            if not present:
2844
                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.
2845
            update_entry_index, present = \
2846
                self._find_entry_index(update_key, self._dirblocks[update_block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2847
            if not present:
2848
                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.
2849
            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.
2850
            # it must not be absent at the moment
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2851
            if update_tree_details[0][0] == 'a': # absent
2852
                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.
2853
            update_tree_details[0] = DirState.NULL_PARENT_DETAILS
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
2854
        self._mark_modified()
2255.2.93 by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
2855
        return last_reference
2255.2.88 by Robert Collins
Significant steps back to operation.
2856
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2857
    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.
2858
        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.
2859
        """Update an entry to the state in tree 0.
2860
2861
        This will either create a new entry at 'key' or update an existing one.
2862
        It also makes sure that any other records which might mention this are
2863
        updated as well.
2864
2865
        :param key: (dir, name, file_id) for the new entry
2866
        :param minikind: The type for the entry ('f' == 'file', 'd' ==
2867
                'directory'), etc.
2868
        :param executable: Should the executable bit be set?
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
2869
        :param fingerprint: Simple fingerprint for new entry: canonical-form
2870
            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
2871
        :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.
2872
        :param size: Size information for new entry
2873
        :param path_utf8: key[0] + '/' + key[1], just passed in to avoid doing
2874
                extra computation.
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2875
        :param fullscan: If True then a complete scan of the dirstate is being
2876
            done and checking for duplicate rows should not be done. This
2877
            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
2878
2879
        If packed_stat and fingerprint are not given, they're invalidated in
2880
        the entry.
2255.2.142 by John Arbash Meinel
Simplify the update_minimal api a little bit, and document the parameters.
2881
        """
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
2882
        block = self._find_block(key)[1]
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2883
        if packed_stat is None:
2884
            packed_stat = DirState.NULLSTAT
2872.4.5 by Martin Pool
doc
2885
        # XXX: Some callers pass '' as the packed_stat, and it seems to be
2886
        # sometimes present in the dirstate - this seems oddly inconsistent.
2887
        # mbp 20071008
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2888
        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
2889
        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
2890
        id_index = self._get_id_index()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2891
        if not present:
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2892
            # New record. Check there isn't a entry at this path already.
2893
            if not fullscan:
2894
                low_index, _ = self._find_entry_index(key[0:2] + ('',), block)
2895
                while low_index < len(block):
2896
                    entry = block[low_index]
2897
                    if entry[0][0:2] == key[0:2]:
2898
                        if entry[1][0][0] not in 'ar':
2899
                            # This entry has the same path (but a different id) as
2900
                            # the new entry we're adding, and is present in ths
2901
                            # tree.
2902
                            raise errors.InconsistentDelta(
2903
                                ("%s/%s" % key[0:2]).decode('utf8'), key[2],
2904
                                "Attempt to add item at path already occupied by "
2905
                                "id %r" % entry[0][2])
4526.9.14 by Robert Collins
Review feedback on dirstate.
2906
                        low_index += 1
4526.9.8 by Robert Collins
Check that the paths deltas put entries into are not in use already.
2907
                    else:
2908
                        break
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2909
            # 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.
2910
            existing_keys = id_index.get(key[2], ())
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2911
            if not existing_keys:
2912
                # not currently in the state, simplest case
2913
                new_entry = key, [new_details] + self._empty_parent_info()
2914
            else:
2255.2.88 by Robert Collins
Significant steps back to operation.
2915
                # present at one or more existing other paths.
2916
                # grab one of them and use it to generate parent
2917
                # relocation/absent entries.
2918
                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.
2919
                # existing_keys can be changed as we iterate.
2920
                for other_key in tuple(existing_keys):
2255.2.88 by Robert Collins
Significant steps back to operation.
2921
                    # change the record at other to be a pointer to this new
2922
                    # record. The loop looks similar to the change to
2923
                    # relocations when updating an existing record but its not:
2924
                    # the test for existing kinds is different: this can be
2925
                    # 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.
2926
                    other_block_index, present = self._find_block_index_from_key(
2927
                        other_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2928
                    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.
2929
                        raise AssertionError('could not find block for %s' % (
2930
                            other_key,))
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2931
                    other_block = self._dirblocks[other_block_index][1]
2932
                    other_entry_index, present = self._find_entry_index(
2933
                        other_key, other_block)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2934
                    if not present:
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2935
                        raise AssertionError(
2936
                            'update_minimal: could not find other entry for %s'
2937
                            % (other_key,))
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2938
                    if path_utf8 is None:
2939
                        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.
2940
                    # 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.
2941
                    # location. This also updates the aliased iterator
2942
                    # (current_old in set_state_from_inventory) so that the old
2943
                    # entry, if not already examined, is skipped over by that
2944
                    # loop.
2945
                    other_entry = other_block[other_entry_index]
2946
                    other_entry[1][0] = ('r', path_utf8, 0, False, '')
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
2947
                    if self._maybe_remove_row(other_block, other_entry_index,
2948
                                              id_index):
2949
                        # If the row holding this was removed, we need to
2950
                        # recompute where this entry goes
2951
                        entry_index, _ = self._find_entry_index(key, block)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2952
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2953
                # This loop:
2954
                # adds a tuple to the new details for each column
2955
                #  - either by copying an existing relocation pointer inside that column
2956
                #  - 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.
2957
                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.
2958
                if num_present_parents:
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
2959
                    # TODO: This re-evaluates the existing_keys set, do we need
2960
                    #       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.
2961
                    other_key = list(existing_keys)[0]
2255.2.88 by Robert Collins
Significant steps back to operation.
2962
                for lookup_index in xrange(1, num_present_parents + 1):
2963
                    # grab any one entry, use it to find the right path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2964
                    # TODO: optimise this to reduce memory use in highly
2255.2.88 by Robert Collins
Significant steps back to operation.
2965
                    # fragmented situations by reusing the relocation
2966
                    # records.
2967
                    update_block_index, present = \
2968
                        self._find_block_index_from_key(other_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2969
                    if not present:
2970
                        raise AssertionError('could not find block for %s' % (other_key,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2971
                    update_entry_index, present = \
2972
                        self._find_entry_index(other_key, self._dirblocks[update_block_index][1])
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2973
                    if not present:
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
2974
                        raise AssertionError('update_minimal: could not find entry for %s' % (other_key,))
2255.2.88 by Robert Collins
Significant steps back to operation.
2975
                    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.
2976
                    if update_details[0] in 'ar': # relocated, absent
2255.2.88 by Robert Collins
Significant steps back to operation.
2977
                        # its a pointer or absent in lookup_index's tree, use
2978
                        # it as is.
2979
                        new_entry[1].append(update_details)
2980
                    else:
2981
                        # 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
2982
                        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
2983
                        new_entry[1].append(('r', pointer_path, 0, False, ''))
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2984
            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.
2985
            self._add_to_id_index(id_index, key)
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2986
        else:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2987
            # Does the new state matter?
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
2988
            block[entry_index][1][0] = new_details
2255.2.88 by Robert Collins
Significant steps back to operation.
2989
            # parents cannot be affected by what we do.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2990
            # other occurences of this id can be found
2255.2.88 by Robert Collins
Significant steps back to operation.
2991
            # from the id index.
2992
            # ---
2993
            # tree index consistency: All other paths for this id in this tree
2994
            # index must point to the correct path. We have to loop here because
2995
            # we may have passed entries in the state with this file id already
2996
            # that were absent - where parent entries are - and they need to be
2997
            # converted to relocated.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2998
            if path_utf8 is None:
2999
                raise AssertionError('no path')
5418.1.1 by Andrew Bennetts
Merge lp:bzr/2.2, including fixes for #619872, #631350, #633745.
3000
            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.
3001
            if key not in existing_keys:
3002
                raise AssertionError('We found the entry in the blocks, but'
3003
                    ' the key is not in the id_index.'
3004
                    ' 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.
3005
            for entry_key in existing_keys:
2255.2.88 by Robert Collins
Significant steps back to operation.
3006
                # TODO:PROFILING: It might be faster to just update
3007
                # rather than checking if we need to, and then overwrite
3008
                # the one we are located at.
3009
                if entry_key != key:
3010
                    # this file id is at a different path in one of the
3011
                    # other trees, so put absent pointers there
3012
                    # This is the vertical axis in the matrix, all pointing
3013
                    # to the real path.
3014
                    block_index, present = self._find_block_index_from_key(entry_key)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
3015
                    if not present:
3016
                        raise AssertionError('not present: %r', entry_key)
2255.2.88 by Robert Collins
Significant steps back to operation.
3017
                    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!
3018
                    if not present:
3019
                        raise AssertionError('not present: %r', entry_key)
2255.2.88 by Robert Collins
Significant steps back to operation.
3020
                    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
3021
                        ('r', path_utf8, 0, False, '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
3022
        # add a containing dirblock if needed.
2255.2.113 by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind
3023
        if new_details[0] == 'd':
2255.2.146 by John Arbash Meinel
Implement move_directory by factoring out move_one
3024
            subdir_key = (osutils.pathjoin(*key[0:2]), '', '')
2255.2.96 by Robert Collins
Restore dirstate to all tests passing condition.
3025
            block_index, present = self._find_block_index_from_key(subdir_key)
3026
            if not present:
3027
                self._dirblocks.insert(block_index, (subdir_key[0], []))
2255.2.88 by Robert Collins
Significant steps back to operation.
3028
4379.5.1 by Ian Clatworthy
prepare form smart dirstate saving
3029
        self._mark_modified()
2255.2.87 by Robert Collins
core dirstate tests passing with new structure.
3030
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
3031
    def _maybe_remove_row(self, block, index, id_index):
3032
        """Remove index if it is absent or relocated across the row.
3033
        
3034
        id_index is updated accordingly.
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
3035
        :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.
3036
        """
3037
        present_in_row = False
3038
        entry = block[index]
3039
        for column in entry[1]:
3040
            if column[0] not in 'ar':
3041
                present_in_row = True
3042
                break
3043
        if not present_in_row:
3044
            block.pop(index)
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
3045
            self._remove_from_id_index(id_index, entry[0])
5050.26.1 by John Arbash Meinel
Fix a bug in update_minimal.
3046
            return True
3047
        return False
4536.4.5 by Robert Collins
Review feedback, and cleanup rows correctly in update_minimal when no more references are present.
3048
2255.2.168 by Martin Pool
merge robert, debugging
3049
    def _validate(self):
3050
        """Check that invariants on the dirblock are correct.
3051
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3052
        This can be useful in debugging; it shouldn't be necessary in
2255.2.168 by Martin Pool
merge robert, debugging
3053
        normal code.
2323.6.13 by Martin Pool
Fix some tests that need to lock dirstate before validating
3054
3055
        This must be called with a lock held.
2255.2.168 by Martin Pool
merge robert, debugging
3056
        """
2323.5.12 by Martin Pool
doc
3057
        # NOTE: This must always raise AssertionError not just assert,
3058
        # otherwise it may not behave properly under python -O
3059
        #
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3060
        # TODO: All entries must have some content that's not 'a' or 'r',
3061
        # otherwise it could just be removed.
3062
        #
3063
        # TODO: All relocations must point directly to a real entry.
3064
        #
3065
        # TODO: No repeated keys.
3066
        #
3067
        # -- mbp 20070325
2255.2.168 by Martin Pool
merge robert, debugging
3068
        from pprint import pformat
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3069
        self._read_dirblocks_if_needed()
2255.2.168 by Martin Pool
merge robert, debugging
3070
        if len(self._dirblocks) > 0:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3071
            if not self._dirblocks[0][0] == '':
3072
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
3073
                    "dirblocks don't start with root block:\n" + \
3376.2.8 by Martin Pool
Some review cleanups for assertion removal
3074
                    pformat(self._dirblocks))
2255.2.168 by Martin Pool
merge robert, debugging
3075
        if len(self._dirblocks) > 1:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3076
            if not self._dirblocks[1][0] == '':
3077
                raise AssertionError(
2255.2.168 by Martin Pool
merge robert, debugging
3078
                    "dirblocks missing root directory:\n" + \
3376.2.8 by Martin Pool
Some review cleanups for assertion removal
3079
                    pformat(self._dirblocks))
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
3080
        # the dirblocks are sorted by their path components, name, and dir id
3081
        dir_names = [d[0].split('/')
3082
                for d in self._dirblocks[1:]]
3083
        if dir_names != sorted(dir_names):
3084
            raise AssertionError(
3085
                "dir names are not in sorted order:\n" + \
3086
                pformat(self._dirblocks) + \
3087
                "\nkeys:\n" +
3088
                pformat(dir_names))
2255.2.168 by Martin Pool
merge robert, debugging
3089
        for dirblock in self._dirblocks:
2255.7.94 by Martin Pool
Fix dirstate sorting bug and refine the _validate() assertions:
3090
            # within each dirblock, the entries are sorted by filename and
2323.5.12 by Martin Pool
doc
3091
            # then by id.
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
3092
            for entry in dirblock[1]:
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3093
                if dirblock[0] != entry[0][0]:
3094
                    raise AssertionError(
3095
                        "entry key for %r"
3096
                        "doesn't match directory name in\n%r" %
3097
                        (entry, pformat(dirblock)))
3098
            if dirblock[1] != sorted(dirblock[1]):
3099
                raise AssertionError(
3100
                    "dirblock for %r is not sorted:\n%s" % \
3101
                    (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.
3102
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
3103
        def check_valid_parent():
3104
            """Check that the current entry has a valid parent.
3105
3106
            This makes sure that the parent has a record,
3107
            and that the parent isn't marked as "absent" in the
3108
            current tree. (It is invalid to have a non-absent file in an absent
3109
            directory.)
3110
            """
3111
            if entry[0][0:2] == ('', ''):
3112
                # There should be no parent for the root row
3113
                return
3114
            parent_entry = self._get_entry(tree_index, path_utf8=entry[0][0])
3115
            if parent_entry == (None, None):
3116
                raise AssertionError(
3117
                    "no parent entry for: %s in tree %s"
3118
                    % (this_path, tree_index))
2438.1.15 by John Arbash Meinel
Remove a superfluous 'else' (recommended by Martin)
3119
            if parent_entry[1][tree_index][0] != 'd':
3120
                raise AssertionError(
3121
                    "Parent entry for %s is not marked as a valid"
3122
                    " directory. %s" % (this_path, parent_entry,))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
3123
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
3124
        # For each file id, for each tree: either
3125
        # the file id is not present at all; all rows with that id in the
3126
        # key have it marked as 'absent'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3127
        # 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
3128
        # that mention that id point to the correct name.
3129
        #
3130
        # We check this with a dict per tree pointing either to the present
3131
        # name, or None if absent.
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3132
        tree_count = self._num_present_parents() + 1
3133
        id_path_maps = [dict() for i in range(tree_count)]
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
3134
        # Make sure that all renamed entries point to the correct location.
3135
        for entry in self._iter_entries():
2323.5.6 by Martin Pool
Add some tests and better messages for DirState._validate
3136
            file_id = entry[0][2]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3137
            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
3138
            if len(entry[1]) != tree_count:
3139
                raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3140
                "wrong number of entry details for row\n%s" \
3141
                ",\nexpected %d" % \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3142
                (pformat(entry), tree_count))
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3143
            absent_positions = 0
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
3144
            for tree_index, tree_state in enumerate(entry[1]):
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3145
                this_tree_map = id_path_maps[tree_index]
3146
                minikind = tree_state[0]
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3147
                if minikind in 'ar':
3148
                    absent_positions += 1
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3149
                # have we seen this id before in this column?
3150
                if file_id in this_tree_map:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3151
                    previous_path, previous_loc = this_tree_map[file_id]
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3152
                    # any later mention of this file must be consistent with
3153
                    # what was said before
3154
                    if minikind == 'a':
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3155
                        if previous_path is not None:
3156
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3157
                            "file %s is absent in row %r but also present " \
3158
                            "at %r"% \
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3159
                            (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3160
                    elif minikind == 'r':
3161
                        target_location = tree_state[1]
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3162
                        if previous_path != target_location:
3163
                            raise AssertionError(
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3164
                            "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
3165
                            % (file_id, entry, previous_path))
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3166
                    else:
3167
                        # a file, directory, etc - may have been previously
3168
                        # pointed to by a relocation, which must point here
2323.5.10 by Martin Pool
DirState._validate must raise AssertionError rather than using assert
3169
                        if previous_path != this_path:
3170
                            raise AssertionError(
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3171
                                "entry %r inconsistent with previous path %r "
3172
                                "seen at %r" %
3173
                                (entry, previous_path, previous_loc))
2438.1.2 by John Arbash Meinel
Add a check that all entries have a valid parent entry.
3174
                        check_valid_parent()
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3175
                else:
3176
                    if minikind == 'a':
3177
                        # absent; should not occur anywhere else
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3178
                        this_tree_map[file_id] = None, this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3179
                    elif minikind == 'r':
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3180
                        # relocation, must occur at expected location
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3181
                        this_tree_map[file_id] = tree_state[1], this_path
2323.5.7 by Martin Pool
Better DirState._validate and tests for it.
3182
                    else:
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3183
                        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.
3184
                        check_valid_parent()
2929.2.2 by Robert Collins
Review feedback on dirstate update_basis_via_delta logic.
3185
            if absent_positions == tree_count:
3186
                raise AssertionError(
3187
                    "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.
3188
        if self._id_index is not None:
3189
            for file_id, entry_keys in self._id_index.iteritems():
3190
                for entry_key in entry_keys:
3191
                    if entry_key[2] != file_id:
3192
                        raise AssertionError(
3193
                            'file_id %r did not match entry key %s'
3194
                            % (file_id, entry_key))
5361.3.2 by John Arbash Meinel
Change the DirState id_index structure to use tuples instead of sets.
3195
                if len(entry_keys) != len(set(entry_keys)):
3196
                    raise AssertionError(
3197
                        'id_index contained non-unique data for %s'
3198
                        % (entry_keys,))
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
3199
2255.4.2 by James Westby
(broken) Add the locking methods.
3200
    def _wipe_state(self):
3201
        """Forget all state information about the dirstate."""
3202
        self._header_state = DirState.NOT_IN_MEMORY
3203
        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
3204
        self._changes_aborted = False
2255.4.2 by James Westby
(broken) Add the locking methods.
3205
        self._parents = []
3206
        self._ghosts = []
3207
        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.
3208
        self._id_index = None
2929.1.1 by Robert Collins
Use a dict to access stat cache information from dirstate.
3209
        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.
3210
        self._end_of_header = None
3211
        self._cutoff_time = None
3212
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
3213
3214
    def lock_read(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3215
        """Acquire a read lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3216
        if self._lock_token is not None:
3217
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3218
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
3219
        #       already in memory, we could read just the header and check for
3220
        #       any modification. If not modified, we can just leave things
3221
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
3222
        self._lock_token = lock.ReadLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3223
        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
3224
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
3225
        self._wipe_state()
2255.5.1 by John Arbash Meinel
Update the dirstate tests to lock and unlock properly.
3226
2255.4.2 by James Westby
(broken) Add the locking methods.
3227
    def lock_write(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3228
        """Acquire a write lock on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3229
        if self._lock_token is not None:
3230
            raise errors.LockContention(self._lock_token)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3231
        # TODO: jam 20070301 Rather than wiping completely, if the blocks are
3232
        #       already in memory, we could read just the header and check for
3233
        #       any modification. If not modified, we can just leave things
3234
        #       alone
2255.4.2 by James Westby
(broken) Add the locking methods.
3235
        self._lock_token = lock.WriteLock(self._filename)
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3236
        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
3237
        self._state_file = self._lock_token.f
2255.4.2 by James Westby
(broken) Add the locking methods.
3238
        self._wipe_state()
3239
3240
    def unlock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3241
        """Drop any locks held on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3242
        if self._lock_token is None:
3243
            raise errors.LockNotHeld(self)
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.5.2 by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself
3248
        self._state_file = None
2255.10.2 by John Arbash Meinel
Update to dirstate locking.
3249
        self._lock_state = None
2255.4.2 by James Westby
(broken) Add the locking methods.
3250
        self._lock_token.unlock()
3251
        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.
3252
        self._split_path_cache = {}
2255.4.2 by James Westby
(broken) Add the locking methods.
3253
3254
    def _requires_lock(self):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
3255
        """Check that a lock is currently held by someone on the dirstate."""
2255.4.2 by James Westby
(broken) Add the locking methods.
3256
        if not self._lock_token:
3257
            raise errors.ObjectNotLocked(self)
1852.13.20 by Robert Collins
Steps toward an object model.
3258
2255.8.2 by John Arbash Meinel
Add a helper function, which allows us to store keys as plain paths,
3259
3696.4.17 by Robert Collins
Review feedback.
3260
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.
3261
                 _stat_to_minikind=DirState._stat_to_minikind,
3262
                 _pack_stat=pack_stat):
3263
    """Update the entry based on what is actually on disk.
3264
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
3265
    This function only calculates the sha if it needs to - if the entry is
3266
    uncachable, or clearly different to the first parent's entry, no sha
3267
    is calculated, and None is returned.
3268
3696.4.17 by Robert Collins
Review feedback.
3269
    :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.
3270
    :param entry: This is the dirblock entry for the file in question.
3271
    :param abspath: The path on disk for this file.
3696.4.17 by Robert Collins
Review feedback.
3272
    :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.
3273
    :return: None, or The sha1 hexdigest of the file (40 bytes) or link
3274
        target of a symlink.
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3275
    """
3276
    try:
3277
        minikind = _stat_to_minikind[stat_value.st_mode & 0170000]
3278
    except KeyError:
3279
        # Unhandled kind
3280
        return None
3281
    packed_stat = _pack_stat(stat_value)
3282
    (saved_minikind, saved_link_or_sha1, saved_file_size,
3283
     saved_executable, saved_packed_stat) = entry[1][0]
3284
4100.2.5 by Aaron Bentley
Stop resetting minikind to 'd' when comparing.
3285
    if minikind == 'd' and saved_minikind == 't':
3286
        minikind = 't'
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3287
    if (minikind == saved_minikind
3288
        and packed_stat == saved_packed_stat):
3289
        # The stat hasn't changed since we saved, so we can re-use the
3290
        # saved sha hash.
3291
        if minikind == 'd':
3292
            return None
3293
3294
        # size should also be in packed_stat
3295
        if saved_file_size == stat_value.st_size:
3296
            return saved_link_or_sha1
3297
3298
    # If we have gotten this far, that means that we need to actually
3299
    # process this entry.
3300
    link_or_sha1 = None
5802.3.1 by John Arbash Meinel
Fix bug #765881. Having a file added on disk was skipping
3301
    worth_saving = True
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3302
    if minikind == 'f':
3696.4.17 by Robert Collins
Review feedback.
3303
        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.
3304
                                         saved_executable)
3696.4.17 by Robert Collins
Review feedback.
3305
        if state._cutoff_time is None:
3306
            state._sha_cutoff_time()
3307
        if (stat_value.st_mtime < state._cutoff_time
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
3308
            and stat_value.st_ctime < state._cutoff_time
3309
            and len(entry[1]) > 1
3310
            and entry[1][1][0] != 'a'):
4132.2.1 by Ian Clatworthy
make sha1_provider a parameter to DirState()
3311
            # Could check for size changes for further optimised
3312
            # avoidance of sha1's. However the most prominent case of
3313
            # over-shaing is during initial add, which this catches.
3314
            # Besides, if content filtering happens, size and sha
3315
            # are calculated at the same time, so checking just the size
3316
            # gains nothing w.r.t. performance.
3696.5.2 by Robert Collins
Integrate less aggressive sha logic with C iter-changes.
3317
            link_or_sha1 = state._sha1_file(abspath)
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3318
            entry[1][0] = ('f', link_or_sha1, stat_value.st_size,
3319
                           executable, packed_stat)
3320
        else:
3321
            entry[1][0] = ('f', '', stat_value.st_size,
3322
                           executable, DirState.NULLSTAT)
5802.3.1 by John Arbash Meinel
Fix bug #765881. Having a file added on disk was skipping
3323
            worth_saving = False
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3324
    elif minikind == 'd':
3325
        link_or_sha1 = None
3326
        entry[1][0] = ('d', '', 0, False, packed_stat)
3327
        if saved_minikind != 'd':
3328
            # This changed from something into a directory. Make sure we
3329
            # have a directory block for it. This doesn't happen very
3330
            # often, so this doesn't have to be super fast.
3331
            block_index, entry_index, dir_present, file_present = \
3696.4.17 by Robert Collins
Review feedback.
3332
                state._get_block_entry_index(entry[0][0], entry[0][1], 0)
3333
            state._ensure_block(block_index, entry_index,
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3334
                               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
3335
        else:
3336
            worth_saving = False
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3337
    elif minikind == 'l':
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
3338
        if saved_minikind == 'l':
3339
            worth_saving = False
3696.4.17 by Robert Collins
Review feedback.
3340
        link_or_sha1 = state._read_link(abspath, saved_link_or_sha1)
3341
        if state._cutoff_time is None:
3342
            state._sha_cutoff_time()
3343
        if (stat_value.st_mtime < state._cutoff_time
3344
            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.
3345
            entry[1][0] = ('l', link_or_sha1, stat_value.st_size,
3346
                           False, packed_stat)
3347
        else:
3348
            entry[1][0] = ('l', '', stat_value.st_size,
3349
                           False, DirState.NULLSTAT)
5802.3.1 by John Arbash Meinel
Fix bug #765881. Having a file added on disk was skipping
3350
    if worth_saving:
5807.4.6 by John Arbash Meinel
Merge newer bzr.dev and resolve conflicts.
3351
        state._mark_modified([entry])
3696.4.1 by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests.
3352
    return link_or_sha1
3353
3354
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3355
class ProcessEntryPython(object):
3356
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3357
    __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.
3358
        "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.
3359
        "partial", "use_filesystem_for_exec", "utf8_decode",
3360
        "searched_specific_files", "search_specific_files",
3361
        "searched_exact_paths", "search_specific_file_parents", "seen_ids",
3362
        "state", "source_index", "target_index", "want_unversioned", "tree"]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3363
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3364
    def __init__(self, include_unchanged, use_filesystem_for_exec,
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3365
        search_specific_files, state, source_index, target_index,
3366
        want_unversioned, tree):
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3367
        self.old_dirname_to_file_id = {}
3368
        self.new_dirname_to_file_id = {}
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3369
        # Are we doing a partial iter_changes?
3370
        self.partial = search_specific_files != set([''])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3371
        # Using a list so that we can access the values and change them in
3372
        # nested scope. Each one is [path, file_id, entry]
3373
        self.last_source_parent = [None, None]
3374
        self.last_target_parent = [None, None]
3375
        self.include_unchanged = include_unchanged
3376
        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.
3377
        self.utf8_decode = cache_utf8._utf8_decode
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3378
        # 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.
3379
        # search_specific_files, if the detail is relocated: add the id, and
3380
        # add the relocated path as one to search if its not searched already.
3381
        # 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.
3382
        self.searched_specific_files = set()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3383
        # When we search exact paths without expanding downwards, we record
3384
        # that here.
3385
        self.searched_exact_paths = set()
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3386
        self.search_specific_files = search_specific_files
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3387
        # The parents up to the root of the paths we are searching.
3388
        # After all normal paths are returned, these specific items are returned.
3389
        self.search_specific_file_parents = set()
3390
        # The ids we've sent out in the delta.
3391
        self.seen_ids = set()
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3392
        self.state = state
3393
        self.source_index = source_index
3394
        self.target_index = target_index
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3395
        if target_index != 0:
3396
            # A lot of code in here depends on target_index == 0
3397
            raise errors.BzrError('unsupported target index')
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3398
        self.want_unversioned = want_unversioned
3399
        self.tree = tree
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3400
3696.4.17 by Robert Collins
Review feedback.
3401
    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.
3402
        """Compare an entry and real disk to generate delta information.
3403
3404
        :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.
3405
            the path of entry. If None, then the path is considered absent in 
3406
            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.
3407
            Basename is returned as a utf8 string because we expect this
3408
            tuple will be ignored, and don't want to take the time to
3409
            decode.
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3410
        :return: (iter_changes_result, changed). If the entry has not been
3411
            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.
3412
            or metadata changes have occurred, and True if any content or
3413
            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.
3414
            if changed is not None, iter_changes_result will always be a result
3415
            tuple. Otherwise, iter_changes_result is None unless changed is
3416
            True.
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3417
        """
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3418
        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.
3419
            source_details = DirState.NULL_PARENT_DETAILS
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3420
        else:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3421
            source_details = entry[1][self.source_index]
3422
        target_details = entry[1][self.target_index]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3423
        target_minikind = target_details[0]
3424
        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.
3425
            if not (self.target_index == 0):
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3426
                raise AssertionError()
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
3427
            link_or_sha1 = update_entry(self.state, entry,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3428
                abspath=path_info[4], stat_value=path_info[3])
3429
            # The entry may have been modified by update_entry
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3430
            target_details = entry[1][self.target_index]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3431
            target_minikind = target_details[0]
3432
        else:
3433
            link_or_sha1 = None
3434
        file_id = entry[0][2]
3435
        source_minikind = source_details[0]
3436
        if source_minikind in 'fdltr' and target_minikind in 'fdlt':
3437
            # claimed content in both: diff
3438
            #   r    | fdlt   |      | add source to search, add id path move and perform
3439
            #        |        |      | diff check on source-target
3440
            #   r    | fdlt   |  a   | dangling file that was present in the basis.
3441
            #        |        |      | ???
3442
            if source_minikind in 'r':
3443
                # add the source to the search path to find any children it
3444
                # 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.
3445
                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.
3446
                                             source_details[1]):
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
3447
                    self.search_specific_files.add(source_details[1])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3448
                # generate the old path; this is needed for stating later
3449
                # as well.
3450
                old_path = source_details[1]
3451
                old_dirname, old_basename = os.path.split(old_path)
3452
                path = pathjoin(entry[0][0], entry[0][1])
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3453
                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.
3454
                                             path_utf8=old_path)
3455
                # update the source details variable to be the real
3456
                # location.
3457
                if old_entry == (None, None):
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3458
                    raise errors.CorruptDirstate(self.state._filename,
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3459
                        "entry '%s/%s' is considered renamed from %r"
3460
                        " but source does not exist\n"
3461
                        "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.
3462
                source_details = old_entry[1][self.source_index]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3463
                source_minikind = source_details[0]
3464
            else:
3465
                old_dirname = entry[0][0]
3466
                old_basename = entry[0][1]
3467
                old_path = path = None
3468
            if path_info is None:
3469
                # the file is missing on disk, show as removed.
3470
                content_change = True
3471
                target_kind = None
3472
                target_exec = False
3473
            else:
3474
                # source and target are both versioned and disk file is present.
3475
                target_kind = path_info[2]
3476
                if target_kind == 'directory':
3477
                    if path is None:
3478
                        old_path = path = pathjoin(old_dirname, old_basename)
3479
                    self.new_dirname_to_file_id[path] = file_id
3480
                    if source_minikind != 'd':
3481
                        content_change = True
3482
                    else:
3483
                        # directories have no fingerprint
3484
                        content_change = False
3485
                    target_exec = False
3486
                elif target_kind == 'file':
3487
                    if source_minikind != 'f':
3488
                        content_change = True
3489
                    else:
4393.3.1 by Ian Clatworthy
fix status & commit issue reported by Frits Jalvingh
3490
                        # Check the sha. We can't just rely on the size as
3491
                        # content filtering may mean differ sizes actually
3492
                        # map to the same content
3493
                        if link_or_sha1 is None:
3494
                            # Stat cache miss:
3495
                            statvalue, link_or_sha1 = \
3496
                                self.state._sha1_provider.stat_and_sha1(
3497
                                path_info[4])
3498
                            self.state._observed_sha1(entry, link_or_sha1,
3499
                                statvalue)
3500
                        content_change = (link_or_sha1 != source_details[1])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3501
                    # Target details is updated at update_entry time
3502
                    if self.use_filesystem_for_exec:
3503
                        # We don't need S_ISREG here, because we are sure
3504
                        # we are dealing with a file.
3505
                        target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
3506
                    else:
3507
                        target_exec = target_details[3]
3508
                elif target_kind == 'symlink':
3509
                    if source_minikind != 'l':
3510
                        content_change = True
3511
                    else:
3512
                        content_change = (link_or_sha1 != source_details[1])
3513
                    target_exec = False
3514
                elif target_kind == 'tree-reference':
3515
                    if source_minikind != 't':
3516
                        content_change = True
3517
                    else:
3518
                        content_change = False
3519
                    target_exec = False
3520
                else:
4634.58.1 by Robert Collins
Show a sensible error when a previously versionable path becomes a FIFO or other unversionable file.
3521
                    if path is None:
3522
                        path = pathjoin(old_dirname, old_basename)
3523
                    raise errors.BadFileKindError(path, path_info[2])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3524
            if source_minikind == 'd':
3525
                if path is None:
3526
                    old_path = path = pathjoin(old_dirname, old_basename)
3527
                self.old_dirname_to_file_id[old_path] = file_id
3528
            # 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.
3529
            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.
3530
                source_parent_id = self.last_source_parent[1]
3531
            else:
3532
                try:
3533
                    source_parent_id = self.old_dirname_to_file_id[old_dirname]
3534
                except KeyError:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3535
                    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.
3536
                                                           path_utf8=old_dirname)
3537
                    source_parent_id = source_parent_entry[0][2]
3538
                if source_parent_id == entry[0][2]:
3539
                    # This is the root, so the parent is None
3540
                    source_parent_id = None
3541
                else:
3542
                    self.last_source_parent[0] = old_dirname
3543
                    self.last_source_parent[1] = source_parent_id
3544
            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.
3545
            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.
3546
                target_parent_id = self.last_target_parent[1]
3547
            else:
3548
                try:
3549
                    target_parent_id = self.new_dirname_to_file_id[new_dirname]
3550
                except KeyError:
3551
                    # TODO: We don't always need to do the lookup, because the
3552
                    #       parent entry will be the same as the source entry.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3553
                    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.
3554
                                                           path_utf8=new_dirname)
3555
                    if target_parent_entry == (None, None):
3556
                        raise AssertionError(
3557
                            "Could not find target parent in wt: %s\nparent of: %s"
3558
                            % (new_dirname, entry))
3559
                    target_parent_id = target_parent_entry[0][2]
3560
                if target_parent_id == entry[0][2]:
3561
                    # This is the root, so the parent is None
3562
                    target_parent_id = None
3563
                else:
3564
                    self.last_target_parent[0] = new_dirname
3565
                    self.last_target_parent[1] = target_parent_id
3566
3567
            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.
3568
            changed = (content_change
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3569
                or source_parent_id != target_parent_id
3570
                or old_basename != entry[0][1]
3571
                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.
3572
                )
3573
            if not changed and not self.include_unchanged:
3574
                return None, False
3575
            else:
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3576
                if old_path is None:
3577
                    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.
3578
                    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.
3579
                    path_u = old_path_u
3580
                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.
3581
                    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.
3582
                    if old_path == path:
3583
                        path_u = old_path_u
3584
                    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.
3585
                        path_u = self.utf8_decode(path)[0]
3586
                source_kind = DirState._minikind_to_kind[source_minikind]
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3587
                return (entry[0][2],
3588
                       (old_path_u, path_u),
3589
                       content_change,
3590
                       (True, True),
3591
                       (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.
3592
                       (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.
3593
                       (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.
3594
                       (source_exec, target_exec)), changed
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3595
        elif source_minikind in 'a' and target_minikind in 'fdlt':
3596
            # looks like a new file
3597
            path = pathjoin(entry[0][0], entry[0][1])
3598
            # parent id is the entry for the path in the target tree
3599
            # 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.
3600
            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.
3601
                                         path_utf8=entry[0][0])[0][2]
3602
            if parent_id == entry[0][2]:
3603
                parent_id = None
3604
            if path_info is not None:
3605
                # Present on disk:
3606
                if self.use_filesystem_for_exec:
3607
                    # We need S_ISREG here, because we aren't sure if this
3608
                    # is a file or not.
3609
                    target_exec = bool(
3610
                        stat.S_ISREG(path_info[3].st_mode)
3611
                        and stat.S_IEXEC & path_info[3].st_mode)
3612
                else:
3613
                    target_exec = target_details[3]
3614
                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.
3615
                       (None, self.utf8_decode(path)[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3616
                       True,
3617
                       (False, True),
3618
                       (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.
3619
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3620
                       (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.
3621
                       (None, target_exec)), True
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3622
            else:
3623
                # Its a missing file, report it as such.
3624
                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.
3625
                       (None, self.utf8_decode(path)[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3626
                       False,
3627
                       (False, True),
3628
                       (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.
3629
                       (None, self.utf8_decode(entry[0][1])[0]),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3630
                       (None, None),
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3631
                       (None, False)), True
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3632
        elif source_minikind in 'fdlt' and target_minikind in 'a':
3633
            # unversioned, possibly, or possibly not deleted: we dont care.
3634
            # if its still on disk, *and* theres no other entry at this
3635
            # path [we dont know this in this routine at the moment -
3636
            # perhaps we should change this - then it would be an unknown.
3637
            old_path = pathjoin(entry[0][0], entry[0][1])
3638
            # 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.
3639
            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.
3640
            if parent_id == entry[0][2]:
3641
                parent_id = None
3642
            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.
3643
                   (self.utf8_decode(old_path)[0], None),
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3644
                   True,
3645
                   (True, False),
3646
                   (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.
3647
                   (self.utf8_decode(entry[0][1])[0], None),
3648
                   (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.
3649
                   (source_details[3], None)), True
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3650
        elif source_minikind in 'fdlt' and target_minikind in 'r':
3651
            # a rename; could be a true rename, or a rename inherited from
3652
            # a renamed parent. TODO: handle this efficiently. Its not
3653
            # common case to rename dirs though, so a correct but slow
3654
            # implementation will do.
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
3655
            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.
3656
                self.search_specific_files.add(target_details[1])
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
3657
        elif source_minikind in 'ra' and target_minikind in 'ra':
3658
            # neither of the selected trees contain this file,
3659
            # so skip over it. This is not currently directly tested, but
3660
            # is indirectly via test_too_much.TestCommands.test_conflicts.
3661
            pass
3662
        else:
3663
            raise AssertionError("don't know how to compare "
3664
                "source_minikind=%r, target_minikind=%r"
3665
                % (source_minikind, target_minikind))
3666
            ## 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.
3667
        return None, None
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3668
3669
    def __iter__(self):
3670
        return self
3671
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3672
    def _gather_result_for_consistency(self, result):
3673
        """Check a result we will yield to make sure we are consistent later.
3674
        
3675
        This gathers result's parents into a set to output later.
3676
3677
        :param result: A result tuple.
3678
        """
3679
        if not self.partial or not result[0]:
3680
            return
3681
        self.seen_ids.add(result[0])
3682
        new_path = result[1][1]
3683
        if new_path:
3684
            # Not the root and not a delete: queue up the parents of the path.
3685
            self.search_specific_file_parents.update(
3686
                osutils.parent_directories(new_path.encode('utf8')))
3687
            # Add the root directory which parent_directories does not
3688
            # provide.
3689
            self.search_specific_file_parents.add('')
3690
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3691
    def iter_changes(self):
3692
        """Iterate over the changes."""
3693
        utf8_decode = cache_utf8._utf8_decode
3696.4.17 by Robert Collins
Review feedback.
3694
        _cmp_by_dirs = cmp_by_dirs
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3695
        _process_entry = self._process_entry
3696
        search_specific_files = self.search_specific_files
3697
        searched_specific_files = self.searched_specific_files
3696.4.17 by Robert Collins
Review feedback.
3698
        splitpath = osutils.splitpath
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3699
        # sketch:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3700
        # compare source_index and target_index at or under each element of search_specific_files.
3701
        # 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
3702
        # 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.
3703
        # for the target.
3704
        # cases:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3705
        #
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3706
        # Source | Target | disk | action
3707
        #   r    | fdlt   |      | add source to search, add id path move and perform
3708
        #        |        |      | diff check on source-target
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3709
        #   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.
3710
        #        |        |      | ???
3711
        #   r    |  a     |      | add source to search
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3712
        #   r    |  a     |  a   |
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3713
        #   r    |  r     |      | this path is present in a non-examined tree, skip.
3714
        #   r    |  r     |  a   | this path is present in a non-examined tree, skip.
3715
        #   a    | fdlt   |      | add new id
3716
        #   a    | fdlt   |  a   | dangling locally added file, skip
3717
        #   a    |  a     |      | not present in either tree, skip
3718
        #   a    |  a     |  a   | not present in any tree, skip
3719
        #   a    |  r     |      | not present in either tree at this path, skip as it
3720
        #        |        |      | may not be selected by the users list of paths.
3721
        #   a    |  r     |  a   | not present in either tree at this path, skip as it
3722
        #        |        |      | may not be selected by the users list of paths.
3723
        #  fdlt  | fdlt   |      | content in both: diff them
3724
        #  fdlt  | fdlt   |  a   | deleted locally, but not unversioned - show as deleted ?
3725
        #  fdlt  |  a     |      | unversioned: output deleted id for now
3726
        #  fdlt  |  a     |  a   | unversioned and deleted: output deleted id
3727
        #  fdlt  |  r     |      | relocated in this tree, so add target to search.
3728
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
3729
        #        |        |      | this id at the other path.
3730
        #  fdlt  |  r     |  a   | relocated in this tree, so add target to search.
3731
        #        |        |      | Dont diff, we will see an r,fd; pair when we reach
3732
        #        |        |      | this id at the other path.
3733
3734
        # TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
3735
        #       keeping a cache of directories that we have seen.
3736
3737
        while search_specific_files:
3738
            # TODO: the pending list should be lexically sorted?  the
3739
            # interface doesn't require it.
3740
            current_root = search_specific_files.pop()
3741
            current_root_unicode = current_root.decode('utf8')
3742
            searched_specific_files.add(current_root)
3743
            # process the entries for this containing directory: the rest will be
3744
            # found by their parents recursively.
3745
            root_entries = self.state._entries_for_path(current_root)
3746
            root_abspath = self.tree.abspath(current_root_unicode)
3747
            try:
3748
                root_stat = os.lstat(root_abspath)
3749
            except OSError, e:
3750
                if e.errno == errno.ENOENT:
3751
                    # the path does not exist: let _process_entry know that.
3752
                    root_dir_info = None
3753
                else:
3754
                    # some other random error: hand it up.
3755
                    raise
3756
            else:
3757
                root_dir_info = ('', current_root,
3758
                    osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
3759
                    root_abspath)
3760
                if root_dir_info[2] == 'directory':
3761
                    if self.tree._directory_is_tree_reference(
3762
                        current_root.decode('utf8')):
3763
                        root_dir_info = root_dir_info[:2] + \
3764
                            ('tree-reference',) + root_dir_info[3:]
3765
3766
            if not root_entries and not root_dir_info:
3767
                # this specified path is not present at all, skip it.
3768
                continue
3769
            path_handled = False
3770
            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.
3771
                result, changed = _process_entry(entry, root_dir_info)
3772
                if changed is not None:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3773
                    path_handled = True
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3774
                    if changed:
3775
                        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.
3776
                    if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3777
                        yield result
3778
            if self.want_unversioned and not path_handled and root_dir_info:
3779
                new_executable = bool(
3780
                    stat.S_ISREG(root_dir_info[3].st_mode)
3781
                    and stat.S_IEXEC & root_dir_info[3].st_mode)
3782
                yield (None,
3783
                       (None, current_root_unicode),
3784
                       True,
3785
                       (False, False),
3786
                       (None, None),
3787
                       (None, splitpath(current_root_unicode)[-1]),
3788
                       (None, root_dir_info[2]),
3789
                       (None, new_executable)
3790
                      )
3791
            initial_key = (current_root, '', '')
3792
            block_index, _ = self.state._find_block_index_from_key(initial_key)
3793
            if block_index == 0:
3794
                # we have processed the total root already, but because the
3795
                # initial key matched it we should skip it here.
3796
                block_index +=1
3797
            if root_dir_info and root_dir_info[2] == 'tree-reference':
3798
                current_dir_info = None
3799
            else:
3800
                dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
3801
                try:
3802
                    current_dir_info = dir_iterator.next()
3803
                except OSError, e:
3804
                    # on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
3805
                    # python 2.5 has e.errno == EINVAL,
3806
                    #            and e.winerror == ERROR_DIRECTORY
3807
                    e_winerror = getattr(e, 'winerror', None)
3808
                    win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
3809
                    # there may be directories in the inventory even though
3810
                    # this path is not a file on disk: so mark it as end of
3811
                    # iterator
3812
                    if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
3813
                        current_dir_info = None
3814
                    elif (sys.platform == 'win32'
3815
                          and (e.errno in win_errors
3816
                               or e_winerror in win_errors)):
3817
                        current_dir_info = None
3818
                    else:
3819
                        raise
3820
                else:
3821
                    if current_dir_info[0][0] == '':
3822
                        # remove .bzr from iteration
3696.4.11 by Robert Collins
Some Cification of iter_changes, and making the python one actually work.
3823
                        bzr_index = bisect.bisect_left(current_dir_info[1], ('.bzr',))
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3824
                        if current_dir_info[1][bzr_index][0] != '.bzr':
3825
                            raise AssertionError()
3826
                        del current_dir_info[1][bzr_index]
3827
            # walk until both the directory listing and the versioned metadata
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3828
            # are exhausted.
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3829
            if (block_index < len(self.state._dirblocks) and
3830
                osutils.is_inside(current_root, self.state._dirblocks[block_index][0])):
3831
                current_block = self.state._dirblocks[block_index]
3832
            else:
3833
                current_block = None
3834
            while (current_dir_info is not None or
3835
                   current_block is not None):
3836
                if (current_dir_info and current_block
3837
                    and current_dir_info[0][0] != current_block[0]):
3696.4.17 by Robert Collins
Review feedback.
3838
                    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.
3839
                        # filesystem data refers to paths not covered by the dirblock.
3840
                        # this has two possibilities:
3841
                        # A) it is versioned but empty, so there is no block for it
3842
                        # B) it is not versioned.
3843
3844
                        # if (A) then we need to recurse into it to check for
3845
                        # new unknown files or directories.
3846
                        # if (B) then we should ignore it, because we don't
3847
                        # recurse into unknown directories.
3848
                        path_index = 0
3849
                        while path_index < len(current_dir_info[1]):
3850
                                current_path_info = current_dir_info[1][path_index]
3851
                                if self.want_unversioned:
3852
                                    if current_path_info[2] == 'directory':
3853
                                        if self.tree._directory_is_tree_reference(
3854
                                            current_path_info[0].decode('utf8')):
3855
                                            current_path_info = current_path_info[:2] + \
3856
                                                ('tree-reference',) + current_path_info[3:]
3857
                                    new_executable = bool(
3858
                                        stat.S_ISREG(current_path_info[3].st_mode)
3859
                                        and stat.S_IEXEC & current_path_info[3].st_mode)
3860
                                    yield (None,
3861
                                        (None, utf8_decode(current_path_info[0])[0]),
3862
                                        True,
3863
                                        (False, False),
3864
                                        (None, None),
3865
                                        (None, utf8_decode(current_path_info[1])[0]),
3866
                                        (None, current_path_info[2]),
3867
                                        (None, new_executable))
3868
                                # dont descend into this unversioned path if it is
3869
                                # a dir
3870
                                if current_path_info[2] in ('directory',
3871
                                                            'tree-reference'):
3872
                                    del current_dir_info[1][path_index]
3873
                                    path_index -= 1
3874
                                path_index += 1
3875
3876
                        # This dir info has been handled, go to the next
3877
                        try:
3878
                            current_dir_info = dir_iterator.next()
3879
                        except StopIteration:
3880
                            current_dir_info = None
3881
                    else:
3882
                        # We have a dirblock entry for this location, but there
3883
                        # is no filesystem path for this. This is most likely
3884
                        # because a directory was removed from the disk.
3885
                        # We don't have to report the missing directory,
3886
                        # because that should have already been handled, but we
3887
                        # need to handle all of the files that are contained
3888
                        # within.
3889
                        for current_entry in current_block[1]:
3890
                            # entry referring to file not present on disk.
3891
                            # 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.
3892
                            result, changed = _process_entry(current_entry, None)
3893
                            if changed is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3894
                                if changed:
3895
                                    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.
3896
                                if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3897
                                    yield result
3898
                        block_index +=1
3899
                        if (block_index < len(self.state._dirblocks) and
3900
                            osutils.is_inside(current_root,
3901
                                              self.state._dirblocks[block_index][0])):
3902
                            current_block = self.state._dirblocks[block_index]
3903
                        else:
3904
                            current_block = None
3905
                    continue
3906
                entry_index = 0
3907
                if current_block and entry_index < len(current_block[1]):
3908
                    current_entry = current_block[1][entry_index]
3909
                else:
3910
                    current_entry = None
3911
                advance_entry = True
3912
                path_index = 0
3913
                if current_dir_info and path_index < len(current_dir_info[1]):
3914
                    current_path_info = current_dir_info[1][path_index]
3915
                    if current_path_info[2] == 'directory':
3916
                        if self.tree._directory_is_tree_reference(
3917
                            current_path_info[0].decode('utf8')):
3918
                            current_path_info = current_path_info[:2] + \
3919
                                ('tree-reference',) + current_path_info[3:]
3920
                else:
3921
                    current_path_info = None
3922
                advance_path = True
3923
                path_handled = False
3924
                while (current_entry is not None or
3925
                    current_path_info is not None):
3926
                    if current_entry is None:
4095.3.2 by Vincent Ladeuil
Better fix covering more code paths.
3927
                        # the check for path_handled when the path is advanced
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3928
                        # will yield this path if needed.
3929
                        pass
3930
                    elif current_path_info is None:
3931
                        # 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.
3932
                        result, changed = _process_entry(current_entry, current_path_info)
3933
                        if changed is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3934
                            if changed:
3935
                                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.
3936
                            if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3937
                                yield result
3938
                    elif (current_entry[0][1] != current_path_info[1]
3939
                          or current_entry[1][self.target_index][0] in 'ar'):
3940
                        # The current path on disk doesn't match the dirblock
3941
                        # record. Either the dirblock is marked as absent, or
3942
                        # the file on disk is not present at all in the
3943
                        # dirblock. Either way, report about the dirblock
3944
                        # entry, and let other code handle the filesystem one.
3945
3946
                        # Compare the basename for these files to determine
3947
                        # which comes first
3948
                        if current_path_info[1] < current_entry[0][1]:
3949
                            # extra file on disk: pass for now, but only
3950
                            # increment the path, not the entry
3951
                            advance_entry = False
3952
                        else:
3953
                            # entry referring to file not present on disk.
3954
                            # 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.
3955
                            result, changed = _process_entry(current_entry, None)
3956
                            if changed is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3957
                                if changed:
3958
                                    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.
3959
                                if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3960
                                    yield result
3961
                            advance_path = False
3962
                    else:
4570.2.1 by Robert Collins
Refactoring of dirstate iter_changes to make it possible to tell changed vs unchanged results internally.
3963
                        result, changed = _process_entry(current_entry, current_path_info)
3964
                        if changed is not None:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3965
                            path_handled = True
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
3966
                            if changed:
3967
                                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.
3968
                            if changed or self.include_unchanged:
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
3969
                                yield result
3970
                    if advance_entry and current_entry is not None:
3971
                        entry_index += 1
3972
                        if entry_index < len(current_block[1]):
3973
                            current_entry = current_block[1][entry_index]
3974
                        else:
3975
                            current_entry = None
3976
                    else:
3977
                        advance_entry = True # reset the advance flaga
3978
                    if advance_path and current_path_info is not None:
3979
                        if not path_handled:
3980
                            # unversioned in all regards
3981
                            if self.want_unversioned:
3982
                                new_executable = bool(
3983
                                    stat.S_ISREG(current_path_info[3].st_mode)
3984
                                    and stat.S_IEXEC & current_path_info[3].st_mode)
3985
                                try:
3986
                                    relpath_unicode = utf8_decode(current_path_info[0])[0]
3987
                                except UnicodeDecodeError:
3988
                                    raise errors.BadFilenameEncoding(
3989
                                        current_path_info[0], osutils._fs_enc)
3990
                                yield (None,
3991
                                    (None, relpath_unicode),
3992
                                    True,
3993
                                    (False, False),
3994
                                    (None, None),
3995
                                    (None, utf8_decode(current_path_info[1])[0]),
3996
                                    (None, current_path_info[2]),
3997
                                    (None, new_executable))
3998
                            # dont descend into this unversioned path if it is
3999
                            # a dir
4000
                            if current_path_info[2] in ('directory'):
4001
                                del current_dir_info[1][path_index]
4002
                                path_index -= 1
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4003
                        # dont descend the disk iterator into any tree
3696.4.10 by Robert Collins
Basic first cut of full-pyrex iter_changes.
4004
                        # paths.
4005
                        if current_path_info[2] == 'tree-reference':
4006
                            del current_dir_info[1][path_index]
4007
                            path_index -= 1
4008
                        path_index += 1
4009
                        if path_index < len(current_dir_info[1]):
4010
                            current_path_info = current_dir_info[1][path_index]
4011
                            if current_path_info[2] == 'directory':
4012
                                if self.tree._directory_is_tree_reference(
4013
                                    current_path_info[0].decode('utf8')):
4014
                                    current_path_info = current_path_info[:2] + \
4015
                                        ('tree-reference',) + current_path_info[3:]
4016
                        else:
4017
                            current_path_info = None
4018
                        path_handled = False
4019
                    else:
4020
                        advance_path = True # reset the advance flagg.
4021
                if current_block is not None:
4022
                    block_index += 1
4023
                    if (block_index < len(self.state._dirblocks) and
4024
                        osutils.is_inside(current_root, self.state._dirblocks[block_index][0])):
4025
                        current_block = self.state._dirblocks[block_index]
4026
                    else:
4027
                        current_block = None
4028
                if current_dir_info is not None:
4029
                    try:
4030
                        current_dir_info = dir_iterator.next()
4031
                    except StopIteration:
4032
                        current_dir_info = None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
4033
        for result in self._iter_specific_file_parents():
4034
            yield result
4035
4036
    def _iter_specific_file_parents(self):
4037
        """Iter over the specific file parents."""
4038
        while self.search_specific_file_parents:
4039
            # Process the parent directories for the paths we were iterating.
4040
            # Even in extremely large trees this should be modest, so currently
4041
            # no attempt is made to optimise.
4042
            path_utf8 = self.search_specific_file_parents.pop()
4043
            if osutils.is_inside_any(self.searched_specific_files, path_utf8):
4044
                # We've examined this path.
4045
                continue
4046
            if path_utf8 in self.searched_exact_paths:
4047
                # We've examined this path.
4048
                continue
4049
            path_entries = self.state._entries_for_path(path_utf8)
4050
            # We need either one or two entries. If the path in
4051
            # self.target_index has moved (so the entry in source_index is in
4052
            # 'ar') then we need to also look for the entry for this path in
4053
            # self.source_index, to output the appropriate delete-or-rename.
4054
            selected_entries = []
4055
            found_item = False
4056
            for candidate_entry in path_entries:
4057
                # Find entries present in target at this path:
4058
                if candidate_entry[1][self.target_index][0] not in 'ar':
4059
                    found_item = True
4060
                    selected_entries.append(candidate_entry)
4061
                # Find entries present in source at this path:
4062
                elif (self.source_index is not None and
4063
                    candidate_entry[1][self.source_index][0] not in 'ar'):
4064
                    found_item = True
4065
                    if candidate_entry[1][self.target_index][0] == 'a':
4066
                        # Deleted, emit it here.
4067
                        selected_entries.append(candidate_entry)
4068
                    else:
4069
                        # renamed, emit it when we process the directory it
4070
                        # ended up at.
4071
                        self.search_specific_file_parents.add(
4072
                            candidate_entry[1][self.target_index][1])
4073
            if not found_item:
4074
                raise AssertionError(
4075
                    "Missing entry for specific path parent %r, %r" % (
4076
                    path_utf8, path_entries))
4077
            path_info = self._path_info(path_utf8, path_utf8.decode('utf8'))
4078
            for entry in selected_entries:
4079
                if entry[0][2] in self.seen_ids:
4080
                    continue
4081
                result, changed = self._process_entry(entry, path_info)
4082
                if changed is None:
4083
                    raise AssertionError(
4084
                        "Got entry<->path mismatch for specific path "
4085
                        "%r entry %r path_info %r " % (
4086
                        path_utf8, entry, path_info))
4087
                # Only include changes - we're outside the users requested
4088
                # expansion.
4089
                if changed:
4090
                    self._gather_result_for_consistency(result)
4091
                    if (result[6][0] == 'directory' and
4092
                        result[6][1] != 'directory'):
4093
                        # This stopped being a directory, the old children have
4094
                        # to be included.
4095
                        if entry[1][self.source_index][0] == 'r':
4096
                            # renamed, take the source path
4097
                            entry_path_utf8 = entry[1][self.source_index][1]
4098
                        else:
4099
                            entry_path_utf8 = path_utf8
4100
                        initial_key = (entry_path_utf8, '', '')
4101
                        block_index, _ = self.state._find_block_index_from_key(
4102
                            initial_key)
4103
                        if block_index == 0:
4104
                            # The children of the root are in block index 1.
4105
                            block_index +=1
4106
                        current_block = None
4107
                        if block_index < len(self.state._dirblocks):
4108
                            current_block = self.state._dirblocks[block_index]
4109
                            if not osutils.is_inside(
4110
                                entry_path_utf8, current_block[0]):
4111
                                # No entries for this directory at all.
4112
                                current_block = None
4113
                        if current_block is not None:
4114
                            for entry in current_block[1]:
4115
                                if entry[1][self.source_index][0] in 'ar':
4116
                                    # Not in the source tree, so doesn't have to be
4117
                                    # included.
4118
                                    continue
4119
                                # Path of the entry itself.
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
4120
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
4121
                                self.search_specific_file_parents.add(
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
4122
                                    osutils.pathjoin(*entry[0][:2]))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
4123
                if changed or self.include_unchanged:
4124
                    yield result
4125
            self.searched_exact_paths.add(path_utf8)
4126
4127
    def _path_info(self, utf8_path, unicode_path):
4128
        """Generate path_info for unicode_path.
4129
4130
        :return: None if unicode_path does not exist, or a path_info tuple.
4131
        """
4132
        abspath = self.tree.abspath(unicode_path)
4133
        try:
4134
            stat = os.lstat(abspath)
4135
        except OSError, e:
4136
            if e.errno == errno.ENOENT:
4137
                # the path does not exist.
4138
                return None
4139
            else:
4140
                raise
4141
        utf8_basename = utf8_path.rsplit('/', 1)[-1]
4142
        dir_info = (utf8_path, utf8_basename,
4143
            osutils.file_kind_from_stat_mode(stat.st_mode), stat,
4144
            abspath)
4145
        if dir_info[2] == 'directory':
4146
            if self.tree._directory_is_tree_reference(
4147
                unicode_path):
4148
                self.root_dir_info = self.root_dir_info[:2] + \
4149
                    ('tree-reference',) + self.root_dir_info[3:]
4150
        return dir_info
3696.4.4 by Robert Collins
Relocate iter_changes' process_entry method to allow C optimisation.
4151
4152
2474.1.1 by John Arbash Meinel
Create a Pyrex extension for reading the dirstate file.
4153
# Try to load the compiled form if possible
4154
try:
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
4155
    from bzrlib._dirstate_helpers_pyx import (
4156
        _read_dirblocks,
4157
        bisect_dirblock,
4158
        _bisect_path_left,
4159
        _bisect_path_right,
4160
        cmp_by_dirs,
3696.4.5 by Robert Collins
Simple 'compiled with pyrex' ProcessEntry class. faster.
4161
        ProcessEntryC as _process_entry,
3696.4.17 by Robert Collins
Review feedback.
4162
        update_entry as update_entry,
2474.1.21 by John Arbash Meinel
Cleanup the multiple testing.
4163
        )
4574.3.6 by Martin Pool
More warnings when failing to load extensions
4164
except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
4165
    osutils.failed_to_load_extension(e)
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
4166
    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
4167
        _read_dirblocks,
4168
        bisect_dirblock,
4169
        _bisect_path_left,
4170
        _bisect_path_right,
4171
        cmp_by_dirs,
2474.1.57 by John Arbash Meinel
Move code around to refactor according to our pyrex extension design.
4172
        )
4459.2.2 by Vincent Ladeuil
Use the same method or function names for _dirstate_helpers in pyrex and
4173
    # FIXME: It would be nice to be able to track moved lines so that the
4174
    # corresponding python code can be moved to the _dirstate_helpers_py
4175
    # module. I don't want to break the history for this important piece of
4176
    # code so I left the code here -- vila 20090622
4177
    update_entry = py_update_entry
4178
    _process_entry = ProcessEntryPython