1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""WorkingTree4 format and implementation.
19
WorkingTree4 provides the dirstate based working tree logic.
21
To get a WorkingTree, call bzrdir.open_workingtree() or
22
WorkingTree.open(dir).
25
from cStringIO import StringIO
29
from bzrlib.lazy_import import lazy_import
30
lazy_import(globals(), """
43
revision as _mod_revision,
53
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
56
import bzrlib.mutabletree
57
from bzrlib.mutabletree import needs_tree_write_lock
58
from bzrlib.osutils import (
65
from bzrlib.trace import mutter
66
from bzrlib.transport.local import LocalTransport
67
from bzrlib.tree import InterTree
68
from bzrlib.tree import Tree
69
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
72
class DirStateWorkingTree(WorkingTree3):
73
def __init__(self, basedir,
78
"""Construct a WorkingTree for basedir.
80
If the branch is not supplied, it is opened automatically.
81
If the branch is supplied, it must be the branch for this basedir.
82
(branch.base is not cross checked, because for remote branches that
83
would be meaningless).
85
self._format = _format
87
basedir = safe_unicode(basedir)
88
mutter("opening working tree %r", basedir)
90
self.basedir = realpath(basedir)
91
# if branch is at our basedir and is a format 6 or less
92
# assume all other formats have their own control files.
93
self._control_files = _control_files
94
self._transport = self._control_files._transport
97
# during a read or write lock these objects are set, and are
98
# None the rest of the time.
100
self._inventory = None
102
self._setup_directory_is_tree_reference()
103
self._detect_case_handling()
104
self._rules_searcher = None
105
self.views = self._make_views()
106
#--- allow tests to select the dirstate iter_changes implementation
107
self._iter_changes = dirstate._process_entry
109
@needs_tree_write_lock
110
def _add(self, files, ids, kinds):
111
"""See MutableTree._add."""
112
state = self.current_dirstate()
113
for f, file_id, kind in zip(files, ids, kinds):
116
# special case tree root handling.
117
if f == '' and self.path2id(f) == ROOT_ID:
118
state.set_path_id('', generate_ids.gen_file_id(f))
121
file_id = generate_ids.gen_file_id(f)
122
# deliberately add the file with no cached stat or sha1
123
# - on the first access it will be gathered, and we can
124
# always change this once tests are all passing.
125
state.add(f, file_id, kind, None, '')
126
self._make_dirty(reset_inventory=True)
128
def _make_dirty(self, reset_inventory):
129
"""Make the tree state dirty.
131
:param reset_inventory: True if the cached inventory should be removed
132
(presuming there is one).
135
if reset_inventory and self._inventory is not None:
136
self._inventory = None
138
@needs_tree_write_lock
139
def add_reference(self, sub_tree):
140
# use standard implementation, which calls back to self._add
142
# So we don't store the reference_revision in the working dirstate,
143
# it's just recorded at the moment of commit.
144
self._add_reference(sub_tree)
146
def break_lock(self):
147
"""Break a lock if one is present from another instance.
149
Uses the ui factory to ask for confirmation if the lock may be from
152
This will probe the repository for its lock as well.
154
# if the dirstate is locked by an active process, reject the break lock
157
if self._dirstate is None:
161
state = self._current_dirstate()
162
if state._lock_token is not None:
163
# we already have it locked. sheese, cant break our own lock.
164
raise errors.LockActive(self.basedir)
167
# try for a write lock - need permission to get one anyhow
170
except errors.LockContention:
171
# oslocks fail when a process is still live: fail.
172
# TODO: get the locked lockdir info and give to the user to
173
# assist in debugging.
174
raise errors.LockActive(self.basedir)
179
self._dirstate = None
180
self._control_files.break_lock()
181
self.branch.break_lock()
183
def _comparison_data(self, entry, path):
184
kind, executable, stat_value = \
185
WorkingTree3._comparison_data(self, entry, path)
186
# it looks like a plain directory, but it's really a reference -- see
188
if (self._repo_supports_tree_reference and kind == 'directory'
189
and entry is not None and entry.kind == 'tree-reference'):
190
kind = 'tree-reference'
191
return kind, executable, stat_value
194
def commit(self, message=None, revprops=None, *args, **kwargs):
195
# mark the tree as dirty post commit - commit
196
# can change the current versioned list by doing deletes.
197
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
198
self._make_dirty(reset_inventory=True)
201
def current_dirstate(self):
202
"""Return the current dirstate object.
204
This is not part of the tree interface and only exposed for ease of
207
:raises errors.NotWriteLocked: when not in a lock.
209
self._must_be_locked()
210
return self._current_dirstate()
212
def _current_dirstate(self):
213
"""Internal function that does not check lock status.
215
This is needed for break_lock which also needs the dirstate.
217
if self._dirstate is not None:
218
return self._dirstate
219
local_path = self.bzrdir.get_workingtree_transport(None
220
).local_abspath('dirstate')
221
self._dirstate = dirstate.DirState.on_file(local_path,
222
self._sha1_provider())
223
return self._dirstate
225
def _sha1_provider(self):
226
"""A function that returns a SHA1Provider suitable for this tree.
228
:return: None if content filtering is not supported by this tree.
229
Otherwise, a SHA1Provider is returned that sha's the canonical
230
form of files, i.e. after read filters are applied.
232
if self.supports_content_filtering():
233
return ContentFilterAwareSHA1Provider(self)
237
def filter_unversioned_files(self, paths):
238
"""Filter out paths that are versioned.
240
:return: set of paths.
242
# TODO: make a generic multi-bisect routine roughly that should list
243
# the paths, then process one half at a time recursively, and feed the
244
# results of each bisect in further still
245
paths = sorted(paths)
247
state = self.current_dirstate()
248
# TODO we want a paths_to_dirblocks helper I think
250
dirname, basename = os.path.split(path.encode('utf8'))
251
_, _, _, path_is_versioned = state._get_block_entry_index(
252
dirname, basename, 0)
253
if not path_is_versioned:
258
"""Write all cached data to disk."""
259
if self._control_files._lock_mode != 'w':
260
raise errors.NotWriteLocked(self)
261
self.current_dirstate().save()
262
self._inventory = None
265
@needs_tree_write_lock
266
def _gather_kinds(self, files, kinds):
267
"""See MutableTree._gather_kinds."""
268
for pos, f in enumerate(files):
269
if kinds[pos] is None:
270
kinds[pos] = self._kind(f)
272
def _generate_inventory(self):
273
"""Create and set self.inventory from the dirstate object.
275
This is relatively expensive: we have to walk the entire dirstate.
276
Ideally we would not, and can deprecate this function.
278
#: uncomment to trap on inventory requests.
279
# import pdb;pdb.set_trace()
280
state = self.current_dirstate()
281
state._read_dirblocks_if_needed()
282
root_key, current_entry = self._get_entry(path='')
283
current_id = root_key[2]
284
if not (current_entry[0][0] == 'd'): # directory
285
raise AssertionError(current_entry)
286
inv = Inventory(root_id=current_id)
287
# Turn some things into local variables
288
minikind_to_kind = dirstate.DirState._minikind_to_kind
289
factory = entry_factory
290
utf8_decode = cache_utf8._utf8_decode
292
# we could do this straight out of the dirstate; it might be fast
293
# and should be profiled - RBC 20070216
294
parent_ies = {'' : inv.root}
295
for block in state._dirblocks[1:]: # skip the root
298
parent_ie = parent_ies[dirname]
300
# all the paths in this block are not versioned in this tree
302
for key, entry in block[1]:
303
minikind, link_or_sha1, size, executable, stat = entry[0]
304
if minikind in ('a', 'r'): # absent, relocated
305
# a parent tree only entry
308
name_unicode = utf8_decode(name)[0]
310
kind = minikind_to_kind[minikind]
311
inv_entry = factory[kind](file_id, name_unicode,
314
# This is only needed on win32, where this is the only way
315
# we know the executable bit.
316
inv_entry.executable = executable
317
# not strictly needed: working tree
318
#inv_entry.text_size = size
319
#inv_entry.text_sha1 = sha1
320
elif kind == 'directory':
321
# add this entry to the parent map.
322
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
323
elif kind == 'tree-reference':
324
if not self._repo_supports_tree_reference:
325
raise errors.UnsupportedOperation(
326
self._generate_inventory,
327
self.branch.repository)
328
inv_entry.reference_revision = link_or_sha1 or None
329
elif kind != 'symlink':
330
raise AssertionError("unknown kind %r" % kind)
331
# These checks cost us around 40ms on a 55k entry tree
332
if file_id in inv_byid:
333
raise AssertionError('file_id %s already in'
334
' inventory as %s' % (file_id, inv_byid[file_id]))
335
if name_unicode in parent_ie.children:
336
raise AssertionError('name %r already in parent'
338
inv_byid[file_id] = inv_entry
339
parent_ie.children[name_unicode] = inv_entry
340
self._inventory = inv
342
def _get_entry(self, file_id=None, path=None):
343
"""Get the dirstate row for file_id or path.
345
If either file_id or path is supplied, it is used as the key to lookup.
346
If both are supplied, the fastest lookup is used, and an error is
347
raised if they do not both point at the same row.
349
:param file_id: An optional unicode file_id to be looked up.
350
:param path: An optional unicode path to be looked up.
351
:return: The dirstate row tuple for path/file_id, or (None, None)
353
if file_id is None and path is None:
354
raise errors.BzrError('must supply file_id or path')
355
state = self.current_dirstate()
357
path = path.encode('utf8')
358
return state._get_entry(0, fileid_utf8=file_id, path_utf8=path)
360
def get_file_sha1(self, file_id, path=None, stat_value=None):
361
# check file id is valid unconditionally.
362
entry = self._get_entry(file_id=file_id, path=path)
364
raise errors.NoSuchId(self, file_id)
366
path = pathjoin(entry[0][0], entry[0][1]).decode('utf8')
368
file_abspath = self.abspath(path)
369
state = self.current_dirstate()
370
if stat_value is None:
372
stat_value = os.lstat(file_abspath)
374
if e.errno == errno.ENOENT:
378
link_or_sha1 = dirstate.update_entry(state, entry, file_abspath,
379
stat_value=stat_value)
380
if entry[1][0][0] == 'f':
381
if link_or_sha1 is None:
382
file_obj, statvalue = self.get_file_with_stat(file_id, path)
384
sha1 = osutils.sha_file(file_obj)
387
self._observed_sha1(file_id, path, (sha1, statvalue))
393
def _get_inventory(self):
394
"""Get the inventory for the tree. This is only valid within a lock."""
395
if 'evil' in debug.debug_flags:
396
trace.mutter_callsite(2,
397
"accessing .inventory forces a size of tree translation.")
398
if self._inventory is not None:
399
return self._inventory
400
self._must_be_locked()
401
self._generate_inventory()
402
return self._inventory
404
inventory = property(_get_inventory,
405
doc="Inventory of this Tree")
408
def get_parent_ids(self):
409
"""See Tree.get_parent_ids.
411
This implementation requests the ids list from the dirstate file.
413
return self.current_dirstate().get_parent_ids()
415
def get_reference_revision(self, file_id, path=None):
416
# referenced tree's revision is whatever's currently there
417
return self.get_nested_tree(file_id, path).last_revision()
419
def get_nested_tree(self, file_id, path=None):
421
path = self.id2path(file_id)
422
# else: check file_id is at path?
423
return WorkingTree.open(self.abspath(path))
426
def get_root_id(self):
427
"""Return the id of this trees root"""
428
return self._get_entry(path='')[0][2]
430
def has_id(self, file_id):
431
state = self.current_dirstate()
432
row, parents = self._get_entry(file_id=file_id)
435
return osutils.lexists(pathjoin(
436
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
439
def id2path(self, file_id):
440
"Convert a file-id to a path."
441
state = self.current_dirstate()
442
entry = self._get_entry(file_id=file_id)
443
if entry == (None, None):
444
raise errors.NoSuchId(tree=self, file_id=file_id)
445
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
446
return path_utf8.decode('utf8')
448
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
449
entry = self._get_entry(path=path)
450
if entry == (None, None):
451
return False # Missing entries are not executable
452
return entry[1][0][3] # Executable?
454
if not osutils.supports_executable():
455
def is_executable(self, file_id, path=None):
456
"""Test if a file is executable or not.
458
Note: The caller is expected to take a read-lock before calling this.
460
entry = self._get_entry(file_id=file_id, path=path)
461
if entry == (None, None):
463
return entry[1][0][3]
465
_is_executable_from_path_and_stat = \
466
_is_executable_from_path_and_stat_from_basis
468
def is_executable(self, file_id, path=None):
469
"""Test if a file is executable or not.
471
Note: The caller is expected to take a read-lock before calling this.
473
self._must_be_locked()
475
path = self.id2path(file_id)
476
mode = os.lstat(self.abspath(path)).st_mode
477
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
479
def all_file_ids(self):
480
"""See Tree.iter_all_file_ids"""
481
self._must_be_locked()
483
for key, tree_details in self.current_dirstate()._iter_entries():
484
if tree_details[0][0] in ('a', 'r'): # relocated
491
"""Iterate through file_ids for this tree.
493
file_ids are in a WorkingTree if they are in the working inventory
494
and the working file exists.
497
for key, tree_details in self.current_dirstate()._iter_entries():
498
if tree_details[0][0] in ('a', 'r'): # absent, relocated
499
# not relevant to the working tree
501
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
502
if osutils.lexists(path):
503
result.append(key[2])
506
def iter_references(self):
507
if not self._repo_supports_tree_reference:
508
# When the repo doesn't support references, we will have nothing to
511
for key, tree_details in self.current_dirstate()._iter_entries():
512
if tree_details[0][0] in ('a', 'r'): # absent, relocated
513
# not relevant to the working tree
516
# the root is not a reference.
518
relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
520
if self._kind(relpath) == 'tree-reference':
521
yield relpath, key[2]
522
except errors.NoSuchFile:
523
# path is missing on disk.
526
def _observed_sha1(self, file_id, path, (sha1, statvalue)):
527
"""See MutableTree._observed_sha1."""
528
state = self.current_dirstate()
529
entry = self._get_entry(file_id=file_id, path=path)
530
state._observed_sha1(entry, sha1, statvalue)
532
def kind(self, file_id):
533
"""Return the kind of a file.
535
This is always the actual kind that's on disk, regardless of what it
538
Note: The caller is expected to take a read-lock before calling this.
540
relpath = self.id2path(file_id)
542
raise AssertionError(
543
"path for id {%s} is None!" % file_id)
544
return self._kind(relpath)
546
def _kind(self, relpath):
547
abspath = self.abspath(relpath)
548
kind = file_kind(abspath)
549
if (self._repo_supports_tree_reference and kind == 'directory'):
550
entry = self._get_entry(path=relpath)
551
if entry[1] is not None:
552
if entry[1][0][0] == 't':
553
kind = 'tree-reference'
557
def _last_revision(self):
558
"""See Mutable.last_revision."""
559
parent_ids = self.current_dirstate().get_parent_ids()
563
return _mod_revision.NULL_REVISION
566
"""See Branch.lock_read, and WorkingTree.unlock."""
567
self.branch.lock_read()
569
self._control_files.lock_read()
571
state = self.current_dirstate()
572
if not state._lock_token:
574
# set our support for tree references from the repository in
576
self._repo_supports_tree_reference = getattr(
577
self.branch.repository._format, "supports_tree_reference",
580
self._control_files.unlock()
586
def _lock_self_write(self):
587
"""This should be called after the branch is locked."""
589
self._control_files.lock_write()
591
state = self.current_dirstate()
592
if not state._lock_token:
594
# set our support for tree references from the repository in
596
self._repo_supports_tree_reference = getattr(
597
self.branch.repository._format, "supports_tree_reference",
600
self._control_files.unlock()
606
def lock_tree_write(self):
607
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
608
self.branch.lock_read()
609
self._lock_self_write()
611
def lock_write(self):
612
"""See MutableTree.lock_write, and WorkingTree.unlock."""
613
self.branch.lock_write()
614
self._lock_self_write()
616
@needs_tree_write_lock
617
def move(self, from_paths, to_dir, after=False):
618
"""See WorkingTree.move()."""
622
state = self.current_dirstate()
623
if isinstance(from_paths, basestring):
625
to_dir_utf8 = to_dir.encode('utf8')
626
to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
627
id_index = state._get_id_index()
628
# check destination directory
629
# get the details for it
630
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
631
state._get_block_entry_index(to_entry_dirname, to_basename, 0)
632
if not entry_present:
633
raise errors.BzrMoveFailedError('', to_dir,
634
errors.NotVersionedError(to_dir))
635
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
636
# get a handle on the block itself.
637
to_block_index = state._ensure_block(
638
to_entry_block_index, to_entry_entry_index, to_dir_utf8)
639
to_block = state._dirblocks[to_block_index]
640
to_abs = self.abspath(to_dir)
641
if not isdir(to_abs):
642
raise errors.BzrMoveFailedError('',to_dir,
643
errors.NotADirectory(to_abs))
645
if to_entry[1][0][0] != 'd':
646
raise errors.BzrMoveFailedError('',to_dir,
647
errors.NotADirectory(to_abs))
649
if self._inventory is not None:
650
update_inventory = True
652
to_dir_id = to_entry[0][2]
653
to_dir_ie = inv[to_dir_id]
655
update_inventory = False
658
def move_one(old_entry, from_path_utf8, minikind, executable,
659
fingerprint, packed_stat, size,
660
to_block, to_key, to_path_utf8):
661
state._make_absent(old_entry)
662
from_key = old_entry[0]
664
lambda:state.update_minimal(from_key,
666
executable=executable,
667
fingerprint=fingerprint,
668
packed_stat=packed_stat,
670
path_utf8=from_path_utf8))
671
state.update_minimal(to_key,
673
executable=executable,
674
fingerprint=fingerprint,
675
packed_stat=packed_stat,
677
path_utf8=to_path_utf8)
678
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
679
new_entry = to_block[1][added_entry_index]
680
rollbacks.append(lambda:state._make_absent(new_entry))
682
for from_rel in from_paths:
683
# from_rel is 'pathinroot/foo/bar'
684
from_rel_utf8 = from_rel.encode('utf8')
685
from_dirname, from_tail = osutils.split(from_rel)
686
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
687
from_entry = self._get_entry(path=from_rel)
688
if from_entry == (None, None):
689
raise errors.BzrMoveFailedError(from_rel,to_dir,
690
errors.NotVersionedError(path=from_rel))
692
from_id = from_entry[0][2]
693
to_rel = pathjoin(to_dir, from_tail)
694
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
695
item_to_entry = self._get_entry(path=to_rel)
696
if item_to_entry != (None, None):
697
raise errors.BzrMoveFailedError(from_rel, to_rel,
698
"Target is already versioned.")
700
if from_rel == to_rel:
701
raise errors.BzrMoveFailedError(from_rel, to_rel,
702
"Source and target are identical.")
704
from_missing = not self.has_filename(from_rel)
705
to_missing = not self.has_filename(to_rel)
712
raise errors.BzrMoveFailedError(from_rel, to_rel,
713
errors.NoSuchFile(path=to_rel,
714
extra="New file has not been created yet"))
716
# neither path exists
717
raise errors.BzrRenameFailedError(from_rel, to_rel,
718
errors.PathsDoNotExist(paths=(from_rel, to_rel)))
720
if from_missing: # implicitly just update our path mapping
723
raise errors.RenameFailedFilesExist(from_rel, to_rel)
726
def rollback_rename():
727
"""A single rename has failed, roll it back."""
728
# roll back everything, even if we encounter trouble doing one
731
# TODO: at least log the other exceptions rather than just
732
# losing them mbp 20070307
734
for rollback in reversed(rollbacks):
738
exc_info = sys.exc_info()
740
raise exc_info[0], exc_info[1], exc_info[2]
742
# perform the disk move first - its the most likely failure point.
744
from_rel_abs = self.abspath(from_rel)
745
to_rel_abs = self.abspath(to_rel)
747
osutils.rename(from_rel_abs, to_rel_abs)
749
raise errors.BzrMoveFailedError(from_rel, to_rel, e[1])
750
rollbacks.append(lambda: osutils.rename(to_rel_abs, from_rel_abs))
752
# perform the rename in the inventory next if needed: its easy
756
from_entry = inv[from_id]
757
current_parent = from_entry.parent_id
758
inv.rename(from_id, to_dir_id, from_tail)
760
lambda: inv.rename(from_id, current_parent, from_tail))
761
# finally do the rename in the dirstate, which is a little
762
# tricky to rollback, but least likely to need it.
763
old_block_index, old_entry_index, dir_present, file_present = \
764
state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
765
old_block = state._dirblocks[old_block_index][1]
766
old_entry = old_block[old_entry_index]
767
from_key, old_entry_details = old_entry
768
cur_details = old_entry_details[0]
770
to_key = ((to_block[0],) + from_key[1:3])
771
minikind = cur_details[0]
772
move_one(old_entry, from_path_utf8=from_rel_utf8,
774
executable=cur_details[3],
775
fingerprint=cur_details[1],
776
packed_stat=cur_details[4],
780
to_path_utf8=to_rel_utf8)
783
def update_dirblock(from_dir, to_key, to_dir_utf8):
784
"""Recursively update all entries in this dirblock."""
786
raise AssertionError("renaming root not supported")
787
from_key = (from_dir, '')
788
from_block_idx, present = \
789
state._find_block_index_from_key(from_key)
791
# This is the old record, if it isn't present, then
792
# there is theoretically nothing to update.
793
# (Unless it isn't present because of lazy loading,
794
# but we don't do that yet)
796
from_block = state._dirblocks[from_block_idx]
797
to_block_index, to_entry_index, _, _ = \
798
state._get_block_entry_index(to_key[0], to_key[1], 0)
799
to_block_index = state._ensure_block(
800
to_block_index, to_entry_index, to_dir_utf8)
801
to_block = state._dirblocks[to_block_index]
803
# Grab a copy since move_one may update the list.
804
for entry in from_block[1][:]:
805
if not (entry[0][0] == from_dir):
806
raise AssertionError()
807
cur_details = entry[1][0]
808
to_key = (to_dir_utf8, entry[0][1], entry[0][2])
809
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
810
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
811
minikind = cur_details[0]
813
# Deleted children of a renamed directory
814
# Do not need to be updated.
815
# Children that have been renamed out of this
816
# directory should also not be updated
818
move_one(entry, from_path_utf8=from_path_utf8,
820
executable=cur_details[3],
821
fingerprint=cur_details[1],
822
packed_stat=cur_details[4],
826
to_path_utf8=to_path_utf8)
828
# We need to move all the children of this
830
update_dirblock(from_path_utf8, to_key,
832
update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
836
result.append((from_rel, to_rel))
837
state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
838
self._make_dirty(reset_inventory=False)
842
def _must_be_locked(self):
843
if not self._control_files._lock_count:
844
raise errors.ObjectNotLocked(self)
847
"""Initialize the state in this tree to be a new tree."""
851
def path2id(self, path):
852
"""Return the id for path in this tree."""
853
path = path.strip('/')
854
entry = self._get_entry(path=path)
855
if entry == (None, None):
859
def paths2ids(self, paths, trees=[], require_versioned=True):
860
"""See Tree.paths2ids().
862
This specialisation fast-paths the case where all the trees are in the
867
parents = self.get_parent_ids()
869
if not (isinstance(tree, DirStateRevisionTree) and tree._revision_id in
871
return super(DirStateWorkingTree, self).paths2ids(paths,
872
trees, require_versioned)
873
search_indexes = [0] + [1 + parents.index(tree._revision_id) for tree in trees]
874
# -- make all paths utf8 --
877
paths_utf8.add(path.encode('utf8'))
879
# -- paths is now a utf8 path set --
880
# -- get the state object and prepare it.
881
state = self.current_dirstate()
882
if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY
883
and '' not in paths):
884
paths2ids = self._paths2ids_using_bisect
886
paths2ids = self._paths2ids_in_memory
887
return paths2ids(paths, search_indexes,
888
require_versioned=require_versioned)
890
def _paths2ids_in_memory(self, paths, search_indexes,
891
require_versioned=True):
892
state = self.current_dirstate()
893
state._read_dirblocks_if_needed()
894
def _entries_for_path(path):
895
"""Return a list with all the entries that match path for all ids.
897
dirname, basename = os.path.split(path)
898
key = (dirname, basename, '')
899
block_index, present = state._find_block_index_from_key(key)
901
# the block which should contain path is absent.
904
block = state._dirblocks[block_index][1]
905
entry_index, _ = state._find_entry_index(key, block)
906
# we may need to look at multiple entries at this path: walk while the paths match.
907
while (entry_index < len(block) and
908
block[entry_index][0][0:2] == key[0:2]):
909
result.append(block[entry_index])
912
if require_versioned:
913
# -- check all supplied paths are versioned in a search tree. --
916
path_entries = _entries_for_path(path)
918
# this specified path is not present at all: error
919
all_versioned = False
921
found_versioned = False
922
# for each id at this path
923
for entry in path_entries:
925
for index in search_indexes:
926
if entry[1][index][0] != 'a': # absent
927
found_versioned = True
928
# all good: found a versioned cell
930
if not found_versioned:
931
# none of the indexes was not 'absent' at all ids for this
933
all_versioned = False
935
if not all_versioned:
936
raise errors.PathsNotVersionedError(paths)
937
# -- remove redundancy in supplied paths to prevent over-scanning --
938
search_paths = osutils.minimum_path_selection(paths)
940
# for all search_indexs in each path at or under each element of
941
# search_paths, if the detail is relocated: add the id, and add the
942
# relocated path as one to search if its not searched already. If the
943
# detail is not relocated, add the id.
944
searched_paths = set()
946
def _process_entry(entry):
947
"""Look at search_indexes within entry.
949
If a specific tree's details are relocated, add the relocation
950
target to search_paths if not searched already. If it is absent, do
951
nothing. Otherwise add the id to found_ids.
953
for index in search_indexes:
954
if entry[1][index][0] == 'r': # relocated
955
if not osutils.is_inside_any(searched_paths, entry[1][index][1]):
956
search_paths.add(entry[1][index][1])
957
elif entry[1][index][0] != 'a': # absent
958
found_ids.add(entry[0][2])
960
current_root = search_paths.pop()
961
searched_paths.add(current_root)
962
# process the entries for this containing directory: the rest will be
963
# found by their parents recursively.
964
root_entries = _entries_for_path(current_root)
966
# this specified path is not present at all, skip it.
968
for entry in root_entries:
969
_process_entry(entry)
970
initial_key = (current_root, '', '')
971
block_index, _ = state._find_block_index_from_key(initial_key)
972
while (block_index < len(state._dirblocks) and
973
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
974
for entry in state._dirblocks[block_index][1]:
975
_process_entry(entry)
979
def _paths2ids_using_bisect(self, paths, search_indexes,
980
require_versioned=True):
981
state = self.current_dirstate()
984
split_paths = sorted(osutils.split(p) for p in paths)
985
found = state._bisect_recursive(split_paths)
987
if require_versioned:
988
found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
989
for dir_name in split_paths:
990
if dir_name not in found_dir_names:
991
raise errors.PathsNotVersionedError(paths)
993
for dir_name_id, trees_info in found.iteritems():
994
for index in search_indexes:
995
if trees_info[index][0] not in ('r', 'a'):
996
found_ids.add(dir_name_id[2])
999
def read_working_inventory(self):
1000
"""Read the working inventory.
1002
This is a meaningless operation for dirstate, but we obey it anyhow.
1004
return self.inventory
1007
def revision_tree(self, revision_id):
1008
"""See Tree.revision_tree.
1010
WorkingTree4 supplies revision_trees for any basis tree.
1012
dirstate = self.current_dirstate()
1013
parent_ids = dirstate.get_parent_ids()
1014
if revision_id not in parent_ids:
1015
raise errors.NoSuchRevisionInTree(self, revision_id)
1016
if revision_id in dirstate.get_ghosts():
1017
raise errors.NoSuchRevisionInTree(self, revision_id)
1018
return DirStateRevisionTree(dirstate, revision_id,
1019
self.branch.repository)
1021
@needs_tree_write_lock
1022
def set_last_revision(self, new_revision):
1023
"""Change the last revision in the working tree."""
1024
parents = self.get_parent_ids()
1025
if new_revision in (_mod_revision.NULL_REVISION, None):
1026
if len(parents) >= 2:
1027
raise AssertionError(
1028
"setting the last parent to none with a pending merge is "
1030
self.set_parent_ids([])
1032
self.set_parent_ids([new_revision] + parents[1:],
1033
allow_leftmost_as_ghost=True)
1035
@needs_tree_write_lock
1036
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1037
"""Set the parent ids to revision_ids.
1039
See also set_parent_trees. This api will try to retrieve the tree data
1040
for each element of revision_ids from the trees repository. If you have
1041
tree data already available, it is more efficient to use
1042
set_parent_trees rather than set_parent_ids. set_parent_ids is however
1043
an easier API to use.
1045
:param revision_ids: The revision_ids to set as the parent ids of this
1046
working tree. Any of these may be ghosts.
1049
for revision_id in revision_ids:
1051
revtree = self.branch.repository.revision_tree(revision_id)
1052
# TODO: jam 20070213 KnitVersionedFile raises
1053
# RevisionNotPresent rather than NoSuchRevision if a
1054
# given revision_id is not present. Should Repository be
1055
# catching it and re-raising NoSuchRevision?
1056
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1058
trees.append((revision_id, revtree))
1059
self.set_parent_trees(trees,
1060
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1062
@needs_tree_write_lock
1063
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1064
"""Set the parents of the working tree.
1066
:param parents_list: A list of (revision_id, tree) tuples.
1067
If tree is None, then that element is treated as an unreachable
1068
parent tree - i.e. a ghost.
1070
dirstate = self.current_dirstate()
1071
if len(parents_list) > 0:
1072
if not allow_leftmost_as_ghost and parents_list[0][1] is None:
1073
raise errors.GhostRevisionUnusableHere(parents_list[0][0])
1077
parent_ids = [rev_id for rev_id, tree in parents_list]
1078
graph = self.branch.repository.get_graph()
1079
heads = graph.heads(parent_ids)
1080
accepted_revisions = set()
1082
# convert absent trees to the null tree, which we convert back to
1083
# missing on access.
1084
for rev_id, tree in parents_list:
1085
if len(accepted_revisions) > 0:
1086
# we always accept the first tree
1087
if rev_id in accepted_revisions or rev_id not in heads:
1088
# We have already included either this tree, or its
1089
# descendent, so we skip it.
1091
_mod_revision.check_not_reserved_id(rev_id)
1092
if tree is not None:
1093
real_trees.append((rev_id, tree))
1095
real_trees.append((rev_id,
1096
self.branch.repository.revision_tree(
1097
_mod_revision.NULL_REVISION)))
1098
ghosts.append(rev_id)
1099
accepted_revisions.add(rev_id)
1100
dirstate.set_parent_trees(real_trees, ghosts=ghosts)
1101
self._make_dirty(reset_inventory=False)
1103
def _set_root_id(self, file_id):
1104
"""See WorkingTree.set_root_id."""
1105
state = self.current_dirstate()
1106
state.set_path_id('', file_id)
1107
if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
1108
self._make_dirty(reset_inventory=True)
1110
def _sha_from_stat(self, path, stat_result):
1111
"""Get a sha digest from the tree's stat cache.
1113
The default implementation assumes no stat cache is present.
1115
:param path: The path.
1116
:param stat_result: The stat result being looked up.
1118
return self.current_dirstate().sha1_from_stat(path, stat_result)
1121
def supports_tree_reference(self):
1122
return self._repo_supports_tree_reference
1125
"""Unlock in format 4 trees needs to write the entire dirstate."""
1126
# do non-implementation specific cleanup
1129
if self._control_files._lock_count == 1:
1130
# eventually we should do signature checking during read locks for
1132
if self._control_files._lock_mode == 'w':
1135
if self._dirstate is not None:
1136
# This is a no-op if there are no modifications.
1137
self._dirstate.save()
1138
self._dirstate.unlock()
1139
# TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
1140
# point. Instead, it could check if the header has been
1141
# modified when it is locked, and if not, it can hang on to
1142
# the data it has in memory.
1143
self._dirstate = None
1144
self._inventory = None
1145
# reverse order of locking.
1147
return self._control_files.unlock()
1149
self.branch.unlock()
1151
@needs_tree_write_lock
1152
def unversion(self, file_ids):
1153
"""Remove the file ids in file_ids from the current versioned set.
1155
When a file_id is unversioned, all of its children are automatically
1158
:param file_ids: The file ids to stop versioning.
1159
:raises: NoSuchId if any fileid is not currently versioned.
1163
state = self.current_dirstate()
1164
state._read_dirblocks_if_needed()
1165
ids_to_unversion = set(file_ids)
1166
paths_to_unversion = set()
1168
# check if the root is to be unversioned, if so, assert for now.
1169
# walk the state marking unversioned things as absent.
1170
# if there are any un-unversioned ids at the end, raise
1171
for key, details in state._dirblocks[0][1]:
1172
if (details[0][0] not in ('a', 'r') and # absent or relocated
1173
key[2] in ids_to_unversion):
1174
# I haven't written the code to unversion / yet - it should be
1176
raise errors.BzrError('Unversioning the / is not currently supported')
1178
while block_index < len(state._dirblocks):
1179
# process one directory at a time.
1180
block = state._dirblocks[block_index]
1181
# first check: is the path one to remove - it or its children
1182
delete_block = False
1183
for path in paths_to_unversion:
1184
if (block[0].startswith(path) and
1185
(len(block[0]) == len(path) or
1186
block[0][len(path)] == '/')):
1187
# this entire block should be deleted - its the block for a
1188
# path to unversion; or the child of one
1191
# TODO: trim paths_to_unversion as we pass by paths
1193
# this block is to be deleted: process it.
1194
# TODO: we can special case the no-parents case and
1195
# just forget the whole block.
1197
while entry_index < len(block[1]):
1198
entry = block[1][entry_index]
1199
if entry[1][0][0] in 'ar':
1200
# don't remove absent or renamed entries
1203
# Mark this file id as having been removed
1204
ids_to_unversion.discard(entry[0][2])
1205
if not state._make_absent(entry):
1206
# The block has not shrunk.
1208
# go to the next block. (At the moment we dont delete empty
1213
while entry_index < len(block[1]):
1214
entry = block[1][entry_index]
1215
if (entry[1][0][0] in ('a', 'r') or # absent, relocated
1216
# ^ some parent row.
1217
entry[0][2] not in ids_to_unversion):
1218
# ^ not an id to unversion
1221
if entry[1][0][0] == 'd':
1222
paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))
1223
if not state._make_absent(entry):
1225
# we have unversioned this id
1226
ids_to_unversion.remove(entry[0][2])
1228
if ids_to_unversion:
1229
raise errors.NoSuchId(self, iter(ids_to_unversion).next())
1230
self._make_dirty(reset_inventory=False)
1231
# have to change the legacy inventory too.
1232
if self._inventory is not None:
1233
for file_id in file_ids:
1234
self._inventory.remove_recursive_id(file_id)
1236
@needs_tree_write_lock
1237
def rename_one(self, from_rel, to_rel, after=False):
1238
"""See WorkingTree.rename_one"""
1240
WorkingTree.rename_one(self, from_rel, to_rel, after)
1242
@needs_tree_write_lock
1243
def apply_inventory_delta(self, changes):
1244
"""See MutableTree.apply_inventory_delta"""
1245
state = self.current_dirstate()
1246
state.update_by_delta(changes)
1247
self._make_dirty(reset_inventory=True)
1249
def update_basis_by_delta(self, new_revid, delta):
1250
"""See MutableTree.update_basis_by_delta."""
1251
if self.last_revision() == new_revid:
1252
raise AssertionError()
1253
self.current_dirstate().update_basis_by_delta(delta, new_revid)
1256
def _validate(self):
1257
self._dirstate._validate()
1259
@needs_tree_write_lock
1260
def _write_inventory(self, inv):
1261
"""Write inventory as the current inventory."""
1263
raise AssertionError("attempting to write an inventory when the "
1264
"dirstate is dirty will lose pending changes")
1265
self.current_dirstate().set_state_from_inventory(inv)
1266
self._make_dirty(reset_inventory=False)
1267
if self._inventory is not None:
1268
self._inventory = inv
1272
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1274
def __init__(self, tree):
1277
def sha1(self, abspath):
1278
"""See dirstate.SHA1Provider.sha1()."""
1279
filters = self.tree._content_filter_stack(
1280
self.tree.relpath(osutils.safe_unicode(abspath)))
1281
return internal_size_sha_file_byname(abspath, filters)[1]
1283
def stat_and_sha1(self, abspath):
1284
"""See dirstate.SHA1Provider.stat_and_sha1()."""
1285
filters = self.tree._content_filter_stack(
1286
self.tree.relpath(osutils.safe_unicode(abspath)))
1287
file_obj = file(abspath, 'rb', 65000)
1289
statvalue = os.fstat(file_obj.fileno())
1291
file_obj = filtered_input_file(file_obj, filters)
1292
sha1 = osutils.size_sha_file(file_obj)[1]
1295
return statvalue, sha1
1298
class WorkingTree4(DirStateWorkingTree):
1299
"""This is the Format 4 working tree.
1301
This differs from WorkingTree3 by:
1302
- Having a consolidated internal dirstate, stored in a
1303
randomly-accessible sorted file on disk.
1304
- Not having a regular inventory attribute. One can be synthesized
1305
on demand but this is expensive and should be avoided.
1307
This is new in bzr 0.15.
1311
class WorkingTree5(DirStateWorkingTree):
1312
"""This is the Format 5 working tree.
1314
This differs from WorkingTree4 by:
1315
- Supporting content filtering.
1317
This is new in bzr 1.11.
1321
class WorkingTree6(DirStateWorkingTree):
1322
"""This is the Format 6 working tree.
1324
This differs from WorkingTree5 by:
1325
- Supporting a current view that may mask the set of files in a tree
1326
impacted by most user operations.
1328
This is new in bzr 1.14.
1331
def _make_views(self):
1332
return views.PathBasedViews(self)
1335
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
1336
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1337
accelerator_tree=None, hardlink=False):
1338
"""See WorkingTreeFormat.initialize().
1340
:param revision_id: allows creating a working tree at a different
1341
revision than the branch is at.
1342
:param accelerator_tree: A tree which can be used for retrieving file
1343
contents more quickly than the revision tree, i.e. a workingtree.
1344
The revision tree will be used for cases where accelerator_tree's
1345
content is different.
1346
:param hardlink: If true, hard-link files from accelerator_tree,
1349
These trees get an initial random root id, if their repository supports
1350
rich root data, TREE_ROOT otherwise.
1352
if not isinstance(a_bzrdir.transport, LocalTransport):
1353
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1354
transport = a_bzrdir.get_workingtree_transport(self)
1355
control_files = self._open_control_files(a_bzrdir)
1356
control_files.create_lock()
1357
control_files.lock_write()
1358
transport.put_bytes('format', self.get_format_string(),
1359
mode=a_bzrdir._get_file_mode())
1360
if from_branch is not None:
1361
branch = from_branch
1363
branch = a_bzrdir.open_branch()
1364
if revision_id is None:
1365
revision_id = branch.last_revision()
1366
local_path = transport.local_abspath('dirstate')
1367
# write out new dirstate (must exist when we create the tree)
1368
state = dirstate.DirState.initialize(local_path)
1371
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1375
_control_files=control_files)
1377
wt.lock_tree_write()
1379
self._init_custom_control_files(wt)
1380
if revision_id in (None, _mod_revision.NULL_REVISION):
1381
if branch.repository.supports_rich_root():
1382
wt._set_root_id(generate_ids.gen_root_id())
1384
wt._set_root_id(ROOT_ID)
1387
# frequently, we will get here due to branching. The accelerator
1388
# tree will be the tree from the branch, so the desired basis
1389
# tree will often be a parent of the accelerator tree.
1390
if accelerator_tree is not None:
1392
basis = accelerator_tree.revision_tree(revision_id)
1393
except errors.NoSuchRevision:
1396
basis = branch.repository.revision_tree(revision_id)
1397
if revision_id == _mod_revision.NULL_REVISION:
1400
parents_list = [(revision_id, basis)]
1403
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1405
# if the basis has a root id we have to use that; otherwise we
1406
# use a new random one
1407
basis_root_id = basis.get_root_id()
1408
if basis_root_id is not None:
1409
wt._set_root_id(basis_root_id)
1411
# If content filtering is supported, do not use the accelerator
1412
# tree - the cost of transforming the content both ways and
1413
# checking for changed content can outweight the gains it gives.
1414
# Note: do NOT move this logic up higher - using the basis from
1415
# the accelerator tree is still desirable because that can save
1416
# a minute or more of processing on large trees!
1417
# The original tree may not have the same content filters
1418
# applied so we can't safely build the inventory delta from
1420
if wt.supports_content_filtering():
1421
accelerator_tree = None
1422
delta_from_tree = False
1424
delta_from_tree = True
1425
# delta_from_tree is safe even for DirStateRevisionTrees,
1426
# because wt4.apply_inventory_delta does not mutate the input
1427
# inventory entries.
1428
transform.build_tree(basis, wt, accelerator_tree,
1430
delta_from_tree=delta_from_tree)
1434
control_files.unlock()
1438
def _init_custom_control_files(self, wt):
1439
"""Subclasses with custom control files should override this method.
1441
The working tree and control files are locked for writing when this
1444
:param wt: the WorkingTree object
1447
def _open(self, a_bzrdir, control_files):
1448
"""Open the tree itself.
1450
:param a_bzrdir: the dir for the tree.
1451
:param control_files: the control files for the tree.
1453
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1454
branch=a_bzrdir.open_branch(),
1457
_control_files=control_files)
1459
def __get_matchingbzrdir(self):
1460
return self._get_matchingbzrdir()
1462
def _get_matchingbzrdir(self):
1463
"""Overrideable method to get a bzrdir for testing."""
1464
# please test against something that will let us do tree references
1465
return bzrdir.format_registry.make_bzrdir(
1466
'dirstate-with-subtree')
1468
_matchingbzrdir = property(__get_matchingbzrdir)
1471
class WorkingTreeFormat4(DirStateWorkingTreeFormat):
1472
"""The first consolidated dirstate working tree format.
1475
- exists within a metadir controlling .bzr
1476
- includes an explicit version marker for the workingtree control
1477
files, separate from the BzrDir format
1478
- modifies the hash cache format
1479
- is new in bzr 0.15
1480
- uses a LockDir to guard access to it.
1483
upgrade_recommended = False
1485
_tree_class = WorkingTree4
1487
def get_format_string(self):
1488
"""See WorkingTreeFormat.get_format_string()."""
1489
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1491
def get_format_description(self):
1492
"""See WorkingTreeFormat.get_format_description()."""
1493
return "Working tree format 4"
1496
class WorkingTreeFormat5(DirStateWorkingTreeFormat):
1497
"""WorkingTree format supporting content filtering.
1500
upgrade_recommended = False
1502
_tree_class = WorkingTree5
1504
def get_format_string(self):
1505
"""See WorkingTreeFormat.get_format_string()."""
1506
return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1508
def get_format_description(self):
1509
"""See WorkingTreeFormat.get_format_description()."""
1510
return "Working tree format 5"
1512
def supports_content_filtering(self):
1516
class WorkingTreeFormat6(DirStateWorkingTreeFormat):
1517
"""WorkingTree format supporting views.
1520
upgrade_recommended = False
1522
_tree_class = WorkingTree6
1524
def get_format_string(self):
1525
"""See WorkingTreeFormat.get_format_string()."""
1526
return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1528
def get_format_description(self):
1529
"""See WorkingTreeFormat.get_format_description()."""
1530
return "Working tree format 6"
1532
def _init_custom_control_files(self, wt):
1533
"""Subclasses with custom control files should override this method."""
1534
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())
1536
def supports_content_filtering(self):
1539
def supports_views(self):
1543
class DirStateRevisionTree(Tree):
1544
"""A revision tree pulling the inventory from a dirstate."""
1546
def __init__(self, dirstate, revision_id, repository):
1547
self._dirstate = dirstate
1548
self._revision_id = revision_id
1549
self._repository = repository
1550
self._inventory = None
1552
self._dirstate_locked = False
1553
self._repo_supports_tree_reference = getattr(
1554
repository._format, "supports_tree_reference",
1558
return "<%s of %s in %s>" % \
1559
(self.__class__.__name__, self._revision_id, self._dirstate)
1561
def annotate_iter(self, file_id,
1562
default_revision=_mod_revision.CURRENT_REVISION):
1563
"""See Tree.annotate_iter"""
1564
text_key = (file_id, self.inventory[file_id].revision)
1565
annotations = self._repository.texts.annotate(text_key)
1566
return [(key[-1], line) for (key, line) in annotations]
1568
def _get_ancestors(self, default_revision):
1569
return set(self._repository.get_ancestry(self._revision_id,
1571
def _comparison_data(self, entry, path):
1572
"""See Tree._comparison_data."""
1574
return None, False, None
1575
# trust the entry as RevisionTree does, but this may not be
1576
# sensible: the entry might not have come from us?
1577
return entry.kind, entry.executable, None
1579
def _file_size(self, entry, stat_value):
1580
return entry.text_size
1582
def filter_unversioned_files(self, paths):
1583
"""Filter out paths that are not versioned.
1585
:return: set of paths.
1587
pred = self.has_filename
1588
return set((p for p in paths if not pred(p)))
1590
def get_root_id(self):
1591
return self.path2id('')
1593
def id2path(self, file_id):
1594
"Convert a file-id to a path."
1595
entry = self._get_entry(file_id=file_id)
1596
if entry == (None, None):
1597
raise errors.NoSuchId(tree=self, file_id=file_id)
1598
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
1599
return path_utf8.decode('utf8')
1601
def iter_references(self):
1602
if not self._repo_supports_tree_reference:
1603
# When the repo doesn't support references, we will have nothing to
1606
# Otherwise, fall back to the default implementation
1607
return super(DirStateRevisionTree, self).iter_references()
1609
def _get_parent_index(self):
1610
"""Return the index in the dirstate referenced by this tree."""
1611
return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1613
def _get_entry(self, file_id=None, path=None):
1614
"""Get the dirstate row for file_id or path.
1616
If either file_id or path is supplied, it is used as the key to lookup.
1617
If both are supplied, the fastest lookup is used, and an error is
1618
raised if they do not both point at the same row.
1620
:param file_id: An optional unicode file_id to be looked up.
1621
:param path: An optional unicode path to be looked up.
1622
:return: The dirstate row tuple for path/file_id, or (None, None)
1624
if file_id is None and path is None:
1625
raise errors.BzrError('must supply file_id or path')
1626
if path is not None:
1627
path = path.encode('utf8')
1628
parent_index = self._get_parent_index()
1629
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
1631
def _generate_inventory(self):
1632
"""Create and set self.inventory from the dirstate object.
1634
(So this is only called the first time the inventory is requested for
1635
this tree; it then remains in memory until it's out of date.)
1637
This is relatively expensive: we have to walk the entire dirstate.
1639
if not self._locked:
1640
raise AssertionError(
1641
'cannot generate inventory of an unlocked '
1642
'dirstate revision tree')
1643
# separate call for profiling - makes it clear where the costs are.
1644
self._dirstate._read_dirblocks_if_needed()
1645
if self._revision_id not in self._dirstate.get_parent_ids():
1646
raise AssertionError(
1647
'parent %s has disappeared from %s' % (
1648
self._revision_id, self._dirstate.get_parent_ids()))
1649
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1650
# This is identical now to the WorkingTree _generate_inventory except
1651
# for the tree index use.
1652
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
1653
current_id = root_key[2]
1654
if current_entry[parent_index][0] != 'd':
1655
raise AssertionError()
1656
inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1657
inv.root.revision = current_entry[parent_index][4]
1658
# Turn some things into local variables
1659
minikind_to_kind = dirstate.DirState._minikind_to_kind
1660
factory = entry_factory
1661
utf8_decode = cache_utf8._utf8_decode
1662
inv_byid = inv._byid
1663
# we could do this straight out of the dirstate; it might be fast
1664
# and should be profiled - RBC 20070216
1665
parent_ies = {'' : inv.root}
1666
for block in self._dirstate._dirblocks[1:]: #skip root
1669
parent_ie = parent_ies[dirname]
1671
# all the paths in this block are not versioned in this tree
1673
for key, entry in block[1]:
1674
minikind, fingerprint, size, executable, revid = entry[parent_index]
1675
if minikind in ('a', 'r'): # absent, relocated
1679
name_unicode = utf8_decode(name)[0]
1681
kind = minikind_to_kind[minikind]
1682
inv_entry = factory[kind](file_id, name_unicode,
1684
inv_entry.revision = revid
1686
inv_entry.executable = executable
1687
inv_entry.text_size = size
1688
inv_entry.text_sha1 = fingerprint
1689
elif kind == 'directory':
1690
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1691
elif kind == 'symlink':
1692
inv_entry.executable = False
1693
inv_entry.text_size = None
1694
inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1695
elif kind == 'tree-reference':
1696
inv_entry.reference_revision = fingerprint or None
1698
raise AssertionError("cannot convert entry %r into an InventoryEntry"
1700
# These checks cost us around 40ms on a 55k entry tree
1701
if file_id in inv_byid:
1702
raise AssertionError('file_id %s already in'
1703
' inventory as %s' % (file_id, inv_byid[file_id]))
1704
if name_unicode in parent_ie.children:
1705
raise AssertionError('name %r already in parent'
1707
inv_byid[file_id] = inv_entry
1708
parent_ie.children[name_unicode] = inv_entry
1709
self._inventory = inv
1711
def get_file_mtime(self, file_id, path=None):
1712
"""Return the modification time for this record.
1714
We return the timestamp of the last-changed revision.
1716
# Make sure the file exists
1717
entry = self._get_entry(file_id, path=path)
1718
if entry == (None, None): # do we raise?
1720
parent_index = self._get_parent_index()
1721
last_changed_revision = entry[1][parent_index][4]
1722
return self._repository.get_revision(last_changed_revision).timestamp
1724
def get_file_sha1(self, file_id, path=None, stat_value=None):
1725
entry = self._get_entry(file_id=file_id, path=path)
1726
parent_index = self._get_parent_index()
1727
parent_details = entry[1][parent_index]
1728
if parent_details[0] == 'f':
1729
return parent_details[1]
1732
def get_file(self, file_id, path=None):
1733
return StringIO(self.get_file_text(file_id))
1735
def get_file_size(self, file_id):
1736
"""See Tree.get_file_size"""
1737
return self.inventory[file_id].text_size
1739
def get_file_text(self, file_id, path=None):
1740
_, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1741
return ''.join(content)
1743
def get_reference_revision(self, file_id, path=None):
1744
return self.inventory[file_id].reference_revision
1746
def iter_files_bytes(self, desired_files):
1747
"""See Tree.iter_files_bytes.
1749
This version is implemented on top of Repository.iter_files_bytes"""
1750
parent_index = self._get_parent_index()
1751
repo_desired_files = []
1752
for file_id, identifier in desired_files:
1753
entry = self._get_entry(file_id)
1754
if entry == (None, None):
1755
raise errors.NoSuchId(self, file_id)
1756
repo_desired_files.append((file_id, entry[1][parent_index][4],
1758
return self._repository.iter_files_bytes(repo_desired_files)
1760
def get_symlink_target(self, file_id):
1761
entry = self._get_entry(file_id=file_id)
1762
parent_index = self._get_parent_index()
1763
if entry[1][parent_index][0] != 'l':
1766
target = entry[1][parent_index][1]
1767
target = target.decode('utf8')
1770
def get_revision_id(self):
1771
"""Return the revision id for this tree."""
1772
return self._revision_id
1774
def _get_inventory(self):
1775
if self._inventory is not None:
1776
return self._inventory
1777
self._must_be_locked()
1778
self._generate_inventory()
1779
return self._inventory
1781
inventory = property(_get_inventory,
1782
doc="Inventory of this Tree")
1784
def get_parent_ids(self):
1785
"""The parents of a tree in the dirstate are not cached."""
1786
return self._repository.get_revision(self._revision_id).parent_ids
1788
def has_filename(self, filename):
1789
return bool(self.path2id(filename))
1791
def kind(self, file_id):
1792
entry = self._get_entry(file_id=file_id)[1]
1794
raise errors.NoSuchId(tree=self, file_id=file_id)
1795
return dirstate.DirState._minikind_to_kind[entry[1][0]]
1797
def stored_kind(self, file_id):
1798
"""See Tree.stored_kind"""
1799
return self.kind(file_id)
1801
def path_content_summary(self, path):
1802
"""See Tree.path_content_summary."""
1803
id = self.inventory.path2id(path)
1805
return ('missing', None, None, None)
1806
entry = self._inventory[id]
1809
return (kind, entry.text_size, entry.executable, entry.text_sha1)
1810
elif kind == 'symlink':
1811
return (kind, None, None, entry.symlink_target)
1813
return (kind, None, None, None)
1815
def is_executable(self, file_id, path=None):
1816
ie = self.inventory[file_id]
1817
if ie.kind != "file":
1819
return ie.executable
1821
def list_files(self, include_root=False, from_dir=None, recursive=True):
1822
# We use a standard implementation, because DirStateRevisionTree is
1823
# dealing with one of the parents of the current state
1824
inv = self._get_inventory()
1825
if from_dir is None:
1828
from_dir_id = inv.path2id(from_dir)
1829
if from_dir_id is None:
1830
# Directory not versioned
1832
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1833
if inv.root is not None and not include_root and from_dir is None:
1835
for path, entry in entries:
1836
yield path, 'V', entry.kind, entry.file_id, entry
1838
def lock_read(self):
1839
"""Lock the tree for a set of operations."""
1840
if not self._locked:
1841
self._repository.lock_read()
1842
if self._dirstate._lock_token is None:
1843
self._dirstate.lock_read()
1844
self._dirstate_locked = True
1847
def _must_be_locked(self):
1848
if not self._locked:
1849
raise errors.ObjectNotLocked(self)
1852
def path2id(self, path):
1853
"""Return the id for path in this tree."""
1854
# lookup by path: faster than splitting and walking the ivnentory.
1855
entry = self._get_entry(path=path)
1856
if entry == (None, None):
1861
"""Unlock, freeing any cache memory used during the lock."""
1862
# outside of a lock, the inventory is suspect: release it.
1864
if not self._locked:
1865
self._inventory = None
1867
if self._dirstate_locked:
1868
self._dirstate.unlock()
1869
self._dirstate_locked = False
1870
self._repository.unlock()
1873
def supports_tree_reference(self):
1874
return self._repo_supports_tree_reference
1876
def walkdirs(self, prefix=""):
1877
# TODO: jam 20070215 This is the lazy way by using the RevisionTree
1878
# implementation based on an inventory.
1879
# This should be cleaned up to use the much faster Dirstate code
1880
# So for now, we just build up the parent inventory, and extract
1881
# it the same way RevisionTree does.
1882
_directory = 'directory'
1883
inv = self._get_inventory()
1884
top_id = inv.path2id(prefix)
1888
pending = [(prefix, top_id)]
1891
relpath, file_id = pending.pop()
1892
# 0 - relpath, 1- file-id
1894
relroot = relpath + '/'
1897
# FIXME: stash the node in pending
1898
entry = inv[file_id]
1899
for name, child in entry.sorted_children():
1900
toppath = relroot + name
1901
dirblock.append((toppath, name, child.kind, None,
1902
child.file_id, child.kind
1904
yield (relpath, entry.file_id), dirblock
1905
# push the user specified dirs from dirblock
1906
for dir in reversed(dirblock):
1907
if dir[2] == _directory:
1908
pending.append((dir[0], dir[4]))
1911
class InterDirStateTree(InterTree):
1912
"""Fast path optimiser for changes_from with dirstate trees.
1914
This is used only when both trees are in the dirstate working file, and
1915
the source is any parent within the dirstate, and the destination is
1916
the current working tree of the same dirstate.
1918
# this could be generalized to allow comparisons between any trees in the
1919
# dirstate, and possibly between trees stored in different dirstates.
1921
def __init__(self, source, target):
1922
super(InterDirStateTree, self).__init__(source, target)
1923
if not InterDirStateTree.is_compatible(source, target):
1924
raise Exception, "invalid source %r and target %r" % (source, target)
1927
def make_source_parent_tree(source, target):
1928
"""Change the source tree into a parent of the target."""
1929
revid = source.commit('record tree')
1930
target.branch.repository.fetch(source.branch.repository, revid)
1931
target.set_parent_ids([revid])
1932
return target.basis_tree(), target
1935
def make_source_parent_tree_python_dirstate(klass, test_case, source, target):
1936
result = klass.make_source_parent_tree(source, target)
1937
result[1]._iter_changes = dirstate.ProcessEntryPython
1941
def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
1942
from bzrlib.tests.test__dirstate_helpers import \
1943
CompiledDirstateHelpersFeature
1944
if not CompiledDirstateHelpersFeature.available():
1945
from bzrlib.tests import UnavailableFeature
1946
raise UnavailableFeature(CompiledDirstateHelpersFeature)
1947
from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1948
result = klass.make_source_parent_tree(source, target)
1949
result[1]._iter_changes = ProcessEntryC
1952
_matching_from_tree_format = WorkingTreeFormat4()
1953
_matching_to_tree_format = WorkingTreeFormat4()
1956
def _test_mutable_trees_to_test_trees(klass, test_case, source, target):
1957
# This method shouldn't be called, because we have python and C
1958
# specific flavours.
1959
raise NotImplementedError
1961
def iter_changes(self, include_unchanged=False,
1962
specific_files=None, pb=None, extra_trees=[],
1963
require_versioned=True, want_unversioned=False):
1964
"""Return the changes from source to target.
1966
:return: An iterator that yields tuples. See InterTree.iter_changes
1968
:param specific_files: An optional list of file paths to restrict the
1969
comparison to. When mapping filenames to ids, all matches in all
1970
trees (including optional extra_trees) are used, and all children of
1971
matched directories are included.
1972
:param include_unchanged: An optional boolean requesting the inclusion of
1973
unchanged entries in the result.
1974
:param extra_trees: An optional list of additional trees to use when
1975
mapping the contents of specific_files (paths) to file_ids.
1976
:param require_versioned: If True, all files in specific_files must be
1977
versioned in one of source, target, extra_trees or
1978
PathsNotVersionedError is raised.
1979
:param want_unversioned: Should unversioned files be returned in the
1980
output. An unversioned file is defined as one with (False, False)
1981
for the versioned pair.
1983
# NB: show_status depends on being able to pass in non-versioned files
1984
# and report them as unknown
1985
# TODO: handle extra trees in the dirstate.
1986
if (extra_trees or specific_files == []):
1987
# we can't fast-path these cases (yet)
1988
return super(InterDirStateTree, self).iter_changes(
1989
include_unchanged, specific_files, pb, extra_trees,
1990
require_versioned, want_unversioned=want_unversioned)
1991
parent_ids = self.target.get_parent_ids()
1992
if not (self.source._revision_id in parent_ids
1993
or self.source._revision_id == _mod_revision.NULL_REVISION):
1994
raise AssertionError(
1995
"revision {%s} is not stored in {%s}, but %s "
1996
"can only be used for trees stored in the dirstate"
1997
% (self.source._revision_id, self.target, self.iter_changes))
1999
if self.source._revision_id == _mod_revision.NULL_REVISION:
2001
indices = (target_index,)
2003
if not (self.source._revision_id in parent_ids):
2004
raise AssertionError(
2005
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
2006
self.source._revision_id, parent_ids))
2007
source_index = 1 + parent_ids.index(self.source._revision_id)
2008
indices = (source_index, target_index)
2009
# -- make all specific_files utf8 --
2011
specific_files_utf8 = set()
2012
for path in specific_files:
2013
# Note, if there are many specific files, using cache_utf8
2014
# would be good here.
2015
specific_files_utf8.add(path.encode('utf8'))
2016
specific_files = specific_files_utf8
2018
specific_files = set([''])
2019
# -- specific_files is now a utf8 path set --
2021
# -- get the state object and prepare it.
2022
state = self.target.current_dirstate()
2023
state._read_dirblocks_if_needed()
2024
if require_versioned:
2025
# -- check all supplied paths are versioned in a search tree. --
2027
for path in specific_files:
2028
path_entries = state._entries_for_path(path)
2029
if not path_entries:
2030
# this specified path is not present at all: error
2031
not_versioned.append(path)
2033
found_versioned = False
2034
# for each id at this path
2035
for entry in path_entries:
2037
for index in indices:
2038
if entry[1][index][0] != 'a': # absent
2039
found_versioned = True
2040
# all good: found a versioned cell
2042
if not found_versioned:
2043
# none of the indexes was not 'absent' at all ids for this
2045
not_versioned.append(path)
2046
if len(not_versioned) > 0:
2047
raise errors.PathsNotVersionedError(not_versioned)
2048
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2049
search_specific_files = osutils.minimum_path_selection(specific_files)
2051
use_filesystem_for_exec = (sys.platform != 'win32')
2052
iter_changes = self.target._iter_changes(include_unchanged,
2053
use_filesystem_for_exec, search_specific_files, state,
2054
source_index, target_index, want_unversioned, self.target)
2055
return iter_changes.iter_changes()
2058
def is_compatible(source, target):
2059
# the target must be a dirstate working tree
2060
if not isinstance(target, DirStateWorkingTree):
2062
# the source must be a revtree or dirstate rev tree.
2063
if not isinstance(source,
2064
(revisiontree.RevisionTree, DirStateRevisionTree)):
2066
# the source revid must be in the target dirstate
2067
if not (source._revision_id == _mod_revision.NULL_REVISION or
2068
source._revision_id in target.get_parent_ids()):
2069
# TODO: what about ghosts? it may well need to
2070
# check for them explicitly.
2074
InterTree.register_optimiser(InterDirStateTree)
2077
class Converter3to4(object):
2078
"""Perform an in-place upgrade of format 3 to format 4 trees."""
2081
self.target_format = WorkingTreeFormat4()
2083
def convert(self, tree):
2084
# lock the control files not the tree, so that we dont get tree
2085
# on-unlock behaviours, and so that noone else diddles with the
2086
# tree during upgrade.
2087
tree._control_files.lock_write()
2089
tree.read_working_inventory()
2090
self.create_dirstate_data(tree)
2091
self.update_format(tree)
2092
self.remove_xml_files(tree)
2094
tree._control_files.unlock()
2096
def create_dirstate_data(self, tree):
2097
"""Create the dirstate based data for tree."""
2098
local_path = tree.bzrdir.get_workingtree_transport(None
2099
).local_abspath('dirstate')
2100
state = dirstate.DirState.from_tree(tree, local_path)
2104
def remove_xml_files(self, tree):
2105
"""Remove the oldformat 3 data."""
2106
transport = tree.bzrdir.get_workingtree_transport(None)
2107
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
2108
'pending-merges', 'stat-cache']:
2110
transport.delete(path)
2111
except errors.NoSuchFile:
2112
# some files are optional - just deal.
2115
def update_format(self, tree):
2116
"""Change the format marker."""
2117
tree._transport.put_bytes('format',
2118
self.target_format.get_format_string(),
2119
mode=tree.bzrdir._get_file_mode())
2122
class Converter4to5(object):
2123
"""Perform an in-place upgrade of format 4 to format 5 trees."""
2126
self.target_format = WorkingTreeFormat5()
2128
def convert(self, tree):
2129
# lock the control files not the tree, so that we don't get tree
2130
# on-unlock behaviours, and so that no-one else diddles with the
2131
# tree during upgrade.
2132
tree._control_files.lock_write()
2134
self.update_format(tree)
2136
tree._control_files.unlock()
2138
def update_format(self, tree):
2139
"""Change the format marker."""
2140
tree._transport.put_bytes('format',
2141
self.target_format.get_format_string(),
2142
mode=tree.bzrdir._get_file_mode())
2145
class Converter4or5to6(object):
2146
"""Perform an in-place upgrade of format 4 or 5 to format 6 trees."""
2149
self.target_format = WorkingTreeFormat6()
2151
def convert(self, tree):
2152
# lock the control files not the tree, so that we don't get tree
2153
# on-unlock behaviours, and so that no-one else diddles with the
2154
# tree during upgrade.
2155
tree._control_files.lock_write()
2157
self.init_custom_control_files(tree)
2158
self.update_format(tree)
2160
tree._control_files.unlock()
2162
def init_custom_control_files(self, tree):
2163
"""Initialize custom control files."""
2164
tree._transport.put_bytes('views', '',
2165
mode=tree.bzrdir._get_file_mode())
2167
def update_format(self, tree):
2168
"""Change the format marker."""
2169
tree._transport.put_bytes('format',
2170
self.target_format.get_format_string(),
2171
mode=tree.bzrdir._get_file_mode())
added
removed
bzrlib/workingtree_4.py
