25
25
from cStringIO import StringIO
29
28
from bzrlib.lazy_import import lazy_import
30
29
lazy_import(globals(), """
30
from bisect import bisect_left
32
from copy import deepcopy
35
41
from bzrlib import (
43
conflicts as _mod_conflicts,
43
revision as _mod_revision,
49
58
import bzrlib.branch
59
from bzrlib.transport import get_transport
63
from bzrlib import symbol_versioning
53
64
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
65
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
66
from bzrlib.lockable_files import LockableFiles, TransportLock
67
from bzrlib.lockdir import LockDir
68
import bzrlib.mutabletree
56
69
from bzrlib.mutabletree import needs_tree_write_lock
57
70
from bzrlib.osutils import (
64
from bzrlib.trace import mutter
82
from bzrlib.trace import mutter, note
65
83
from bzrlib.transport.local import LocalTransport
66
from bzrlib.tree import InterTree
84
from bzrlib.progress import DummyProgress, ProgressPhase
85
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
86
from bzrlib.rio import RioReader, rio_file, Stanza
87
from bzrlib.symbol_versioning import (deprecated_passed,
67
95
from bzrlib.tree import Tree
68
96
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
71
class DirStateWorkingTree(WorkingTree3):
99
class WorkingTree4(WorkingTree3):
100
"""This is the Format 4 working tree.
102
This differs from WorkingTree3 by:
103
- having a consolidated internal dirstate.
104
- not having a regular inventory attribute.
106
This is new in bzr TODO FIXME SETMEBEFORE MERGE.
72
109
def __init__(self, basedir,
74
111
_control_files=None,
111
165
state = self.current_dirstate()
112
166
for f, file_id, kind in zip(files, ids, kinds):
115
# special case tree root handling.
116
if f == '' and self.path2id(f) == ROOT_ID:
117
state.set_path_id('', generate_ids.gen_file_id(f))
119
170
if file_id is None:
120
171
file_id = generate_ids.gen_file_id(f)
121
172
# deliberately add the file with no cached stat or sha1
122
173
# - on the first access it will be gathered, and we can
123
174
# always change this once tests are all passing.
124
175
state.add(f, file_id, kind, None, '')
125
self._make_dirty(reset_inventory=True)
127
def _make_dirty(self, reset_inventory):
128
"""Make the tree state dirty.
130
:param reset_inventory: True if the cached inventory should be removed
131
(presuming there is one).
133
176
self._dirty = True
134
if reset_inventory and self._inventory is not None:
135
self._inventory = None
137
@needs_tree_write_lock
138
def add_reference(self, sub_tree):
139
# use standard implementation, which calls back to self._add
141
# So we don't store the reference_revision in the working dirstate,
142
# it's just recorded at the moment of commit.
143
self._add_reference(sub_tree)
145
def break_lock(self):
146
"""Break a lock if one is present from another instance.
148
Uses the ui factory to ask for confirmation if the lock may be from
151
This will probe the repository for its lock as well.
153
# if the dirstate is locked by an active process, reject the break lock
156
if self._dirstate is None:
160
state = self._current_dirstate()
161
if state._lock_token is not None:
162
# we already have it locked. sheese, cant break our own lock.
163
raise errors.LockActive(self.basedir)
166
# try for a write lock - need permission to get one anyhow
169
except errors.LockContention:
170
# oslocks fail when a process is still live: fail.
171
# TODO: get the locked lockdir info and give to the user to
172
# assist in debugging.
173
raise errors.LockActive(self.basedir)
178
self._dirstate = None
179
self._control_files.break_lock()
180
self.branch.break_lock()
182
def _comparison_data(self, entry, path):
183
kind, executable, stat_value = \
184
WorkingTree3._comparison_data(self, entry, path)
185
# it looks like a plain directory, but it's really a reference -- see
187
if (self._repo_supports_tree_reference and kind == 'directory'
188
and entry is not None and entry.kind == 'tree-reference'):
189
kind = 'tree-reference'
190
return kind, executable, stat_value
193
def commit(self, message=None, revprops=None, *args, **kwargs):
194
# mark the tree as dirty post commit - commit
195
# can change the current versioned list by doing deletes.
196
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
197
self._make_dirty(reset_inventory=True)
200
178
def current_dirstate(self):
201
"""Return the current dirstate object.
179
"""Return the current dirstate object.
203
181
This is not part of the tree interface and only exposed for ease of
206
:raises errors.NotWriteLocked: when not in a lock.
208
self._must_be_locked()
209
return self._current_dirstate()
211
def _current_dirstate(self):
212
"""Internal function that does not check lock status.
214
This is needed for break_lock which also needs the dirstate.
184
:raises errors.NotWriteLocked: when not in a lock.
185
XXX: This should probably be errors.NotLocked.
187
if not self._control_files._lock_count:
188
raise errors.ObjectNotLocked(self)
216
189
if self._dirstate is not None:
217
190
return self._dirstate
218
191
local_path = self.bzrdir.get_workingtree_transport(None
219
192
).local_abspath('dirstate')
220
self._dirstate = dirstate.DirState.on_file(local_path,
221
self._sha1_provider())
193
self._dirstate = dirstate.DirState.on_file(local_path)
222
194
return self._dirstate
224
def _sha1_provider(self):
225
"""A function that returns a SHA1Provider suitable for this tree.
227
:return: None if content filtering is not supported by this tree.
228
Otherwise, a SHA1Provider is returned that sha's the canonical
229
form of files, i.e. after read filters are applied.
231
if self.supports_content_filtering():
232
return ContentFilterAwareSHA1Provider(self)
236
196
def filter_unversioned_files(self, paths):
237
"""Filter out paths that are versioned.
197
"""Filter out paths that are not versioned.
239
199
:return: set of paths.
279
232
state = self.current_dirstate()
280
233
state._read_dirblocks_if_needed()
281
234
root_key, current_entry = self._get_entry(path='')
282
current_id = root_key[2]
283
if not (current_entry[0][0] == 'd'): # directory
284
raise AssertionError(current_entry)
235
current_id = root_key[2].decode('utf8')
236
assert current_entry[0][0] == 'directory'
285
237
inv = Inventory(root_id=current_id)
286
# Turn some things into local variables
287
minikind_to_kind = dirstate.DirState._minikind_to_kind
288
factory = entry_factory
289
utf8_decode = cache_utf8._utf8_decode
291
238
# we could do this straight out of the dirstate; it might be fast
292
239
# and should be profiled - RBC 20070216
293
parent_ies = {'' : inv.root}
240
parent_ids = {'' : inv.root.file_id}
294
241
for block in state._dirblocks[1:]: # skip the root
295
242
dirname = block[0]
297
parent_ie = parent_ies[dirname]
244
parent_id = parent_ids[block[0]]
299
246
# all the paths in this block are not versioned in this tree
301
248
for key, entry in block[1]:
302
minikind, link_or_sha1, size, executable, stat = entry[0]
303
if minikind in ('a', 'r'): # absent, relocated
249
if entry[0][0] in ('absent', 'relocated'):
304
250
# a parent tree only entry
307
name_unicode = utf8_decode(name)[0]
309
kind = minikind_to_kind[minikind]
310
inv_entry = factory[kind](file_id, name_unicode,
252
name = key[1].decode('utf8')
253
file_id = key[2].decode('utf8')
254
kind, link_or_sha1, size, executable, stat = entry[0]
255
inv_entry = entry_factory[kind](file_id, name, parent_id)
312
256
if kind == 'file':
313
# This is only needed on win32, where this is the only way
314
# we know the executable bit.
315
inv_entry.executable = executable
316
257
# not strictly needed: working tree
317
#inv_entry.text_size = size
318
#inv_entry.text_sha1 = sha1
258
#entry.executable = executable
259
#entry.text_size = size
260
#entry.text_sha1 = sha1
319
262
elif kind == 'directory':
320
263
# add this entry to the parent map.
321
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
322
elif kind == 'tree-reference':
323
if not self._repo_supports_tree_reference:
324
raise errors.UnsupportedOperation(
325
self._generate_inventory,
326
self.branch.repository)
327
inv_entry.reference_revision = link_or_sha1 or None
328
elif kind != 'symlink':
329
raise AssertionError("unknown kind %r" % kind)
330
# These checks cost us around 40ms on a 55k entry tree
331
if file_id in inv_byid:
332
raise AssertionError('file_id %s already in'
333
' inventory as %s' % (file_id, inv_byid[file_id]))
334
if name_unicode in parent_ie.children:
335
raise AssertionError('name %r already in parent'
337
inv_byid[file_id] = inv_entry
338
parent_ie.children[name_unicode] = inv_entry
264
parent_ids[(dirname + '/' + name).strip('/')] = file_id
339
266
self._inventory = inv
341
268
def _get_entry(self, file_id=None, path=None):
352
279
if file_id is None and path is None:
353
280
raise errors.BzrError('must supply file_id or path')
354
281
state = self.current_dirstate()
282
if file_id is not None:
283
file_id = file_id.encode('utf8')
355
284
if path is not None:
356
285
path = path.encode('utf8')
357
286
return state._get_entry(0, fileid_utf8=file_id, path_utf8=path)
359
288
def get_file_sha1(self, file_id, path=None, stat_value=None):
360
289
# check file id is valid unconditionally.
361
entry = self._get_entry(file_id=file_id, path=path)
363
raise errors.NoSuchId(self, file_id)
290
key, details = self._get_entry(file_id=file_id, path=path)
291
assert key is not None, 'what error should this raise'
293
# if row stat is valid, use cached sha1, else, get a new sha1.
365
path = pathjoin(entry[0][0], entry[0][1]).decode('utf8')
367
file_abspath = self.abspath(path)
368
state = self.current_dirstate()
369
if stat_value is None:
371
stat_value = os.lstat(file_abspath)
373
if e.errno == errno.ENOENT:
377
link_or_sha1 = dirstate.update_entry(state, entry, file_abspath,
378
stat_value=stat_value)
379
if entry[1][0][0] == 'f':
380
if link_or_sha1 is None:
381
file_obj, statvalue = self.get_file_with_stat(file_id, path)
383
sha1 = osutils.sha_file(file_obj)
386
self._observed_sha1(file_id, path, (sha1, statvalue))
295
path = os.path.join(*key[0:2]).decode('utf8')
296
return self._hashcache.get_sha1(path, stat_value)
392
298
def _get_inventory(self):
393
299
"""Get the inventory for the tree. This is only valid within a lock."""
394
if 'evil' in debug.debug_flags:
395
trace.mutter_callsite(2,
396
"accessing .inventory forces a size of tree translation.")
397
300
if self._inventory is not None:
398
301
return self._inventory
399
self._must_be_locked()
400
302
self._generate_inventory()
401
303
return self._inventory
407
309
def get_parent_ids(self):
408
310
"""See Tree.get_parent_ids.
410
312
This implementation requests the ids list from the dirstate file.
412
314
return self.current_dirstate().get_parent_ids()
414
def get_reference_revision(self, file_id, path=None):
415
# referenced tree's revision is whatever's currently there
416
return self.get_nested_tree(file_id, path).last_revision()
418
def get_nested_tree(self, file_id, path=None):
420
path = self.id2path(file_id)
421
# else: check file_id is at path?
422
return WorkingTree.open(self.abspath(path))
425
317
def get_root_id(self):
426
318
"""Return the id of this trees root"""
427
return self._get_entry(path='')[0][2]
319
return self._get_entry(path='')[0][2].decode('utf8')
429
321
def has_id(self, file_id):
430
322
state = self.current_dirstate()
323
fileid_utf8 = file_id.encode('utf8')
431
324
row, parents = self._get_entry(file_id=file_id)
434
327
return osutils.lexists(pathjoin(
435
328
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
437
def has_or_had_id(self, file_id):
438
state = self.current_dirstate()
439
row, parents = self._get_entry(file_id=file_id)
440
return row is not None
443
def id2path(self, file_id):
444
"Convert a file-id to a path."
331
def id2path(self, fileid):
445
332
state = self.current_dirstate()
446
entry = self._get_entry(file_id=file_id)
447
if entry == (None, None):
448
raise errors.NoSuchId(tree=self, file_id=file_id)
449
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
450
return path_utf8.decode('utf8')
452
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
453
entry = self._get_entry(path=path)
454
if entry == (None, None):
455
return False # Missing entries are not executable
456
return entry[1][0][3] # Executable?
458
if not osutils.supports_executable():
459
def is_executable(self, file_id, path=None):
460
"""Test if a file is executable or not.
462
Note: The caller is expected to take a read-lock before calling this.
464
entry = self._get_entry(file_id=file_id, path=path)
465
if entry == (None, None):
467
return entry[1][0][3]
469
_is_executable_from_path_and_stat = \
470
_is_executable_from_path_and_stat_from_basis
472
def is_executable(self, file_id, path=None):
473
"""Test if a file is executable or not.
475
Note: The caller is expected to take a read-lock before calling this.
477
self._must_be_locked()
479
path = self.id2path(file_id)
480
mode = os.lstat(self.abspath(path)).st_mode
481
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
483
def all_file_ids(self):
484
"""See Tree.iter_all_file_ids"""
485
self._must_be_locked()
487
for key, tree_details in self.current_dirstate()._iter_entries():
488
if tree_details[0][0] in ('a', 'r'): # relocated
333
fileid_utf8 = fileid.encode('utf8')
334
key, tree_details = state._get_entry(0, fileid_utf8=fileid_utf8)
335
return os.path.join(*key[0:2]).decode('utf8')
494
338
def __iter__(self):
501
345
for key, tree_details in self.current_dirstate()._iter_entries():
502
if tree_details[0][0] in ('a', 'r'): # absent, relocated
346
if tree_details[0][0] in ('absent', 'relocated'):
503
347
# not relevant to the working tree
505
349
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
506
350
if osutils.lexists(path):
507
result.append(key[2])
351
result.append(key[2].decode('utf8'))
508
352
return iter(result)
510
def iter_references(self):
511
if not self._repo_supports_tree_reference:
512
# When the repo doesn't support references, we will have nothing to
515
for key, tree_details in self.current_dirstate()._iter_entries():
516
if tree_details[0][0] in ('a', 'r'): # absent, relocated
517
# not relevant to the working tree
520
# the root is not a reference.
522
relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
524
if self._kind(relpath) == 'tree-reference':
525
yield relpath, key[2]
526
except errors.NoSuchFile:
527
# path is missing on disk.
530
def _observed_sha1(self, file_id, path, (sha1, statvalue)):
531
"""See MutableTree._observed_sha1."""
532
state = self.current_dirstate()
533
entry = self._get_entry(file_id=file_id, path=path)
534
state._observed_sha1(entry, sha1, statvalue)
536
def kind(self, file_id):
537
"""Return the kind of a file.
539
This is always the actual kind that's on disk, regardless of what it
542
Note: The caller is expected to take a read-lock before calling this.
544
relpath = self.id2path(file_id)
546
raise AssertionError(
547
"path for id {%s} is None!" % file_id)
548
return self._kind(relpath)
550
def _kind(self, relpath):
551
abspath = self.abspath(relpath)
552
kind = file_kind(abspath)
553
if (self._repo_supports_tree_reference and kind == 'directory'):
554
entry = self._get_entry(path=relpath)
555
if entry[1] is not None:
556
if entry[1][0][0] == 't':
557
kind = 'tree-reference'
561
355
def _last_revision(self):
562
356
"""See Mutable.last_revision."""
565
359
return parent_ids[0]
567
return _mod_revision.NULL_REVISION
570
"""See Branch.lock_read, and WorkingTree.unlock."""
571
self.branch.lock_read()
573
self._control_files.lock_read()
575
state = self.current_dirstate()
576
if not state._lock_token:
578
# set our support for tree references from the repository in
580
self._repo_supports_tree_reference = getattr(
581
self.branch.repository._format, "supports_tree_reference",
584
self._control_files.unlock()
590
def _lock_self_write(self):
591
"""This should be called after the branch is locked."""
593
self._control_files.lock_write()
595
state = self.current_dirstate()
596
if not state._lock_token:
598
# set our support for tree references from the repository in
600
self._repo_supports_tree_reference = getattr(
601
self.branch.repository._format, "supports_tree_reference",
604
self._control_files.unlock()
610
def lock_tree_write(self):
611
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
612
self.branch.lock_read()
613
self._lock_self_write()
615
def lock_write(self):
616
"""See MutableTree.lock_write, and WorkingTree.unlock."""
617
self.branch.lock_write()
618
self._lock_self_write()
620
363
@needs_tree_write_lock
621
def move(self, from_paths, to_dir, after=False):
364
def move(self, from_paths, to_dir=None, after=False, **kwargs):
622
365
"""See WorkingTree.move()."""
624
366
if not from_paths:
626
369
state = self.current_dirstate()
627
if isinstance(from_paths, basestring):
371
# check for deprecated use of signature
373
to_dir = kwargs.get('to_name', None)
375
raise TypeError('You must supply a target directory')
377
symbol_versioning.warn('The parameter to_name was deprecated'
378
' in version 0.13. Use to_dir instead',
381
assert not isinstance(from_paths, basestring)
629
382
to_dir_utf8 = to_dir.encode('utf8')
630
383
to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
631
id_index = state._get_id_index()
632
384
# check destination directory
633
385
# get the details for it
634
386
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
635
387
state._get_block_entry_index(to_entry_dirname, to_basename, 0)
636
388
if not entry_present:
637
389
raise errors.BzrMoveFailedError('', to_dir,
638
errors.NotVersionedError(to_dir))
390
errors.NotInWorkingDirectory(to_dir))
639
391
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
640
392
# get a handle on the block itself.
641
393
to_block_index = state._ensure_block(
646
398
raise errors.BzrMoveFailedError('',to_dir,
647
399
errors.NotADirectory(to_abs))
649
if to_entry[1][0][0] != 'd':
401
if to_entry[1][0][0] != 'directory':
650
402
raise errors.BzrMoveFailedError('',to_dir,
651
403
errors.NotADirectory(to_abs))
653
405
if self._inventory is not None:
654
406
update_inventory = True
655
407
inv = self.inventory
656
to_dir_id = to_entry[0][2]
657
408
to_dir_ie = inv[to_dir_id]
409
to_dir_id = to_entry[0][2].decode('utf8')
659
411
update_inventory = False
662
def move_one(old_entry, from_path_utf8, minikind, executable,
663
fingerprint, packed_stat, size,
664
to_block, to_key, to_path_utf8):
665
state._make_absent(old_entry)
666
from_key = old_entry[0]
668
lambda:state.update_minimal(from_key,
670
executable=executable,
671
fingerprint=fingerprint,
672
packed_stat=packed_stat,
674
path_utf8=from_path_utf8))
675
state.update_minimal(to_key,
677
executable=executable,
678
fingerprint=fingerprint,
679
packed_stat=packed_stat,
681
path_utf8=to_path_utf8)
682
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
683
new_entry = to_block[1][added_entry_index]
684
rollbacks.append(lambda:state._make_absent(new_entry))
413
# create rename entries and tuples
686
414
for from_rel in from_paths:
687
415
# from_rel is 'pathinroot/foo/bar'
688
from_rel_utf8 = from_rel.encode('utf8')
689
from_dirname, from_tail = osutils.split(from_rel)
690
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
416
from_dirname, from_tail = os.path.split(from_rel)
417
from_dirname = from_dirname.encode('utf8')
691
418
from_entry = self._get_entry(path=from_rel)
692
419
if from_entry == (None, None):
693
420
raise errors.BzrMoveFailedError(from_rel,to_dir,
694
errors.NotVersionedError(path=from_rel))
421
errors.NotVersionedError(path=str(from_rel)))
696
from_id = from_entry[0][2]
423
from_id = from_entry[0][2].decode('utf8')
697
424
to_rel = pathjoin(to_dir, from_tail)
698
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
699
425
item_to_entry = self._get_entry(path=to_rel)
700
426
if item_to_entry != (None, None):
701
427
raise errors.BzrMoveFailedError(from_rel, to_rel,
764
486
lambda: inv.rename(from_id, current_parent, from_tail))
765
487
# finally do the rename in the dirstate, which is a little
766
488
# tricky to rollback, but least likely to need it.
489
basename = from_tail.encode('utf8')
767
490
old_block_index, old_entry_index, dir_present, file_present = \
768
state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
491
state._get_block_entry_index(from_dirname, basename, 0)
769
492
old_block = state._dirblocks[old_block_index][1]
770
old_entry = old_block[old_entry_index]
771
from_key, old_entry_details = old_entry
772
cur_details = old_entry_details[0]
493
old_entry_details = old_block[old_entry_index][1]
773
494
# remove the old row
495
from_key = old_block[old_entry_index][0]
774
496
to_key = ((to_block[0],) + from_key[1:3])
775
minikind = cur_details[0]
776
move_one(old_entry, from_path_utf8=from_rel_utf8,
778
executable=cur_details[3],
779
fingerprint=cur_details[1],
780
packed_stat=cur_details[4],
784
to_path_utf8=to_rel_utf8)
787
def update_dirblock(from_dir, to_key, to_dir_utf8):
788
"""Recursively update all entries in this dirblock."""
790
raise AssertionError("renaming root not supported")
791
from_key = (from_dir, '')
792
from_block_idx, present = \
793
state._find_block_index_from_key(from_key)
795
# This is the old record, if it isn't present, then
796
# there is theoretically nothing to update.
797
# (Unless it isn't present because of lazy loading,
798
# but we don't do that yet)
800
from_block = state._dirblocks[from_block_idx]
801
to_block_index, to_entry_index, _, _ = \
802
state._get_block_entry_index(to_key[0], to_key[1], 0)
803
to_block_index = state._ensure_block(
804
to_block_index, to_entry_index, to_dir_utf8)
805
to_block = state._dirblocks[to_block_index]
807
# Grab a copy since move_one may update the list.
808
for entry in from_block[1][:]:
809
if not (entry[0][0] == from_dir):
810
raise AssertionError()
811
cur_details = entry[1][0]
812
to_key = (to_dir_utf8, entry[0][1], entry[0][2])
813
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
814
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
815
minikind = cur_details[0]
817
# Deleted children of a renamed directory
818
# Do not need to be updated.
819
# Children that have been renamed out of this
820
# directory should also not be updated
822
move_one(entry, from_path_utf8=from_path_utf8,
824
executable=cur_details[3],
825
fingerprint=cur_details[1],
826
packed_stat=cur_details[4],
830
to_path_utf8=to_path_utf8)
832
# We need to move all the children of this
834
update_dirblock(from_path_utf8, to_key,
836
update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
497
state._make_absent(old_block[old_entry_index])
499
lambda:state.update_minimal(from_key,
500
old_entry_details[0][0],
501
num_present_parents=len(old_entry_details) - 1,
502
executable=old_entry_details[0][3],
503
fingerprint=old_entry_details[0][1],
504
packed_stat=old_entry_details[0][4],
505
size=old_entry_details[0][2],
506
id_index=state._get_id_index(),
507
path_utf8=from_rel.encode('utf8')))
508
# create new row in current block
509
state.update_minimal(to_key,
510
old_entry_details[0][0],
511
num_present_parents=len(old_entry_details) - 1,
512
executable=old_entry_details[0][3],
513
fingerprint=old_entry_details[0][1],
514
packed_stat=old_entry_details[0][4],
515
size=old_entry_details[0][2],
516
id_index=state._get_id_index(),
517
path_utf8=to_rel.encode('utf8'))
518
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
519
new_entry = to_block[added_entry_index]
520
rollbacks.append(lambda:state._make_absent(new_entry))
521
if new_entry[1][0][0] == 'directory':
522
import pdb;pdb.set_trace()
523
# if a directory, rename all the contents of child blocks
524
# adding rollbacks as each is inserted to remove them and
525
# restore the original
526
# TODO: large scale slice assignment.
528
# save old list region
529
# move up or down the old region
530
# add rollback to move the region back
531
# assign new list to new region
838
534
rollback_rename()
840
result.append((from_rel, to_rel))
841
536
state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
842
self._make_dirty(reset_inventory=False)
846
def _must_be_locked(self):
847
if not self._control_files._lock_count:
848
raise errors.ObjectNotLocked(self)
539
return #rename_tuples
850
541
def _new_tree(self):
851
542
"""Initialize the state in this tree to be a new tree."""
1077
742
raise errors.GhostRevisionUnusableHere(parents_list[0][0])
1081
parent_ids = [rev_id for rev_id, tree in parents_list]
1082
graph = self.branch.repository.get_graph()
1083
heads = graph.heads(parent_ids)
1084
accepted_revisions = set()
1086
745
# convert absent trees to the null tree, which we convert back to
1087
746
# missing on access.
1088
747
for rev_id, tree in parents_list:
1089
if len(accepted_revisions) > 0:
1090
# we always accept the first tree
1091
if rev_id in accepted_revisions or rev_id not in heads:
1092
# We have already included either this tree, or its
1093
# descendent, so we skip it.
1095
_mod_revision.check_not_reserved_id(rev_id)
748
rev_id = osutils.safe_revision_id(rev_id)
1096
749
if tree is not None:
1097
750
real_trees.append((rev_id, tree))
1099
752
real_trees.append((rev_id,
1100
self.branch.repository.revision_tree(
1101
_mod_revision.NULL_REVISION)))
753
self.branch.repository.revision_tree(None)))
1102
754
ghosts.append(rev_id)
1103
accepted_revisions.add(rev_id)
1104
755
dirstate.set_parent_trees(real_trees, ghosts=ghosts)
1105
self._make_dirty(reset_inventory=False)
1107
758
def _set_root_id(self, file_id):
1108
759
"""See WorkingTree.set_root_id."""
1109
760
state = self.current_dirstate()
1110
761
state.set_path_id('', file_id)
1111
if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
1112
self._make_dirty(reset_inventory=True)
1114
def _sha_from_stat(self, path, stat_result):
1115
"""Get a sha digest from the tree's stat cache.
1117
The default implementation assumes no stat cache is present.
1119
:param path: The path.
1120
:param stat_result: The stat result being looked up.
1122
return self.current_dirstate().sha1_from_stat(path, stat_result)
1125
def supports_tree_reference(self):
1126
return self._repo_supports_tree_reference
762
self._dirty = state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED
1128
764
def unlock(self):
1129
765
"""Unlock in format 4 trees needs to write the entire dirstate."""
1130
# do non-implementation specific cleanup
1133
766
if self._control_files._lock_count == 1:
767
self._write_hashcache_if_dirty()
1134
768
# eventually we should do signature checking during read locks for
1135
769
# dirstate updates.
1136
770
if self._control_files._lock_mode == 'w':
1139
if self._dirstate is not None:
1140
# This is a no-op if there are no modifications.
1141
self._dirstate.save()
1142
self._dirstate.unlock()
1143
# TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
1144
# point. Instead, it could check if the header has been
1145
# modified when it is locked, and if not, it can hang on to
1146
# the data it has in memory.
1147
773
self._dirstate = None
1148
774
self._inventory = None
1149
775
# reverse order of locking.
1231
852
block_index += 1
1232
853
if ids_to_unversion:
1233
854
raise errors.NoSuchId(self, iter(ids_to_unversion).next())
1234
self._make_dirty(reset_inventory=False)
1235
856
# have to change the legacy inventory too.
1236
857
if self._inventory is not None:
1237
858
for file_id in file_ids:
1238
859
self._inventory.remove_recursive_id(file_id)
1240
861
@needs_tree_write_lock
1241
def rename_one(self, from_rel, to_rel, after=False):
1242
"""See WorkingTree.rename_one"""
1244
WorkingTree.rename_one(self, from_rel, to_rel, after)
1246
@needs_tree_write_lock
1247
def apply_inventory_delta(self, changes):
1248
"""See MutableTree.apply_inventory_delta"""
1249
state = self.current_dirstate()
1250
state.update_by_delta(changes)
1251
self._make_dirty(reset_inventory=True)
1253
def update_basis_by_delta(self, new_revid, delta):
1254
"""See MutableTree.update_basis_by_delta."""
1255
if self.last_revision() == new_revid:
1256
raise AssertionError()
1257
self.current_dirstate().update_basis_by_delta(delta, new_revid)
1260
def _validate(self):
1261
self._dirstate._validate()
1263
@needs_tree_write_lock
1264
862
def _write_inventory(self, inv):
1265
863
"""Write inventory as the current inventory."""
1267
raise AssertionError("attempting to write an inventory when the "
1268
"dirstate is dirty will lose pending changes")
1269
had_inventory = self._inventory is not None
1270
# Setting self._inventory = None forces the dirstate to regenerate the
1271
# working inventory. We do this because self.inventory may be inv, or
1272
# may have been modified, and either case would prevent a clean delta
1274
self._inventory = None
1276
delta = inv._make_delta(self.inventory)
1278
self.apply_inventory_delta(delta)
1280
self._inventory = inv
864
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
865
self.current_dirstate().set_state_from_inventory(inv)
1284
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1286
def __init__(self, tree):
1289
def sha1(self, abspath):
1290
"""See dirstate.SHA1Provider.sha1()."""
1291
filters = self.tree._content_filter_stack(
1292
self.tree.relpath(osutils.safe_unicode(abspath)))
1293
return internal_size_sha_file_byname(abspath, filters)[1]
1295
def stat_and_sha1(self, abspath):
1296
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1297
filters = self.tree._content_filter_stack(
1298
self.tree.relpath(osutils.safe_unicode(abspath)))
1299
file_obj = file(abspath, 'rb', 65000)
1301
statvalue = os.fstat(file_obj.fileno())
1303
file_obj = filtered_input_file(file_obj, filters)
1304
sha1 = osutils.size_sha_file(file_obj)[1]
1307
return statvalue, sha1
1310
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1311
"""Dirstate working tree that supports content filtering.
1313
The dirstate holds the hash and size of the canonical form of the file,
1314
and most methods must return that.
1317
def _file_content_summary(self, path, stat_result):
1318
# This is to support the somewhat obsolete path_content_summary method
1319
# with content filtering: see
1320
# <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
1322
# If the dirstate cache is up to date and knows the hash and size,
1324
# Otherwise if there are no content filters, return the on-disk size
1325
# and leave the hash blank.
1326
# Otherwise, read and filter the on-disk file and use its size and
1329
# The dirstate doesn't store the size of the canonical form so we
1330
# can't trust it for content-filtered trees. We just return None.
1331
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result)
1332
executable = self._is_executable_from_path_and_stat(path, stat_result)
1333
return ('file', None, executable, dirstate_sha1)
1336
class WorkingTree4(DirStateWorkingTree):
1337
"""This is the Format 4 working tree.
1339
This differs from WorkingTree3 by:
1340
- Having a consolidated internal dirstate, stored in a
1341
randomly-accessible sorted file on disk.
1342
- Not having a regular inventory attribute. One can be synthesized
1343
on demand but this is expensive and should be avoided.
1345
This is new in bzr 0.15.
1349
class WorkingTree5(ContentFilteringDirStateWorkingTree):
1350
"""This is the Format 5 working tree.
1352
This differs from WorkingTree4 by:
1353
- Supporting content filtering.
1355
This is new in bzr 1.11.
1359
class WorkingTree6(ContentFilteringDirStateWorkingTree):
1360
"""This is the Format 6 working tree.
1362
This differs from WorkingTree5 by:
1363
- Supporting a current view that may mask the set of files in a tree
1364
impacted by most user operations.
1366
This is new in bzr 1.14.
1369
def _make_views(self):
1370
return views.PathBasedViews(self)
1373
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1375
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
accelerator_tree=None, hardlink=False):
870
class WorkingTreeFormat4(WorkingTreeFormat3):
871
"""The first consolidated dirstate working tree format.
874
- exists within a metadir controlling .bzr
875
- includes an explicit version marker for the workingtree control
876
files, separate from the BzrDir format
877
- modifies the hash cache format
878
- is new in bzr TODO FIXME SETBEFOREMERGE
879
- uses a LockDir to guard access to it.
882
def get_format_string(self):
883
"""See WorkingTreeFormat.get_format_string()."""
884
return "Bazaar Working Tree format 4\n"
886
def get_format_description(self):
887
"""See WorkingTreeFormat.get_format_description()."""
888
return "Working tree format 4"
890
def initialize(self, a_bzrdir, revision_id=None):
1377
891
"""See WorkingTreeFormat.initialize().
1379
:param revision_id: allows creating a working tree at a different
893
revision_id allows creating a working tree at a different
1380
894
revision than the branch is at.
1381
:param accelerator_tree: A tree which can be used for retrieving file
1382
contents more quickly than the revision tree, i.e. a workingtree.
1383
The revision tree will be used for cases where accelerator_tree's
1384
content is different.
1385
:param hardlink: If true, hard-link files from accelerator_tree,
1388
These trees get an initial random root id, if their repository supports
1389
rich root data, TREE_ROOT otherwise.
896
revision_id = osutils.safe_revision_id(revision_id)
1391
897
if not isinstance(a_bzrdir.transport, LocalTransport):
1392
898
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1393
899
transport = a_bzrdir.get_workingtree_transport(self)
1394
900
control_files = self._open_control_files(a_bzrdir)
1395
901
control_files.create_lock()
1396
902
control_files.lock_write()
1397
transport.put_bytes('format', self.get_format_string(),
1398
mode=a_bzrdir._get_file_mode())
1399
if from_branch is not None:
1400
branch = from_branch
1402
branch = a_bzrdir.open_branch()
903
control_files.put_utf8('format', self.get_format_string())
904
branch = a_bzrdir.open_branch()
1403
905
if revision_id is None:
1404
906
revision_id = branch.last_revision()
1405
907
local_path = transport.local_abspath('dirstate')
1406
# write out new dirstate (must exist when we create the tree)
1407
state = dirstate.DirState.initialize(local_path)
1410
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
908
dirstate.DirState.initialize(local_path)
909
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1413
912
_bzrdir=a_bzrdir,
1414
913
_control_files=control_files)
1416
wt.lock_tree_write()
1418
self._init_custom_control_files(wt)
1419
if revision_id in (None, _mod_revision.NULL_REVISION):
1420
if branch.repository.supports_rich_root():
1421
wt._set_root_id(generate_ids.gen_root_id())
1423
wt._set_root_id(ROOT_ID)
1426
# frequently, we will get here due to branching. The accelerator
1427
# tree will be the tree from the branch, so the desired basis
1428
# tree will often be a parent of the accelerator tree.
1429
if accelerator_tree is not None:
1431
basis = accelerator_tree.revision_tree(revision_id)
1432
except errors.NoSuchRevision:
1435
basis = branch.repository.revision_tree(revision_id)
1436
if revision_id == _mod_revision.NULL_REVISION:
1439
parents_list = [(revision_id, basis)]
917
#wt.current_dirstate().set_path_id('', NEWROOT)
918
wt.set_last_revision(revision_id)
920
basis = wt.basis_tree()
1440
921
basis.lock_read()
1442
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1444
# if the basis has a root id we have to use that; otherwise we
1445
# use a new random one
1446
basis_root_id = basis.get_root_id()
1447
if basis_root_id is not None:
1448
wt._set_root_id(basis_root_id)
1450
if wt.supports_content_filtering():
1451
# The original tree may not have the same content filters
1452
# applied so we can't safely build the inventory delta from
1454
delta_from_tree = False
1456
delta_from_tree = True
1457
# delta_from_tree is safe even for DirStateRevisionTrees,
1458
# because wt4.apply_inventory_delta does not mutate the input
1459
# inventory entries.
1460
transform.build_tree(basis, wt, accelerator_tree,
1462
delta_from_tree=delta_from_tree)
922
transform.build_tree(basis, wt)
1466
925
control_files.unlock()
1470
def _init_custom_control_files(self, wt):
1471
"""Subclasses with custom control files should override this method.
1473
The working tree and control files are locked for writing when this
1476
:param wt: the WorkingTree object
1479
930
def _open(self, a_bzrdir, control_files):
1480
931
"""Open the tree itself.
1482
933
:param a_bzrdir: the dir for the tree.
1483
934
:param control_files: the control files for the tree.
1485
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
936
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1486
937
branch=a_bzrdir.open_branch(),
1488
939
_bzrdir=a_bzrdir,
1489
940
_control_files=control_files)
1491
def __get_matchingbzrdir(self):
1492
return self._get_matchingbzrdir()
1494
def _get_matchingbzrdir(self):
1495
"""Overrideable method to get a bzrdir for testing."""
1496
# please test against something that will let us do tree references
1497
return bzrdir.format_registry.make_bzrdir(
1498
'dirstate-with-subtree')
1500
_matchingbzrdir = property(__get_matchingbzrdir)
1503
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1504
"""The first consolidated dirstate working tree format.
1507
- exists within a metadir controlling .bzr
1508
- includes an explicit version marker for the workingtree control
1509
files, separate from the BzrDir format
1510
- modifies the hash cache format
1511
- is new in bzr 0.15
1512
- uses a LockDir to guard access to it.
1515
upgrade_recommended = False
1517
_tree_class = WorkingTree4
1519
def get_format_string(self):
1520
"""See WorkingTreeFormat.get_format_string()."""
1521
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1523
def get_format_description(self):
1524
"""See WorkingTreeFormat.get_format_description()."""
1525
return "Working tree format 4"
1528
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1529
"""WorkingTree format supporting content filtering.
1532
upgrade_recommended = False
1534
_tree_class = WorkingTree5
1536
def get_format_string(self):
1537
"""See WorkingTreeFormat.get_format_string()."""
1538
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1540
def get_format_description(self):
1541
"""See WorkingTreeFormat.get_format_description()."""
1542
return "Working tree format 5"
1544
def supports_content_filtering(self):
1548
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1549
"""WorkingTree format supporting views.
1552
upgrade_recommended = False
1554
_tree_class = WorkingTree6
1556
def get_format_string(self):
1557
"""See WorkingTreeFormat.get_format_string()."""
1558
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1560
def get_format_description(self):
1561
"""See WorkingTreeFormat.get_format_description()."""
1562
return "Working tree format 6"
1564
def _init_custom_control_files(self, wt):
1565
"""Subclasses with custom control files should override this method."""
1566
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1568
def supports_content_filtering(self):
1571
def supports_views(self):
1575
943
class DirStateRevisionTree(Tree):
1576
"""A revision tree pulling the inventory from a dirstate.
1578
Note that this is one of the historical (ie revision) trees cached in the
1579
dirstate for easy access, not the workingtree.
944
"""A revision tree pulling the inventory from a dirstate."""
1582
946
def __init__(self, dirstate, revision_id, repository):
1583
947
self._dirstate = dirstate
1584
self._revision_id = revision_id
948
self._revision_id = osutils.safe_revision_id(revision_id)
1585
949
self._repository = repository
1586
950
self._inventory = None
1587
951
self._locked = 0
1588
self._dirstate_locked = False
1589
self._repo_supports_tree_reference = getattr(
1590
repository._format, "supports_tree_reference",
1594
return "<%s of %s in %s>" % \
1595
(self.__class__.__name__, self._revision_id, self._dirstate)
1597
def annotate_iter(self, file_id,
1598
default_revision=_mod_revision.CURRENT_REVISION):
953
def annotate_iter(self, file_id):
1599
954
"""See Tree.annotate_iter"""
1600
text_key = (file_id, self.inventory[file_id].revision)
1601
annotations = self._repository.texts.annotate(text_key)
1602
return [(key[-1], line) for (key, line) in annotations]
955
w = self._repository.weave_store.get_weave(file_id,
956
self._repository.get_transaction())
957
return w.annotate_iter(self.inventory[file_id].revision)
1604
def _get_ancestors(self, default_revision):
1605
return set(self._repository.get_ancestry(self._revision_id,
1607
959
def _comparison_data(self, entry, path):
1608
960
"""See Tree._comparison_data."""
1609
961
if entry is None:
1623
975
pred = self.has_filename
1624
976
return set((p for p in paths if not pred(p)))
1626
def get_root_id(self):
1627
return self.path2id('')
1629
def id2path(self, file_id):
1630
"Convert a file-id to a path."
1631
entry = self._get_entry(file_id=file_id)
1632
if entry == (None, None):
1633
raise errors.NoSuchId(tree=self, file_id=file_id)
1634
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
1635
return path_utf8.decode('utf8')
1637
def iter_references(self):
1638
if not self._repo_supports_tree_reference:
1639
# When the repo doesn't support references, we will have nothing to
1642
# Otherwise, fall back to the default implementation
1643
return super(DirStateRevisionTree, self).iter_references()
1645
def _get_parent_index(self):
1646
"""Return the index in the dirstate referenced by this tree."""
1647
return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1649
978
def _get_entry(self, file_id=None, path=None):
1650
979
"""Get the dirstate row for file_id or path.
1652
981
If either file_id or path is supplied, it is used as the key to lookup.
1653
982
If both are supplied, the fastest lookup is used, and an error is
1654
983
raised if they do not both point at the same row.
1656
985
:param file_id: An optional unicode file_id to be looked up.
1657
986
:param path: An optional unicode path to be looked up.
1658
987
:return: The dirstate row tuple for path/file_id, or (None, None)
1660
989
if file_id is None and path is None:
1661
990
raise errors.BzrError('must supply file_id or path')
991
if file_id is not None:
992
file_id = file_id.encode('utf8')
1662
993
if path is not None:
1663
994
path = path.encode('utf8')
1664
parent_index = self._get_parent_index()
995
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1665
996
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
1667
998
def _generate_inventory(self):
1668
999
"""Create and set self.inventory from the dirstate object.
1670
(So this is only called the first time the inventory is requested for
1671
this tree; it then remains in memory until it's out of date.)
1673
1001
This is relatively expensive: we have to walk the entire dirstate.
1675
if not self._locked:
1676
raise AssertionError(
1677
'cannot generate inventory of an unlocked '
1678
'dirstate revision tree')
1002
Ideally we would not, and instead would """
1003
assert self._locked, 'cannot generate inventory of an unlocked '\
1004
'dirstate revision tree'
1679
1005
# separate call for profiling - makes it clear where the costs are.
1680
1006
self._dirstate._read_dirblocks_if_needed()
1681
if self._revision_id not in self._dirstate.get_parent_ids():
1682
raise AssertionError(
1683
'parent %s has disappeared from %s' % (
1684
self._revision_id, self._dirstate.get_parent_ids()))
1007
assert self._revision_id in self._dirstate.get_parent_ids(), \
1008
'parent %s has disappeared from %s' % (
1009
self._revision_id, self._dirstate.get_parent_ids())
1685
1010
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1686
1011
# This is identical now to the WorkingTree _generate_inventory except
1687
1012
# for the tree index use.
1688
1013
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
1689
current_id = root_key[2]
1690
if current_entry[parent_index][0] != 'd':
1691
raise AssertionError()
1014
current_id = root_key[2].decode('utf8')
1015
assert current_entry[parent_index][0] == 'directory'
1692
1016
inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1693
1017
inv.root.revision = current_entry[parent_index][4]
1694
# Turn some things into local variables
1695
minikind_to_kind = dirstate.DirState._minikind_to_kind
1696
factory = entry_factory
1697
utf8_decode = cache_utf8._utf8_decode
1698
inv_byid = inv._byid
1699
1018
# we could do this straight out of the dirstate; it might be fast
1700
1019
# and should be profiled - RBC 20070216
1701
parent_ies = {'' : inv.root}
1020
parent_ids = {'' : inv.root.file_id}
1702
1021
for block in self._dirstate._dirblocks[1:]: #skip root
1703
1022
dirname = block[0]
1705
parent_ie = parent_ies[dirname]
1024
parent_id = parent_ids[block[0]]
1706
1025
except KeyError:
1707
1026
# all the paths in this block are not versioned in this tree
1709
1028
for key, entry in block[1]:
1710
minikind, fingerprint, size, executable, revid = entry[parent_index]
1711
if minikind in ('a', 'r'): # absent, relocated
1029
if entry[parent_index][0] in ('absent', 'relocated'):
1712
1030
# not this tree
1715
name_unicode = utf8_decode(name)[0]
1717
kind = minikind_to_kind[minikind]
1718
inv_entry = factory[kind](file_id, name_unicode,
1032
name = key[1].decode('utf8')
1033
file_id = key[2].decode('utf8')
1034
kind, link_or_sha1, size, executable, revid = entry[parent_index]
1035
inv_entry = entry_factory[kind](file_id, name, parent_id)
1720
1036
inv_entry.revision = revid
1721
1037
if kind == 'file':
1722
1038
inv_entry.executable = executable
1723
1039
inv_entry.text_size = size
1724
inv_entry.text_sha1 = fingerprint
1040
inv_entry.text_sha1 = link_or_sha1
1725
1041
elif kind == 'directory':
1726
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1042
parent_ids[(dirname + '/' + name).strip('/')] = file_id
1727
1043
elif kind == 'symlink':
1728
1044
inv_entry.executable = False
1729
inv_entry.text_size = None
1730
inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1731
elif kind == 'tree-reference':
1732
inv_entry.reference_revision = fingerprint or None
1045
inv_entry.text_size = size
1046
inv_entry.symlink_target = link_or_sha1.decode('utf8')
1734
raise AssertionError("cannot convert entry %r into an InventoryEntry"
1736
# These checks cost us around 40ms on a 55k entry tree
1737
if file_id in inv_byid:
1738
raise AssertionError('file_id %s already in'
1739
' inventory as %s' % (file_id, inv_byid[file_id]))
1740
if name_unicode in parent_ie.children:
1741
raise AssertionError('name %r already in parent'
1743
inv_byid[file_id] = inv_entry
1744
parent_ie.children[name_unicode] = inv_entry
1048
raise Exception, kind
1745
1050
self._inventory = inv
1747
def get_file_mtime(self, file_id, path=None):
1748
"""Return the modification time for this record.
1750
We return the timestamp of the last-changed revision.
1752
# Make sure the file exists
1753
entry = self._get_entry(file_id, path=path)
1754
if entry == (None, None): # do we raise?
1756
parent_index = self._get_parent_index()
1757
last_changed_revision = entry[1][parent_index][4]
1759
rev = self._repository.get_revision(last_changed_revision)
1760
except errors.NoSuchRevision:
1761
raise errors.FileTimestampUnavailable(self.id2path(file_id))
1762
return rev.timestamp
1764
1052
def get_file_sha1(self, file_id, path=None, stat_value=None):
1765
entry = self._get_entry(file_id=file_id, path=path)
1766
parent_index = self._get_parent_index()
1767
parent_details = entry[1][parent_index]
1768
if parent_details[0] == 'f':
1769
return parent_details[1]
1053
# TODO: if path is present, fast-path on that, as inventory
1054
# might not be present
1055
ie = self.inventory[file_id]
1056
if ie.kind == "file":
1772
def get_file(self, file_id, path=None):
1060
def get_file(self, file_id):
1773
1061
return StringIO(self.get_file_text(file_id))
1063
def get_file_lines(self, file_id):
1064
ie = self.inventory[file_id]
1065
return self._repository.weave_store.get_weave(file_id,
1066
self._repository.get_transaction()).get_lines(ie.revision)
1775
1068
def get_file_size(self, file_id):
1776
"""See Tree.get_file_size"""
1777
1069
return self.inventory[file_id].text_size
1779
def get_file_text(self, file_id, path=None):
1780
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1781
return ''.join(content)
1783
def get_reference_revision(self, file_id, path=None):
1784
return self.inventory[file_id].reference_revision
1786
def iter_files_bytes(self, desired_files):
1787
"""See Tree.iter_files_bytes.
1789
This version is implemented on top of Repository.iter_files_bytes"""
1790
parent_index = self._get_parent_index()
1791
repo_desired_files = []
1792
for file_id, identifier in desired_files:
1793
entry = self._get_entry(file_id)
1794
if entry == (None, None):
1795
raise errors.NoSuchId(self, file_id)
1796
repo_desired_files.append((file_id, entry[1][parent_index][4],
1798
return self._repository.iter_files_bytes(repo_desired_files)
1800
def get_symlink_target(self, file_id):
1801
entry = self._get_entry(file_id=file_id)
1802
parent_index = self._get_parent_index()
1803
if entry[1][parent_index][0] != 'l':
1806
target = entry[1][parent_index][1]
1807
target = target.decode('utf8')
1071
def get_file_text(self, file_id):
1072
return ''.join(self.get_file_lines(file_id))
1810
1074
def get_revision_id(self):
1811
1075
"""Return the revision id for this tree."""
1947
1169
for dir in reversed(dirblock):
1948
1170
if dir[2] == _directory:
1949
1171
pending.append((dir[0], dir[4]))
1952
class InterDirStateTree(InterTree):
1953
"""Fast path optimiser for changes_from with dirstate trees.
1955
This is used only when both trees are in the dirstate working file, and
1956
the source is any parent within the dirstate, and the destination is
1957
the current working tree of the same dirstate.
1959
# this could be generalized to allow comparisons between any trees in the
1960
# dirstate, and possibly between trees stored in different dirstates.
1962
def __init__(self, source, target):
1963
super(InterDirStateTree, self).__init__(source, target)
1964
if not InterDirStateTree.is_compatible(source, target):
1965
raise Exception, "invalid source %r and target %r" % (source, target)
1968
def make_source_parent_tree(source, target):
1969
"""Change the source tree into a parent of the target."""
1970
revid = source.commit('record tree')
1971
target.branch.repository.fetch(source.branch.repository, revid)
1972
target.set_parent_ids([revid])
1973
return target.basis_tree(), target
1976
def make_source_parent_tree_python_dirstate(klass, test_case, source, target):
1977
result = klass.make_source_parent_tree(source, target)
1978
result[1]._iter_changes = dirstate.ProcessEntryPython
1982
def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
1984
from bzrlib.tests.test__dirstate_helpers import \
1985
compiled_dirstate_helpers_feature
1986
test_case.requireFeature(compiled_dirstate_helpers_feature)
1987
from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1988
result = klass.make_source_parent_tree(source, target)
1989
result[1]._iter_changes = ProcessEntryC
1992
_matching_from_tree_format = WorkingTreeFormat4()
1993
_matching_to_tree_format = WorkingTreeFormat4()
1996
def _test_mutable_trees_to_test_trees(klass, test_case, source, target):
1997
# This method shouldn't be called, because we have python and C
1998
# specific flavours.
1999
raise NotImplementedError
2001
def iter_changes(self, include_unchanged=False,
2002
specific_files=None, pb=None, extra_trees=[],
2003
require_versioned=True, want_unversioned=False):
2004
"""Return the changes from source to target.
2006
:return: An iterator that yields tuples. See InterTree.iter_changes
2008
:param specific_files: An optional list of file paths to restrict the
2009
comparison to. When mapping filenames to ids, all matches in all
2010
trees (including optional extra_trees) are used, and all children of
2011
matched directories are included.
2012
:param include_unchanged: An optional boolean requesting the inclusion of
2013
unchanged entries in the result.
2014
:param extra_trees: An optional list of additional trees to use when
2015
mapping the contents of specific_files (paths) to file_ids.
2016
:param require_versioned: If True, all files in specific_files must be
2017
versioned in one of source, target, extra_trees or
2018
PathsNotVersionedError is raised.
2019
:param want_unversioned: Should unversioned files be returned in the
2020
output. An unversioned file is defined as one with (False, False)
2021
for the versioned pair.
2023
# TODO: handle extra trees in the dirstate.
2024
if (extra_trees or specific_files == []):
2025
# we can't fast-path these cases (yet)
2026
return super(InterDirStateTree, self).iter_changes(
2027
include_unchanged, specific_files, pb, extra_trees,
2028
require_versioned, want_unversioned=want_unversioned)
2029
parent_ids = self.target.get_parent_ids()
2030
if not (self.source._revision_id in parent_ids
2031
or self.source._revision_id == _mod_revision.NULL_REVISION):
2032
raise AssertionError(
2033
"revision {%s} is not stored in {%s}, but %s "
2034
"can only be used for trees stored in the dirstate"
2035
% (self.source._revision_id, self.target, self.iter_changes))
2037
if self.source._revision_id == _mod_revision.NULL_REVISION:
2039
indices = (target_index,)
2041
if not (self.source._revision_id in parent_ids):
2042
raise AssertionError(
2043
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
2044
self.source._revision_id, parent_ids))
2045
source_index = 1 + parent_ids.index(self.source._revision_id)
2046
indices = (source_index, target_index)
2047
# -- make all specific_files utf8 --
2049
specific_files_utf8 = set()
2050
for path in specific_files:
2051
# Note, if there are many specific files, using cache_utf8
2052
# would be good here.
2053
specific_files_utf8.add(path.encode('utf8'))
2054
specific_files = specific_files_utf8
2056
specific_files = set([''])
2057
# -- specific_files is now a utf8 path set --
2059
# -- get the state object and prepare it.
2060
state = self.target.current_dirstate()
2061
state._read_dirblocks_if_needed()
2062
if require_versioned:
2063
# -- check all supplied paths are versioned in a search tree. --
2065
for path in specific_files:
2066
path_entries = state._entries_for_path(path)
2067
if not path_entries:
2068
# this specified path is not present at all: error
2069
not_versioned.append(path)
2071
found_versioned = False
2072
# for each id at this path
2073
for entry in path_entries:
2075
for index in indices:
2076
if entry[1][index][0] != 'a': # absent
2077
found_versioned = True
2078
# all good: found a versioned cell
2080
if not found_versioned:
2081
# none of the indexes was not 'absent' at all ids for this
2083
not_versioned.append(path)
2084
if len(not_versioned) > 0:
2085
raise errors.PathsNotVersionedError(not_versioned)
2086
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2087
search_specific_files = osutils.minimum_path_selection(specific_files)
2089
use_filesystem_for_exec = (sys.platform != 'win32')
2090
iter_changes = self.target._iter_changes(include_unchanged,
2091
use_filesystem_for_exec, search_specific_files, state,
2092
source_index, target_index, want_unversioned, self.target)
2093
return iter_changes.iter_changes()
2096
def is_compatible(source, target):
2097
# the target must be a dirstate working tree
2098
if not isinstance(target, DirStateWorkingTree):
2100
# the source must be a revtree or dirstate rev tree.
2101
if not isinstance(source,
2102
(revisiontree.RevisionTree, DirStateRevisionTree)):
2104
# the source revid must be in the target dirstate
2105
if not (source._revision_id == _mod_revision.NULL_REVISION or
2106
source._revision_id in target.get_parent_ids()):
2107
# TODO: what about ghosts? it may well need to
2108
# check for them explicitly.
2112
InterTree.register_optimiser(InterDirStateTree)
2115
class Converter3to4(object):
2116
"""Perform an in-place upgrade of format 3 to format 4 trees."""
2119
self.target_format = WorkingTreeFormat4()
2121
def convert(self, tree):
2122
# lock the control files not the tree, so that we dont get tree
2123
# on-unlock behaviours, and so that noone else diddles with the
2124
# tree during upgrade.
2125
tree._control_files.lock_write()
2127
tree.read_working_inventory()
2128
self.create_dirstate_data(tree)
2129
self.update_format(tree)
2130
self.remove_xml_files(tree)
2132
tree._control_files.unlock()
2134
def create_dirstate_data(self, tree):
2135
"""Create the dirstate based data for tree."""
2136
local_path = tree.bzrdir.get_workingtree_transport(None
2137
).local_abspath('dirstate')
2138
state = dirstate.DirState.from_tree(tree, local_path)
2142
def remove_xml_files(self, tree):
2143
"""Remove the oldformat 3 data."""
2144
transport = tree.bzrdir.get_workingtree_transport(None)
2145
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
2146
'pending-merges', 'stat-cache']:
2148
transport.delete(path)
2149
except errors.NoSuchFile:
2150
# some files are optional - just deal.
2153
def update_format(self, tree):
2154
"""Change the format marker."""
2155
tree._transport.put_bytes('format',
2156
self.target_format.get_format_string(),
2157
mode=tree.bzrdir._get_file_mode())
2160
class Converter4to5(object):
2161
"""Perform an in-place upgrade of format 4 to format 5 trees."""
2164
self.target_format = WorkingTreeFormat5()
2166
def convert(self, tree):
2167
# lock the control files not the tree, so that we don't get tree
2168
# on-unlock behaviours, and so that no-one else diddles with the
2169
# tree during upgrade.
2170
tree._control_files.lock_write()
2172
self.update_format(tree)
2174
tree._control_files.unlock()
2176
def update_format(self, tree):
2177
"""Change the format marker."""
2178
tree._transport.put_bytes('format',
2179
self.target_format.get_format_string(),
2180
mode=tree.bzrdir._get_file_mode())
2183
class Converter4or5to6(object):
2184
"""Perform an in-place upgrade of format 4 or 5 to format 6 trees."""
2187
self.target_format = WorkingTreeFormat6()
2189
def convert(self, tree):
2190
# lock the control files not the tree, so that we don't get tree
2191
# on-unlock behaviours, and so that no-one else diddles with the
2192
# tree during upgrade.
2193
tree._control_files.lock_write()
2195
self.init_custom_control_files(tree)
2196
self.update_format(tree)
2198
tree._control_files.unlock()
2200
def init_custom_control_files(self, tree):
2201
"""Initialize custom control files."""
2202
tree._transport.put_bytes('views', '',
2203
mode=tree.bzrdir._get_file_mode())
2205
def update_format(self, tree):
2206
"""Change the format marker."""
2207
tree._transport.put_bytes('format',
2208
self.target_format.get_format_string(),
2209
mode=tree.bzrdir._get_file_mode())
added
removed
bzrlib/workingtree_4.py
