1
# Copyright (C) 2006, 2007 Canonical Ltd
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.
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.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""DirState objects record the state of a directory and its bzr metadata.
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.
23
MINIKIND = "f" | "d" | "l" | "a" | "r" | "t";
26
WHOLE_NUMBER = {digit}, digit;
28
REVISION_ID = a non-empty utf8 string;
30
dirstate format = header line, full checksum, row count, parent details,
31
ghost_details, entries;
32
header line = "#bazaar dirstate flat format 3", NL;
33
full checksum = "crc32: ", ["-"], WHOLE_NUMBER, NL;
34
row count = "num_entries: ", WHOLE_NUMBER, NL;
35
parent_details = WHOLE NUMBER, {REVISION_ID}* NL;
36
ghost_details = WHOLE NUMBER, {REVISION_ID}*, NL;
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;
47
fingerprint = a nonempty utf8 sequence with meaning defined by minikind.
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)
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
59
For an entry for a tree, we have (using tree 0 - current tree) to demonstrate:
60
entry[1][0][0]: minikind
61
entry[1][0][1]: fingerprint
63
entry[1][0][3]: executable
64
entry[1][0][4]: packed_stat
66
entry[1][1][4]: revision_id
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
74
entries[0][2]: file_id
75
entries[1][0]: The tree data for the current tree for this fileid at /
79
'r' is a relocated entry: This path is not present in this tree with this id,
80
but the id can be found at another location. The fingerprint is used to
81
point to the target location.
82
'a' is an absent entry: In that tree the id is not present at this path.
83
'd' is a directory entry: This path in this tree is a directory with the
84
current file id. There is no fingerprint for directories.
85
'f' is a file entry: As for directory, but its a file. The fingerprint is a
87
'l' is a symlink entry: As for directory, but a symlink. The fingerprint is the
89
't' is a reference to a nested subtree; the fingerprint is the referenced
94
The entries on disk and in memory are ordered according to the following keys:
96
directory, as a list of components
100
--- Format 1 had the following different definition: ---
101
rows = dirname, NULL, basename, NULL, MINIKIND, NULL, fileid_utf8, NULL,
102
WHOLE NUMBER (* size *), NULL, packed stat, NULL, sha1|symlink target,
104
PARENT ROW = NULL, revision_utf8, NULL, MINIKIND, NULL, dirname, NULL,
105
basename, NULL, WHOLE NUMBER (* size *), NULL, "y" | "n", NULL,
108
PARENT ROW's are emitted for every parent that is not in the ghosts details
109
line. That is, if the parents are foo, bar, baz, and the ghosts are bar, then
110
each row will have a PARENT ROW for foo and baz, but not for bar.
113
In any tree, a kind of 'moved' indicates that the fingerprint field
114
(which we treat as opaque data specific to the 'kind' anyway) has the
115
details for the id of this row in that tree.
117
I'm strongly tempted to add a id->path index as well, but I think that
118
where we need id->path mapping; we also usually read the whole file, so
119
I'm going to skip that for the moment, as we have the ability to locate
120
via bisect any path in any tree, and if we lookup things by path, we can
121
accumulate an id->path mapping as we go, which will tend to match what we
124
I plan to implement this asap, so please speak up now to alter/tweak the
125
design - and once we stabilise on this, I'll update the wiki page for
128
The rationale for all this is that we want fast operations for the
129
common case (diff/status/commit/merge on all files) and extremely fast
130
operations for the less common but still occurs a lot status/diff/commit
131
on specific files). Operations on specific files involve a scan for all
132
the children of a path, *in every involved tree*, which the current
133
format did not accommodate.
137
1) Fast end to end use for bzr's top 5 uses cases. (commmit/diff/status/merge/???)
138
2) fall back current object model as needed.
139
3) scale usably to the largest trees known today - say 50K entries. (mozilla
140
is an example of this)
144
Eventually reuse dirstate objects across locks IFF the dirstate file has not
145
been modified, but will require that we flush/ignore cached stat-hit data
146
because we won't want to restat all files on disk just because a lock was
147
acquired, yet we cannot trust the data after the previous lock was released.
149
Memory representation:
150
vector of all directories, and vector of the childen ?
152
root_entrie = (direntry for root, [parent_direntries_for_root]),
154
('', ['data for achild', 'data for bchild', 'data for cchild'])
155
('dir', ['achild', 'cchild', 'echild'])
157
- single bisect to find N subtrees from a path spec
158
- in-order for serialisation - this is 'dirblock' grouping.
159
- insertion of a file '/a' affects only the '/' child-vector, that is, to
160
insert 10K elements from scratch does not generates O(N^2) memoves of a
161
single vector, rather each individual, which tends to be limited to a
162
manageable number. Will scale badly on trees with 10K entries in a
163
single directory. compare with Inventory.InventoryDirectory which has
164
a dictionary for the children. No bisect capability, can only probe for
165
exact matches, or grab all elements and sort.
166
- What's the risk of error here? Once we have the base format being processed
167
we should have a net win regardless of optimality. So we are going to
168
go with what seems reasonable.
171
Maybe we should do a test profile of the core structure - 10K simulated
172
searches/lookups/etc?
174
Objects for each row?
175
The lifetime of Dirstate objects is current per lock, but see above for
176
possible extensions. The lifetime of a row from a dirstate is expected to be
177
very short in the optimistic case: which we are optimising for. For instance,
178
subtree status will determine from analysis of the disk data what rows need to
179
be examined at all, and will be able to determine from a single row whether
180
that file has altered or not, so we are aiming to process tens of thousands of
181
entries each second within the dirstate context, before exposing anything to
182
the larger codebase. This suggests we want the time for a single file
183
comparison to be < 0.1 milliseconds. That would give us 10000 paths per second
184
processed, and to scale to 100 thousand we'll another order of magnitude to do
185
that. Now, as the lifetime for all unchanged entries is the time to parse, stat
186
the file on disk, and then immediately discard, the overhead of object creation
187
becomes a significant cost.
189
Figures: Creating a tuple from from 3 elements was profiled at 0.0625
190
microseconds, whereas creating a object which is subclassed from tuple was
191
0.500 microseconds, and creating an object with 3 elements and slots was 3
192
microseconds long. 0.1 milliseconds is 100 microseconds, and ideally we'll get
193
down to 10 microseconds for the total processing - having 33% of that be object
194
creation is a huge overhead. There is a potential cost in using tuples within
195
each row which is that the conditional code to do comparisons may be slower
196
than method invocation, but method invocation is known to be slow due to stack
197
frame creation, so avoiding methods in these tight inner loops in unfortunately
198
desirable. We can consider a pyrex version of this with objects in future if
207
from stat import S_IEXEC
223
def pack_stat(st, _encode=binascii.b2a_base64, _pack=struct.pack):
224
"""Convert stat values into a packed representation."""
225
# jam 20060614 it isn't really worth removing more entries if we
226
# are going to leave it in packed form.
227
# With only st_mtime and st_mode filesize is 5.5M and read time is 275ms
228
# With all entries, filesize is 5.9M and read time is maybe 280ms
229
# well within the noise margin
231
# base64 encoding always adds a final newline, so strip it off
232
# The current version
233
return _encode(_pack('>LLLLLL'
234
, st.st_size, int(st.st_mtime), int(st.st_ctime)
235
, st.st_dev, st.st_ino & 0xFFFFFFFF, st.st_mode))[:-1]
236
# This is 0.060s / 1.520s faster by not encoding as much information
237
# return _encode(_pack('>LL', int(st.st_mtime), st.st_mode))[:-1]
238
# This is not strictly faster than _encode(_pack())[:-1]
239
# return '%X.%X.%X.%X.%X.%X' % (
240
# st.st_size, int(st.st_mtime), int(st.st_ctime),
241
# st.st_dev, st.st_ino, st.st_mode)
242
# Similar to the _encode(_pack('>LL'))
243
# return '%X.%X' % (int(st.st_mtime), st.st_mode)
246
class DirState(object):
247
"""Record directory and metadata state for fast access.
249
A dirstate is a specialised data structure for managing local working
250
tree state information. Its not yet well defined whether it is platform
251
specific, and if it is how we detect/parameterise that.
253
Dirstates use the usual lock_write, lock_read and unlock mechanisms.
254
Unlike most bzr disk formats, DirStates must be locked for reading, using
255
lock_read. (This is an os file lock internally.) This is necessary
256
because the file can be rewritten in place.
258
DirStates must be explicitly written with save() to commit changes; just
259
unlocking them does not write the changes to disk.
262
_kind_to_minikind = {
268
'tree-reference': 't',
270
_minikind_to_kind = {
276
't': 'tree-reference',
278
_stat_to_minikind = {
283
_to_yesno = {True:'y', False: 'n'} # TODO profile the performance gain
284
# of using int conversion rather than a dict here. AND BLAME ANDREW IF
287
# TODO: jam 20070221 Figure out what to do if we have a record that exceeds
288
# the BISECT_PAGE_SIZE. For now, we just have to make it large enough
289
# that we are sure a single record will always fit.
290
BISECT_PAGE_SIZE = 4096
293
IN_MEMORY_UNMODIFIED = 1
294
IN_MEMORY_MODIFIED = 2
296
# A pack_stat (the x's) that is just noise and will never match the output
299
NULL_PARENT_DETAILS = ('a', '', 0, False, '')
301
HEADER_FORMAT_2 = '#bazaar dirstate flat format 2\n'
302
HEADER_FORMAT_3 = '#bazaar dirstate flat format 3\n'
304
def __init__(self, path):
305
"""Create a DirState object.
309
:attr _root_entrie: The root row of the directory/file information,
310
- contains the path to / - '', ''
311
- kind of 'directory',
312
- the file id of the root in utf8
315
- and no sha information.
316
:param path: The path at which the dirstate file on disk should live.
318
# _header_state and _dirblock_state represent the current state
319
# of the dirstate metadata and the per-row data respectiely.
320
# NOT_IN_MEMORY indicates that no data is in memory
321
# IN_MEMORY_UNMODIFIED indicates that what we have in memory
322
# is the same as is on disk
323
# IN_MEMORY_MODIFIED indicates that we have a modified version
324
# of what is on disk.
325
# In future we will add more granularity, for instance _dirblock_state
326
# will probably support partially-in-memory as a separate variable,
327
# allowing for partially-in-memory unmodified and partially-in-memory
329
self._header_state = DirState.NOT_IN_MEMORY
330
self._dirblock_state = DirState.NOT_IN_MEMORY
334
self._state_file = None
335
self._filename = path
336
self._lock_token = None
337
self._lock_state = None
338
self._id_index = None
339
self._end_of_header = None
340
self._cutoff_time = None
341
self._split_path_cache = {}
342
self._bisect_page_size = DirState.BISECT_PAGE_SIZE
346
(self.__class__.__name__, self._filename)
348
def add(self, path, file_id, kind, stat, fingerprint):
349
"""Add a path to be tracked.
351
:param path: The path within the dirstate - '' is the root, 'foo' is the
352
path foo within the root, 'foo/bar' is the path bar within foo
354
:param file_id: The file id of the path being added.
355
:param kind: The kind of the path, as a string like 'file',
357
:param stat: The output of os.lstat for the path.
358
:param fingerprint: The sha value of the file,
359
or the target of a symlink,
360
or the referenced revision id for tree-references,
361
or '' for directories.
364
# find the block its in.
365
# find the location in the block.
366
# check its not there
368
#------- copied from inventory.make_entry
369
# --- normalized_filename wants a unicode basename only, so get one.
370
dirname, basename = osutils.split(path)
371
# we dont import normalized_filename directly because we want to be
372
# able to change the implementation at runtime for tests.
373
norm_name, can_access = osutils.normalized_filename(basename)
374
if norm_name != basename:
378
raise errors.InvalidNormalization(path)
379
# you should never have files called . or ..; just add the directory
380
# in the parent, or according to the special treatment for the root
381
if basename == '.' or basename == '..':
382
raise errors.InvalidEntryName(path)
383
# now that we've normalised, we need the correct utf8 path and
384
# dirname and basename elements. This single encode and split should be
385
# faster than three separate encodes.
386
utf8path = (dirname + '/' + basename).strip('/').encode('utf8')
387
dirname, basename = osutils.split(utf8path)
388
assert file_id.__class__ == str, \
389
"must be a utf8 file_id not %s" % (type(file_id))
390
# Make sure the file_id does not exist in this tree
391
file_id_entry = self._get_entry(0, fileid_utf8=file_id)
392
if file_id_entry != (None, None):
393
path = osutils.pathjoin(file_id_entry[0][0], file_id_entry[0][1])
394
kind = DirState._minikind_to_kind[file_id_entry[1][0][0]]
395
info = '%s:%s' % (kind, path)
396
raise errors.DuplicateFileId(file_id, info)
397
first_key = (dirname, basename, '')
398
block_index, present = self._find_block_index_from_key(first_key)
400
# check the path is not in the tree
401
block = self._dirblocks[block_index][1]
402
entry_index, _ = self._find_entry_index(first_key, block)
403
while (entry_index < len(block) and
404
block[entry_index][0][0:2] == first_key[0:2]):
405
if block[entry_index][1][0][0] not in 'ar':
406
# this path is in the dirstate in the current tree.
407
raise Exception, "adding already added path!"
410
# The block where we want to put the file is not present. But it
411
# might be because the directory was empty, or not loaded yet. Look
412
# for a parent entry, if not found, raise NotVersionedError
413
parent_dir, parent_base = osutils.split(dirname)
414
parent_block_idx, parent_entry_idx, _, parent_present = \
415
self._get_block_entry_index(parent_dir, parent_base, 0)
416
if not parent_present:
417
raise errors.NotVersionedError(path, str(self))
418
self._ensure_block(parent_block_idx, parent_entry_idx, dirname)
419
block = self._dirblocks[block_index][1]
420
entry_key = (dirname, basename, file_id)
423
packed_stat = DirState.NULLSTAT
426
packed_stat = pack_stat(stat)
427
parent_info = self._empty_parent_info()
428
minikind = DirState._kind_to_minikind[kind]
430
entry_data = entry_key, [
431
(minikind, fingerprint, size, False, packed_stat),
433
elif kind == 'directory':
434
entry_data = entry_key, [
435
(minikind, '', 0, False, packed_stat),
437
elif kind == 'symlink':
438
entry_data = entry_key, [
439
(minikind, fingerprint, size, False, packed_stat),
441
elif kind == 'tree-reference':
442
entry_data = entry_key, [
443
(minikind, fingerprint, 0, False, packed_stat),
446
raise errors.BzrError('unknown kind %r' % kind)
447
entry_index, present = self._find_entry_index(entry_key, block)
449
block.insert(entry_index, entry_data)
451
assert block[entry_index][1][0][0] == 'a', " %r(%r) already added" % (basename, file_id)
452
block[entry_index][1][0] = entry_data[1][0]
454
if kind == 'directory':
455
# insert a new dirblock
456
self._ensure_block(block_index, entry_index, utf8path)
457
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
459
self._id_index.setdefault(entry_key[2], set()).add(entry_key)
461
def _bisect(self, paths):
462
"""Bisect through the disk structure for specific rows.
464
:param paths: A list of paths to find
465
:return: A dict mapping path => entries for found entries. Missing
466
entries will not be in the map.
467
The list is not sorted, and entries will be populated
468
based on when they were read.
470
self._requires_lock()
471
# We need the file pointer to be right after the initial header block
472
self._read_header_if_needed()
473
# If _dirblock_state was in memory, we should just return info from
474
# there, this function is only meant to handle when we want to read
476
assert self._dirblock_state == DirState.NOT_IN_MEMORY
478
# The disk representation is generally info + '\0\n\0' at the end. But
479
# for bisecting, it is easier to treat this as '\0' + info + '\0\n'
480
# Because it means we can sync on the '\n'
481
state_file = self._state_file
482
file_size = os.fstat(state_file.fileno()).st_size
483
# We end up with 2 extra fields, we should have a trailing '\n' to
484
# ensure that we read the whole record, and we should have a precursur
485
# '' which ensures that we start after the previous '\n'
486
entry_field_count = self._fields_per_entry() + 1
488
low = self._end_of_header
489
high = file_size - 1 # Ignore the final '\0'
490
# Map from (dir, name) => entry
493
# Avoid infinite seeking
494
max_count = 30*len(paths)
496
# pending is a list of places to look.
497
# each entry is a tuple of low, high, dir_names
498
# low -> the first byte offset to read (inclusive)
499
# high -> the last byte offset (inclusive)
500
# dir_names -> The list of (dir, name) pairs that should be found in
501
# the [low, high] range
502
pending = [(low, high, paths)]
504
page_size = self._bisect_page_size
506
fields_to_entry = self._get_fields_to_entry()
509
low, high, cur_files = pending.pop()
511
if not cur_files or low >= high:
516
if count > max_count:
517
raise errors.BzrError('Too many seeks, most likely a bug.')
519
mid = max(low, (low+high-page_size)/2)
522
# limit the read size, so we don't end up reading data that we have
524
read_size = min(page_size, (high-mid)+1)
525
block = state_file.read(read_size)
528
entries = block.split('\n')
531
# We didn't find a '\n', so we cannot have found any records.
532
# So put this range back and try again. But we know we have to
533
# increase the page size, because a single read did not contain
534
# a record break (so records must be larger than page_size)
536
pending.append((low, high, cur_files))
539
# Check the first and last entries, in case they are partial, or if
540
# we don't care about the rest of this page
542
first_fields = entries[0].split('\0')
543
if len(first_fields) < entry_field_count:
544
# We didn't get the complete first entry
545
# so move start, and grab the next, which
546
# should be a full entry
547
start += len(entries[0])+1
548
first_fields = entries[1].split('\0')
551
if len(first_fields) <= 2:
552
# We didn't even get a filename here... what do we do?
553
# Try a large page size and repeat this query
555
pending.append((low, high, cur_files))
558
# Find what entries we are looking for, which occur before and
559
# after this first record.
562
first_path = first_fields[1] + '/' + first_fields[2]
564
first_path = first_fields[2]
565
first_loc = _bisect_path_left(cur_files, first_path)
567
# These exist before the current location
568
pre = cur_files[:first_loc]
569
# These occur after the current location, which may be in the
570
# data we read, or might be after the last entry
571
post = cur_files[first_loc:]
573
if post and len(first_fields) >= entry_field_count:
574
# We have files after the first entry
576
# Parse the last entry
577
last_entry_num = len(entries)-1
578
last_fields = entries[last_entry_num].split('\0')
579
if len(last_fields) < entry_field_count:
580
# The very last hunk was not complete,
581
# read the previous hunk
582
after = mid + len(block) - len(entries[-1])
584
last_fields = entries[last_entry_num].split('\0')
586
after = mid + len(block)
589
last_path = last_fields[1] + '/' + last_fields[2]
591
last_path = last_fields[2]
592
last_loc = _bisect_path_right(post, last_path)
594
middle_files = post[:last_loc]
595
post = post[last_loc:]
598
# We have files that should occur in this block
599
# (>= first, <= last)
600
# Either we will find them here, or we can mark them as
603
if middle_files[0] == first_path:
604
# We might need to go before this location
605
pre.append(first_path)
606
if middle_files[-1] == last_path:
607
post.insert(0, last_path)
609
# Find out what paths we have
610
paths = {first_path:[first_fields]}
611
# last_path might == first_path so we need to be
612
# careful if we should append rather than overwrite
613
if last_entry_num != first_entry_num:
614
paths.setdefault(last_path, []).append(last_fields)
615
for num in xrange(first_entry_num+1, last_entry_num):
616
# TODO: jam 20070223 We are already splitting here, so
617
# shouldn't we just split the whole thing rather
618
# than doing the split again in add_one_record?
619
fields = entries[num].split('\0')
621
path = fields[1] + '/' + fields[2]
624
paths.setdefault(path, []).append(fields)
626
for path in middle_files:
627
for fields in paths.get(path, []):
628
# offset by 1 because of the opening '\0'
629
# consider changing fields_to_entry to avoid the
631
entry = fields_to_entry(fields[1:])
632
found.setdefault(path, []).append(entry)
634
# Now we have split up everything into pre, middle, and post, and
635
# we have handled everything that fell in 'middle'.
636
# We add 'post' first, so that we prefer to seek towards the
637
# beginning, so that we will tend to go as early as we need, and
638
# then only seek forward after that.
640
pending.append((after, high, post))
642
pending.append((low, start-1, pre))
644
# Consider that we may want to return the directory entries in sorted
645
# order. For now, we just return them in whatever order we found them,
646
# and leave it up to the caller if they care if it is ordered or not.
649
def _bisect_dirblocks(self, dir_list):
650
"""Bisect through the disk structure to find entries in given dirs.
652
_bisect_dirblocks is meant to find the contents of directories, which
653
differs from _bisect, which only finds individual entries.
655
:param dir_list: A sorted list of directory names ['', 'dir', 'foo'].
656
:return: A map from dir => entries_for_dir
658
# TODO: jam 20070223 A lot of the bisecting logic could be shared
659
# between this and _bisect. It would require parameterizing the
660
# inner loop with a function, though. We should evaluate the
661
# performance difference.
662
self._requires_lock()
663
# We need the file pointer to be right after the initial header block
664
self._read_header_if_needed()
665
# If _dirblock_state was in memory, we should just return info from
666
# there, this function is only meant to handle when we want to read
668
assert self._dirblock_state == DirState.NOT_IN_MEMORY
670
# The disk representation is generally info + '\0\n\0' at the end. But
671
# for bisecting, it is easier to treat this as '\0' + info + '\0\n'
672
# Because it means we can sync on the '\n'
673
state_file = self._state_file
674
file_size = os.fstat(state_file.fileno()).st_size
675
# We end up with 2 extra fields, we should have a trailing '\n' to
676
# ensure that we read the whole record, and we should have a precursur
677
# '' which ensures that we start after the previous '\n'
678
entry_field_count = self._fields_per_entry() + 1
680
low = self._end_of_header
681
high = file_size - 1 # Ignore the final '\0'
682
# Map from dir => entry
685
# Avoid infinite seeking
686
max_count = 30*len(dir_list)
688
# pending is a list of places to look.
689
# each entry is a tuple of low, high, dir_names
690
# low -> the first byte offset to read (inclusive)
691
# high -> the last byte offset (inclusive)
692
# dirs -> The list of directories that should be found in
693
# the [low, high] range
694
pending = [(low, high, dir_list)]
696
page_size = self._bisect_page_size
698
fields_to_entry = self._get_fields_to_entry()
701
low, high, cur_dirs = pending.pop()
703
if not cur_dirs or low >= high:
708
if count > max_count:
709
raise errors.BzrError('Too many seeks, most likely a bug.')
711
mid = max(low, (low+high-page_size)/2)
714
# limit the read size, so we don't end up reading data that we have
716
read_size = min(page_size, (high-mid)+1)
717
block = state_file.read(read_size)
720
entries = block.split('\n')
723
# We didn't find a '\n', so we cannot have found any records.
724
# So put this range back and try again. But we know we have to
725
# increase the page size, because a single read did not contain
726
# a record break (so records must be larger than page_size)
728
pending.append((low, high, cur_dirs))
731
# Check the first and last entries, in case they are partial, or if
732
# we don't care about the rest of this page
734
first_fields = entries[0].split('\0')
735
if len(first_fields) < entry_field_count:
736
# We didn't get the complete first entry
737
# so move start, and grab the next, which
738
# should be a full entry
739
start += len(entries[0])+1
740
first_fields = entries[1].split('\0')
743
if len(first_fields) <= 1:
744
# We didn't even get a dirname here... what do we do?
745
# Try a large page size and repeat this query
747
pending.append((low, high, cur_dirs))
750
# Find what entries we are looking for, which occur before and
751
# after this first record.
753
first_dir = first_fields[1]
754
first_loc = bisect.bisect_left(cur_dirs, first_dir)
756
# These exist before the current location
757
pre = cur_dirs[:first_loc]
758
# These occur after the current location, which may be in the
759
# data we read, or might be after the last entry
760
post = cur_dirs[first_loc:]
762
if post and len(first_fields) >= entry_field_count:
763
# We have records to look at after the first entry
765
# Parse the last entry
766
last_entry_num = len(entries)-1
767
last_fields = entries[last_entry_num].split('\0')
768
if len(last_fields) < entry_field_count:
769
# The very last hunk was not complete,
770
# read the previous hunk
771
after = mid + len(block) - len(entries[-1])
773
last_fields = entries[last_entry_num].split('\0')
775
after = mid + len(block)
777
last_dir = last_fields[1]
778
last_loc = bisect.bisect_right(post, last_dir)
780
middle_files = post[:last_loc]
781
post = post[last_loc:]
784
# We have files that should occur in this block
785
# (>= first, <= last)
786
# Either we will find them here, or we can mark them as
789
if middle_files[0] == first_dir:
790
# We might need to go before this location
791
pre.append(first_dir)
792
if middle_files[-1] == last_dir:
793
post.insert(0, last_dir)
795
# Find out what paths we have
796
paths = {first_dir:[first_fields]}
797
# last_dir might == first_dir so we need to be
798
# careful if we should append rather than overwrite
799
if last_entry_num != first_entry_num:
800
paths.setdefault(last_dir, []).append(last_fields)
801
for num in xrange(first_entry_num+1, last_entry_num):
802
# TODO: jam 20070223 We are already splitting here, so
803
# shouldn't we just split the whole thing rather
804
# than doing the split again in add_one_record?
805
fields = entries[num].split('\0')
806
paths.setdefault(fields[1], []).append(fields)
808
for cur_dir in middle_files:
809
for fields in paths.get(cur_dir, []):
810
# offset by 1 because of the opening '\0'
811
# consider changing fields_to_entry to avoid the
813
entry = fields_to_entry(fields[1:])
814
found.setdefault(cur_dir, []).append(entry)
816
# Now we have split up everything into pre, middle, and post, and
817
# we have handled everything that fell in 'middle'.
818
# We add 'post' first, so that we prefer to seek towards the
819
# beginning, so that we will tend to go as early as we need, and
820
# then only seek forward after that.
822
pending.append((after, high, post))
824
pending.append((low, start-1, pre))
828
def _bisect_recursive(self, paths):
829
"""Bisect for entries for all paths and their children.
831
This will use bisect to find all records for the supplied paths. It
832
will then continue to bisect for any records which are marked as
833
directories. (and renames?)
835
:param paths: A sorted list of (dir, name) pairs
836
eg: [('', 'a'), ('', 'f'), ('a/b', 'c')]
837
:return: A dictionary mapping (dir, name, file_id) => [tree_info]
839
# Map from (dir, name, file_id) => [tree_info]
842
found_dir_names = set()
844
# Directories that have been read
845
processed_dirs = set()
846
# Get the ball rolling with the first bisect for all entries.
847
newly_found = self._bisect(paths)
850
# Directories that need to be read
852
paths_to_search = set()
853
for entry_list in newly_found.itervalues():
854
for dir_name_id, trees_info in entry_list:
855
found[dir_name_id] = trees_info
856
found_dir_names.add(dir_name_id[:2])
858
for tree_info in trees_info:
859
minikind = tree_info[0]
862
# We already processed this one as a directory,
863
# we don't need to do the extra work again.
865
subdir, name, file_id = dir_name_id
866
path = osutils.pathjoin(subdir, name)
868
if path not in processed_dirs:
869
pending_dirs.add(path)
870
elif minikind == 'r':
871
# Rename, we need to directly search the target
872
# which is contained in the fingerprint column
873
dir_name = osutils.split(tree_info[1])
874
if dir_name[0] in pending_dirs:
875
# This entry will be found in the dir search
877
if dir_name not in found_dir_names:
878
paths_to_search.add(tree_info[1])
879
# Now we have a list of paths to look for directly, and
880
# directory blocks that need to be read.
881
# newly_found is mixing the keys between (dir, name) and path
882
# entries, but that is okay, because we only really care about the
884
newly_found = self._bisect(sorted(paths_to_search))
885
newly_found.update(self._bisect_dirblocks(sorted(pending_dirs)))
886
processed_dirs.update(pending_dirs)
889
def _empty_parent_info(self):
890
return [DirState.NULL_PARENT_DETAILS] * (len(self._parents) -
893
def _ensure_block(self, parent_block_index, parent_row_index, dirname):
894
"""Ensure a block for dirname exists.
896
This function exists to let callers which know that there is a
897
directory dirname ensure that the block for it exists. This block can
898
fail to exist because of demand loading, or because a directory had no
899
children. In either case it is not an error. It is however an error to
900
call this if there is no parent entry for the directory, and thus the
901
function requires the coordinates of such an entry to be provided.
903
The root row is special cased and can be indicated with a parent block
906
:param parent_block_index: The index of the block in which dirname's row
908
:param parent_row_index: The index in the parent block where the row
910
:param dirname: The utf8 dirname to ensure there is a block for.
911
:return: The index for the block.
913
if dirname == '' and parent_row_index == 0 and parent_block_index == 0:
914
# This is the signature of the root row, and the
915
# contents-of-root row is always index 1
917
# the basename of the directory must be the end of its full name.
918
if not (parent_block_index == -1 and
919
parent_block_index == -1 and dirname == ''):
920
assert dirname.endswith(
921
self._dirblocks[parent_block_index][1][parent_row_index][0][1])
922
block_index, present = self._find_block_index_from_key((dirname, '', ''))
924
## In future, when doing partial parsing, this should load and
925
# populate the entire block.
926
self._dirblocks.insert(block_index, (dirname, []))
929
def _entries_to_current_state(self, new_entries):
930
"""Load new_entries into self.dirblocks.
932
Process new_entries into the current state object, making them the active
933
state. The entries are grouped together by directory to form dirblocks.
935
:param new_entries: A sorted list of entries. This function does not sort
936
to prevent unneeded overhead when callers have a sorted list already.
939
assert new_entries[0][0][0:2] == ('', ''), \
940
"Missing root row %r" % (new_entries[0][0],)
941
# The two blocks here are deliberate: the root block and the
942
# contents-of-root block.
943
self._dirblocks = [('', []), ('', [])]
944
current_block = self._dirblocks[0][1]
947
append_entry = current_block.append
948
for entry in new_entries:
949
if entry[0][0] != current_dirname:
950
# new block - different dirname
952
current_dirname = entry[0][0]
953
self._dirblocks.append((current_dirname, current_block))
954
append_entry = current_block.append
955
# append the entry to the current block
957
self._split_root_dirblock_into_contents()
959
def _split_root_dirblock_into_contents(self):
960
"""Split the root dirblocks into root and contents-of-root.
962
After parsing by path, we end up with root entries and contents-of-root
963
entries in the same block. This loop splits them out again.
965
# The above loop leaves the "root block" entries mixed with the
966
# "contents-of-root block". But we don't want an if check on
967
# all entries, so instead we just fix it up here.
968
assert self._dirblocks[1] == ('', [])
970
contents_of_root_block = []
971
for entry in self._dirblocks[0][1]:
972
if not entry[0][1]: # This is a root entry
973
root_block.append(entry)
975
contents_of_root_block.append(entry)
976
self._dirblocks[0] = ('', root_block)
977
self._dirblocks[1] = ('', contents_of_root_block)
979
def _entry_to_line(self, entry):
980
"""Serialize entry to a NULL delimited line ready for _get_output_lines.
982
:param entry: An entry_tuple as defined in the module docstring.
984
entire_entry = list(entry[0])
985
for tree_number, tree_data in enumerate(entry[1]):
986
# (minikind, fingerprint, size, executable, tree_specific_string)
987
entire_entry.extend(tree_data)
988
# 3 for the key, 5 for the fields per tree.
989
tree_offset = 3 + tree_number * 5
991
entire_entry[tree_offset + 0] = tree_data[0]
993
entire_entry[tree_offset + 2] = str(tree_data[2])
995
entire_entry[tree_offset + 3] = DirState._to_yesno[tree_data[3]]
996
return '\0'.join(entire_entry)
998
def _fields_per_entry(self):
999
"""How many null separated fields should be in each entry row.
1001
Each line now has an extra '\n' field which is not used
1002
so we just skip over it
1004
3 fields for the key
1005
+ number of fields per tree_data (5) * tree count
1008
tree_count = 1 + self._num_present_parents()
1009
return 3 + 5 * tree_count + 1
1011
def _find_block(self, key, add_if_missing=False):
1012
"""Return the block that key should be present in.
1014
:param key: A dirstate entry key.
1015
:return: The block tuple.
1017
block_index, present = self._find_block_index_from_key(key)
1019
if not add_if_missing:
1020
# check to see if key is versioned itself - we might want to
1021
# add it anyway, because dirs with no entries dont get a
1022
# dirblock at parse time.
1023
# This is an uncommon branch to take: most dirs have children,
1024
# and most code works with versioned paths.
1025
parent_base, parent_name = osutils.split(key[0])
1026
if not self._get_block_entry_index(parent_base, parent_name, 0)[3]:
1027
# some parent path has not been added - its an error to add
1029
raise errors.NotVersionedError(key[0:2], str(self))
1030
self._dirblocks.insert(block_index, (key[0], []))
1031
return self._dirblocks[block_index]
1033
def _find_block_index_from_key(self, key):
1034
"""Find the dirblock index for a key.
1036
:return: The block index, True if the block for the key is present.
1038
if key[0:2] == ('', ''):
1040
block_index = bisect_dirblock(self._dirblocks, key[0], 1,
1041
cache=self._split_path_cache)
1042
# _right returns one-past-where-key is so we have to subtract
1043
# one to use it. we use _right here because there are two
1044
# '' blocks - the root, and the contents of root
1045
# we always have a minimum of 2 in self._dirblocks: root and
1046
# root-contents, and for '', we get 2 back, so this is
1047
# simple and correct:
1048
present = (block_index < len(self._dirblocks) and
1049
self._dirblocks[block_index][0] == key[0])
1050
return block_index, present
1052
def _find_entry_index(self, key, block):
1053
"""Find the entry index for a key in a block.
1055
:return: The entry index, True if the entry for the key is present.
1057
entry_index = bisect.bisect_left(block, (key, []))
1058
present = (entry_index < len(block) and
1059
block[entry_index][0] == key)
1060
return entry_index, present
1063
def from_tree(tree, dir_state_filename):
1064
"""Create a dirstate from a bzr Tree.
1066
:param tree: The tree which should provide parent information and
1068
:return: a DirState object which is currently locked for writing.
1069
(it was locked by DirState.initialize)
1071
result = DirState.initialize(dir_state_filename)
1075
parent_ids = tree.get_parent_ids()
1076
num_parents = len(parent_ids)
1078
for parent_id in parent_ids:
1079
parent_tree = tree.branch.repository.revision_tree(parent_id)
1080
parent_trees.append((parent_id, parent_tree))
1081
parent_tree.lock_read()
1082
result.set_parent_trees(parent_trees, [])
1083
result.set_state_from_inventory(tree.inventory)
1085
for revid, parent_tree in parent_trees:
1086
parent_tree.unlock()
1089
# The caller won't have a chance to unlock this, so make sure we
1095
def update_entry(self, entry, abspath, stat_value,
1096
_stat_to_minikind=_stat_to_minikind,
1097
_pack_stat=pack_stat):
1098
"""Update the entry based on what is actually on disk.
1100
:param entry: This is the dirblock entry for the file in question.
1101
:param abspath: The path on disk for this file.
1102
:param stat_value: (optional) if we already have done a stat on the
1104
:return: The sha1 hexdigest of the file (40 bytes) or link target of a
1108
minikind = _stat_to_minikind[stat_value.st_mode & 0170000]
1112
packed_stat = _pack_stat(stat_value)
1113
(saved_minikind, saved_link_or_sha1, saved_file_size,
1114
saved_executable, saved_packed_stat) = entry[1][0]
1116
if (minikind == saved_minikind
1117
and packed_stat == saved_packed_stat):
1118
# The stat hasn't changed since we saved, so we can re-use the
1123
# size should also be in packed_stat
1124
if saved_file_size == stat_value.st_size:
1125
return saved_link_or_sha1
1127
# If we have gotten this far, that means that we need to actually
1128
# process this entry.
1131
link_or_sha1 = self._sha1_file(abspath, entry)
1132
executable = self._is_executable(stat_value.st_mode,
1134
if self._cutoff_time is None:
1135
self._sha_cutoff_time()
1136
if (stat_value.st_mtime < self._cutoff_time
1137
and stat_value.st_ctime < self._cutoff_time):
1138
entry[1][0] = ('f', link_or_sha1, stat_value.st_size,
1139
executable, packed_stat)
1141
entry[1][0] = ('f', '', stat_value.st_size,
1142
executable, DirState.NULLSTAT)
1143
elif minikind == 'd':
1145
entry[1][0] = ('d', '', 0, False, packed_stat)
1146
if saved_minikind != 'd':
1147
# This changed from something into a directory. Make sure we
1148
# have a directory block for it. This doesn't happen very
1149
# often, so this doesn't have to be super fast.
1150
block_index, entry_index, dir_present, file_present = \
1151
self._get_block_entry_index(entry[0][0], entry[0][1], 0)
1152
self._ensure_block(block_index, entry_index,
1153
osutils.pathjoin(entry[0][0], entry[0][1]))
1154
elif minikind == 'l':
1155
link_or_sha1 = self._read_link(abspath, saved_link_or_sha1)
1156
if self._cutoff_time is None:
1157
self._sha_cutoff_time()
1158
if (stat_value.st_mtime < self._cutoff_time
1159
and stat_value.st_ctime < self._cutoff_time):
1160
entry[1][0] = ('l', link_or_sha1, stat_value.st_size,
1163
entry[1][0] = ('l', '', stat_value.st_size,
1164
False, DirState.NULLSTAT)
1165
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1168
def _sha_cutoff_time(self):
1169
"""Return cutoff time.
1171
Files modified more recently than this time are at risk of being
1172
undetectably modified and so can't be cached.
1174
# Cache the cutoff time as long as we hold a lock.
1175
# time.time() isn't super expensive (approx 3.38us), but
1176
# when you call it 50,000 times it adds up.
1177
# For comparison, os.lstat() costs 7.2us if it is hot.
1178
self._cutoff_time = int(time.time()) - 3
1179
return self._cutoff_time
1181
def _lstat(self, abspath, entry):
1182
"""Return the os.lstat value for this path."""
1183
return os.lstat(abspath)
1185
def _sha1_file(self, abspath, entry):
1186
"""Calculate the SHA1 of a file by reading the full text"""
1187
f = file(abspath, 'rb', buffering=65000)
1189
return osutils.sha_file(f)
1193
def _is_executable(self, mode, old_executable):
1194
"""Is this file executable?"""
1195
return bool(S_IEXEC & mode)
1197
def _is_executable_win32(self, mode, old_executable):
1198
"""On win32 the executable bit is stored in the dirstate."""
1199
return old_executable
1201
if sys.platform == 'win32':
1202
_is_executable = _is_executable_win32
1204
def _read_link(self, abspath, old_link):
1205
"""Read the target of a symlink"""
1206
# TODO: jam 200700301 On Win32, this could just return the value
1207
# already in memory. However, this really needs to be done at a
1208
# higher level, because there either won't be anything on disk,
1209
# or the thing on disk will be a file.
1210
return os.readlink(abspath)
1212
def get_ghosts(self):
1213
"""Return a list of the parent tree revision ids that are ghosts."""
1214
self._read_header_if_needed()
1217
def get_lines(self):
1218
"""Serialise the entire dirstate to a sequence of lines."""
1219
if (self._header_state == DirState.IN_MEMORY_UNMODIFIED and
1220
self._dirblock_state == DirState.IN_MEMORY_UNMODIFIED):
1221
# read whats on disk.
1222
self._state_file.seek(0)
1223
return self._state_file.readlines()
1225
lines.append(self._get_parents_line(self.get_parent_ids()))
1226
lines.append(self._get_ghosts_line(self._ghosts))
1227
# append the root line which is special cased
1228
lines.extend(map(self._entry_to_line, self._iter_entries()))
1229
return self._get_output_lines(lines)
1231
def _get_ghosts_line(self, ghost_ids):
1232
"""Create a line for the state file for ghost information."""
1233
return '\0'.join([str(len(ghost_ids))] + ghost_ids)
1235
def _get_parents_line(self, parent_ids):
1236
"""Create a line for the state file for parents information."""
1237
return '\0'.join([str(len(parent_ids))] + parent_ids)
1239
def _get_fields_to_entry(self):
1240
"""Get a function which converts entry fields into a entry record.
1242
This handles size and executable, as well as parent records.
1244
:return: A function which takes a list of fields, and returns an
1245
appropriate record for storing in memory.
1247
# This is intentionally unrolled for performance
1248
num_present_parents = self._num_present_parents()
1249
if num_present_parents == 0:
1250
def fields_to_entry_0_parents(fields, _int=int):
1251
path_name_file_id_key = (fields[0], fields[1], fields[2])
1252
return (path_name_file_id_key, [
1254
fields[3], # minikind
1255
fields[4], # fingerprint
1256
_int(fields[5]), # size
1257
fields[6] == 'y', # executable
1258
fields[7], # packed_stat or revision_id
1260
return fields_to_entry_0_parents
1261
elif num_present_parents == 1:
1262
def fields_to_entry_1_parent(fields, _int=int):
1263
path_name_file_id_key = (fields[0], fields[1], fields[2])
1264
return (path_name_file_id_key, [
1266
fields[3], # minikind
1267
fields[4], # fingerprint
1268
_int(fields[5]), # size
1269
fields[6] == 'y', # executable
1270
fields[7], # packed_stat or revision_id
1273
fields[8], # minikind
1274
fields[9], # fingerprint
1275
_int(fields[10]), # size
1276
fields[11] == 'y', # executable
1277
fields[12], # packed_stat or revision_id
1280
return fields_to_entry_1_parent
1281
elif num_present_parents == 2:
1282
def fields_to_entry_2_parents(fields, _int=int):
1283
path_name_file_id_key = (fields[0], fields[1], fields[2])
1284
return (path_name_file_id_key, [
1286
fields[3], # minikind
1287
fields[4], # fingerprint
1288
_int(fields[5]), # size
1289
fields[6] == 'y', # executable
1290
fields[7], # packed_stat or revision_id
1293
fields[8], # minikind
1294
fields[9], # fingerprint
1295
_int(fields[10]), # size
1296
fields[11] == 'y', # executable
1297
fields[12], # packed_stat or revision_id
1300
fields[13], # minikind
1301
fields[14], # fingerprint
1302
_int(fields[15]), # size
1303
fields[16] == 'y', # executable
1304
fields[17], # packed_stat or revision_id
1307
return fields_to_entry_2_parents
1309
def fields_to_entry_n_parents(fields, _int=int):
1310
path_name_file_id_key = (fields[0], fields[1], fields[2])
1311
trees = [(fields[cur], # minikind
1312
fields[cur+1], # fingerprint
1313
_int(fields[cur+2]), # size
1314
fields[cur+3] == 'y', # executable
1315
fields[cur+4], # stat or revision_id
1316
) for cur in xrange(3, len(fields)-1, 5)]
1317
return path_name_file_id_key, trees
1318
return fields_to_entry_n_parents
1320
def get_parent_ids(self):
1321
"""Return a list of the parent tree ids for the directory state."""
1322
self._read_header_if_needed()
1323
return list(self._parents)
1325
def _get_block_entry_index(self, dirname, basename, tree_index):
1326
"""Get the coordinates for a path in the state structure.
1328
:param dirname: The utf8 dirname to lookup.
1329
:param basename: The utf8 basename to lookup.
1330
:param tree_index: The index of the tree for which this lookup should
1332
:return: A tuple describing where the path is located, or should be
1333
inserted. The tuple contains four fields: the block index, the row
1334
index, the directory is present (boolean), the entire path is
1335
present (boolean). There is no guarantee that either
1336
coordinate is currently reachable unless the found field for it is
1337
True. For instance, a directory not present in the searched tree
1338
may be returned with a value one greater than the current highest
1339
block offset. The directory present field will always be True when
1340
the path present field is True. The directory present field does
1341
NOT indicate that the directory is present in the searched tree,
1342
rather it indicates that there are at least some files in some
1345
self._read_dirblocks_if_needed()
1346
key = dirname, basename, ''
1347
block_index, present = self._find_block_index_from_key(key)
1349
# no such directory - return the dir index and 0 for the row.
1350
return block_index, 0, False, False
1351
block = self._dirblocks[block_index][1] # access the entries only
1352
entry_index, present = self._find_entry_index(key, block)
1353
# linear search through present entries at this path to find the one
1355
while entry_index < len(block) and block[entry_index][0][1] == basename:
1356
if block[entry_index][1][tree_index][0] not in \
1357
('a', 'r'): # absent, relocated
1358
return block_index, entry_index, True, True
1360
return block_index, entry_index, True, False
1362
def _get_entry(self, tree_index, fileid_utf8=None, path_utf8=None):
1363
"""Get the dirstate entry for path in tree tree_index.
1365
If either file_id or path is supplied, it is used as the key to lookup.
1366
If both are supplied, the fastest lookup is used, and an error is
1367
raised if they do not both point at the same row.
1369
:param tree_index: The index of the tree we wish to locate this path
1370
in. If the path is present in that tree, the entry containing its
1371
details is returned, otherwise (None, None) is returned
1372
0 is the working tree, higher indexes are successive parent
1374
:param fileid_utf8: A utf8 file_id to look up.
1375
:param path_utf8: An utf8 path to be looked up.
1376
:return: The dirstate entry tuple for path, or (None, None)
1378
self._read_dirblocks_if_needed()
1379
if path_utf8 is not None:
1380
assert path_utf8.__class__ == str, 'path_utf8 is not a str: %s %s' % (type(path_utf8), path_utf8)
1381
# path lookups are faster
1382
dirname, basename = osutils.split(path_utf8)
1383
block_index, entry_index, dir_present, file_present = \
1384
self._get_block_entry_index(dirname, basename, tree_index)
1385
if not file_present:
1387
entry = self._dirblocks[block_index][1][entry_index]
1388
assert entry[0][2] and entry[1][tree_index][0] not in ('a', 'r'), 'unversioned entry?!?!'
1390
if entry[0][2] != fileid_utf8:
1391
raise errors.BzrError('integrity error ? : mismatching'
1392
' tree_index, file_id and path')
1395
assert fileid_utf8 is not None
1396
possible_keys = self._get_id_index().get(fileid_utf8, None)
1397
if not possible_keys:
1399
for key in possible_keys:
1400
block_index, present = \
1401
self._find_block_index_from_key(key)
1402
# strange, probably indicates an out of date
1403
# id index - for now, allow this.
1406
# WARNING: DO not change this code to use _get_block_entry_index
1407
# as that function is not suitable: it does not use the key
1408
# to lookup, and thus the wrong coordinates are returned.
1409
block = self._dirblocks[block_index][1]
1410
entry_index, present = self._find_entry_index(key, block)
1412
entry = self._dirblocks[block_index][1][entry_index]
1413
if entry[1][tree_index][0] in 'fdlt':
1414
# this is the result we are looking for: the
1415
# real home of this file_id in this tree.
1417
if entry[1][tree_index][0] == 'a':
1418
# there is no home for this entry in this tree
1420
assert entry[1][tree_index][0] == 'r', \
1421
"entry %r has invalid minikind %r for tree %r" \
1423
entry[1][tree_index][0],
1425
real_path = entry[1][tree_index][1]
1426
return self._get_entry(tree_index, fileid_utf8=fileid_utf8,
1427
path_utf8=real_path)
1431
def initialize(cls, path):
1432
"""Create a new dirstate on path.
1434
The new dirstate will be an empty tree - that is it has no parents,
1435
and only a root node - which has id ROOT_ID.
1437
:param path: The name of the file for the dirstate.
1438
:return: A write-locked DirState object.
1440
# This constructs a new DirState object on a path, sets the _state_file
1441
# to a new empty file for that path. It then calls _set_data() with our
1442
# stock empty dirstate information - a root with ROOT_ID, no children,
1443
# and no parents. Finally it calls save() to ensure that this data will
1446
# root dir and root dir contents with no children.
1447
empty_tree_dirblocks = [('', []), ('', [])]
1448
# a new root directory, with a NULLSTAT.
1449
empty_tree_dirblocks[0][1].append(
1450
(('', '', inventory.ROOT_ID), [
1451
('d', '', 0, False, DirState.NULLSTAT),
1455
result._set_data([], empty_tree_dirblocks)
1462
def _inv_entry_to_details(self, inv_entry):
1463
"""Convert an inventory entry (from a revision tree) to state details.
1465
:param inv_entry: An inventory entry whose sha1 and link targets can be
1466
relied upon, and which has a revision set.
1467
:return: A details tuple - the details for a single tree at a path +
1470
kind = inv_entry.kind
1471
minikind = DirState._kind_to_minikind[kind]
1472
tree_data = inv_entry.revision
1473
assert len(tree_data) > 0, 'empty revision for the inv_entry.'
1474
if kind == 'directory':
1478
elif kind == 'symlink':
1479
fingerprint = inv_entry.symlink_target or ''
1482
elif kind == 'file':
1483
fingerprint = inv_entry.text_sha1 or ''
1484
size = inv_entry.text_size or 0
1485
executable = inv_entry.executable
1486
elif kind == 'tree-reference':
1487
fingerprint = inv_entry.reference_revision or ''
1491
raise Exception("can't pack %s" % inv_entry)
1492
return (minikind, fingerprint, size, executable, tree_data)
1494
def _iter_entries(self):
1495
"""Iterate over all the entries in the dirstate.
1497
Each yelt item is an entry in the standard format described in the
1498
docstring of bzrlib.dirstate.
1500
self._read_dirblocks_if_needed()
1501
for directory in self._dirblocks:
1502
for entry in directory[1]:
1505
def _get_id_index(self):
1506
"""Get an id index of self._dirblocks."""
1507
if self._id_index is None:
1509
for key, tree_details in self._iter_entries():
1510
id_index.setdefault(key[2], set()).add(key)
1511
self._id_index = id_index
1512
return self._id_index
1514
def _get_output_lines(self, lines):
1515
"""Format lines for final output.
1517
:param lines: A sequence of lines containing the parents list and the
1520
output_lines = [DirState.HEADER_FORMAT_3]
1521
lines.append('') # a final newline
1522
inventory_text = '\0\n\0'.join(lines)
1523
output_lines.append('crc32: %s\n' % (zlib.crc32(inventory_text),))
1524
# -3, 1 for num parents, 1 for ghosts, 1 for final newline
1525
num_entries = len(lines)-3
1526
output_lines.append('num_entries: %s\n' % (num_entries,))
1527
output_lines.append(inventory_text)
1530
def _make_deleted_row(self, fileid_utf8, parents):
1531
"""Return a deleted row for fileid_utf8."""
1532
return ('/', 'RECYCLED.BIN', 'file', fileid_utf8, 0, DirState.NULLSTAT,
1535
def _num_present_parents(self):
1536
"""The number of parent entries in each record row."""
1537
return len(self._parents) - len(self._ghosts)
1541
"""Construct a DirState on the file at path path.
1543
:return: An unlocked DirState object, associated with the given path.
1545
result = DirState(path)
1548
def _read_dirblocks_if_needed(self):
1549
"""Read in all the dirblocks from the file if they are not in memory.
1551
This populates self._dirblocks, and sets self._dirblock_state to
1552
IN_MEMORY_UNMODIFIED. It is not currently ready for incremental block
1555
self._read_header_if_needed()
1556
if self._dirblock_state == DirState.NOT_IN_MEMORY:
1557
_read_dirblocks(self)
1559
def _read_header(self):
1560
"""This reads in the metadata header, and the parent ids.
1562
After reading in, the file should be positioned at the null
1563
just before the start of the first record in the file.
1565
:return: (expected crc checksum, number of entries, parent list)
1567
self._read_prelude()
1568
parent_line = self._state_file.readline()
1569
info = parent_line.split('\0')
1570
num_parents = int(info[0])
1571
assert num_parents == len(info)-2, 'incorrect parent info line'
1572
self._parents = info[1:-1]
1574
ghost_line = self._state_file.readline()
1575
info = ghost_line.split('\0')
1576
num_ghosts = int(info[1])
1577
assert num_ghosts == len(info)-3, 'incorrect ghost info line'
1578
self._ghosts = info[2:-1]
1579
self._header_state = DirState.IN_MEMORY_UNMODIFIED
1580
self._end_of_header = self._state_file.tell()
1582
def _read_header_if_needed(self):
1583
"""Read the header of the dirstate file if needed."""
1584
# inline this as it will be called a lot
1585
if not self._lock_token:
1586
raise errors.ObjectNotLocked(self)
1587
if self._header_state == DirState.NOT_IN_MEMORY:
1590
def _read_prelude(self):
1591
"""Read in the prelude header of the dirstate file.
1593
This only reads in the stuff that is not connected to the crc
1594
checksum. The position will be correct to read in the rest of
1595
the file and check the checksum after this point.
1596
The next entry in the file should be the number of parents,
1597
and their ids. Followed by a newline.
1599
header = self._state_file.readline()
1600
assert header == DirState.HEADER_FORMAT_3, \
1601
'invalid header line: %r' % (header,)
1602
crc_line = self._state_file.readline()
1603
assert crc_line.startswith('crc32: '), 'missing crc32 checksum'
1604
self.crc_expected = int(crc_line[len('crc32: '):-1])
1605
num_entries_line = self._state_file.readline()
1606
assert num_entries_line.startswith('num_entries: '), 'missing num_entries line'
1607
self._num_entries = int(num_entries_line[len('num_entries: '):-1])
1610
"""Save any pending changes created during this session.
1612
We reuse the existing file, because that prevents race conditions with
1613
file creation, and use oslocks on it to prevent concurrent modification
1614
and reads - because dirstate's incremental data aggregation is not
1615
compatible with reading a modified file, and replacing a file in use by
1616
another process is impossible on Windows.
1618
A dirstate in read only mode should be smart enough though to validate
1619
that the file has not changed, and otherwise discard its cache and
1620
start over, to allow for fine grained read lock duration, so 'status'
1621
wont block 'commit' - for example.
1623
if (self._header_state == DirState.IN_MEMORY_MODIFIED or
1624
self._dirblock_state == DirState.IN_MEMORY_MODIFIED):
1626
grabbed_write_lock = False
1627
if self._lock_state != 'w':
1628
grabbed_write_lock, new_lock = self._lock_token.temporary_write_lock()
1629
# Switch over to the new lock, as the old one may be closed.
1630
# TODO: jam 20070315 We should validate the disk file has
1631
# not changed contents. Since temporary_write_lock may
1632
# not be an atomic operation.
1633
self._lock_token = new_lock
1634
self._state_file = new_lock.f
1635
if not grabbed_write_lock:
1636
# We couldn't grab a write lock, so we switch back to a read one
1639
self._state_file.seek(0)
1640
self._state_file.writelines(self.get_lines())
1641
self._state_file.truncate()
1642
self._state_file.flush()
1643
self._header_state = DirState.IN_MEMORY_UNMODIFIED
1644
self._dirblock_state = DirState.IN_MEMORY_UNMODIFIED
1646
if grabbed_write_lock:
1647
self._lock_token = self._lock_token.restore_read_lock()
1648
self._state_file = self._lock_token.f
1649
# TODO: jam 20070315 We should validate the disk file has
1650
# not changed contents. Since restore_read_lock may
1651
# not be an atomic operation.
1653
def _set_data(self, parent_ids, dirblocks):
1654
"""Set the full dirstate data in memory.
1656
This is an internal function used to completely replace the objects
1657
in memory state. It puts the dirstate into state 'full-dirty'.
1659
:param parent_ids: A list of parent tree revision ids.
1660
:param dirblocks: A list containing one tuple for each directory in the
1661
tree. Each tuple contains the directory path and a list of entries
1662
found in that directory.
1664
# our memory copy is now authoritative.
1665
self._dirblocks = dirblocks
1666
self._header_state = DirState.IN_MEMORY_MODIFIED
1667
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1668
self._parents = list(parent_ids)
1669
self._id_index = None
1671
def set_path_id(self, path, new_id):
1672
"""Change the id of path to new_id in the current working tree.
1674
:param path: The path inside the tree to set - '' is the root, 'foo'
1675
is the path foo in the root.
1676
:param new_id: The new id to assign to the path. This must be a utf8
1677
file id (not unicode, and not None).
1679
assert new_id.__class__ == str, \
1680
"path_id %r is not a plain string" % (new_id,)
1681
self._read_dirblocks_if_needed()
1683
# TODO: logic not written
1684
raise NotImplementedError(self.set_path_id)
1685
# TODO: check new id is unique
1686
entry = self._get_entry(0, path_utf8=path)
1687
if entry[0][2] == new_id:
1688
# Nothing to change.
1690
# mark the old path absent, and insert a new root path
1691
self._make_absent(entry)
1692
self.update_minimal(('', '', new_id), 'd',
1693
path_utf8='', packed_stat=entry[1][0][4])
1694
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1695
if self._id_index is not None:
1696
self._id_index.setdefault(new_id, set()).add(entry[0])
1698
def set_parent_trees(self, trees, ghosts):
1699
"""Set the parent trees for the dirstate.
1701
:param trees: A list of revision_id, tree tuples. tree must be provided
1702
even if the revision_id refers to a ghost: supply an empty tree in
1704
:param ghosts: A list of the revision_ids that are ghosts at the time
1707
# TODO: generate a list of parent indexes to preserve to save
1708
# processing specific parent trees. In the common case one tree will
1709
# be preserved - the left most parent.
1710
# TODO: if the parent tree is a dirstate, we might want to walk them
1711
# all by path in parallel for 'optimal' common-case performance.
1712
# generate new root row.
1713
self._read_dirblocks_if_needed()
1714
# TODO future sketch: Examine the existing parents to generate a change
1715
# map and then walk the new parent trees only, mapping them into the
1716
# dirstate. Walk the dirstate at the same time to remove unreferenced
1719
# sketch: loop over all entries in the dirstate, cherry picking
1720
# entries from the parent trees, if they are not ghost trees.
1721
# after we finish walking the dirstate, all entries not in the dirstate
1722
# are deletes, so we want to append them to the end as per the design
1723
# discussions. So do a set difference on ids with the parents to
1724
# get deletes, and add them to the end.
1725
# During the update process we need to answer the following questions:
1726
# - find other keys containing a fileid in order to create cross-path
1727
# links. We dont't trivially use the inventory from other trees
1728
# because this leads to either double touching, or to accessing
1730
# - find other keys containing a path
1731
# We accumulate each entry via this dictionary, including the root
1734
# we could do parallel iterators, but because file id data may be
1735
# scattered throughout, we dont save on index overhead: we have to look
1736
# at everything anyway. We can probably save cycles by reusing parent
1737
# data and doing an incremental update when adding an additional
1738
# parent, but for now the common cases are adding a new parent (merge),
1739
# and replacing completely (commit), and commit is more common: so
1740
# optimise merge later.
1742
# ---- start generation of full tree mapping data
1743
# what trees should we use?
1744
parent_trees = [tree for rev_id, tree in trees if rev_id not in ghosts]
1745
# how many trees do we end up with
1746
parent_count = len(parent_trees)
1748
# one: the current tree
1749
for entry in self._iter_entries():
1750
# skip entries not in the current tree
1751
if entry[1][0][0] in ('a', 'r'): # absent, relocated
1753
by_path[entry[0]] = [entry[1][0]] + \
1754
[DirState.NULL_PARENT_DETAILS] * parent_count
1755
id_index[entry[0][2]] = set([entry[0]])
1757
# now the parent trees:
1758
for tree_index, tree in enumerate(parent_trees):
1759
# the index is off by one, adjust it.
1760
tree_index = tree_index + 1
1761
# when we add new locations for a fileid we need these ranges for
1762
# any fileid in this tree as we set the by_path[id] to:
1763
# already_processed_tree_details + new_details + new_location_suffix
1764
# the suffix is from tree_index+1:parent_count+1.
1765
new_location_suffix = [DirState.NULL_PARENT_DETAILS] * (parent_count - tree_index)
1766
# now stitch in all the entries from this tree
1767
for path, entry in tree.inventory.iter_entries_by_dir():
1768
# here we process each trees details for each item in the tree.
1769
# we first update any existing entries for the id at other paths,
1770
# then we either create or update the entry for the id at the
1771
# right path, and finally we add (if needed) a mapping from
1772
# file_id to this path. We do it in this order to allow us to
1773
# avoid checking all known paths for the id when generating a
1774
# new entry at this path: by adding the id->path mapping last,
1775
# all the mappings are valid and have correct relocation
1776
# records where needed.
1777
file_id = entry.file_id
1778
path_utf8 = path.encode('utf8')
1779
dirname, basename = osutils.split(path_utf8)
1780
new_entry_key = (dirname, basename, file_id)
1781
# tree index consistency: All other paths for this id in this tree
1782
# index must point to the correct path.
1783
for entry_key in id_index.setdefault(file_id, set()):
1784
# TODO:PROFILING: It might be faster to just update
1785
# rather than checking if we need to, and then overwrite
1786
# the one we are located at.
1787
if entry_key != new_entry_key:
1788
# this file id is at a different path in one of the
1789
# other trees, so put absent pointers there
1790
# This is the vertical axis in the matrix, all pointing
1792
by_path[entry_key][tree_index] = ('r', path_utf8, 0, False, '')
1793
# by path consistency: Insert into an existing path record (trivial), or
1794
# add a new one with relocation pointers for the other tree indexes.
1795
if new_entry_key in id_index[file_id]:
1796
# there is already an entry where this data belongs, just insert it.
1797
by_path[new_entry_key][tree_index] = \
1798
self._inv_entry_to_details(entry)
1800
# add relocated entries to the horizontal axis - this row
1801
# mapping from path,id. We need to look up the correct path
1802
# for the indexes from 0 to tree_index -1
1804
for lookup_index in xrange(tree_index):
1805
# boundary case: this is the first occurence of file_id
1806
# so there are no id_indexs, possibly take this out of
1808
if not len(id_index[file_id]):
1809
new_details.append(DirState.NULL_PARENT_DETAILS)
1811
# grab any one entry, use it to find the right path.
1812
# TODO: optimise this to reduce memory use in highly
1813
# fragmented situations by reusing the relocation
1815
a_key = iter(id_index[file_id]).next()
1816
if by_path[a_key][lookup_index][0] in ('r', 'a'):
1817
# its a pointer or missing statement, use it as is.
1818
new_details.append(by_path[a_key][lookup_index])
1820
# we have the right key, make a pointer to it.
1821
real_path = ('/'.join(a_key[0:2])).strip('/')
1822
new_details.append(('r', real_path, 0, False, ''))
1823
new_details.append(self._inv_entry_to_details(entry))
1824
new_details.extend(new_location_suffix)
1825
by_path[new_entry_key] = new_details
1826
id_index[file_id].add(new_entry_key)
1827
# --- end generation of full tree mappings
1829
# sort and output all the entries
1830
new_entries = self._sort_entries(by_path.items())
1831
self._entries_to_current_state(new_entries)
1832
self._parents = [rev_id for rev_id, tree in trees]
1833
self._ghosts = list(ghosts)
1834
self._header_state = DirState.IN_MEMORY_MODIFIED
1835
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1836
self._id_index = id_index
1838
def _sort_entries(self, entry_list):
1839
"""Given a list of entries, sort them into the right order.
1841
This is done when constructing a new dirstate from trees - normally we
1842
try to keep everything in sorted blocks all the time, but sometimes
1843
it's easier to sort after the fact.
1845
# TODO: Might be faster to do a schwartzian transform?
1847
# sort by: directory parts, file name, file id
1848
return entry[0][0].split('/'), entry[0][1], entry[0][2]
1849
return sorted(entry_list, key=_key)
1851
def set_state_from_inventory(self, new_inv):
1852
"""Set new_inv as the current state.
1854
This API is called by tree transform, and will usually occur with
1855
existing parent trees.
1857
:param new_inv: The inventory object to set current state from.
1859
self._read_dirblocks_if_needed()
1861
# incremental algorithm:
1862
# two iterators: current data and new data, both in dirblock order.
1863
new_iterator = new_inv.iter_entries_by_dir()
1864
# we will be modifying the dirstate, so we need a stable iterator. In
1865
# future we might write one, for now we just clone the state into a
1866
# list - which is a shallow copy.
1867
old_iterator = iter(list(self._iter_entries()))
1868
# both must have roots so this is safe:
1869
current_new = new_iterator.next()
1870
current_old = old_iterator.next()
1871
def advance(iterator):
1873
return iterator.next()
1874
except StopIteration:
1876
while current_new or current_old:
1877
# skip entries in old that are not really there
1878
if current_old and current_old[1][0][0] in ('r', 'a'):
1879
# relocated or absent
1880
current_old = advance(old_iterator)
1883
# convert new into dirblock style
1884
new_path_utf8 = current_new[0].encode('utf8')
1885
new_dirname, new_basename = osutils.split(new_path_utf8)
1886
new_id = current_new[1].file_id
1887
new_entry_key = (new_dirname, new_basename, new_id)
1888
current_new_minikind = \
1889
DirState._kind_to_minikind[current_new[1].kind]
1890
if current_new_minikind == 't':
1891
fingerprint = current_new[1].reference_revision or ''
1895
# for safety disable variables
1896
new_path_utf8 = new_dirname = new_basename = new_id = new_entry_key = None
1897
# 5 cases, we dont have a value that is strictly greater than everything, so
1898
# we make both end conditions explicit
1900
# old is finished: insert current_new into the state.
1901
self.update_minimal(new_entry_key, current_new_minikind,
1902
executable=current_new[1].executable,
1903
path_utf8=new_path_utf8, fingerprint=fingerprint)
1904
current_new = advance(new_iterator)
1905
elif not current_new:
1907
self._make_absent(current_old)
1908
current_old = advance(old_iterator)
1909
elif new_entry_key == current_old[0]:
1910
# same - common case
1911
# TODO: update the record if anything significant has changed.
1912
# the minimal required trigger is if the execute bit or cached
1914
if (current_old[1][0][3] != current_new[1].executable or
1915
current_old[1][0][0] != current_new_minikind):
1916
self.update_minimal(current_old[0], current_new_minikind,
1917
executable=current_new[1].executable,
1918
path_utf8=new_path_utf8, fingerprint=fingerprint)
1919
# both sides are dealt with, move on
1920
current_old = advance(old_iterator)
1921
current_new = advance(new_iterator)
1922
elif (new_entry_key[0].split('/') < current_old[0][0].split('/')
1923
and new_entry_key[1:] < current_old[0][1:]):
1925
# add a entry for this and advance new
1926
self.update_minimal(new_entry_key, current_new_minikind,
1927
executable=current_new[1].executable,
1928
path_utf8=new_path_utf8, fingerprint=fingerprint)
1929
current_new = advance(new_iterator)
1932
self._make_absent(current_old)
1933
current_old = advance(old_iterator)
1934
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1935
self._id_index = None
1937
def _make_absent(self, current_old):
1938
"""Mark current_old - an entry - as absent for tree 0.
1940
:return: True if this was the last details entry for the entry key:
1941
that is, if the underlying block has had the entry removed, thus
1942
shrinking in length.
1944
# build up paths that this id will be left at after the change is made,
1945
# so we can update their cross references in tree 0
1946
all_remaining_keys = set()
1947
# Dont check the working tree, because it's going.
1948
for details in current_old[1][1:]:
1949
if details[0] not in ('a', 'r'): # absent, relocated
1950
all_remaining_keys.add(current_old[0])
1951
elif details[0] == 'r': # relocated
1952
# record the key for the real path.
1953
all_remaining_keys.add(tuple(osutils.split(details[1])) + (current_old[0][2],))
1954
# absent rows are not present at any path.
1955
last_reference = current_old[0] not in all_remaining_keys
1957
# the current row consists entire of the current item (being marked
1958
# absent), and relocated or absent entries for the other trees:
1959
# Remove it, its meaningless.
1960
block = self._find_block(current_old[0])
1961
entry_index, present = self._find_entry_index(current_old[0], block[1])
1962
assert present, 'could not find entry for %s' % (current_old,)
1963
block[1].pop(entry_index)
1964
# if we have an id_index in use, remove this key from it for this id.
1965
if self._id_index is not None:
1966
self._id_index[current_old[0][2]].remove(current_old[0])
1967
# update all remaining keys for this id to record it as absent. The
1968
# existing details may either be the record we are making as deleted
1969
# (if there were other trees with the id present at this path), or may
1971
for update_key in all_remaining_keys:
1972
update_block_index, present = \
1973
self._find_block_index_from_key(update_key)
1974
assert present, 'could not find block for %s' % (update_key,)
1975
update_entry_index, present = \
1976
self._find_entry_index(update_key, self._dirblocks[update_block_index][1])
1977
assert present, 'could not find entry for %s' % (update_key,)
1978
update_tree_details = self._dirblocks[update_block_index][1][update_entry_index][1]
1979
# it must not be absent at the moment
1980
assert update_tree_details[0][0] != 'a' # absent
1981
update_tree_details[0] = DirState.NULL_PARENT_DETAILS
1982
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1983
return last_reference
1985
def update_minimal(self, key, minikind, executable=False, fingerprint='',
1986
packed_stat=None, size=0, path_utf8=None):
1987
"""Update an entry to the state in tree 0.
1989
This will either create a new entry at 'key' or update an existing one.
1990
It also makes sure that any other records which might mention this are
1993
:param key: (dir, name, file_id) for the new entry
1994
:param minikind: The type for the entry ('f' == 'file', 'd' ==
1996
:param executable: Should the executable bit be set?
1997
:param fingerprint: Simple fingerprint for new entry.
1998
:param packed_stat: packed stat value for new entry.
1999
:param size: Size information for new entry
2000
:param path_utf8: key[0] + '/' + key[1], just passed in to avoid doing
2003
block = self._find_block(key)[1]
2004
if packed_stat is None:
2005
packed_stat = DirState.NULLSTAT
2006
entry_index, present = self._find_entry_index(key, block)
2007
new_details = (minikind, fingerprint, size, executable, packed_stat)
2008
id_index = self._get_id_index()
2010
# new entry, synthesis cross reference here,
2011
existing_keys = id_index.setdefault(key[2], set())
2012
if not existing_keys:
2013
# not currently in the state, simplest case
2014
new_entry = key, [new_details] + self._empty_parent_info()
2016
# present at one or more existing other paths.
2017
# grab one of them and use it to generate parent
2018
# relocation/absent entries.
2019
new_entry = key, [new_details]
2020
for other_key in existing_keys:
2021
# change the record at other to be a pointer to this new
2022
# record. The loop looks similar to the change to
2023
# relocations when updating an existing record but its not:
2024
# the test for existing kinds is different: this can be
2025
# factored out to a helper though.
2026
other_block_index, present = self._find_block_index_from_key(other_key)
2027
assert present, 'could not find block for %s' % (other_key,)
2028
other_entry_index, present = self._find_entry_index(other_key,
2029
self._dirblocks[other_block_index][1])
2030
assert present, 'could not find entry for %s' % (other_key,)
2031
assert path_utf8 is not None
2032
self._dirblocks[other_block_index][1][other_entry_index][1][0] = \
2033
('r', path_utf8, 0, False, '')
2035
num_present_parents = self._num_present_parents()
2036
for lookup_index in xrange(1, num_present_parents + 1):
2037
# grab any one entry, use it to find the right path.
2038
# TODO: optimise this to reduce memory use in highly
2039
# fragmented situations by reusing the relocation
2041
update_block_index, present = \
2042
self._find_block_index_from_key(other_key)
2043
assert present, 'could not find block for %s' % (other_key,)
2044
update_entry_index, present = \
2045
self._find_entry_index(other_key, self._dirblocks[update_block_index][1])
2046
assert present, 'could not find entry for %s' % (other_key,)
2047
update_details = self._dirblocks[update_block_index][1][update_entry_index][1][lookup_index]
2048
if update_details[0] in ('r', 'a'): # relocated, absent
2049
# its a pointer or absent in lookup_index's tree, use
2051
new_entry[1].append(update_details)
2053
# we have the right key, make a pointer to it.
2054
pointer_path = osutils.pathjoin(*other_key[0:2])
2055
new_entry[1].append(('r', pointer_path, 0, False, ''))
2056
block.insert(entry_index, new_entry)
2057
existing_keys.add(key)
2059
# Does the new state matter?
2060
block[entry_index][1][0] = new_details
2061
# parents cannot be affected by what we do.
2062
# other occurences of this id can be found
2063
# from the id index.
2065
# tree index consistency: All other paths for this id in this tree
2066
# index must point to the correct path. We have to loop here because
2067
# we may have passed entries in the state with this file id already
2068
# that were absent - where parent entries are - and they need to be
2069
# converted to relocated.
2070
assert path_utf8 is not None
2071
for entry_key in id_index.setdefault(key[2], set()):
2072
# TODO:PROFILING: It might be faster to just update
2073
# rather than checking if we need to, and then overwrite
2074
# the one we are located at.
2075
if entry_key != key:
2076
# this file id is at a different path in one of the
2077
# other trees, so put absent pointers there
2078
# This is the vertical axis in the matrix, all pointing
2080
block_index, present = self._find_block_index_from_key(entry_key)
2082
entry_index, present = self._find_entry_index(entry_key, self._dirblocks[block_index][1])
2084
self._dirblocks[block_index][1][entry_index][1][0] = \
2085
('r', path_utf8, 0, False, '')
2086
# add a containing dirblock if needed.
2087
if new_details[0] == 'd':
2088
subdir_key = (osutils.pathjoin(*key[0:2]), '', '')
2089
block_index, present = self._find_block_index_from_key(subdir_key)
2091
self._dirblocks.insert(block_index, (subdir_key[0], []))
2093
self._dirblock_state = DirState.IN_MEMORY_MODIFIED
2095
def _validate(self):
2096
"""Check that invariants on the dirblock are correct.
2098
This can be useful in debugging; it shouldn't be necessary in
2101
This must be called with a lock held.
2103
# NOTE: This must always raise AssertionError not just assert,
2104
# otherwise it may not behave properly under python -O
2106
# TODO: All entries must have some content that's not 'a' or 'r',
2107
# otherwise it could just be removed.
2109
# TODO: All relocations must point directly to a real entry.
2111
# TODO: No repeated keys.
2114
from pprint import pformat
2115
self._read_dirblocks_if_needed()
2116
if len(self._dirblocks) > 0:
2117
if not self._dirblocks[0][0] == '':
2118
raise AssertionError(
2119
"dirblocks don't start with root block:\n" + \
2121
if len(self._dirblocks) > 1:
2122
if not self._dirblocks[1][0] == '':
2123
raise AssertionError(
2124
"dirblocks missing root directory:\n" + \
2126
# the dirblocks are sorted by their path components, name, and dir id
2127
dir_names = [d[0].split('/')
2128
for d in self._dirblocks[1:]]
2129
if dir_names != sorted(dir_names):
2130
raise AssertionError(
2131
"dir names are not in sorted order:\n" + \
2132
pformat(self._dirblocks) + \
2135
for dirblock in self._dirblocks:
2136
# within each dirblock, the entries are sorted by filename and
2138
for entry in dirblock[1]:
2139
if dirblock[0] != entry[0][0]:
2140
raise AssertionError(
2142
"doesn't match directory name in\n%r" %
2143
(entry, pformat(dirblock)))
2144
if dirblock[1] != sorted(dirblock[1]):
2145
raise AssertionError(
2146
"dirblock for %r is not sorted:\n%s" % \
2147
(dirblock[0], pformat(dirblock)))
2150
def check_valid_parent():
2151
"""Check that the current entry has a valid parent.
2153
This makes sure that the parent has a record,
2154
and that the parent isn't marked as "absent" in the
2155
current tree. (It is invalid to have a non-absent file in an absent
2158
if entry[0][0:2] == ('', ''):
2159
# There should be no parent for the root row
2161
parent_entry = self._get_entry(tree_index, path_utf8=entry[0][0])
2162
if parent_entry == (None, None):
2163
raise AssertionError(
2164
"no parent entry for: %s in tree %s"
2165
% (this_path, tree_index))
2166
if parent_entry[1][tree_index][0] != 'd':
2167
raise AssertionError(
2168
"Parent entry for %s is not marked as a valid"
2169
" directory. %s" % (this_path, parent_entry,))
2171
# For each file id, for each tree: either
2172
# the file id is not present at all; all rows with that id in the
2173
# key have it marked as 'absent'
2174
# OR the file id is present under exactly one name; any other entries
2175
# that mention that id point to the correct name.
2177
# We check this with a dict per tree pointing either to the present
2178
# name, or None if absent.
2179
tree_count = self._num_present_parents() + 1
2180
id_path_maps = [dict() for i in range(tree_count)]
2181
# Make sure that all renamed entries point to the correct location.
2182
for entry in self._iter_entries():
2183
file_id = entry[0][2]
2184
this_path = osutils.pathjoin(entry[0][0], entry[0][1])
2185
if len(entry[1]) != tree_count:
2186
raise AssertionError(
2187
"wrong number of entry details for row\n%s" \
2188
",\nexpected %d" % \
2189
(pformat(entry), tree_count))
2190
for tree_index, tree_state in enumerate(entry[1]):
2191
this_tree_map = id_path_maps[tree_index]
2192
minikind = tree_state[0]
2193
# have we seen this id before in this column?
2194
if file_id in this_tree_map:
2195
previous_path = this_tree_map[file_id]
2196
# any later mention of this file must be consistent with
2197
# what was said before
2199
if previous_path is not None:
2200
raise AssertionError(
2201
"file %s is absent in row %r but also present " \
2203
(file_id, entry, previous_path))
2204
elif minikind == 'r':
2205
target_location = tree_state[1]
2206
if previous_path != target_location:
2207
raise AssertionError(
2208
"file %s relocation in row %r but also at %r" \
2209
% (file_id, entry, previous_path))
2211
# a file, directory, etc - may have been previously
2212
# pointed to by a relocation, which must point here
2213
if previous_path != this_path:
2214
raise AssertionError(
2215
"entry %r inconsistent with previous path %r" % \
2216
(entry, previous_path))
2217
check_valid_parent()
2220
# absent; should not occur anywhere else
2221
this_tree_map[file_id] = None
2222
elif minikind == 'r':
2223
# relocation, must occur at expected location
2224
this_tree_map[file_id] = tree_state[1]
2226
this_tree_map[file_id] = this_path
2227
check_valid_parent()
2229
def _wipe_state(self):
2230
"""Forget all state information about the dirstate."""
2231
self._header_state = DirState.NOT_IN_MEMORY
2232
self._dirblock_state = DirState.NOT_IN_MEMORY
2235
self._dirblocks = []
2236
self._id_index = None
2237
self._end_of_header = None
2238
self._cutoff_time = None
2239
self._split_path_cache = {}
2241
def lock_read(self):
2242
"""Acquire a read lock on the dirstate."""
2243
if self._lock_token is not None:
2244
raise errors.LockContention(self._lock_token)
2245
# TODO: jam 20070301 Rather than wiping completely, if the blocks are
2246
# already in memory, we could read just the header and check for
2247
# any modification. If not modified, we can just leave things
2249
self._lock_token = lock.ReadLock(self._filename)
2250
self._lock_state = 'r'
2251
self._state_file = self._lock_token.f
2254
def lock_write(self):
2255
"""Acquire a write lock on the dirstate."""
2256
if self._lock_token is not None:
2257
raise errors.LockContention(self._lock_token)
2258
# TODO: jam 20070301 Rather than wiping completely, if the blocks are
2259
# already in memory, we could read just the header and check for
2260
# any modification. If not modified, we can just leave things
2262
self._lock_token = lock.WriteLock(self._filename)
2263
self._lock_state = 'w'
2264
self._state_file = self._lock_token.f
2268
"""Drop any locks held on the dirstate."""
2269
if self._lock_token is None:
2270
raise errors.LockNotHeld(self)
2271
# TODO: jam 20070301 Rather than wiping completely, if the blocks are
2272
# already in memory, we could read just the header and check for
2273
# any modification. If not modified, we can just leave things
2275
self._state_file = None
2276
self._lock_state = None
2277
self._lock_token.unlock()
2278
self._lock_token = None
2279
self._split_path_cache = {}
2281
def _requires_lock(self):
2282
"""Check that a lock is currently held by someone on the dirstate."""
2283
if not self._lock_token:
2284
raise errors.ObjectNotLocked(self)
2287
# Try to load the compiled form if possible
2289
from bzrlib._dirstate_helpers_c import (
2290
_read_dirblocks_c as _read_dirblocks,
2291
bisect_dirblock_c as bisect_dirblock,
2292
_bisect_path_left_c as _bisect_path_left,
2293
_bisect_path_right_c as _bisect_path_right,
2294
cmp_by_dirs_c as cmp_by_dirs,
2297
from bzrlib._dirstate_helpers_py import (
2298
_read_dirblocks_py as _read_dirblocks,
2299
bisect_dirblock_py as bisect_dirblock,
2300
_bisect_path_left_py as _bisect_path_left,
2301
_bisect_path_right_py as _bisect_path_right,
2302
cmp_by_dirs_py as cmp_by_dirs,
added
removed
bzrlib/dirstate.py
