1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""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(), """
31
from bisect import bisect_left
33
from copy import deepcopy
45
conflicts as _mod_conflicts,
55
revision as _mod_revision,
65
from bzrlib.transport import get_transport
69
from bzrlib import symbol_versioning
70
from bzrlib.decorators import needs_read_lock, needs_write_lock
71
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
72
from bzrlib.lockable_files import LockableFiles, TransportLock
73
from bzrlib.lockdir import LockDir
74
import bzrlib.mutabletree
75
from bzrlib.mutabletree import needs_tree_write_lock
76
from bzrlib.osutils import (
86
from bzrlib.trace import mutter, note
87
from bzrlib.transport.local import LocalTransport
88
from bzrlib.tree import InterTree
89
from bzrlib.progress import DummyProgress, ProgressPhase
90
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
91
from bzrlib.rio import RioReader, rio_file, Stanza
92
from bzrlib.symbol_versioning import (deprecated_passed,
97
from bzrlib.tree import Tree
98
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
101
# This is the Windows equivalent of ENOTDIR
102
# It is defined in pywin32.winerror, but we don't want a strong dependency for
103
# just an error code.
104
ERROR_PATH_NOT_FOUND = 3
105
ERROR_DIRECTORY = 267
108
class WorkingTree4(WorkingTree3):
109
"""This is the Format 4 working tree.
111
This differs from WorkingTree3 by:
112
- Having a consolidated internal dirstate, stored in a
113
randomly-accessible sorted file on disk.
114
- Not having a regular inventory attribute. One can be synthesized
115
on demand but this is expensive and should be avoided.
117
This is new in bzr 0.15.
120
def __init__(self, basedir,
125
"""Construct a WorkingTree for basedir.
127
If the branch is not supplied, it is opened automatically.
128
If the branch is supplied, it must be the branch for this basedir.
129
(branch.base is not cross checked, because for remote branches that
130
would be meaningless).
132
self._format = _format
133
self.bzrdir = _bzrdir
134
basedir = safe_unicode(basedir)
135
mutter("opening working tree %r", basedir)
136
self._branch = branch
137
self.basedir = realpath(basedir)
138
# if branch is at our basedir and is a format 6 or less
139
# assume all other formats have their own control files.
140
self._control_files = _control_files
141
self._transport = self._control_files._transport
144
# during a read or write lock these objects are set, and are
145
# None the rest of the time.
146
self._dirstate = None
147
self._inventory = None
149
self._setup_directory_is_tree_reference()
150
self._detect_case_handling()
151
self._rules_searcher = None
153
@needs_tree_write_lock
154
def _add(self, files, ids, kinds):
155
"""See MutableTree._add."""
156
state = self.current_dirstate()
157
for f, file_id, kind in zip(files, ids, kinds):
160
# special case tree root handling.
161
if f == '' and self.path2id(f) == ROOT_ID:
162
state.set_path_id('', generate_ids.gen_file_id(f))
165
file_id = generate_ids.gen_file_id(f)
166
# deliberately add the file with no cached stat or sha1
167
# - on the first access it will be gathered, and we can
168
# always change this once tests are all passing.
169
state.add(f, file_id, kind, None, '')
170
self._make_dirty(reset_inventory=True)
172
def _make_dirty(self, reset_inventory):
173
"""Make the tree state dirty.
175
:param reset_inventory: True if the cached inventory should be removed
176
(presuming there is one).
179
if reset_inventory and self._inventory is not None:
180
self._inventory = None
182
@needs_tree_write_lock
183
def add_reference(self, sub_tree):
184
# use standard implementation, which calls back to self._add
186
# So we don't store the reference_revision in the working dirstate,
187
# it's just recorded at the moment of commit.
188
self._add_reference(sub_tree)
190
def break_lock(self):
191
"""Break a lock if one is present from another instance.
193
Uses the ui factory to ask for confirmation if the lock may be from
196
This will probe the repository for its lock as well.
198
# if the dirstate is locked by an active process, reject the break lock
201
if self._dirstate is None:
205
state = self._current_dirstate()
206
if state._lock_token is not None:
207
# we already have it locked. sheese, cant break our own lock.
208
raise errors.LockActive(self.basedir)
211
# try for a write lock - need permission to get one anyhow
214
except errors.LockContention:
215
# oslocks fail when a process is still live: fail.
216
# TODO: get the locked lockdir info and give to the user to
217
# assist in debugging.
218
raise errors.LockActive(self.basedir)
223
self._dirstate = None
224
self._control_files.break_lock()
225
self.branch.break_lock()
227
def _comparison_data(self, entry, path):
228
kind, executable, stat_value = \
229
WorkingTree3._comparison_data(self, entry, path)
230
# it looks like a plain directory, but it's really a reference -- see
232
if (self._repo_supports_tree_reference and
233
kind == 'directory' and
234
self._directory_is_tree_reference(path)):
235
kind = 'tree-reference'
236
return kind, executable, stat_value
239
def commit(self, message=None, revprops=None, *args, **kwargs):
240
# mark the tree as dirty post commit - commit
241
# can change the current versioned list by doing deletes.
242
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
243
self._make_dirty(reset_inventory=True)
246
def current_dirstate(self):
247
"""Return the current dirstate object.
249
This is not part of the tree interface and only exposed for ease of
252
:raises errors.NotWriteLocked: when not in a lock.
254
self._must_be_locked()
255
return self._current_dirstate()
257
def _current_dirstate(self):
258
"""Internal function that does not check lock status.
260
This is needed for break_lock which also needs the dirstate.
262
if self._dirstate is not None:
263
return self._dirstate
264
local_path = self.bzrdir.get_workingtree_transport(None
265
).local_abspath('dirstate')
266
self._dirstate = dirstate.DirState.on_file(local_path)
267
return self._dirstate
269
def filter_unversioned_files(self, paths):
270
"""Filter out paths that are versioned.
272
:return: set of paths.
274
# TODO: make a generic multi-bisect routine roughly that should list
275
# the paths, then process one half at a time recursively, and feed the
276
# results of each bisect in further still
277
paths = sorted(paths)
279
state = self.current_dirstate()
280
# TODO we want a paths_to_dirblocks helper I think
282
dirname, basename = os.path.split(path.encode('utf8'))
283
_, _, _, path_is_versioned = state._get_block_entry_index(
284
dirname, basename, 0)
285
if not path_is_versioned:
290
"""Write all cached data to disk."""
291
if self._control_files._lock_mode != 'w':
292
raise errors.NotWriteLocked(self)
293
self.current_dirstate().save()
294
self._inventory = None
297
@needs_tree_write_lock
298
def _gather_kinds(self, files, kinds):
299
"""See MutableTree._gather_kinds."""
300
for pos, f in enumerate(files):
301
if kinds[pos] is None:
302
kinds[pos] = self._kind(f)
304
def _generate_inventory(self):
305
"""Create and set self.inventory from the dirstate object.
307
This is relatively expensive: we have to walk the entire dirstate.
308
Ideally we would not, and can deprecate this function.
310
#: uncomment to trap on inventory requests.
311
# import pdb;pdb.set_trace()
312
state = self.current_dirstate()
313
state._read_dirblocks_if_needed()
314
root_key, current_entry = self._get_entry(path='')
315
current_id = root_key[2]
316
if not (current_entry[0][0] == 'd'): # directory
317
raise AssertionError(current_entry)
318
inv = Inventory(root_id=current_id)
319
# Turn some things into local variables
320
minikind_to_kind = dirstate.DirState._minikind_to_kind
321
factory = entry_factory
322
utf8_decode = cache_utf8._utf8_decode
324
# we could do this straight out of the dirstate; it might be fast
325
# and should be profiled - RBC 20070216
326
parent_ies = {'' : inv.root}
327
for block in state._dirblocks[1:]: # skip the root
330
parent_ie = parent_ies[dirname]
332
# all the paths in this block are not versioned in this tree
334
for key, entry in block[1]:
335
minikind, link_or_sha1, size, executable, stat = entry[0]
336
if minikind in ('a', 'r'): # absent, relocated
337
# a parent tree only entry
340
name_unicode = utf8_decode(name)[0]
342
kind = minikind_to_kind[minikind]
343
inv_entry = factory[kind](file_id, name_unicode,
346
# This is only needed on win32, where this is the only way
347
# we know the executable bit.
348
inv_entry.executable = executable
349
# not strictly needed: working tree
350
#inv_entry.text_size = size
351
#inv_entry.text_sha1 = sha1
352
elif kind == 'directory':
353
# add this entry to the parent map.
354
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
355
elif kind == 'tree-reference':
356
if not self._repo_supports_tree_reference:
357
raise AssertionError(
359
"doesn't support tree references "
360
"required by entry %r"
362
inv_entry.reference_revision = link_or_sha1 or None
363
elif kind != 'symlink':
364
raise AssertionError("unknown kind %r" % kind)
365
# These checks cost us around 40ms on a 55k entry tree
366
if file_id in inv_byid:
367
raise AssertionError('file_id %s already in'
368
' inventory as %s' % (file_id, inv_byid[file_id]))
369
if name_unicode in parent_ie.children:
370
raise AssertionError('name %r already in parent'
372
inv_byid[file_id] = inv_entry
373
parent_ie.children[name_unicode] = inv_entry
374
self._inventory = inv
376
def _get_entry(self, file_id=None, path=None):
377
"""Get the dirstate row for file_id or path.
379
If either file_id or path is supplied, it is used as the key to lookup.
380
If both are supplied, the fastest lookup is used, and an error is
381
raised if they do not both point at the same row.
383
:param file_id: An optional unicode file_id to be looked up.
384
:param path: An optional unicode path to be looked up.
385
:return: The dirstate row tuple for path/file_id, or (None, None)
387
if file_id is None and path is None:
388
raise errors.BzrError('must supply file_id or path')
389
state = self.current_dirstate()
391
path = path.encode('utf8')
392
return state._get_entry(0, fileid_utf8=file_id, path_utf8=path)
394
def get_file_sha1(self, file_id, path=None, stat_value=None):
395
# check file id is valid unconditionally.
396
entry = self._get_entry(file_id=file_id, path=path)
398
raise errors.NoSuchId(self, file_id)
400
path = pathjoin(entry[0][0], entry[0][1]).decode('utf8')
402
file_abspath = self.abspath(path)
403
state = self.current_dirstate()
404
if stat_value is None:
406
stat_value = os.lstat(file_abspath)
408
if e.errno == errno.ENOENT:
412
link_or_sha1 = state.update_entry(entry, file_abspath,
413
stat_value=stat_value)
414
if entry[1][0][0] == 'f':
418
def _get_inventory(self):
419
"""Get the inventory for the tree. This is only valid within a lock."""
420
if 'evil' in debug.debug_flags:
421
trace.mutter_callsite(2,
422
"accessing .inventory forces a size of tree translation.")
423
if self._inventory is not None:
424
return self._inventory
425
self._must_be_locked()
426
self._generate_inventory()
427
return self._inventory
429
inventory = property(_get_inventory,
430
doc="Inventory of this Tree")
433
def get_parent_ids(self):
434
"""See Tree.get_parent_ids.
436
This implementation requests the ids list from the dirstate file.
438
return self.current_dirstate().get_parent_ids()
440
def get_reference_revision(self, file_id, path=None):
441
# referenced tree's revision is whatever's currently there
442
return self.get_nested_tree(file_id, path).last_revision()
444
def get_nested_tree(self, file_id, path=None):
446
path = self.id2path(file_id)
447
# else: check file_id is at path?
448
return WorkingTree.open(self.abspath(path))
451
def get_root_id(self):
452
"""Return the id of this trees root"""
453
return self._get_entry(path='')[0][2]
455
def has_id(self, file_id):
456
state = self.current_dirstate()
457
row, parents = self._get_entry(file_id=file_id)
460
return osutils.lexists(pathjoin(
461
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
464
def id2path(self, file_id):
465
"Convert a file-id to a path."
466
state = self.current_dirstate()
467
entry = self._get_entry(file_id=file_id)
468
if entry == (None, None):
469
raise errors.NoSuchId(tree=self, file_id=file_id)
470
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
471
return path_utf8.decode('utf8')
473
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
474
entry = self._get_entry(path=path)
475
if entry == (None, None):
476
return False # Missing entries are not executable
477
return entry[1][0][3] # Executable?
479
if not osutils.supports_executable():
480
def is_executable(self, file_id, path=None):
481
"""Test if a file is executable or not.
483
Note: The caller is expected to take a read-lock before calling this.
485
entry = self._get_entry(file_id=file_id, path=path)
486
if entry == (None, None):
488
return entry[1][0][3]
490
_is_executable_from_path_and_stat = \
491
_is_executable_from_path_and_stat_from_basis
493
def is_executable(self, file_id, path=None):
494
"""Test if a file is executable or not.
496
Note: The caller is expected to take a read-lock before calling this.
498
self._must_be_locked()
500
path = self.id2path(file_id)
501
mode = os.lstat(self.abspath(path)).st_mode
502
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
504
def all_file_ids(self):
505
"""See Tree.iter_all_file_ids"""
506
self._must_be_locked()
508
for key, tree_details in self.current_dirstate()._iter_entries():
509
if tree_details[0][0] in ('a', 'r'): # relocated
516
"""Iterate through file_ids for this tree.
518
file_ids are in a WorkingTree if they are in the working inventory
519
and the working file exists.
522
for key, tree_details in self.current_dirstate()._iter_entries():
523
if tree_details[0][0] in ('a', 'r'): # absent, relocated
524
# not relevant to the working tree
526
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
527
if osutils.lexists(path):
528
result.append(key[2])
531
def iter_references(self):
532
if not self._repo_supports_tree_reference:
533
# When the repo doesn't support references, we will have nothing to
536
for key, tree_details in self.current_dirstate()._iter_entries():
537
if tree_details[0][0] in ('a', 'r'): # absent, relocated
538
# not relevant to the working tree
541
# the root is not a reference.
543
relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8'))
545
if self._kind(relpath) == 'tree-reference':
546
yield relpath, key[2]
547
except errors.NoSuchFile:
548
# path is missing on disk.
551
def kind(self, file_id):
552
"""Return the kind of a file.
554
This is always the actual kind that's on disk, regardless of what it
557
Note: The caller is expected to take a read-lock before calling this.
559
relpath = self.id2path(file_id)
561
raise AssertionError(
562
"path for id {%s} is None!" % file_id)
563
return self._kind(relpath)
565
def _kind(self, relpath):
566
abspath = self.abspath(relpath)
567
kind = file_kind(abspath)
568
if (self._repo_supports_tree_reference and
569
kind == 'directory' and
570
self._directory_is_tree_reference(relpath)):
571
kind = 'tree-reference'
575
def _last_revision(self):
576
"""See Mutable.last_revision."""
577
parent_ids = self.current_dirstate().get_parent_ids()
581
return _mod_revision.NULL_REVISION
584
"""See Branch.lock_read, and WorkingTree.unlock."""
585
self.branch.lock_read()
587
self._control_files.lock_read()
589
state = self.current_dirstate()
590
if not state._lock_token:
592
# set our support for tree references from the repository in
594
self._repo_supports_tree_reference = getattr(
595
self.branch.repository._format, "supports_tree_reference",
598
self._control_files.unlock()
604
def _lock_self_write(self):
605
"""This should be called after the branch is locked."""
607
self._control_files.lock_write()
609
state = self.current_dirstate()
610
if not state._lock_token:
612
# set our support for tree references from the repository in
614
self._repo_supports_tree_reference = getattr(
615
self.branch.repository._format, "supports_tree_reference",
618
self._control_files.unlock()
624
def lock_tree_write(self):
625
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
626
self.branch.lock_read()
627
self._lock_self_write()
629
def lock_write(self):
630
"""See MutableTree.lock_write, and WorkingTree.unlock."""
631
self.branch.lock_write()
632
self._lock_self_write()
634
@needs_tree_write_lock
635
def move(self, from_paths, to_dir, after=False):
636
"""See WorkingTree.move()."""
640
state = self.current_dirstate()
641
if isinstance(from_paths, basestring):
643
to_dir_utf8 = to_dir.encode('utf8')
644
to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
645
id_index = state._get_id_index()
646
# check destination directory
647
# get the details for it
648
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
649
state._get_block_entry_index(to_entry_dirname, to_basename, 0)
650
if not entry_present:
651
raise errors.BzrMoveFailedError('', to_dir,
652
errors.NotVersionedError(to_dir))
653
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
654
# get a handle on the block itself.
655
to_block_index = state._ensure_block(
656
to_entry_block_index, to_entry_entry_index, to_dir_utf8)
657
to_block = state._dirblocks[to_block_index]
658
to_abs = self.abspath(to_dir)
659
if not isdir(to_abs):
660
raise errors.BzrMoveFailedError('',to_dir,
661
errors.NotADirectory(to_abs))
663
if to_entry[1][0][0] != 'd':
664
raise errors.BzrMoveFailedError('',to_dir,
665
errors.NotADirectory(to_abs))
667
if self._inventory is not None:
668
update_inventory = True
670
to_dir_id = to_entry[0][2]
671
to_dir_ie = inv[to_dir_id]
673
update_inventory = False
676
def move_one(old_entry, from_path_utf8, minikind, executable,
677
fingerprint, packed_stat, size,
678
to_block, to_key, to_path_utf8):
679
state._make_absent(old_entry)
680
from_key = old_entry[0]
682
lambda:state.update_minimal(from_key,
684
executable=executable,
685
fingerprint=fingerprint,
686
packed_stat=packed_stat,
688
path_utf8=from_path_utf8))
689
state.update_minimal(to_key,
691
executable=executable,
692
fingerprint=fingerprint,
693
packed_stat=packed_stat,
695
path_utf8=to_path_utf8)
696
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
697
new_entry = to_block[1][added_entry_index]
698
rollbacks.append(lambda:state._make_absent(new_entry))
700
for from_rel in from_paths:
701
# from_rel is 'pathinroot/foo/bar'
702
from_rel_utf8 = from_rel.encode('utf8')
703
from_dirname, from_tail = osutils.split(from_rel)
704
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
705
from_entry = self._get_entry(path=from_rel)
706
if from_entry == (None, None):
707
raise errors.BzrMoveFailedError(from_rel,to_dir,
708
errors.NotVersionedError(path=str(from_rel)))
710
from_id = from_entry[0][2]
711
to_rel = pathjoin(to_dir, from_tail)
712
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
713
item_to_entry = self._get_entry(path=to_rel)
714
if item_to_entry != (None, None):
715
raise errors.BzrMoveFailedError(from_rel, to_rel,
716
"Target is already versioned.")
718
if from_rel == to_rel:
719
raise errors.BzrMoveFailedError(from_rel, to_rel,
720
"Source and target are identical.")
722
from_missing = not self.has_filename(from_rel)
723
to_missing = not self.has_filename(to_rel)
730
raise errors.BzrMoveFailedError(from_rel, to_rel,
731
errors.NoSuchFile(path=to_rel,
732
extra="New file has not been created yet"))
734
# neither path exists
735
raise errors.BzrRenameFailedError(from_rel, to_rel,
736
errors.PathsDoNotExist(paths=(from_rel, to_rel)))
738
if from_missing: # implicitly just update our path mapping
741
raise errors.RenameFailedFilesExist(from_rel, to_rel)
744
def rollback_rename():
745
"""A single rename has failed, roll it back."""
746
# roll back everything, even if we encounter trouble doing one
749
# TODO: at least log the other exceptions rather than just
750
# losing them mbp 20070307
752
for rollback in reversed(rollbacks):
756
exc_info = sys.exc_info()
758
raise exc_info[0], exc_info[1], exc_info[2]
760
# perform the disk move first - its the most likely failure point.
762
from_rel_abs = self.abspath(from_rel)
763
to_rel_abs = self.abspath(to_rel)
765
osutils.rename(from_rel_abs, to_rel_abs)
767
raise errors.BzrMoveFailedError(from_rel, to_rel, e[1])
768
rollbacks.append(lambda: osutils.rename(to_rel_abs, from_rel_abs))
770
# perform the rename in the inventory next if needed: its easy
774
from_entry = inv[from_id]
775
current_parent = from_entry.parent_id
776
inv.rename(from_id, to_dir_id, from_tail)
778
lambda: inv.rename(from_id, current_parent, from_tail))
779
# finally do the rename in the dirstate, which is a little
780
# tricky to rollback, but least likely to need it.
781
old_block_index, old_entry_index, dir_present, file_present = \
782
state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
783
old_block = state._dirblocks[old_block_index][1]
784
old_entry = old_block[old_entry_index]
785
from_key, old_entry_details = old_entry
786
cur_details = old_entry_details[0]
788
to_key = ((to_block[0],) + from_key[1:3])
789
minikind = cur_details[0]
790
move_one(old_entry, from_path_utf8=from_rel_utf8,
792
executable=cur_details[3],
793
fingerprint=cur_details[1],
794
packed_stat=cur_details[4],
798
to_path_utf8=to_rel_utf8)
801
def update_dirblock(from_dir, to_key, to_dir_utf8):
802
"""Recursively update all entries in this dirblock."""
804
raise AssertionError("renaming root not supported")
805
from_key = (from_dir, '')
806
from_block_idx, present = \
807
state._find_block_index_from_key(from_key)
809
# This is the old record, if it isn't present, then
810
# there is theoretically nothing to update.
811
# (Unless it isn't present because of lazy loading,
812
# but we don't do that yet)
814
from_block = state._dirblocks[from_block_idx]
815
to_block_index, to_entry_index, _, _ = \
816
state._get_block_entry_index(to_key[0], to_key[1], 0)
817
to_block_index = state._ensure_block(
818
to_block_index, to_entry_index, to_dir_utf8)
819
to_block = state._dirblocks[to_block_index]
821
# Grab a copy since move_one may update the list.
822
for entry in from_block[1][:]:
823
if not (entry[0][0] == from_dir):
824
raise AssertionError()
825
cur_details = entry[1][0]
826
to_key = (to_dir_utf8, entry[0][1], entry[0][2])
827
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
828
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
829
minikind = cur_details[0]
831
# Deleted children of a renamed directory
832
# Do not need to be updated.
833
# Children that have been renamed out of this
834
# directory should also not be updated
836
move_one(entry, from_path_utf8=from_path_utf8,
838
executable=cur_details[3],
839
fingerprint=cur_details[1],
840
packed_stat=cur_details[4],
844
to_path_utf8=to_path_utf8)
846
# We need to move all the children of this
848
update_dirblock(from_path_utf8, to_key,
850
update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
854
result.append((from_rel, to_rel))
855
state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
856
self._make_dirty(reset_inventory=False)
860
def _must_be_locked(self):
861
if not self._control_files._lock_count:
862
raise errors.ObjectNotLocked(self)
865
"""Initialize the state in this tree to be a new tree."""
869
def path2id(self, path):
870
"""Return the id for path in this tree."""
871
path = path.strip('/')
872
entry = self._get_entry(path=path)
873
if entry == (None, None):
877
def paths2ids(self, paths, trees=[], require_versioned=True):
878
"""See Tree.paths2ids().
880
This specialisation fast-paths the case where all the trees are in the
885
parents = self.get_parent_ids()
887
if not (isinstance(tree, DirStateRevisionTree) and tree._revision_id in
889
return super(WorkingTree4, self).paths2ids(paths, trees, require_versioned)
890
search_indexes = [0] + [1 + parents.index(tree._revision_id) for tree in trees]
891
# -- make all paths utf8 --
894
paths_utf8.add(path.encode('utf8'))
896
# -- paths is now a utf8 path set --
897
# -- get the state object and prepare it.
898
state = self.current_dirstate()
899
if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY
900
and '' not in paths):
901
paths2ids = self._paths2ids_using_bisect
903
paths2ids = self._paths2ids_in_memory
904
return paths2ids(paths, search_indexes,
905
require_versioned=require_versioned)
907
def _paths2ids_in_memory(self, paths, search_indexes,
908
require_versioned=True):
909
state = self.current_dirstate()
910
state._read_dirblocks_if_needed()
911
def _entries_for_path(path):
912
"""Return a list with all the entries that match path for all ids.
914
dirname, basename = os.path.split(path)
915
key = (dirname, basename, '')
916
block_index, present = state._find_block_index_from_key(key)
918
# the block which should contain path is absent.
921
block = state._dirblocks[block_index][1]
922
entry_index, _ = state._find_entry_index(key, block)
923
# we may need to look at multiple entries at this path: walk while the paths match.
924
while (entry_index < len(block) and
925
block[entry_index][0][0:2] == key[0:2]):
926
result.append(block[entry_index])
929
if require_versioned:
930
# -- check all supplied paths are versioned in a search tree. --
933
path_entries = _entries_for_path(path)
935
# this specified path is not present at all: error
936
all_versioned = False
938
found_versioned = False
939
# for each id at this path
940
for entry in path_entries:
942
for index in search_indexes:
943
if entry[1][index][0] != 'a': # absent
944
found_versioned = True
945
# all good: found a versioned cell
947
if not found_versioned:
948
# none of the indexes was not 'absent' at all ids for this
950
all_versioned = False
952
if not all_versioned:
953
raise errors.PathsNotVersionedError(paths)
954
# -- remove redundancy in supplied paths to prevent over-scanning --
955
search_paths = osutils.minimum_path_selection(paths)
957
# for all search_indexs in each path at or under each element of
958
# search_paths, if the detail is relocated: add the id, and add the
959
# relocated path as one to search if its not searched already. If the
960
# detail is not relocated, add the id.
961
searched_paths = set()
963
def _process_entry(entry):
964
"""Look at search_indexes within entry.
966
If a specific tree's details are relocated, add the relocation
967
target to search_paths if not searched already. If it is absent, do
968
nothing. Otherwise add the id to found_ids.
970
for index in search_indexes:
971
if entry[1][index][0] == 'r': # relocated
972
if not osutils.is_inside_any(searched_paths, entry[1][index][1]):
973
search_paths.add(entry[1][index][1])
974
elif entry[1][index][0] != 'a': # absent
975
found_ids.add(entry[0][2])
977
current_root = search_paths.pop()
978
searched_paths.add(current_root)
979
# process the entries for this containing directory: the rest will be
980
# found by their parents recursively.
981
root_entries = _entries_for_path(current_root)
983
# this specified path is not present at all, skip it.
985
for entry in root_entries:
986
_process_entry(entry)
987
initial_key = (current_root, '', '')
988
block_index, _ = state._find_block_index_from_key(initial_key)
989
while (block_index < len(state._dirblocks) and
990
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
991
for entry in state._dirblocks[block_index][1]:
992
_process_entry(entry)
996
def _paths2ids_using_bisect(self, paths, search_indexes,
997
require_versioned=True):
998
state = self.current_dirstate()
1001
split_paths = sorted(osutils.split(p) for p in paths)
1002
found = state._bisect_recursive(split_paths)
1004
if require_versioned:
1005
found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
1006
for dir_name in split_paths:
1007
if dir_name not in found_dir_names:
1008
raise errors.PathsNotVersionedError(paths)
1010
for dir_name_id, trees_info in found.iteritems():
1011
for index in search_indexes:
1012
if trees_info[index][0] not in ('r', 'a'):
1013
found_ids.add(dir_name_id[2])
1016
def read_working_inventory(self):
1017
"""Read the working inventory.
1019
This is a meaningless operation for dirstate, but we obey it anyhow.
1021
return self.inventory
1024
def revision_tree(self, revision_id):
1025
"""See Tree.revision_tree.
1027
WorkingTree4 supplies revision_trees for any basis tree.
1029
dirstate = self.current_dirstate()
1030
parent_ids = dirstate.get_parent_ids()
1031
if revision_id not in parent_ids:
1032
raise errors.NoSuchRevisionInTree(self, revision_id)
1033
if revision_id in dirstate.get_ghosts():
1034
raise errors.NoSuchRevisionInTree(self, revision_id)
1035
return DirStateRevisionTree(dirstate, revision_id,
1036
self.branch.repository)
1038
@needs_tree_write_lock
1039
def set_last_revision(self, new_revision):
1040
"""Change the last revision in the working tree."""
1041
parents = self.get_parent_ids()
1042
if new_revision in (NULL_REVISION, None):
1043
if len(parents) >= 2:
1044
raise AssertionError(
1045
"setting the last parent to none with a pending merge is "
1047
self.set_parent_ids([])
1049
self.set_parent_ids([new_revision] + parents[1:],
1050
allow_leftmost_as_ghost=True)
1052
@needs_tree_write_lock
1053
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1054
"""Set the parent ids to revision_ids.
1056
See also set_parent_trees. This api will try to retrieve the tree data
1057
for each element of revision_ids from the trees repository. If you have
1058
tree data already available, it is more efficient to use
1059
set_parent_trees rather than set_parent_ids. set_parent_ids is however
1060
an easier API to use.
1062
:param revision_ids: The revision_ids to set as the parent ids of this
1063
working tree. Any of these may be ghosts.
1066
for revision_id in revision_ids:
1068
revtree = self.branch.repository.revision_tree(revision_id)
1069
# TODO: jam 20070213 KnitVersionedFile raises
1070
# RevisionNotPresent rather than NoSuchRevision if a
1071
# given revision_id is not present. Should Repository be
1072
# catching it and re-raising NoSuchRevision?
1073
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1075
trees.append((revision_id, revtree))
1076
self.set_parent_trees(trees,
1077
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1079
@needs_tree_write_lock
1080
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1081
"""Set the parents of the working tree.
1083
:param parents_list: A list of (revision_id, tree) tuples.
1084
If tree is None, then that element is treated as an unreachable
1085
parent tree - i.e. a ghost.
1087
dirstate = self.current_dirstate()
1088
if len(parents_list) > 0:
1089
if not allow_leftmost_as_ghost and parents_list[0][1] is None:
1090
raise errors.GhostRevisionUnusableHere(parents_list[0][0])
1094
parent_ids = [rev_id for rev_id, tree in parents_list]
1095
graph = self.branch.repository.get_graph()
1096
heads = graph.heads(parent_ids)
1097
accepted_revisions = set()
1099
# convert absent trees to the null tree, which we convert back to
1100
# missing on access.
1101
for rev_id, tree in parents_list:
1102
if len(accepted_revisions) > 0:
1103
# we always accept the first tree
1104
if rev_id in accepted_revisions or rev_id not in heads:
1105
# We have already included either this tree, or its
1106
# descendent, so we skip it.
1108
_mod_revision.check_not_reserved_id(rev_id)
1109
if tree is not None:
1110
real_trees.append((rev_id, tree))
1112
real_trees.append((rev_id,
1113
self.branch.repository.revision_tree(None)))
1114
ghosts.append(rev_id)
1115
accepted_revisions.add(rev_id)
1116
dirstate.set_parent_trees(real_trees, ghosts=ghosts)
1117
self._make_dirty(reset_inventory=False)
1119
def _set_root_id(self, file_id):
1120
"""See WorkingTree.set_root_id."""
1121
state = self.current_dirstate()
1122
state.set_path_id('', file_id)
1123
if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
1124
self._make_dirty(reset_inventory=True)
1126
def _sha_from_stat(self, path, stat_result):
1127
"""Get a sha digest from the tree's stat cache.
1129
The default implementation assumes no stat cache is present.
1131
:param path: The path.
1132
:param stat_result: The stat result being looked up.
1134
return self.current_dirstate().sha1_from_stat(path, stat_result)
1137
def supports_tree_reference(self):
1138
return self._repo_supports_tree_reference
1141
"""Unlock in format 4 trees needs to write the entire dirstate."""
1142
# do non-implementation specific cleanup
1145
if self._control_files._lock_count == 1:
1146
# eventually we should do signature checking during read locks for
1148
if self._control_files._lock_mode == 'w':
1151
if self._dirstate is not None:
1152
# This is a no-op if there are no modifications.
1153
self._dirstate.save()
1154
self._dirstate.unlock()
1155
# TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
1156
# point. Instead, it could check if the header has been
1157
# modified when it is locked, and if not, it can hang on to
1158
# the data it has in memory.
1159
self._dirstate = None
1160
self._inventory = None
1161
# reverse order of locking.
1163
return self._control_files.unlock()
1165
self.branch.unlock()
1167
@needs_tree_write_lock
1168
def unversion(self, file_ids):
1169
"""Remove the file ids in file_ids from the current versioned set.
1171
When a file_id is unversioned, all of its children are automatically
1174
:param file_ids: The file ids to stop versioning.
1175
:raises: NoSuchId if any fileid is not currently versioned.
1179
state = self.current_dirstate()
1180
state._read_dirblocks_if_needed()
1181
ids_to_unversion = set(file_ids)
1182
paths_to_unversion = set()
1184
# check if the root is to be unversioned, if so, assert for now.
1185
# walk the state marking unversioned things as absent.
1186
# if there are any un-unversioned ids at the end, raise
1187
for key, details in state._dirblocks[0][1]:
1188
if (details[0][0] not in ('a', 'r') and # absent or relocated
1189
key[2] in ids_to_unversion):
1190
# I haven't written the code to unversion / yet - it should be
1192
raise errors.BzrError('Unversioning the / is not currently supported')
1194
while block_index < len(state._dirblocks):
1195
# process one directory at a time.
1196
block = state._dirblocks[block_index]
1197
# first check: is the path one to remove - it or its children
1198
delete_block = False
1199
for path in paths_to_unversion:
1200
if (block[0].startswith(path) and
1201
(len(block[0]) == len(path) or
1202
block[0][len(path)] == '/')):
1203
# this entire block should be deleted - its the block for a
1204
# path to unversion; or the child of one
1207
# TODO: trim paths_to_unversion as we pass by paths
1209
# this block is to be deleted: process it.
1210
# TODO: we can special case the no-parents case and
1211
# just forget the whole block.
1213
while entry_index < len(block[1]):
1214
# Mark this file id as having been removed
1215
entry = block[1][entry_index]
1216
ids_to_unversion.discard(entry[0][2])
1217
if (entry[1][0][0] in 'ar' # don't remove absent or renamed
1219
or not state._make_absent(entry)):
1221
# go to the next block. (At the moment we dont delete empty
1226
while entry_index < len(block[1]):
1227
entry = block[1][entry_index]
1228
if (entry[1][0][0] in ('a', 'r') or # absent, relocated
1229
# ^ some parent row.
1230
entry[0][2] not in ids_to_unversion):
1231
# ^ not an id to unversion
1234
if entry[1][0][0] == 'd':
1235
paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))
1236
if not state._make_absent(entry):
1238
# we have unversioned this id
1239
ids_to_unversion.remove(entry[0][2])
1241
if ids_to_unversion:
1242
raise errors.NoSuchId(self, iter(ids_to_unversion).next())
1243
self._make_dirty(reset_inventory=False)
1244
# have to change the legacy inventory too.
1245
if self._inventory is not None:
1246
for file_id in file_ids:
1247
self._inventory.remove_recursive_id(file_id)
1249
@needs_tree_write_lock
1250
def rename_one(self, from_rel, to_rel, after=False):
1251
"""See WorkingTree.rename_one"""
1253
WorkingTree.rename_one(self, from_rel, to_rel, after)
1255
@needs_tree_write_lock
1256
def apply_inventory_delta(self, changes):
1257
"""See MutableTree.apply_inventory_delta"""
1258
state = self.current_dirstate()
1259
state.update_by_delta(changes)
1260
self._make_dirty(reset_inventory=True)
1262
def update_basis_by_delta(self, new_revid, delta):
1263
"""See MutableTree.update_basis_by_delta."""
1264
if self.last_revision() == new_revid:
1265
raise AssertionError()
1266
self.current_dirstate().update_basis_by_delta(delta, new_revid)
1269
def _validate(self):
1270
self._dirstate._validate()
1272
@needs_tree_write_lock
1273
def _write_inventory(self, inv):
1274
"""Write inventory as the current inventory."""
1276
raise AssertionError("attempting to write an inventory when the "
1277
"dirstate is dirty will lose pending changes")
1278
self.current_dirstate().set_state_from_inventory(inv)
1279
self._make_dirty(reset_inventory=False)
1280
if self._inventory is not None:
1281
self._inventory = inv
1285
class WorkingTreeFormat4(WorkingTreeFormat3):
1286
"""The first consolidated dirstate working tree format.
1289
- exists within a metadir controlling .bzr
1290
- includes an explicit version marker for the workingtree control
1291
files, separate from the BzrDir format
1292
- modifies the hash cache format
1293
- is new in bzr 0.15
1294
- uses a LockDir to guard access to it.
1297
upgrade_recommended = False
1299
_tree_class = WorkingTree4
1301
def get_format_string(self):
1302
"""See WorkingTreeFormat.get_format_string()."""
1303
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1305
def get_format_description(self):
1306
"""See WorkingTreeFormat.get_format_description()."""
1307
return "Working tree format 4"
1309
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1310
accelerator_tree=None, hardlink=False):
1311
"""See WorkingTreeFormat.initialize().
1313
:param revision_id: allows creating a working tree at a different
1314
revision than the branch is at.
1315
:param accelerator_tree: A tree which can be used for retrieving file
1316
contents more quickly than the revision tree, i.e. a workingtree.
1317
The revision tree will be used for cases where accelerator_tree's
1318
content is different.
1319
:param hardlink: If true, hard-link files from accelerator_tree,
1322
These trees get an initial random root id, if their repository supports
1323
rich root data, TREE_ROOT otherwise.
1325
if not isinstance(a_bzrdir.transport, LocalTransport):
1326
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1327
transport = a_bzrdir.get_workingtree_transport(self)
1328
control_files = self._open_control_files(a_bzrdir)
1329
control_files.create_lock()
1330
control_files.lock_write()
1331
transport.put_bytes('format', self.get_format_string(),
1332
mode=a_bzrdir._get_file_mode())
1333
if from_branch is not None:
1334
branch = from_branch
1336
branch = a_bzrdir.open_branch()
1337
if revision_id is None:
1338
revision_id = branch.last_revision()
1339
local_path = transport.local_abspath('dirstate')
1340
# write out new dirstate (must exist when we create the tree)
1341
state = dirstate.DirState.initialize(local_path)
1344
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1348
_control_files=control_files)
1350
wt.lock_tree_write()
1352
self._init_custom_control_files(wt)
1353
if revision_id in (None, NULL_REVISION):
1354
if branch.repository.supports_rich_root():
1355
wt._set_root_id(generate_ids.gen_root_id())
1357
wt._set_root_id(ROOT_ID)
1360
# frequently, we will get here due to branching. The accelerator
1361
# tree will be the tree from the branch, so the desired basis
1362
# tree will often be a parent of the accelerator tree.
1363
if accelerator_tree is not None:
1365
basis = accelerator_tree.revision_tree(revision_id)
1366
except errors.NoSuchRevision:
1369
basis = branch.repository.revision_tree(revision_id)
1370
if revision_id == NULL_REVISION:
1373
parents_list = [(revision_id, basis)]
1376
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1378
# if the basis has a root id we have to use that; otherwise we
1379
# use a new random one
1380
basis_root_id = basis.get_root_id()
1381
if basis_root_id is not None:
1382
wt._set_root_id(basis_root_id)
1384
# delta_from_tree is safe even for DirStateRevisionTrees,
1385
# because wt4.apply_inventory_delta does not mutate the input
1386
# inventory entries.
1387
transform.build_tree(basis, wt, accelerator_tree,
1388
hardlink=hardlink, delta_from_tree=True)
1392
control_files.unlock()
1396
def _init_custom_control_files(self, wt):
1397
"""Subclasses with custom control files should override this method.
1399
The working tree and control files are locked for writing when this
1402
:param wt: the WorkingTree object
1405
def _open(self, a_bzrdir, control_files):
1406
"""Open the tree itself.
1408
:param a_bzrdir: the dir for the tree.
1409
:param control_files: the control files for the tree.
1411
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1412
branch=a_bzrdir.open_branch(),
1415
_control_files=control_files)
1417
def __get_matchingbzrdir(self):
1418
# please test against something that will let us do tree references
1419
return bzrdir.format_registry.make_bzrdir(
1420
'dirstate-with-subtree')
1422
_matchingbzrdir = property(__get_matchingbzrdir)
1425
class DirStateRevisionTree(Tree):
1426
"""A revision tree pulling the inventory from a dirstate."""
1428
def __init__(self, dirstate, revision_id, repository):
1429
self._dirstate = dirstate
1430
self._revision_id = revision_id
1431
self._repository = repository
1432
self._inventory = None
1434
self._dirstate_locked = False
1435
self._repo_supports_tree_reference = getattr(
1436
repository._format, "supports_tree_reference",
1440
return "<%s of %s in %s>" % \
1441
(self.__class__.__name__, self._revision_id, self._dirstate)
1443
def annotate_iter(self, file_id,
1444
default_revision=_mod_revision.CURRENT_REVISION):
1445
"""See Tree.annotate_iter"""
1446
text_key = (file_id, self.inventory[file_id].revision)
1447
annotations = self._repository.texts.annotate(text_key)
1448
return [(key[-1], line) for (key, line) in annotations]
1450
def _get_ancestors(self, default_revision):
1451
return set(self._repository.get_ancestry(self._revision_id,
1453
def _comparison_data(self, entry, path):
1454
"""See Tree._comparison_data."""
1456
return None, False, None
1457
# trust the entry as RevisionTree does, but this may not be
1458
# sensible: the entry might not have come from us?
1459
return entry.kind, entry.executable, None
1461
def _file_size(self, entry, stat_value):
1462
return entry.text_size
1464
def filter_unversioned_files(self, paths):
1465
"""Filter out paths that are not versioned.
1467
:return: set of paths.
1469
pred = self.has_filename
1470
return set((p for p in paths if not pred(p)))
1472
def get_root_id(self):
1473
return self.path2id('')
1475
def id2path(self, file_id):
1476
"Convert a file-id to a path."
1477
entry = self._get_entry(file_id=file_id)
1478
if entry == (None, None):
1479
raise errors.NoSuchId(tree=self, file_id=file_id)
1480
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
1481
return path_utf8.decode('utf8')
1483
def iter_references(self):
1484
if not self._repo_supports_tree_reference:
1485
# When the repo doesn't support references, we will have nothing to
1488
# Otherwise, fall back to the default implementation
1489
return super(DirStateRevisionTree, self).iter_references()
1491
def _get_parent_index(self):
1492
"""Return the index in the dirstate referenced by this tree."""
1493
return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1495
def _get_entry(self, file_id=None, path=None):
1496
"""Get the dirstate row for file_id or path.
1498
If either file_id or path is supplied, it is used as the key to lookup.
1499
If both are supplied, the fastest lookup is used, and an error is
1500
raised if they do not both point at the same row.
1502
:param file_id: An optional unicode file_id to be looked up.
1503
:param path: An optional unicode path to be looked up.
1504
:return: The dirstate row tuple for path/file_id, or (None, None)
1506
if file_id is None and path is None:
1507
raise errors.BzrError('must supply file_id or path')
1508
if path is not None:
1509
path = path.encode('utf8')
1510
parent_index = self._get_parent_index()
1511
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
1513
def _generate_inventory(self):
1514
"""Create and set self.inventory from the dirstate object.
1516
(So this is only called the first time the inventory is requested for
1517
this tree; it then remains in memory until it's out of date.)
1519
This is relatively expensive: we have to walk the entire dirstate.
1521
if not self._locked:
1522
raise AssertionError(
1523
'cannot generate inventory of an unlocked '
1524
'dirstate revision tree')
1525
# separate call for profiling - makes it clear where the costs are.
1526
self._dirstate._read_dirblocks_if_needed()
1527
if self._revision_id not in self._dirstate.get_parent_ids():
1528
raise AssertionError(
1529
'parent %s has disappeared from %s' % (
1530
self._revision_id, self._dirstate.get_parent_ids()))
1531
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1532
# This is identical now to the WorkingTree _generate_inventory except
1533
# for the tree index use.
1534
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
1535
current_id = root_key[2]
1536
if current_entry[parent_index][0] != 'd':
1537
raise AssertionError()
1538
inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1539
inv.root.revision = current_entry[parent_index][4]
1540
# Turn some things into local variables
1541
minikind_to_kind = dirstate.DirState._minikind_to_kind
1542
factory = entry_factory
1543
utf8_decode = cache_utf8._utf8_decode
1544
inv_byid = inv._byid
1545
# we could do this straight out of the dirstate; it might be fast
1546
# and should be profiled - RBC 20070216
1547
parent_ies = {'' : inv.root}
1548
for block in self._dirstate._dirblocks[1:]: #skip root
1551
parent_ie = parent_ies[dirname]
1553
# all the paths in this block are not versioned in this tree
1555
for key, entry in block[1]:
1556
minikind, fingerprint, size, executable, revid = entry[parent_index]
1557
if minikind in ('a', 'r'): # absent, relocated
1561
name_unicode = utf8_decode(name)[0]
1563
kind = minikind_to_kind[minikind]
1564
inv_entry = factory[kind](file_id, name_unicode,
1566
inv_entry.revision = revid
1568
inv_entry.executable = executable
1569
inv_entry.text_size = size
1570
inv_entry.text_sha1 = fingerprint
1571
elif kind == 'directory':
1572
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1573
elif kind == 'symlink':
1574
inv_entry.executable = False
1575
inv_entry.text_size = None
1576
inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1577
elif kind == 'tree-reference':
1578
inv_entry.reference_revision = fingerprint or None
1580
raise AssertionError("cannot convert entry %r into an InventoryEntry"
1582
# These checks cost us around 40ms on a 55k entry tree
1583
if file_id in inv_byid:
1584
raise AssertionError('file_id %s already in'
1585
' inventory as %s' % (file_id, inv_byid[file_id]))
1586
if name_unicode in parent_ie.children:
1587
raise AssertionError('name %r already in parent'
1589
inv_byid[file_id] = inv_entry
1590
parent_ie.children[name_unicode] = inv_entry
1591
self._inventory = inv
1593
def get_file_mtime(self, file_id, path=None):
1594
"""Return the modification time for this record.
1596
We return the timestamp of the last-changed revision.
1598
# Make sure the file exists
1599
entry = self._get_entry(file_id, path=path)
1600
if entry == (None, None): # do we raise?
1602
parent_index = self._get_parent_index()
1603
last_changed_revision = entry[1][parent_index][4]
1604
return self._repository.get_revision(last_changed_revision).timestamp
1606
def get_file_sha1(self, file_id, path=None, stat_value=None):
1607
entry = self._get_entry(file_id=file_id, path=path)
1608
parent_index = self._get_parent_index()
1609
parent_details = entry[1][parent_index]
1610
if parent_details[0] == 'f':
1611
return parent_details[1]
1614
def get_file(self, file_id, path=None):
1615
return StringIO(self.get_file_text(file_id))
1617
def get_file_lines(self, file_id):
1618
return osutils.split_lines(self.get_file_text(file_id))
1620
def get_file_size(self, file_id):
1621
"""See Tree.get_file_size"""
1622
return self.inventory[file_id].text_size
1624
def get_file_text(self, file_id):
1625
return list(self.iter_files_bytes([(file_id, None)]))[0][1]
1627
def get_reference_revision(self, file_id, path=None):
1628
return self.inventory[file_id].reference_revision
1630
def iter_files_bytes(self, desired_files):
1631
"""See Tree.iter_files_bytes.
1633
This version is implemented on top of Repository.iter_files_bytes"""
1634
parent_index = self._get_parent_index()
1635
repo_desired_files = []
1636
for file_id, identifier in desired_files:
1637
entry = self._get_entry(file_id)
1638
if entry == (None, None):
1639
raise errors.NoSuchId(self, file_id)
1640
repo_desired_files.append((file_id, entry[1][parent_index][4],
1642
return self._repository.iter_files_bytes(repo_desired_files)
1644
def get_symlink_target(self, file_id):
1645
entry = self._get_entry(file_id=file_id)
1646
parent_index = self._get_parent_index()
1647
if entry[1][parent_index][0] != 'l':
1650
# At present, none of the tree implementations supports non-ascii
1651
# symlink targets. So we will just assume that the dirstate path is
1653
return entry[1][parent_index][1]
1655
def get_revision_id(self):
1656
"""Return the revision id for this tree."""
1657
return self._revision_id
1659
def _get_inventory(self):
1660
if self._inventory is not None:
1661
return self._inventory
1662
self._must_be_locked()
1663
self._generate_inventory()
1664
return self._inventory
1666
inventory = property(_get_inventory,
1667
doc="Inventory of this Tree")
1669
def get_parent_ids(self):
1670
"""The parents of a tree in the dirstate are not cached."""
1671
return self._repository.get_revision(self._revision_id).parent_ids
1673
def has_filename(self, filename):
1674
return bool(self.path2id(filename))
1676
def kind(self, file_id):
1677
entry = self._get_entry(file_id=file_id)[1]
1679
raise errors.NoSuchId(tree=self, file_id=file_id)
1680
return dirstate.DirState._minikind_to_kind[entry[1][0]]
1682
def stored_kind(self, file_id):
1683
"""See Tree.stored_kind"""
1684
return self.kind(file_id)
1686
def path_content_summary(self, path):
1687
"""See Tree.path_content_summary."""
1688
id = self.inventory.path2id(path)
1690
return ('missing', None, None, None)
1691
entry = self._inventory[id]
1694
return (kind, entry.text_size, entry.executable, entry.text_sha1)
1695
elif kind == 'symlink':
1696
return (kind, None, None, entry.symlink_target)
1698
return (kind, None, None, None)
1700
def is_executable(self, file_id, path=None):
1701
ie = self.inventory[file_id]
1702
if ie.kind != "file":
1704
return ie.executable
1706
def list_files(self, include_root=False):
1707
# We use a standard implementation, because DirStateRevisionTree is
1708
# dealing with one of the parents of the current state
1709
inv = self._get_inventory()
1710
entries = inv.iter_entries()
1711
if self.inventory.root is not None and not include_root:
1713
for path, entry in entries:
1714
yield path, 'V', entry.kind, entry.file_id, entry
1716
def lock_read(self):
1717
"""Lock the tree for a set of operations."""
1718
if not self._locked:
1719
self._repository.lock_read()
1720
if self._dirstate._lock_token is None:
1721
self._dirstate.lock_read()
1722
self._dirstate_locked = True
1725
def _must_be_locked(self):
1726
if not self._locked:
1727
raise errors.ObjectNotLocked(self)
1730
def path2id(self, path):
1731
"""Return the id for path in this tree."""
1732
# lookup by path: faster than splitting and walking the ivnentory.
1733
entry = self._get_entry(path=path)
1734
if entry == (None, None):
1739
"""Unlock, freeing any cache memory used during the lock."""
1740
# outside of a lock, the inventory is suspect: release it.
1742
if not self._locked:
1743
self._inventory = None
1745
if self._dirstate_locked:
1746
self._dirstate.unlock()
1747
self._dirstate_locked = False
1748
self._repository.unlock()
1751
def supports_tree_reference(self):
1752
return self._repo_supports_tree_reference
1754
def walkdirs(self, prefix=""):
1755
# TODO: jam 20070215 This is the lazy way by using the RevisionTree
1756
# implementation based on an inventory.
1757
# This should be cleaned up to use the much faster Dirstate code
1758
# So for now, we just build up the parent inventory, and extract
1759
# it the same way RevisionTree does.
1760
_directory = 'directory'
1761
inv = self._get_inventory()
1762
top_id = inv.path2id(prefix)
1766
pending = [(prefix, top_id)]
1769
relpath, file_id = pending.pop()
1770
# 0 - relpath, 1- file-id
1772
relroot = relpath + '/'
1775
# FIXME: stash the node in pending
1776
entry = inv[file_id]
1777
for name, child in entry.sorted_children():
1778
toppath = relroot + name
1779
dirblock.append((toppath, name, child.kind, None,
1780
child.file_id, child.kind
1782
yield (relpath, entry.file_id), dirblock
1783
# push the user specified dirs from dirblock
1784
for dir in reversed(dirblock):
1785
if dir[2] == _directory:
1786
pending.append((dir[0], dir[4]))
1789
class InterDirStateTree(InterTree):
1790
"""Fast path optimiser for changes_from with dirstate trees.
1792
This is used only when both trees are in the dirstate working file, and
1793
the source is any parent within the dirstate, and the destination is
1794
the current working tree of the same dirstate.
1796
# this could be generalized to allow comparisons between any trees in the
1797
# dirstate, and possibly between trees stored in different dirstates.
1799
def __init__(self, source, target):
1800
super(InterDirStateTree, self).__init__(source, target)
1801
if not InterDirStateTree.is_compatible(source, target):
1802
raise Exception, "invalid source %r and target %r" % (source, target)
1805
def make_source_parent_tree(source, target):
1806
"""Change the source tree into a parent of the target."""
1807
revid = source.commit('record tree')
1808
target.branch.repository.fetch(source.branch.repository, revid)
1809
target.set_parent_ids([revid])
1810
return target.basis_tree(), target
1812
_matching_from_tree_format = WorkingTreeFormat4()
1813
_matching_to_tree_format = WorkingTreeFormat4()
1814
_test_mutable_trees_to_test_trees = make_source_parent_tree
1816
def iter_changes(self, include_unchanged=False,
1817
specific_files=None, pb=None, extra_trees=[],
1818
require_versioned=True, want_unversioned=False):
1819
"""Return the changes from source to target.
1821
:return: An iterator that yields tuples. See InterTree.iter_changes
1823
:param specific_files: An optional list of file paths to restrict the
1824
comparison to. When mapping filenames to ids, all matches in all
1825
trees (including optional extra_trees) are used, and all children of
1826
matched directories are included.
1827
:param include_unchanged: An optional boolean requesting the inclusion of
1828
unchanged entries in the result.
1829
:param extra_trees: An optional list of additional trees to use when
1830
mapping the contents of specific_files (paths) to file_ids.
1831
:param require_versioned: If True, all files in specific_files must be
1832
versioned in one of source, target, extra_trees or
1833
PathsNotVersionedError is raised.
1834
:param want_unversioned: Should unversioned files be returned in the
1835
output. An unversioned file is defined as one with (False, False)
1836
for the versioned pair.
1838
utf8_decode = cache_utf8._utf8_decode
1839
_minikind_to_kind = dirstate.DirState._minikind_to_kind
1840
cmp_by_dirs = dirstate.cmp_by_dirs
1841
# NB: show_status depends on being able to pass in non-versioned files
1842
# and report them as unknown
1843
# TODO: handle extra trees in the dirstate.
1844
if (extra_trees or specific_files == []):
1845
# we can't fast-path these cases (yet)
1846
for f in super(InterDirStateTree, self).iter_changes(
1847
include_unchanged, specific_files, pb, extra_trees,
1848
require_versioned, want_unversioned=want_unversioned):
1851
parent_ids = self.target.get_parent_ids()
1852
if not (self.source._revision_id in parent_ids
1853
or self.source._revision_id == NULL_REVISION):
1854
raise AssertionError(
1855
"revision {%s} is not stored in {%s}, but %s "
1856
"can only be used for trees stored in the dirstate"
1857
% (self.source._revision_id, self.target, self.iter_changes))
1859
if self.source._revision_id == NULL_REVISION:
1861
indices = (target_index,)
1863
if not (self.source._revision_id in parent_ids):
1864
raise AssertionError(
1865
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
1866
self.source._revision_id, parent_ids))
1867
source_index = 1 + parent_ids.index(self.source._revision_id)
1868
indices = (source_index, target_index)
1869
# -- make all specific_files utf8 --
1871
specific_files_utf8 = set()
1872
for path in specific_files:
1873
specific_files_utf8.add(path.encode('utf8'))
1874
specific_files = specific_files_utf8
1876
specific_files = set([''])
1877
# -- specific_files is now a utf8 path set --
1878
# -- get the state object and prepare it.
1879
state = self.target.current_dirstate()
1880
state._read_dirblocks_if_needed()
1881
def _entries_for_path(path):
1882
"""Return a list with all the entries that match path for all ids.
1884
dirname, basename = os.path.split(path)
1885
key = (dirname, basename, '')
1886
block_index, present = state._find_block_index_from_key(key)
1888
# the block which should contain path is absent.
1891
block = state._dirblocks[block_index][1]
1892
entry_index, _ = state._find_entry_index(key, block)
1893
# we may need to look at multiple entries at this path: walk while the specific_files match.
1894
while (entry_index < len(block) and
1895
block[entry_index][0][0:2] == key[0:2]):
1896
result.append(block[entry_index])
1899
if require_versioned:
1900
# -- check all supplied paths are versioned in a search tree. --
1901
all_versioned = True
1902
for path in specific_files:
1903
path_entries = _entries_for_path(path)
1904
if not path_entries:
1905
# this specified path is not present at all: error
1906
all_versioned = False
1908
found_versioned = False
1909
# for each id at this path
1910
for entry in path_entries:
1912
for index in indices:
1913
if entry[1][index][0] != 'a': # absent
1914
found_versioned = True
1915
# all good: found a versioned cell
1917
if not found_versioned:
1918
# none of the indexes was not 'absent' at all ids for this
1920
all_versioned = False
1922
if not all_versioned:
1923
raise errors.PathsNotVersionedError(specific_files)
1924
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1925
search_specific_files = set()
1926
for path in specific_files:
1927
other_specific_files = specific_files.difference(set([path]))
1928
if not osutils.is_inside_any(other_specific_files, path):
1929
# this is a top level path, we must check it.
1930
search_specific_files.add(path)
1932
# compare source_index and target_index at or under each element of search_specific_files.
1933
# follow the following comparison table. Note that we only want to do diff operations when
1934
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1938
# Source | Target | disk | action
1939
# r | fdlt | | add source to search, add id path move and perform
1940
# | | | diff check on source-target
1941
# r | fdlt | a | dangling file that was present in the basis.
1943
# r | a | | add source to search
1945
# r | r | | this path is present in a non-examined tree, skip.
1946
# r | r | a | this path is present in a non-examined tree, skip.
1947
# a | fdlt | | add new id
1948
# a | fdlt | a | dangling locally added file, skip
1949
# a | a | | not present in either tree, skip
1950
# a | a | a | not present in any tree, skip
1951
# a | r | | not present in either tree at this path, skip as it
1952
# | | | may not be selected by the users list of paths.
1953
# a | r | a | not present in either tree at this path, skip as it
1954
# | | | may not be selected by the users list of paths.
1955
# fdlt | fdlt | | content in both: diff them
1956
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1957
# fdlt | a | | unversioned: output deleted id for now
1958
# fdlt | a | a | unversioned and deleted: output deleted id
1959
# fdlt | r | | relocated in this tree, so add target to search.
1960
# | | | Dont diff, we will see an r,fd; pair when we reach
1961
# | | | this id at the other path.
1962
# fdlt | r | a | relocated in this tree, so add target to search.
1963
# | | | Dont diff, we will see an r,fd; pair when we reach
1964
# | | | this id at the other path.
1966
# for all search_indexs in each path at or under each element of
1967
# search_specific_files, if the detail is relocated: add the id, and add the
1968
# relocated path as one to search if its not searched already. If the
1969
# detail is not relocated, add the id.
1970
searched_specific_files = set()
1971
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1972
# Using a list so that we can access the values and change them in
1973
# nested scope. Each one is [path, file_id, entry]
1974
last_source_parent = [None, None]
1975
last_target_parent = [None, None]
1977
use_filesystem_for_exec = (sys.platform != 'win32')
1979
# Just a sentry, so that _process_entry can say that this
1980
# record is handled, but isn't interesting to process (unchanged)
1981
uninteresting = object()
1983
old_dirname_to_file_id = {}
1984
new_dirname_to_file_id = {}
1985
# TODO: jam 20070516 - Avoid the _get_entry lookup overhead by
1986
# keeping a cache of directories that we have seen.
1988
def _process_entry(entry, path_info):
1989
"""Compare an entry and real disk to generate delta information.
1991
:param path_info: top_relpath, basename, kind, lstat, abspath for
1992
the path of entry. If None, then the path is considered absent.
1993
(Perhaps we should pass in a concrete entry for this ?)
1994
Basename is returned as a utf8 string because we expect this
1995
tuple will be ignored, and don't want to take the time to
1997
:return: None if these don't match
1998
A tuple of information about the change, or
1999
the object 'uninteresting' if these match, but are
2000
basically identical.
2002
if source_index is None:
2003
source_details = NULL_PARENT_DETAILS
2005
source_details = entry[1][source_index]
2006
target_details = entry[1][target_index]
2007
target_minikind = target_details[0]
2008
if path_info is not None and target_minikind in 'fdlt':
2009
if not (target_index == 0):
2010
raise AssertionError()
2011
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
2012
stat_value=path_info[3])
2013
# The entry may have been modified by update_entry
2014
target_details = entry[1][target_index]
2015
target_minikind = target_details[0]
2018
file_id = entry[0][2]
2019
source_minikind = source_details[0]
2020
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
2021
# claimed content in both: diff
2022
# r | fdlt | | add source to search, add id path move and perform
2023
# | | | diff check on source-target
2024
# r | fdlt | a | dangling file that was present in the basis.
2026
if source_minikind in 'r':
2027
# add the source to the search path to find any children it
2028
# has. TODO ? : only add if it is a container ?
2029
if not osutils.is_inside_any(searched_specific_files,
2031
search_specific_files.add(source_details[1])
2032
# generate the old path; this is needed for stating later
2034
old_path = source_details[1]
2035
old_dirname, old_basename = os.path.split(old_path)
2036
path = pathjoin(entry[0][0], entry[0][1])
2037
old_entry = state._get_entry(source_index,
2039
# update the source details variable to be the real
2041
if old_entry == (None, None):
2042
raise errors.CorruptDirstate(state._filename,
2043
"entry '%s/%s' is considered renamed from %r"
2044
" but source does not exist\n"
2045
"entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
2046
source_details = old_entry[1][source_index]
2047
source_minikind = source_details[0]
2049
old_dirname = entry[0][0]
2050
old_basename = entry[0][1]
2051
old_path = path = None
2052
if path_info is None:
2053
# the file is missing on disk, show as removed.
2054
content_change = True
2058
# source and target are both versioned and disk file is present.
2059
target_kind = path_info[2]
2060
if target_kind == 'directory':
2062
old_path = path = pathjoin(old_dirname, old_basename)
2063
new_dirname_to_file_id[path] = file_id
2064
if source_minikind != 'd':
2065
content_change = True
2067
# directories have no fingerprint
2068
content_change = False
2070
elif target_kind == 'file':
2071
if source_minikind != 'f':
2072
content_change = True
2074
# We could check the size, but we already have the
2076
content_change = (link_or_sha1 != source_details[1])
2077
# Target details is updated at update_entry time
2078
if use_filesystem_for_exec:
2079
# We don't need S_ISREG here, because we are sure
2080
# we are dealing with a file.
2081
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
2083
target_exec = target_details[3]
2084
elif target_kind == 'symlink':
2085
if source_minikind != 'l':
2086
content_change = True
2088
content_change = (link_or_sha1 != source_details[1])
2090
elif target_kind == 'tree-reference':
2091
if source_minikind != 't':
2092
content_change = True
2094
content_change = False
2097
raise Exception, "unknown kind %s" % path_info[2]
2098
if source_minikind == 'd':
2100
old_path = path = pathjoin(old_dirname, old_basename)
2101
old_dirname_to_file_id[old_path] = file_id
2102
# parent id is the entry for the path in the target tree
2103
if old_dirname == last_source_parent[0]:
2104
source_parent_id = last_source_parent[1]
2107
source_parent_id = old_dirname_to_file_id[old_dirname]
2109
source_parent_entry = state._get_entry(source_index,
2110
path_utf8=old_dirname)
2111
source_parent_id = source_parent_entry[0][2]
2112
if source_parent_id == entry[0][2]:
2113
# This is the root, so the parent is None
2114
source_parent_id = None
2116
last_source_parent[0] = old_dirname
2117
last_source_parent[1] = source_parent_id
2118
new_dirname = entry[0][0]
2119
if new_dirname == last_target_parent[0]:
2120
target_parent_id = last_target_parent[1]
2123
target_parent_id = new_dirname_to_file_id[new_dirname]
2125
# TODO: We don't always need to do the lookup, because the
2126
# parent entry will be the same as the source entry.
2127
target_parent_entry = state._get_entry(target_index,
2128
path_utf8=new_dirname)
2129
if target_parent_entry == (None, None):
2130
raise AssertionError(
2131
"Could not find target parent in wt: %s\nparent of: %s"
2132
% (new_dirname, entry))
2133
target_parent_id = target_parent_entry[0][2]
2134
if target_parent_id == entry[0][2]:
2135
# This is the root, so the parent is None
2136
target_parent_id = None
2138
last_target_parent[0] = new_dirname
2139
last_target_parent[1] = target_parent_id
2141
source_exec = source_details[3]
2142
if (include_unchanged
2144
or source_parent_id != target_parent_id
2145
or old_basename != entry[0][1]
2146
or source_exec != target_exec
2148
if old_path is None:
2149
old_path = path = pathjoin(old_dirname, old_basename)
2150
old_path_u = utf8_decode(old_path)[0]
2153
old_path_u = utf8_decode(old_path)[0]
2154
if old_path == path:
2157
path_u = utf8_decode(path)[0]
2158
source_kind = _minikind_to_kind[source_minikind]
2159
return (entry[0][2],
2160
(old_path_u, path_u),
2163
(source_parent_id, target_parent_id),
2164
(utf8_decode(old_basename)[0], utf8_decode(entry[0][1])[0]),
2165
(source_kind, target_kind),
2166
(source_exec, target_exec))
2168
return uninteresting
2169
elif source_minikind in 'a' and target_minikind in 'fdlt':
2170
# looks like a new file
2171
path = pathjoin(entry[0][0], entry[0][1])
2172
# parent id is the entry for the path in the target tree
2173
# TODO: these are the same for an entire directory: cache em.
2174
parent_id = state._get_entry(target_index,
2175
path_utf8=entry[0][0])[0][2]
2176
if parent_id == entry[0][2]:
2178
if path_info is not None:
2180
if use_filesystem_for_exec:
2181
# We need S_ISREG here, because we aren't sure if this
2184
stat.S_ISREG(path_info[3].st_mode)
2185
and stat.S_IEXEC & path_info[3].st_mode)
2187
target_exec = target_details[3]
2188
return (entry[0][2],
2189
(None, utf8_decode(path)[0]),
2193
(None, utf8_decode(entry[0][1])[0]),
2194
(None, path_info[2]),
2195
(None, target_exec))
2197
# Its a missing file, report it as such.
2198
return (entry[0][2],
2199
(None, utf8_decode(path)[0]),
2203
(None, utf8_decode(entry[0][1])[0]),
2206
elif source_minikind in 'fdlt' and target_minikind in 'a':
2207
# unversioned, possibly, or possibly not deleted: we dont care.
2208
# if its still on disk, *and* theres no other entry at this
2209
# path [we dont know this in this routine at the moment -
2210
# perhaps we should change this - then it would be an unknown.
2211
old_path = pathjoin(entry[0][0], entry[0][1])
2212
# parent id is the entry for the path in the target tree
2213
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
2214
if parent_id == entry[0][2]:
2216
return (entry[0][2],
2217
(utf8_decode(old_path)[0], None),
2221
(utf8_decode(entry[0][1])[0], None),
2222
(_minikind_to_kind[source_minikind], None),
2223
(source_details[3], None))
2224
elif source_minikind in 'fdlt' and target_minikind in 'r':
2225
# a rename; could be a true rename, or a rename inherited from
2226
# a renamed parent. TODO: handle this efficiently. Its not
2227
# common case to rename dirs though, so a correct but slow
2228
# implementation will do.
2229
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
2230
search_specific_files.add(target_details[1])
2231
elif source_minikind in 'ra' and target_minikind in 'ra':
2232
# neither of the selected trees contain this file,
2233
# so skip over it. This is not currently directly tested, but
2234
# is indirectly via test_too_much.TestCommands.test_conflicts.
2237
raise AssertionError("don't know how to compare "
2238
"source_minikind=%r, target_minikind=%r"
2239
% (source_minikind, target_minikind))
2240
## import pdb;pdb.set_trace()
2243
while search_specific_files:
2244
# TODO: the pending list should be lexically sorted? the
2245
# interface doesn't require it.
2246
current_root = search_specific_files.pop()
2247
current_root_unicode = current_root.decode('utf8')
2248
searched_specific_files.add(current_root)
2249
# process the entries for this containing directory: the rest will be
2250
# found by their parents recursively.
2251
root_entries = _entries_for_path(current_root)
2252
root_abspath = self.target.abspath(current_root_unicode)
2254
root_stat = os.lstat(root_abspath)
2256
if e.errno == errno.ENOENT:
2257
# the path does not exist: let _process_entry know that.
2258
root_dir_info = None
2260
# some other random error: hand it up.
2263
root_dir_info = ('', current_root,
2264
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2266
if root_dir_info[2] == 'directory':
2267
if self.target._directory_is_tree_reference(
2268
current_root.decode('utf8')):
2269
root_dir_info = root_dir_info[:2] + \
2270
('tree-reference',) + root_dir_info[3:]
2272
if not root_entries and not root_dir_info:
2273
# this specified path is not present at all, skip it.
2275
path_handled = False
2276
for entry in root_entries:
2277
result = _process_entry(entry, root_dir_info)
2278
if result is not None:
2280
if result is not uninteresting:
2282
if want_unversioned and not path_handled and root_dir_info:
2283
new_executable = bool(
2284
stat.S_ISREG(root_dir_info[3].st_mode)
2285
and stat.S_IEXEC & root_dir_info[3].st_mode)
2287
(None, current_root_unicode),
2291
(None, splitpath(current_root_unicode)[-1]),
2292
(None, root_dir_info[2]),
2293
(None, new_executable)
2295
initial_key = (current_root, '', '')
2296
block_index, _ = state._find_block_index_from_key(initial_key)
2297
if block_index == 0:
2298
# we have processed the total root already, but because the
2299
# initial key matched it we should skip it here.
2301
if root_dir_info and root_dir_info[2] == 'tree-reference':
2302
current_dir_info = None
2304
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2306
current_dir_info = dir_iterator.next()
2308
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2309
# python 2.5 has e.errno == EINVAL,
2310
# and e.winerror == ERROR_DIRECTORY
2311
e_winerror = getattr(e, 'winerror', None)
2312
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2313
# there may be directories in the inventory even though
2314
# this path is not a file on disk: so mark it as end of
2316
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2317
current_dir_info = None
2318
elif (sys.platform == 'win32'
2319
and (e.errno in win_errors
2320
or e_winerror in win_errors)):
2321
current_dir_info = None
2325
if current_dir_info[0][0] == '':
2326
# remove .bzr from iteration
2327
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2328
if current_dir_info[1][bzr_index][0] != '.bzr':
2329
raise AssertionError()
2330
del current_dir_info[1][bzr_index]
2331
# walk until both the directory listing and the versioned metadata
2333
if (block_index < len(state._dirblocks) and
2334
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2335
current_block = state._dirblocks[block_index]
2337
current_block = None
2338
while (current_dir_info is not None or
2339
current_block is not None):
2340
if (current_dir_info and current_block
2341
and current_dir_info[0][0] != current_block[0]):
2342
if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:
2343
# filesystem data refers to paths not covered by the dirblock.
2344
# this has two possibilities:
2345
# A) it is versioned but empty, so there is no block for it
2346
# B) it is not versioned.
2348
# if (A) then we need to recurse into it to check for
2349
# new unknown files or directories.
2350
# if (B) then we should ignore it, because we don't
2351
# recurse into unknown directories.
2353
while path_index < len(current_dir_info[1]):
2354
current_path_info = current_dir_info[1][path_index]
2355
if want_unversioned:
2356
if current_path_info[2] == 'directory':
2357
if self.target._directory_is_tree_reference(
2358
current_path_info[0].decode('utf8')):
2359
current_path_info = current_path_info[:2] + \
2360
('tree-reference',) + current_path_info[3:]
2361
new_executable = bool(
2362
stat.S_ISREG(current_path_info[3].st_mode)
2363
and stat.S_IEXEC & current_path_info[3].st_mode)
2365
(None, utf8_decode(current_path_info[0])[0]),
2369
(None, utf8_decode(current_path_info[1])[0]),
2370
(None, current_path_info[2]),
2371
(None, new_executable))
2372
# dont descend into this unversioned path if it is
2374
if current_path_info[2] in ('directory',
2376
del current_dir_info[1][path_index]
2380
# This dir info has been handled, go to the next
2382
current_dir_info = dir_iterator.next()
2383
except StopIteration:
2384
current_dir_info = None
2386
# We have a dirblock entry for this location, but there
2387
# is no filesystem path for this. This is most likely
2388
# because a directory was removed from the disk.
2389
# We don't have to report the missing directory,
2390
# because that should have already been handled, but we
2391
# need to handle all of the files that are contained
2393
for current_entry in current_block[1]:
2394
# entry referring to file not present on disk.
2395
# advance the entry only, after processing.
2396
result = _process_entry(current_entry, None)
2397
if result is not None:
2398
if result is not uninteresting:
2401
if (block_index < len(state._dirblocks) and
2402
osutils.is_inside(current_root,
2403
state._dirblocks[block_index][0])):
2404
current_block = state._dirblocks[block_index]
2406
current_block = None
2409
if current_block and entry_index < len(current_block[1]):
2410
current_entry = current_block[1][entry_index]
2412
current_entry = None
2413
advance_entry = True
2415
if current_dir_info and path_index < len(current_dir_info[1]):
2416
current_path_info = current_dir_info[1][path_index]
2417
if current_path_info[2] == 'directory':
2418
if self.target._directory_is_tree_reference(
2419
current_path_info[0].decode('utf8')):
2420
current_path_info = current_path_info[:2] + \
2421
('tree-reference',) + current_path_info[3:]
2423
current_path_info = None
2425
path_handled = False
2426
while (current_entry is not None or
2427
current_path_info is not None):
2428
if current_entry is None:
2429
# the check for path_handled when the path is adnvaced
2430
# will yield this path if needed.
2432
elif current_path_info is None:
2433
# no path is fine: the per entry code will handle it.
2434
result = _process_entry(current_entry, current_path_info)
2435
if result is not None:
2436
if result is not uninteresting:
2438
elif (current_entry[0][1] != current_path_info[1]
2439
or current_entry[1][target_index][0] in 'ar'):
2440
# The current path on disk doesn't match the dirblock
2441
# record. Either the dirblock is marked as absent, or
2442
# the file on disk is not present at all in the
2443
# dirblock. Either way, report about the dirblock
2444
# entry, and let other code handle the filesystem one.
2446
# Compare the basename for these files to determine
2448
if current_path_info[1] < current_entry[0][1]:
2449
# extra file on disk: pass for now, but only
2450
# increment the path, not the entry
2451
advance_entry = False
2453
# entry referring to file not present on disk.
2454
# advance the entry only, after processing.
2455
result = _process_entry(current_entry, None)
2456
if result is not None:
2457
if result is not uninteresting:
2459
advance_path = False
2461
result = _process_entry(current_entry, current_path_info)
2462
if result is not None:
2464
if result is not uninteresting:
2466
if advance_entry and current_entry is not None:
2468
if entry_index < len(current_block[1]):
2469
current_entry = current_block[1][entry_index]
2471
current_entry = None
2473
advance_entry = True # reset the advance flaga
2474
if advance_path and current_path_info is not None:
2475
if not path_handled:
2476
# unversioned in all regards
2477
if want_unversioned:
2478
new_executable = bool(
2479
stat.S_ISREG(current_path_info[3].st_mode)
2480
and stat.S_IEXEC & current_path_info[3].st_mode)
2482
relpath_unicode = utf8_decode(current_path_info[0])[0]
2483
except UnicodeDecodeError:
2484
raise errors.BadFilenameEncoding(
2485
current_path_info[0], osutils._fs_enc)
2487
(None, relpath_unicode),
2491
(None, utf8_decode(current_path_info[1])[0]),
2492
(None, current_path_info[2]),
2493
(None, new_executable))
2494
# dont descend into this unversioned path if it is
2496
if current_path_info[2] in ('directory'):
2497
del current_dir_info[1][path_index]
2499
# dont descend the disk iterator into any tree
2501
if current_path_info[2] == 'tree-reference':
2502
del current_dir_info[1][path_index]
2505
if path_index < len(current_dir_info[1]):
2506
current_path_info = current_dir_info[1][path_index]
2507
if current_path_info[2] == 'directory':
2508
if self.target._directory_is_tree_reference(
2509
current_path_info[0].decode('utf8')):
2510
current_path_info = current_path_info[:2] + \
2511
('tree-reference',) + current_path_info[3:]
2513
current_path_info = None
2514
path_handled = False
2516
advance_path = True # reset the advance flagg.
2517
if current_block is not None:
2519
if (block_index < len(state._dirblocks) and
2520
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2521
current_block = state._dirblocks[block_index]
2523
current_block = None
2524
if current_dir_info is not None:
2526
current_dir_info = dir_iterator.next()
2527
except StopIteration:
2528
current_dir_info = None
2531
def is_compatible(source, target):
2532
# the target must be a dirstate working tree
2533
if not isinstance(target, WorkingTree4):
2535
# the source must be a revtreee or dirstate rev tree.
2536
if not isinstance(source,
2537
(revisiontree.RevisionTree, DirStateRevisionTree)):
2539
# the source revid must be in the target dirstate
2540
if not (source._revision_id == NULL_REVISION or
2541
source._revision_id in target.get_parent_ids()):
2542
# TODO: what about ghosts? it may well need to
2543
# check for them explicitly.
2547
InterTree.register_optimiser(InterDirStateTree)
2550
class Converter3to4(object):
2551
"""Perform an in-place upgrade of format 3 to format 4 trees."""
2554
self.target_format = WorkingTreeFormat4()
2556
def convert(self, tree):
2557
# lock the control files not the tree, so that we dont get tree
2558
# on-unlock behaviours, and so that noone else diddles with the
2559
# tree during upgrade.
2560
tree._control_files.lock_write()
2562
tree.read_working_inventory()
2563
self.create_dirstate_data(tree)
2564
self.update_format(tree)
2565
self.remove_xml_files(tree)
2567
tree._control_files.unlock()
2569
def create_dirstate_data(self, tree):
2570
"""Create the dirstate based data for tree."""
2571
local_path = tree.bzrdir.get_workingtree_transport(None
2572
).local_abspath('dirstate')
2573
state = dirstate.DirState.from_tree(tree, local_path)
2577
def remove_xml_files(self, tree):
2578
"""Remove the oldformat 3 data."""
2579
transport = tree.bzrdir.get_workingtree_transport(None)
2580
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
2581
'pending-merges', 'stat-cache']:
2583
transport.delete(path)
2584
except errors.NoSuchFile:
2585
# some files are optional - just deal.
2588
def update_format(self, tree):
2589
"""Change the format marker."""
2590
tree._transport.put_bytes('format',
2591
self.target_format.get_format_string(),
2592
mode=tree.bzrdir._get_file_mode())
added
removed
bzrlib/workingtree_4.py
