1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""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,
63
from bzrlib.transport import get_transport
67
from bzrlib import symbol_versioning
68
from bzrlib.decorators import needs_read_lock, needs_write_lock
69
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
70
from bzrlib.lockable_files import LockableFiles, TransportLock
71
from bzrlib.lockdir import LockDir
72
import bzrlib.mutabletree
73
from bzrlib.mutabletree import needs_tree_write_lock
74
from bzrlib.osutils import (
83
from bzrlib.trace import mutter, note
84
from bzrlib.transport.local import LocalTransport
85
from bzrlib.tree import InterTree
86
from bzrlib.progress import DummyProgress, ProgressPhase
87
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
88
from bzrlib.rio import RioReader, rio_file, Stanza
89
from bzrlib.symbol_versioning import (deprecated_passed,
94
from bzrlib.tree import Tree
95
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
98
class WorkingTree4(WorkingTree3):
99
"""This is the Format 4 working tree.
101
This differs from WorkingTree3 by:
102
- Having a consolidated internal dirstate, stored in a
103
randomly-accessible sorted file on disk.
104
- Not having a regular inventory attribute. One can be synthesized
105
on demand but this is expensive and should be avoided.
107
This is new in bzr 0.15.
110
def __init__(self, basedir,
115
"""Construct a WorkingTree for basedir.
117
If the branch is not supplied, it is opened automatically.
118
If the branch is supplied, it must be the branch for this basedir.
119
(branch.base is not cross checked, because for remote branches that
120
would be meaningless).
122
self._format = _format
123
self.bzrdir = _bzrdir
124
from bzrlib.trace import note, mutter
125
assert isinstance(basedir, basestring), \
126
"base directory %r is not a string" % basedir
127
basedir = safe_unicode(basedir)
128
mutter("opening working tree %r", basedir)
129
self._branch = branch
130
assert isinstance(self.branch, bzrlib.branch.Branch), \
131
"branch %r is not a Branch" % self.branch
132
self.basedir = realpath(basedir)
133
# if branch is at our basedir and is a format 6 or less
134
# assume all other formats have their own control files.
135
assert isinstance(_control_files, LockableFiles), \
136
"_control_files must be a LockableFiles, not %r" % _control_files
137
self._control_files = _control_files
140
# during a read or write lock these objects are set, and are
141
# None the rest of the time.
142
self._dirstate = None
143
self._inventory = None
146
@needs_tree_write_lock
147
def _add(self, files, ids, kinds):
148
"""See MutableTree._add."""
149
state = self.current_dirstate()
150
for f, file_id, kind in zip(files, ids, kinds):
155
# special case tree root handling.
156
if f == '' and self.path2id(f) == ROOT_ID:
157
state.set_path_id('', generate_ids.gen_file_id(f))
160
file_id = generate_ids.gen_file_id(f)
161
# deliberately add the file with no cached stat or sha1
162
# - on the first access it will be gathered, and we can
163
# always change this once tests are all passing.
164
state.add(f, file_id, kind, None, '')
165
self._make_dirty(reset_inventory=True)
167
def _make_dirty(self, reset_inventory):
168
"""Make the tree state dirty.
170
:param reset_inventory: True if the cached inventory should be removed
171
(presuming there is one).
174
if reset_inventory and self._inventory is not None:
175
self._inventory = None
177
@needs_tree_write_lock
178
def add_reference(self, sub_tree):
179
# use standard implementation, which calls back to self._add
181
# So we don't store the reference_revision in the working dirstate,
182
# it's just recorded at the moment of commit.
183
self._add_reference(sub_tree)
185
def break_lock(self):
186
"""Break a lock if one is present from another instance.
188
Uses the ui factory to ask for confirmation if the lock may be from
191
This will probe the repository for its lock as well.
193
# if the dirstate is locked by an active process, reject the break lock
196
if self._dirstate is None:
200
state = self._current_dirstate()
201
if state._lock_token is not None:
202
# we already have it locked. sheese, cant break our own lock.
203
raise errors.LockActive(self.basedir)
206
# try for a write lock - need permission to get one anyhow
209
except errors.LockContention:
210
# oslocks fail when a process is still live: fail.
211
# TODO: get the locked lockdir info and give to the user to
212
# assist in debugging.
213
raise errors.LockActive(self.basedir)
218
self._dirstate = None
219
self._control_files.break_lock()
220
self.branch.break_lock()
222
def _comparison_data(self, entry, path):
223
kind, executable, stat_value = \
224
WorkingTree3._comparison_data(self, entry, path)
225
# it looks like a plain directory, but it's really a reference
226
if kind == 'directory' and entry.kind == 'tree-reference':
227
kind = 'tree-reference'
228
return kind, executable, stat_value
231
def commit(self, message=None, revprops=None, *args, **kwargs):
232
# mark the tree as dirty post commit - commit
233
# can change the current versioned list by doing deletes.
234
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
235
self._make_dirty(reset_inventory=True)
238
def current_dirstate(self):
239
"""Return the current dirstate object.
241
This is not part of the tree interface and only exposed for ease of
244
:raises errors.NotWriteLocked: when not in a lock.
246
self._must_be_locked()
247
return self._current_dirstate()
249
def _current_dirstate(self):
250
"""Internal function that does not check lock status.
252
This is needed for break_lock which also needs the dirstate.
254
if self._dirstate is not None:
255
return self._dirstate
256
local_path = self.bzrdir.get_workingtree_transport(None
257
).local_abspath('dirstate')
258
self._dirstate = dirstate.DirState.on_file(local_path)
259
return self._dirstate
261
def filter_unversioned_files(self, paths):
262
"""Filter out paths that are versioned.
264
:return: set of paths.
266
# TODO: make a generic multi-bisect routine roughly that should list
267
# the paths, then process one half at a time recursively, and feed the
268
# results of each bisect in further still
269
paths = sorted(paths)
271
state = self.current_dirstate()
272
# TODO we want a paths_to_dirblocks helper I think
274
dirname, basename = os.path.split(path.encode('utf8'))
275
_, _, _, path_is_versioned = state._get_block_entry_index(
276
dirname, basename, 0)
277
if not path_is_versioned:
282
"""Write all cached data to disk."""
283
if self._control_files._lock_mode != 'w':
284
raise errors.NotWriteLocked(self)
285
self.current_dirstate().save()
286
self._inventory = None
289
def _generate_inventory(self):
290
"""Create and set self.inventory from the dirstate object.
292
This is relatively expensive: we have to walk the entire dirstate.
293
Ideally we would not, and can deprecate this function.
295
#: uncomment to trap on inventory requests.
296
# import pdb;pdb.set_trace()
297
state = self.current_dirstate()
298
state._read_dirblocks_if_needed()
299
root_key, current_entry = self._get_entry(path='')
300
current_id = root_key[2]
301
assert current_entry[0][0] == 'd' # directory
302
inv = Inventory(root_id=current_id)
303
# Turn some things into local variables
304
minikind_to_kind = dirstate.DirState._minikind_to_kind
305
factory = entry_factory
306
utf8_decode = cache_utf8._utf8_decode
308
# we could do this straight out of the dirstate; it might be fast
309
# and should be profiled - RBC 20070216
310
parent_ies = {'' : inv.root}
311
for block in state._dirblocks[1:]: # skip the root
314
parent_ie = parent_ies[dirname]
316
# all the paths in this block are not versioned in this tree
318
for key, entry in block[1]:
319
minikind, link_or_sha1, size, executable, stat = entry[0]
320
if minikind in ('a', 'r'): # absent, relocated
321
# a parent tree only entry
324
name_unicode = utf8_decode(name)[0]
326
kind = minikind_to_kind[minikind]
327
inv_entry = factory[kind](file_id, name_unicode,
330
# not strictly needed: working tree
331
#entry.executable = executable
332
#entry.text_size = size
333
#entry.text_sha1 = sha1
335
elif kind == 'directory':
336
# add this entry to the parent map.
337
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
338
# These checks cost us around 40ms on a 55k entry tree
339
assert file_id not in inv_byid, ('file_id %s already in'
340
' inventory as %s' % (file_id, inv_byid[file_id]))
341
assert name_unicode not in parent_ie.children
342
inv_byid[file_id] = inv_entry
343
parent_ie.children[name_unicode] = inv_entry
344
self._inventory = inv
346
def _get_entry(self, file_id=None, path=None):
347
"""Get the dirstate row for file_id or path.
349
If either file_id or path is supplied, it is used as the key to lookup.
350
If both are supplied, the fastest lookup is used, and an error is
351
raised if they do not both point at the same row.
353
:param file_id: An optional unicode file_id to be looked up.
354
:param path: An optional unicode path to be looked up.
355
:return: The dirstate row tuple for path/file_id, or (None, None)
357
if file_id is None and path is None:
358
raise errors.BzrError('must supply file_id or path')
359
state = self.current_dirstate()
361
path = path.encode('utf8')
362
return state._get_entry(0, fileid_utf8=file_id, path_utf8=path)
364
def get_file_sha1(self, file_id, path=None, stat_value=None):
365
# check file id is valid unconditionally.
366
entry = self._get_entry(file_id=file_id, path=path)
367
assert entry[0] is not None, 'what error should this raise'
369
# if row stat is valid, use cached sha1, else, get a new sha1.
371
path = pathjoin(entry[0][0], entry[0][1]).decode('utf8')
373
file_abspath = self.abspath(path)
374
state = self.current_dirstate()
375
link_or_sha1 = state.update_entry(entry, file_abspath,
376
stat_value=stat_value)
377
if entry[1][0][0] == 'f':
381
def _get_inventory(self):
382
"""Get the inventory for the tree. This is only valid within a lock."""
383
if self._inventory is not None:
384
return self._inventory
385
self._must_be_locked()
386
self._generate_inventory()
387
return self._inventory
389
inventory = property(_get_inventory,
390
doc="Inventory of this Tree")
393
def get_parent_ids(self):
394
"""See Tree.get_parent_ids.
396
This implementation requests the ids list from the dirstate file.
398
return self.current_dirstate().get_parent_ids()
400
def get_reference_revision(self, entry, path=None):
401
# referenced tree's revision is whatever's currently there
402
return self.get_nested_tree(entry, path).last_revision()
404
def get_nested_tree(self, entry, path=None):
406
path = self.id2path(entry.file_id)
407
return WorkingTree.open(self.abspath(path))
410
def get_root_id(self):
411
"""Return the id of this trees root"""
412
return self._get_entry(path='')[0][2]
414
def has_id(self, file_id):
415
state = self.current_dirstate()
416
file_id = osutils.safe_file_id(file_id)
417
row, parents = self._get_entry(file_id=file_id)
420
return osutils.lexists(pathjoin(
421
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
424
def id2path(self, file_id):
425
file_id = osutils.safe_file_id(file_id)
426
state = self.current_dirstate()
427
entry = self._get_entry(file_id=file_id)
428
if entry == (None, None):
429
raise errors.NoSuchId(tree=self, file_id=file_id)
430
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
431
return path_utf8.decode('utf8')
435
"""Iterate through file_ids for this tree.
437
file_ids are in a WorkingTree if they are in the working inventory
438
and the working file exists.
441
for key, tree_details in self.current_dirstate()._iter_entries():
442
if tree_details[0][0] in ('a', 'r'): # absent, relocated
443
# not relevant to the working tree
445
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
446
if osutils.lexists(path):
447
result.append(key[2])
451
def kind(self, file_id):
452
# The kind of a file is whatever it actually is on disk, except that
453
# tree-references need to be reported as such rather than as the
456
# TODO: Possibly we should check that the directory still really
457
# contains a subtree, at least during commit? mbp 20070227
458
kind = WorkingTree3.kind(self, file_id)
459
if kind == 'directory':
460
# TODO: ask the dirstate not the inventory -- mbp 20060227
461
entry = self.inventory[file_id]
462
if entry.kind == 'tree-reference':
463
kind = 'tree-reference'
467
def _last_revision(self):
468
"""See Mutable.last_revision."""
469
parent_ids = self.current_dirstate().get_parent_ids()
476
"""See Branch.lock_read, and WorkingTree.unlock."""
477
self.branch.lock_read()
479
self._control_files.lock_read()
481
state = self.current_dirstate()
482
if not state._lock_token:
485
self._control_files.unlock()
491
def _lock_self_write(self):
492
"""This should be called after the branch is locked."""
494
self._control_files.lock_write()
496
state = self.current_dirstate()
497
if not state._lock_token:
500
self._control_files.unlock()
506
def lock_tree_write(self):
507
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
508
self.branch.lock_read()
509
self._lock_self_write()
511
def lock_write(self):
512
"""See MutableTree.lock_write, and WorkingTree.unlock."""
513
self.branch.lock_write()
514
self._lock_self_write()
516
@needs_tree_write_lock
517
def move(self, from_paths, to_dir, after=False):
518
"""See WorkingTree.move()."""
523
state = self.current_dirstate()
525
assert not isinstance(from_paths, basestring)
526
to_dir_utf8 = to_dir.encode('utf8')
527
to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
528
id_index = state._get_id_index()
529
# check destination directory
530
# get the details for it
531
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
532
state._get_block_entry_index(to_entry_dirname, to_basename, 0)
533
if not entry_present:
534
raise errors.BzrMoveFailedError('', to_dir,
535
errors.NotVersionedError(to_dir))
536
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
537
# get a handle on the block itself.
538
to_block_index = state._ensure_block(
539
to_entry_block_index, to_entry_entry_index, to_dir_utf8)
540
to_block = state._dirblocks[to_block_index]
541
to_abs = self.abspath(to_dir)
542
if not isdir(to_abs):
543
raise errors.BzrMoveFailedError('',to_dir,
544
errors.NotADirectory(to_abs))
546
if to_entry[1][0][0] != 'd':
547
raise errors.BzrMoveFailedError('',to_dir,
548
errors.NotADirectory(to_abs))
550
if self._inventory is not None:
551
update_inventory = True
553
to_dir_ie = inv[to_dir_id]
554
to_dir_id = to_entry[0][2]
556
update_inventory = False
559
def move_one(old_entry, from_path_utf8, minikind, executable,
560
fingerprint, packed_stat, size,
561
to_block, to_key, to_path_utf8):
562
state._make_absent(old_entry)
563
from_key = old_entry[0]
565
lambda:state.update_minimal(from_key,
567
executable=executable,
568
fingerprint=fingerprint,
569
packed_stat=packed_stat,
571
path_utf8=from_path_utf8))
572
state.update_minimal(to_key,
574
executable=executable,
575
fingerprint=fingerprint,
576
packed_stat=packed_stat,
578
path_utf8=to_path_utf8)
579
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
580
new_entry = to_block[1][added_entry_index]
581
rollbacks.append(lambda:state._make_absent(new_entry))
583
# create rename entries and tuples
584
for from_rel in from_paths:
585
# from_rel is 'pathinroot/foo/bar'
586
from_rel_utf8 = from_rel.encode('utf8')
587
from_dirname, from_tail = osutils.split(from_rel)
588
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
589
from_entry = self._get_entry(path=from_rel)
590
if from_entry == (None, None):
591
raise errors.BzrMoveFailedError(from_rel,to_dir,
592
errors.NotVersionedError(path=str(from_rel)))
594
from_id = from_entry[0][2]
595
to_rel = pathjoin(to_dir, from_tail)
596
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
597
item_to_entry = self._get_entry(path=to_rel)
598
if item_to_entry != (None, None):
599
raise errors.BzrMoveFailedError(from_rel, to_rel,
600
"Target is already versioned.")
602
if from_rel == to_rel:
603
raise errors.BzrMoveFailedError(from_rel, to_rel,
604
"Source and target are identical.")
606
from_missing = not self.has_filename(from_rel)
607
to_missing = not self.has_filename(to_rel)
614
raise errors.BzrMoveFailedError(from_rel, to_rel,
615
errors.NoSuchFile(path=to_rel,
616
extra="New file has not been created yet"))
618
# neither path exists
619
raise errors.BzrRenameFailedError(from_rel, to_rel,
620
errors.PathsDoNotExist(paths=(from_rel, to_rel)))
622
if from_missing: # implicitly just update our path mapping
625
raise errors.RenameFailedFilesExist(from_rel, to_rel,
626
extra="(Use --after to update the Bazaar id)")
629
def rollback_rename():
630
"""A single rename has failed, roll it back."""
632
for rollback in reversed(rollbacks):
636
import pdb;pdb.set_trace()
637
exc_info = sys.exc_info()
639
raise exc_info[0], exc_info[1], exc_info[2]
641
# perform the disk move first - its the most likely failure point.
643
from_rel_abs = self.abspath(from_rel)
644
to_rel_abs = self.abspath(to_rel)
646
osutils.rename(from_rel_abs, to_rel_abs)
648
raise errors.BzrMoveFailedError(from_rel, to_rel, e[1])
649
rollbacks.append(lambda: osutils.rename(to_rel_abs, from_rel_abs))
651
# perform the rename in the inventory next if needed: its easy
655
from_entry = inv[from_id]
656
current_parent = from_entry.parent_id
657
inv.rename(from_id, to_dir_id, from_tail)
659
lambda: inv.rename(from_id, current_parent, from_tail))
660
# finally do the rename in the dirstate, which is a little
661
# tricky to rollback, but least likely to need it.
662
old_block_index, old_entry_index, dir_present, file_present = \
663
state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
664
old_block = state._dirblocks[old_block_index][1]
665
old_entry = old_block[old_entry_index]
666
from_key, old_entry_details = old_entry
667
cur_details = old_entry_details[0]
669
to_key = ((to_block[0],) + from_key[1:3])
670
minikind = cur_details[0]
671
move_one(old_entry, from_path_utf8=from_rel_utf8,
673
executable=cur_details[3],
674
fingerprint=cur_details[1],
675
packed_stat=cur_details[4],
679
to_path_utf8=to_rel_utf8)
682
def update_dirblock(from_dir, to_key, to_dir_utf8):
683
"""all entries in this block need updating.
685
TODO: This is pretty ugly, and doesn't support
686
reverting, but it works.
688
assert from_dir != '', "renaming root not supported"
689
from_key = (from_dir, '')
690
from_block_idx, present = \
691
state._find_block_index_from_key(from_key)
693
# This is the old record, if it isn't present, then
694
# there is theoretically nothing to update.
695
# (Unless it isn't present because of lazy loading,
696
# but we don't do that yet)
698
from_block = state._dirblocks[from_block_idx]
699
to_block_index, to_entry_index, _, _ = \
700
state._get_block_entry_index(to_key[0], to_key[1], 0)
701
to_block_index = state._ensure_block(
702
to_block_index, to_entry_index, to_dir_utf8)
703
to_block = state._dirblocks[to_block_index]
704
for entry in from_block[1]:
705
assert entry[0][0] == from_dir
706
cur_details = entry[1][0]
707
to_key = (to_dir_utf8, entry[0][1], entry[0][2])
708
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
709
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
710
minikind = cur_details[0]
711
move_one(entry, from_path_utf8=from_path_utf8,
713
executable=cur_details[3],
714
fingerprint=cur_details[1],
715
packed_stat=cur_details[4],
719
to_path_utf8=to_rel_utf8)
721
# We need to move all the children of this
723
update_dirblock(from_path_utf8, to_key,
725
update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
729
result.append((from_rel, to_rel))
730
state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
731
self._make_dirty(reset_inventory=False)
735
def _must_be_locked(self):
736
if not self._control_files._lock_count:
737
raise errors.ObjectNotLocked(self)
740
"""Initialize the state in this tree to be a new tree."""
744
def path2id(self, path):
745
"""Return the id for path in this tree."""
746
path = path.strip('/')
747
entry = self._get_entry(path=path)
748
if entry == (None, None):
752
def paths2ids(self, paths, trees=[], require_versioned=True):
753
"""See Tree.paths2ids().
755
This specialisation fast-paths the case where all the trees are in the
760
parents = self.get_parent_ids()
762
if not (isinstance(tree, DirStateRevisionTree) and tree._revision_id in
764
return super(WorkingTree4, self).paths2ids(paths, trees, require_versioned)
765
search_indexes = [0] + [1 + parents.index(tree._revision_id) for tree in trees]
766
# -- make all paths utf8 --
769
paths_utf8.add(path.encode('utf8'))
771
# -- paths is now a utf8 path set --
772
# -- get the state object and prepare it.
773
state = self.current_dirstate()
774
if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY
775
and '' not in paths):
776
paths2ids = self._paths2ids_using_bisect
778
paths2ids = self._paths2ids_in_memory
779
return paths2ids(paths, search_indexes,
780
require_versioned=require_versioned)
782
def _paths2ids_in_memory(self, paths, search_indexes,
783
require_versioned=True):
784
state = self.current_dirstate()
785
state._read_dirblocks_if_needed()
786
def _entries_for_path(path):
787
"""Return a list with all the entries that match path for all ids.
789
dirname, basename = os.path.split(path)
790
key = (dirname, basename, '')
791
block_index, present = state._find_block_index_from_key(key)
793
# the block which should contain path is absent.
796
block = state._dirblocks[block_index][1]
797
entry_index, _ = state._find_entry_index(key, block)
798
# we may need to look at multiple entries at this path: walk while the paths match.
799
while (entry_index < len(block) and
800
block[entry_index][0][0:2] == key[0:2]):
801
result.append(block[entry_index])
804
if require_versioned:
805
# -- check all supplied paths are versioned in a search tree. --
808
path_entries = _entries_for_path(path)
810
# this specified path is not present at all: error
811
all_versioned = False
813
found_versioned = False
814
# for each id at this path
815
for entry in path_entries:
817
for index in search_indexes:
818
if entry[1][index][0] != 'a': # absent
819
found_versioned = True
820
# all good: found a versioned cell
822
if not found_versioned:
823
# none of the indexes was not 'absent' at all ids for this
825
all_versioned = False
827
if not all_versioned:
828
raise errors.PathsNotVersionedError(paths)
829
# -- remove redundancy in supplied paths to prevent over-scanning --
832
other_paths = paths.difference(set([path]))
833
if not osutils.is_inside_any(other_paths, path):
834
# this is a top level path, we must check it.
835
search_paths.add(path)
837
# for all search_indexs in each path at or under each element of
838
# search_paths, if the detail is relocated: add the id, and add the
839
# relocated path as one to search if its not searched already. If the
840
# detail is not relocated, add the id.
841
searched_paths = set()
843
def _process_entry(entry):
844
"""Look at search_indexes within entry.
846
If a specific tree's details are relocated, add the relocation
847
target to search_paths if not searched already. If it is absent, do
848
nothing. Otherwise add the id to found_ids.
850
for index in search_indexes:
851
if entry[1][index][0] == 'r': # relocated
852
if not osutils.is_inside_any(searched_paths, entry[1][index][1]):
853
search_paths.add(entry[1][index][1])
854
elif entry[1][index][0] != 'a': # absent
855
found_ids.add(entry[0][2])
857
current_root = search_paths.pop()
858
searched_paths.add(current_root)
859
# process the entries for this containing directory: the rest will be
860
# found by their parents recursively.
861
root_entries = _entries_for_path(current_root)
863
# this specified path is not present at all, skip it.
865
for entry in root_entries:
866
_process_entry(entry)
867
initial_key = (current_root, '', '')
868
block_index, _ = state._find_block_index_from_key(initial_key)
869
while (block_index < len(state._dirblocks) and
870
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
871
for entry in state._dirblocks[block_index][1]:
872
_process_entry(entry)
876
def _paths2ids_using_bisect(self, paths, search_indexes,
877
require_versioned=True):
878
state = self.current_dirstate()
881
split_paths = sorted(osutils.split(p) for p in paths)
882
found = state._bisect_recursive(split_paths)
884
if require_versioned:
885
found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
886
for dir_name in split_paths:
887
if dir_name not in found_dir_names:
888
raise errors.PathsNotVersionedError(paths)
890
for dir_name_id, trees_info in found.iteritems():
891
for index in search_indexes:
892
if trees_info[index][0] not in ('r', 'a'):
893
found_ids.add(dir_name_id[2])
896
def read_working_inventory(self):
897
"""Read the working inventory.
899
This is a meaningless operation for dirstate, but we obey it anyhow.
901
return self.inventory
904
def revision_tree(self, revision_id):
905
"""See Tree.revision_tree.
907
WorkingTree4 supplies revision_trees for any basis tree.
909
revision_id = osutils.safe_revision_id(revision_id)
910
dirstate = self.current_dirstate()
911
parent_ids = dirstate.get_parent_ids()
912
if revision_id not in parent_ids:
913
raise errors.NoSuchRevisionInTree(self, revision_id)
914
if revision_id in dirstate.get_ghosts():
915
raise errors.NoSuchRevisionInTree(self, revision_id)
916
return DirStateRevisionTree(dirstate, revision_id,
917
self.branch.repository)
919
@needs_tree_write_lock
920
def set_last_revision(self, new_revision):
921
"""Change the last revision in the working tree."""
922
new_revision = osutils.safe_revision_id(new_revision)
923
parents = self.get_parent_ids()
924
if new_revision in (NULL_REVISION, None):
925
assert len(parents) < 2, (
926
"setting the last parent to none with a pending merge is "
928
self.set_parent_ids([])
930
self.set_parent_ids([new_revision] + parents[1:],
931
allow_leftmost_as_ghost=True)
933
@needs_tree_write_lock
934
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
935
"""Set the parent ids to revision_ids.
937
See also set_parent_trees. This api will try to retrieve the tree data
938
for each element of revision_ids from the trees repository. If you have
939
tree data already available, it is more efficient to use
940
set_parent_trees rather than set_parent_ids. set_parent_ids is however
941
an easier API to use.
943
:param revision_ids: The revision_ids to set as the parent ids of this
944
working tree. Any of these may be ghosts.
946
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
948
for revision_id in revision_ids:
950
revtree = self.branch.repository.revision_tree(revision_id)
951
# TODO: jam 20070213 KnitVersionedFile raises
952
# RevisionNotPresent rather than NoSuchRevision if a
953
# given revision_id is not present. Should Repository be
954
# catching it and re-raising NoSuchRevision?
955
except (errors.NoSuchRevision, errors.RevisionNotPresent):
957
trees.append((revision_id, revtree))
958
self.current_dirstate()._validate()
959
self.set_parent_trees(trees,
960
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
961
self.current_dirstate()._validate()
963
@needs_tree_write_lock
964
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
965
"""Set the parents of the working tree.
967
:param parents_list: A list of (revision_id, tree) tuples.
968
If tree is None, then that element is treated as an unreachable
969
parent tree - i.e. a ghost.
971
dirstate = self.current_dirstate()
973
if len(parents_list) > 0:
974
if not allow_leftmost_as_ghost and parents_list[0][1] is None:
975
raise errors.GhostRevisionUnusableHere(parents_list[0][0])
978
# convert absent trees to the null tree, which we convert back to
980
for rev_id, tree in parents_list:
981
rev_id = osutils.safe_revision_id(rev_id)
983
real_trees.append((rev_id, tree))
985
real_trees.append((rev_id,
986
self.branch.repository.revision_tree(None)))
987
ghosts.append(rev_id)
989
dirstate.set_parent_trees(real_trees, ghosts=ghosts)
991
self._make_dirty(reset_inventory=False)
994
def _set_root_id(self, file_id):
995
"""See WorkingTree.set_root_id."""
996
state = self.current_dirstate()
997
state.set_path_id('', file_id)
998
if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
999
self._make_dirty(reset_inventory=True)
1003
"""Unlock in format 4 trees needs to write the entire dirstate."""
1004
if self._control_files._lock_count == 1:
1005
# eventually we should do signature checking during read locks for
1007
if self._control_files._lock_mode == 'w':
1010
if self._dirstate is not None:
1011
# This is a no-op if there are no modifications.
1012
self._dirstate.save()
1013
self._dirstate.unlock()
1014
# TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
1015
# point. Instead, it could check if the header has been
1016
# modified when it is locked, and if not, it can hang on to
1017
# the data it has in memory.
1018
self._dirstate = None
1019
self._inventory = None
1020
# reverse order of locking.
1022
return self._control_files.unlock()
1024
self.branch.unlock()
1026
@needs_tree_write_lock
1027
def unversion(self, file_ids):
1028
"""Remove the file ids in file_ids from the current versioned set.
1030
When a file_id is unversioned, all of its children are automatically
1033
:param file_ids: The file ids to stop versioning.
1034
:raises: NoSuchId if any fileid is not currently versioned.
1038
state = self.current_dirstate()
1039
state._read_dirblocks_if_needed()
1040
ids_to_unversion = set()
1041
for file_id in file_ids:
1042
ids_to_unversion.add(osutils.safe_file_id(file_id))
1043
paths_to_unversion = set()
1045
# check if the root is to be unversioned, if so, assert for now.
1046
# walk the state marking unversioned things as absent.
1047
# if there are any un-unversioned ids at the end, raise
1048
for key, details in state._dirblocks[0][1]:
1049
if (details[0][0] not in ('a', 'r') and # absent or relocated
1050
key[2] in ids_to_unversion):
1051
# I haven't written the code to unversion / yet - it should be
1053
raise errors.BzrError('Unversioning the / is not currently supported')
1055
while block_index < len(state._dirblocks):
1056
# process one directory at a time.
1057
block = state._dirblocks[block_index]
1058
# first check: is the path one to remove - it or its children
1059
delete_block = False
1060
for path in paths_to_unversion:
1061
if (block[0].startswith(path) and
1062
(len(block[0]) == len(path) or
1063
block[0][len(path)] == '/')):
1064
# this entire block should be deleted - its the block for a
1065
# path to unversion; or the child of one
1068
# TODO: trim paths_to_unversion as we pass by paths
1070
# this block is to be deleted: process it.
1071
# TODO: we can special case the no-parents case and
1072
# just forget the whole block.
1074
while entry_index < len(block[1]):
1075
# Mark this file id as having been removed
1076
ids_to_unversion.discard(block[1][entry_index][0][2])
1077
if not state._make_absent(block[1][entry_index]):
1079
# go to the next block. (At the moment we dont delete empty
1084
while entry_index < len(block[1]):
1085
entry = block[1][entry_index]
1086
if (entry[1][0][0] in ('a', 'r') or # absent, relocated
1087
# ^ some parent row.
1088
entry[0][2] not in ids_to_unversion):
1089
# ^ not an id to unversion
1092
if entry[1][0][0] == 'd':
1093
paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))
1094
if not state._make_absent(entry):
1096
# we have unversioned this id
1097
ids_to_unversion.remove(entry[0][2])
1099
if ids_to_unversion:
1100
raise errors.NoSuchId(self, iter(ids_to_unversion).next())
1101
self._make_dirty(reset_inventory=False)
1102
# have to change the legacy inventory too.
1103
if self._inventory is not None:
1104
for file_id in file_ids:
1105
self._inventory.remove_recursive_id(file_id)
1107
@needs_tree_write_lock
1108
def _write_inventory(self, inv):
1109
"""Write inventory as the current inventory."""
1110
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1111
self.current_dirstate().set_state_from_inventory(inv)
1112
self._make_dirty(reset_inventory=False)
1113
if self._inventory is not None:
1114
self._inventory = inv
1118
class WorkingTreeFormat4(WorkingTreeFormat3):
1119
"""The first consolidated dirstate working tree format.
1122
- exists within a metadir controlling .bzr
1123
- includes an explicit version marker for the workingtree control
1124
files, separate from the BzrDir format
1125
- modifies the hash cache format
1126
- is new in bzr TODO FIXME SETBEFOREMERGE
1127
- uses a LockDir to guard access to it.
1130
supports_tree_reference = True
1132
def get_format_string(self):
1133
"""See WorkingTreeFormat.get_format_string()."""
1134
return "Bazaar Working Tree format 4\n"
1136
def get_format_description(self):
1137
"""See WorkingTreeFormat.get_format_description()."""
1138
return "Working tree format 4"
1140
def initialize(self, a_bzrdir, revision_id=None):
1141
"""See WorkingTreeFormat.initialize().
1143
:param revision_id: allows creating a working tree at a different
1144
revision than the branch is at.
1146
These trees get an initial random root id.
1148
revision_id = osutils.safe_revision_id(revision_id)
1149
if not isinstance(a_bzrdir.transport, LocalTransport):
1150
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1151
transport = a_bzrdir.get_workingtree_transport(self)
1152
control_files = self._open_control_files(a_bzrdir)
1153
control_files.create_lock()
1154
control_files.lock_write()
1155
control_files.put_utf8('format', self.get_format_string())
1156
branch = a_bzrdir.open_branch()
1157
if revision_id is None:
1158
revision_id = branch.last_revision()
1159
local_path = transport.local_abspath('dirstate')
1160
# write out new dirstate (must exist when we create the tree)
1161
state = dirstate.DirState.initialize(local_path)
1163
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1167
_control_files=control_files)
1169
wt.lock_tree_write()
1172
if revision_id in (None, NULL_REVISION):
1173
wt._set_root_id(generate_ids.gen_root_id())
1175
wt.current_dirstate()._validate()
1176
wt.set_last_revision(revision_id)
1178
basis = wt.basis_tree()
1180
# if the basis has a root id we have to use that; otherwise we use
1182
basis_root_id = basis.get_root_id()
1183
if basis_root_id is not None:
1184
wt._set_root_id(basis_root_id)
1186
transform.build_tree(basis, wt)
1189
control_files.unlock()
1193
def _open(self, a_bzrdir, control_files):
1194
"""Open the tree itself.
1196
:param a_bzrdir: the dir for the tree.
1197
:param control_files: the control files for the tree.
1199
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1200
branch=a_bzrdir.open_branch(),
1203
_control_files=control_files)
1205
def __get_matchingbzrdir(self):
1206
# please test against something that will let us do tree references
1207
return bzrdir.format_registry.make_bzrdir(
1208
'experimental-reference-dirstate')
1210
_matchingbzrdir = property(__get_matchingbzrdir)
1213
class DirStateRevisionTree(Tree):
1214
"""A revision tree pulling the inventory from a dirstate."""
1216
def __init__(self, dirstate, revision_id, repository):
1217
self._dirstate = dirstate
1218
self._revision_id = osutils.safe_revision_id(revision_id)
1219
self._repository = repository
1220
self._inventory = None
1222
self._dirstate_locked = False
1224
def annotate_iter(self, file_id):
1225
"""See Tree.annotate_iter"""
1226
w = self._repository.weave_store.get_weave(file_id,
1227
self._repository.get_transaction())
1228
return w.annotate_iter(self.inventory[file_id].revision)
1230
def _comparison_data(self, entry, path):
1231
"""See Tree._comparison_data."""
1233
return None, False, None
1234
# trust the entry as RevisionTree does, but this may not be
1235
# sensible: the entry might not have come from us?
1236
return entry.kind, entry.executable, None
1238
def _file_size(self, entry, stat_value):
1239
return entry.text_size
1241
def filter_unversioned_files(self, paths):
1242
"""Filter out paths that are not versioned.
1244
:return: set of paths.
1246
pred = self.has_filename
1247
return set((p for p in paths if not pred(p)))
1249
def get_root_id(self):
1250
return self.path2id('')
1252
def _get_parent_index(self):
1253
"""Return the index in the dirstate referenced by this tree."""
1254
return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1256
def _get_entry(self, file_id=None, path=None):
1257
"""Get the dirstate row for file_id or path.
1259
If either file_id or path is supplied, it is used as the key to lookup.
1260
If both are supplied, the fastest lookup is used, and an error is
1261
raised if they do not both point at the same row.
1263
:param file_id: An optional unicode file_id to be looked up.
1264
:param path: An optional unicode path to be looked up.
1265
:return: The dirstate row tuple for path/file_id, or (None, None)
1267
if file_id is None and path is None:
1268
raise errors.BzrError('must supply file_id or path')
1269
file_id = osutils.safe_file_id(file_id)
1270
if path is not None:
1271
path = path.encode('utf8')
1272
parent_index = self._get_parent_index()
1273
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
1275
def _generate_inventory(self):
1276
"""Create and set self.inventory from the dirstate object.
1278
(So this is only called the first time the inventory is requested for
1279
this tree; it then remains in memory until it's out of date.)
1281
This is relatively expensive: we have to walk the entire dirstate.
1283
assert self._locked, 'cannot generate inventory of an unlocked '\
1284
'dirstate revision tree'
1285
# separate call for profiling - makes it clear where the costs are.
1286
self._dirstate._read_dirblocks_if_needed()
1287
assert self._revision_id in self._dirstate.get_parent_ids(), \
1288
'parent %s has disappeared from %s' % (
1289
self._revision_id, self._dirstate.get_parent_ids())
1290
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1291
# This is identical now to the WorkingTree _generate_inventory except
1292
# for the tree index use.
1293
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
1294
current_id = root_key[2]
1295
assert current_entry[parent_index][0] == 'd'
1296
inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1297
inv.root.revision = current_entry[parent_index][4]
1298
# Turn some things into local variables
1299
minikind_to_kind = dirstate.DirState._minikind_to_kind
1300
factory = entry_factory
1301
utf8_decode = cache_utf8._utf8_decode
1302
inv_byid = inv._byid
1303
# we could do this straight out of the dirstate; it might be fast
1304
# and should be profiled - RBC 20070216
1305
parent_ies = {'' : inv.root}
1306
for block in self._dirstate._dirblocks[1:]: #skip root
1309
parent_ie = parent_ies[dirname]
1311
# all the paths in this block are not versioned in this tree
1313
for key, entry in block[1]:
1314
minikind, fingerprint, size, executable, revid = entry[parent_index]
1315
if minikind in ('a', 'r'): # absent, relocated
1319
name_unicode = utf8_decode(name)[0]
1321
kind = minikind_to_kind[minikind]
1322
inv_entry = factory[kind](file_id, name_unicode,
1324
inv_entry.revision = revid
1326
inv_entry.executable = executable
1327
inv_entry.text_size = size
1328
inv_entry.text_sha1 = fingerprint
1329
elif kind == 'directory':
1330
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1331
elif kind == 'symlink':
1332
inv_entry.executable = False
1333
inv_entry.text_size = size
1334
inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1335
elif kind == 'tree-reference':
1336
inv_entry.reference_revision = fingerprint
1338
raise AssertionError("cannot convert entry %r into an InventoryEntry"
1340
# These checks cost us around 40ms on a 55k entry tree
1341
assert file_id not in inv_byid
1342
assert name_unicode not in parent_ie.children
1343
inv_byid[file_id] = inv_entry
1344
parent_ie.children[name_unicode] = inv_entry
1345
self._inventory = inv
1347
def get_file_mtime(self, file_id, path=None):
1348
"""Return the modification time for this record.
1350
We return the timestamp of the last-changed revision.
1352
# Make sure the file exists
1353
entry = self._get_entry(file_id, path=path)
1354
if entry == (None, None): # do we raise?
1356
parent_index = self._get_parent_index()
1357
last_changed_revision = entry[1][parent_index][4]
1358
return self._repository.get_revision(last_changed_revision).timestamp
1360
def get_file_sha1(self, file_id, path=None, stat_value=None):
1361
entry = self._get_entry(file_id=file_id, path=path)
1362
parent_index = self._get_parent_index()
1363
parent_details = entry[1][parent_index]
1364
if parent_details[0] == 'f':
1365
return parent_details[1]
1368
def get_file(self, file_id):
1369
return StringIO(self.get_file_text(file_id))
1371
def get_file_lines(self, file_id):
1372
ie = self.inventory[file_id]
1373
return self._repository.weave_store.get_weave(file_id,
1374
self._repository.get_transaction()).get_lines(ie.revision)
1376
def get_file_size(self, file_id):
1377
return self.inventory[file_id].text_size
1379
def get_file_text(self, file_id):
1380
return ''.join(self.get_file_lines(file_id))
1382
def get_symlink_target(self, file_id):
1383
entry = self._get_entry(file_id=file_id)
1384
parent_index = self._get_parent_index()
1385
if entry[1][parent_index][0] != 'l':
1388
# At present, none of the tree implementations supports non-ascii
1389
# symlink targets. So we will just assume that the dirstate path is
1391
return entry[1][parent_index][1]
1393
def get_revision_id(self):
1394
"""Return the revision id for this tree."""
1395
return self._revision_id
1397
def _get_inventory(self):
1398
if self._inventory is not None:
1399
return self._inventory
1400
self._must_be_locked()
1401
self._generate_inventory()
1402
return self._inventory
1404
inventory = property(_get_inventory,
1405
doc="Inventory of this Tree")
1407
def get_parent_ids(self):
1408
"""The parents of a tree in the dirstate are not cached."""
1409
return self._repository.get_revision(self._revision_id).parent_ids
1411
def has_filename(self, filename):
1412
return bool(self.path2id(filename))
1414
def kind(self, file_id):
1415
return self.inventory[file_id].kind
1417
def is_executable(self, file_id, path=None):
1418
ie = self.inventory[file_id]
1419
if ie.kind != "file":
1421
return ie.executable
1423
def list_files(self, include_root=False):
1424
# We use a standard implementation, because DirStateRevisionTree is
1425
# dealing with one of the parents of the current state
1426
inv = self._get_inventory()
1427
entries = inv.iter_entries()
1428
if self.inventory.root is not None and not include_root:
1430
for path, entry in entries:
1431
yield path, 'V', entry.kind, entry.file_id, entry
1433
def lock_read(self):
1434
"""Lock the tree for a set of operations."""
1435
if not self._locked:
1436
self._repository.lock_read()
1437
if self._dirstate._lock_token is None:
1438
self._dirstate.lock_read()
1439
self._dirstate_locked = True
1442
def _must_be_locked(self):
1443
if not self._locked:
1444
raise errors.ObjectNotLocked(self)
1447
def path2id(self, path):
1448
"""Return the id for path in this tree."""
1449
# lookup by path: faster than splitting and walking the ivnentory.
1450
entry = self._get_entry(path=path)
1451
if entry == (None, None):
1456
"""Unlock, freeing any cache memory used during the lock."""
1457
# outside of a lock, the inventory is suspect: release it.
1459
if not self._locked:
1460
self._inventory = None
1462
if self._dirstate_locked:
1463
self._dirstate.unlock()
1464
self._dirstate_locked = False
1465
self._repository.unlock()
1467
def walkdirs(self, prefix=""):
1468
# TODO: jam 20070215 This is the cheap way by cheating and using the
1469
# RevisionTree implementation.
1470
# This should be cleaned up to use the much faster Dirstate code
1471
# This is a little tricky, though, because the dirstate is
1472
# indexed by current path, not by parent path.
1473
# So for now, we just build up the parent inventory, and extract
1474
# it the same way RevisionTree does.
1475
_directory = 'directory'
1476
inv = self._get_inventory()
1477
top_id = inv.path2id(prefix)
1481
pending = [(prefix, top_id)]
1484
relpath, file_id = pending.pop()
1485
# 0 - relpath, 1- file-id
1487
relroot = relpath + '/'
1490
# FIXME: stash the node in pending
1491
entry = inv[file_id]
1492
for name, child in entry.sorted_children():
1493
toppath = relroot + name
1494
dirblock.append((toppath, name, child.kind, None,
1495
child.file_id, child.kind
1497
yield (relpath, entry.file_id), dirblock
1498
# push the user specified dirs from dirblock
1499
for dir in reversed(dirblock):
1500
if dir[2] == _directory:
1501
pending.append((dir[0], dir[4]))
1504
class InterDirStateTree(InterTree):
1505
"""Fast path optimiser for changes_from with dirstate trees."""
1507
def __init__(self, source, target):
1508
super(InterDirStateTree, self).__init__(source, target)
1509
if not InterDirStateTree.is_compatible(source, target):
1510
raise Exception, "invalid source %r and target %r" % (source, target)
1513
def make_source_parent_tree(source, target):
1514
"""Change the source tree into a parent of the target."""
1515
revid = source.commit('record tree')
1516
target.branch.repository.fetch(source.branch.repository, revid)
1517
target.set_parent_ids([revid])
1518
return target.basis_tree(), target
1520
_matching_from_tree_format = WorkingTreeFormat4()
1521
_matching_to_tree_format = WorkingTreeFormat4()
1522
_test_mutable_trees_to_test_trees = make_source_parent_tree
1524
def _iter_changes(self, include_unchanged=False,
1525
specific_files=None, pb=None, extra_trees=[],
1526
require_versioned=True, want_unversioned=False):
1527
"""Return the changes from source to target.
1529
:return: An iterator that yields tuples. See InterTree._iter_changes
1531
:param specific_files: An optional list of file paths to restrict the
1532
comparison to. When mapping filenames to ids, all matches in all
1533
trees (including optional extra_trees) are used, and all children of
1534
matched directories are included.
1535
:param include_unchanged: An optional boolean requesting the inclusion of
1536
unchanged entries in the result.
1537
:param extra_trees: An optional list of additional trees to use when
1538
mapping the contents of specific_files (paths) to file_ids.
1539
:param require_versioned: If True, all files in specific_files must be
1540
versioned in one of source, target, extra_trees or
1541
PathsNotVersionedError is raised.
1542
:param want_unversioned: Should unversioned files be returned in the
1543
output. An unversioned file is defined as one with (False, False)
1544
for the versioned pair.
1546
utf8_decode = cache_utf8._utf8_decode_with_None
1547
_minikind_to_kind = dirstate.DirState._minikind_to_kind
1548
# NB: show_status depends on being able to pass in non-versioned files
1549
# and report them as unknown
1550
# TODO: handle extra trees in the dirstate.
1551
# TODO: handle comparisons as an empty tree as a different special
1552
# case? mbp 20070226
1553
if extra_trees or (self.source._revision_id == NULL_REVISION):
1554
# we can't fast-path these cases (yet)
1555
for f in super(InterDirStateTree, self)._iter_changes(
1556
include_unchanged, specific_files, pb, extra_trees,
1560
parent_ids = self.target.get_parent_ids()
1561
assert (self.source._revision_id in parent_ids), \
1562
"revision {%s} is not stored in {%s}, but %s " \
1563
"can only be used for trees stored in the dirstate" \
1564
% (self.source._revision_id, self.target, self._iter_changes)
1566
if self.source._revision_id == NULL_REVISION:
1568
indices = (target_index,)
1570
assert (self.source._revision_id in parent_ids), \
1571
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
1572
self.source._revision_id, parent_ids)
1573
source_index = 1 + parent_ids.index(self.source._revision_id)
1574
indices = (source_index,target_index)
1575
# -- make all specific_files utf8 --
1577
specific_files_utf8 = set()
1578
for path in specific_files:
1579
specific_files_utf8.add(path.encode('utf8'))
1580
specific_files = specific_files_utf8
1582
specific_files = set([''])
1583
# -- specific_files is now a utf8 path set --
1584
# -- get the state object and prepare it.
1585
state = self.target.current_dirstate()
1586
state._read_dirblocks_if_needed()
1587
def _entries_for_path(path):
1588
"""Return a list with all the entries that match path for all ids.
1590
dirname, basename = os.path.split(path)
1591
key = (dirname, basename, '')
1592
block_index, present = state._find_block_index_from_key(key)
1594
# the block which should contain path is absent.
1597
block = state._dirblocks[block_index][1]
1598
entry_index, _ = state._find_entry_index(key, block)
1599
# we may need to look at multiple entries at this path: walk while the specific_files match.
1600
while (entry_index < len(block) and
1601
block[entry_index][0][0:2] == key[0:2]):
1602
result.append(block[entry_index])
1605
if require_versioned:
1606
# -- check all supplied paths are versioned in a search tree. --
1607
all_versioned = True
1608
for path in specific_files:
1609
path_entries = _entries_for_path(path)
1610
if not path_entries:
1611
# this specified path is not present at all: error
1612
all_versioned = False
1614
found_versioned = False
1615
# for each id at this path
1616
for entry in path_entries:
1618
for index in indices:
1619
if entry[1][index][0] != 'a': # absent
1620
found_versioned = True
1621
# all good: found a versioned cell
1623
if not found_versioned:
1624
# none of the indexes was not 'absent' at all ids for this
1626
all_versioned = False
1628
if not all_versioned:
1629
raise errors.PathsNotVersionedError(specific_files)
1630
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1631
search_specific_files = set()
1632
for path in specific_files:
1633
other_specific_files = specific_files.difference(set([path]))
1634
if not osutils.is_inside_any(other_specific_files, path):
1635
# this is a top level path, we must check it.
1636
search_specific_files.add(path)
1638
# compare source_index and target_index at or under each element of search_specific_files.
1639
# follow the following comparison table. Note that we only want to do diff operations when
1640
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1644
# Source | Target | disk | action
1645
# r | fdl | | add source to search, add id path move and perform
1646
# | | | diff check on source-target
1647
# r | fdl | a | dangling file that was present in the basis.
1649
# r | a | | add source to search
1651
# r | r | | this path is present in a non-examined tree, skip.
1652
# r | r | a | this path is present in a non-examined tree, skip.
1653
# a | fdl | | add new id
1654
# a | fdl | a | dangling locally added file, skip
1655
# a | a | | not present in either tree, skip
1656
# a | a | a | not present in any tree, skip
1657
# a | r | | not present in either tree at this path, skip as it
1658
# | | | may not be selected by the users list of paths.
1659
# a | r | a | not present in either tree at this path, skip as it
1660
# | | | may not be selected by the users list of paths.
1661
# fdl | fdl | | content in both: diff them
1662
# fdl | fdl | a | deleted locally, but not unversioned - show as deleted ?
1663
# fdl | a | | unversioned: output deleted id for now
1664
# fdl | a | a | unversioned and deleted: output deleted id
1665
# fdl | r | | relocated in this tree, so add target to search.
1666
# | | | Dont diff, we will see an r,fd; pair when we reach
1667
# | | | this id at the other path.
1668
# fdl | r | a | relocated in this tree, so add target to search.
1669
# | | | Dont diff, we will see an r,fd; pair when we reach
1670
# | | | this id at the other path.
1672
# for all search_indexs in each path at or under each element of
1673
# search_specific_files, if the detail is relocated: add the id, and add the
1674
# relocated path as one to search if its not searched already. If the
1675
# detail is not relocated, add the id.
1676
searched_specific_files = set()
1677
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1678
# Using a list so that we can access the values and change them in
1679
# nested scope. Each one is [path, file_id, entry]
1680
last_source_parent = [None, None, None]
1681
last_target_parent = [None, None, None]
1683
def _process_entry(entry, path_info):
1684
"""Compare an entry and real disk to generate delta information.
1686
:param path_info: top_relpath, basename, kind, lstat, abspath for
1687
the path of entry. If None, then the path is considered absent.
1688
(Perhaps we should pass in a concrete entry for this ?)
1689
Basename is returned as a utf8 string because we expect this
1690
tuple will be ignored, and don't want to take the time to
1693
# TODO: when a parent has been renamed, dont emit path renames for children,
1694
if source_index is None:
1695
source_details = NULL_PARENT_DETAILS
1697
source_details = entry[1][source_index]
1698
target_details = entry[1][target_index]
1699
target_minikind = target_details[0]
1700
if path_info is not None and target_minikind in 'fdl':
1701
assert target_index == 0
1702
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1703
stat_value=path_info[3])
1704
# The entry may have been modified by update_entry
1705
target_details = entry[1][target_index]
1706
target_minikind = target_details[0]
1709
source_minikind = source_details[0]
1710
if source_minikind in 'fdlr' and target_minikind in 'fdl':
1711
# claimed content in both: diff
1712
# r | fdl | | add source to search, add id path move and perform
1713
# | | | diff check on source-target
1714
# r | fdl | a | dangling file that was present in the basis.
1716
if source_minikind in 'r':
1717
# add the source to the search path to find any children it
1718
# has. TODO ? : only add if it is a container ?
1719
if not osutils.is_inside_any(searched_specific_files,
1721
search_specific_files.add(source_details[1])
1722
# generate the old path; this is needed for stating later
1724
old_path = source_details[1]
1725
old_dirname, old_basename = os.path.split(old_path)
1726
path = pathjoin(entry[0][0], entry[0][1])
1727
old_entry = state._get_entry(source_index,
1729
# update the source details variable to be the real
1731
source_details = old_entry[1][source_index]
1732
source_minikind = source_details[0]
1734
old_dirname = entry[0][0]
1735
old_basename = entry[0][1]
1736
old_path = path = pathjoin(old_dirname, old_basename)
1737
if path_info is None:
1738
# the file is missing on disk, show as removed.
1739
content_change = True
1743
# source and target are both versioned and disk file is present.
1744
target_kind = path_info[2]
1745
if target_kind == 'directory':
1746
if source_minikind != 'd':
1747
content_change = True
1749
# directories have no fingerprint
1750
content_change = False
1752
elif target_kind == 'file':
1753
if source_minikind != 'f':
1754
content_change = True
1756
# We could check the size, but we already have the
1758
content_change = (link_or_sha1 != source_details[1])
1759
# Target details is updated at update_entry time
1761
stat.S_ISREG(path_info[3].st_mode)
1762
and stat.S_IEXEC & path_info[3].st_mode)
1763
elif target_kind == 'symlink':
1764
if source_minikind != 'l':
1765
content_change = True
1767
content_change = (link_or_sha1 != source_details[1])
1770
raise Exception, "unknown kind %s" % path_info[2]
1771
# parent id is the entry for the path in the target tree
1772
if old_dirname == last_source_parent[0]:
1773
source_parent_id = last_source_parent[1]
1775
source_parent_entry = state._get_entry(source_index,
1776
path_utf8=old_dirname)
1777
source_parent_id = source_parent_entry[0][2]
1778
if source_parent_id == entry[0][2]:
1779
# This is the root, so the parent is None
1780
source_parent_id = None
1782
last_source_parent[0] = old_dirname
1783
last_source_parent[1] = source_parent_id
1784
last_source_parent[2] = source_parent_entry
1786
new_dirname = entry[0][0]
1787
if new_dirname == last_target_parent[0]:
1788
target_parent_id = last_target_parent[1]
1790
# TODO: We don't always need to do the lookup, because the
1791
# parent entry will be the same as the source entry.
1792
target_parent_entry = state._get_entry(target_index,
1793
path_utf8=new_dirname)
1794
target_parent_id = target_parent_entry[0][2]
1795
if target_parent_id == entry[0][2]:
1796
# This is the root, so the parent is None
1797
target_parent_id = None
1799
last_target_parent[0] = new_dirname
1800
last_target_parent[1] = target_parent_id
1801
last_target_parent[2] = target_parent_entry
1803
source_exec = source_details[3]
1804
return ((entry[0][2], (old_path, path), content_change,
1806
(source_parent_id, target_parent_id),
1807
(old_basename, entry[0][1]),
1808
(_minikind_to_kind[source_minikind], target_kind),
1809
(source_exec, target_exec)),)
1810
elif source_minikind in 'a' and target_minikind in 'fdl':
1811
# looks like a new file
1812
if path_info is not None:
1813
path = pathjoin(entry[0][0], entry[0][1])
1814
# parent id is the entry for the path in the target tree
1815
# TODO: these are the same for an entire directory: cache em.
1816
parent_id = state._get_entry(target_index,
1817
path_utf8=entry[0][0])[0][2]
1818
if parent_id == entry[0][2]:
1821
stat.S_ISREG(path_info[3].st_mode)
1822
and stat.S_IEXEC & path_info[3].st_mode)
1823
return ((entry[0][2], (None, path), True,
1826
(None, entry[0][1]),
1827
(None, path_info[2]),
1828
(None, target_exec)),)
1830
# but its not on disk: we deliberately treat this as just
1831
# never-present. (Why ?! - RBC 20070224)
1833
elif source_minikind in 'fdl' and target_minikind in 'a':
1834
# unversioned, possibly, or possibly not deleted: we dont care.
1835
# if its still on disk, *and* theres no other entry at this
1836
# path [we dont know this in this routine at the moment -
1837
# perhaps we should change this - then it would be an unknown.
1838
old_path = pathjoin(entry[0][0], entry[0][1])
1839
# parent id is the entry for the path in the target tree
1840
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1841
if parent_id == entry[0][2]:
1843
return ((entry[0][2], (old_path, None), True,
1846
(entry[0][1], None),
1847
(_minikind_to_kind[source_minikind], None),
1848
(source_details[3], None)),)
1849
elif source_minikind in 'fdl' and target_minikind in 'r':
1850
# a rename; could be a true rename, or a rename inherited from
1851
# a renamed parent. TODO: handle this efficiently. Its not
1852
# common case to rename dirs though, so a correct but slow
1853
# implementation will do.
1854
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1855
search_specific_files.add(target_details[1])
1856
elif source_minikind in 'r' and target_minikind in 'r':
1857
# neither of the selected trees contain this file,
1858
# so skip over it. This is not currently directly tested, but
1859
# is indirectly via test_too_much.TestCommands.test_conflicts.
1862
print "*******", source_minikind, target_minikind
1863
import pdb;pdb.set_trace()
1865
while search_specific_files:
1866
# TODO: the pending list should be lexically sorted?
1867
current_root = search_specific_files.pop()
1868
searched_specific_files.add(current_root)
1869
# process the entries for this containing directory: the rest will be
1870
# found by their parents recursively.
1871
root_entries = _entries_for_path(current_root)
1872
root_abspath = self.target.abspath(current_root)
1874
root_stat = os.lstat(root_abspath)
1876
if e.errno == errno.ENOENT:
1877
# the path does not exist: let _process_entry know that.
1878
root_dir_info = None
1880
# some other random error: hand it up.
1883
root_dir_info = ('', current_root,
1884
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1886
if not root_entries and not root_dir_info:
1887
# this specified path is not present at all, skip it.
1889
path_handled = False
1890
for entry in root_entries:
1891
for result in _process_entry(entry, root_dir_info):
1892
# this check should probably be outside the loop: one
1893
# 'iterate two trees' api, and then _iter_changes filters
1894
# unchanged pairs. - RBC 20070226
1896
if (include_unchanged
1897
or result[2] # content change
1898
or result[3][0] != result[3][1] # versioned status
1899
or result[4][0] != result[4][1] # parent id
1900
or result[5][0] != result[5][1] # name
1901
or result[6][0] != result[6][1] # kind
1902
or result[7][0] != result[7][1] # executable
1904
result = (result[0],
1905
((utf8_decode(result[1][0])[0]),
1906
utf8_decode(result[1][1])[0]),) + result[2:]
1908
if want_unversioned and not path_handled:
1909
new_executable = bool(
1910
stat.S_ISREG(root_dir_info[3].st_mode)
1911
and stat.S_IEXEC & root_dir_info[3].st_mode)
1912
yield (None, (None, current_root), True, (False, False),
1914
(None, splitpath(current_root)[-1]),
1915
(None, root_dir_info[2]), (None, new_executable))
1916
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
1917
initial_key = (current_root, '', '')
1918
block_index, _ = state._find_block_index_from_key(initial_key)
1919
if block_index == 0:
1920
# we have processed the total root already, but because the
1921
# initial key matched it we should skip it here.
1924
current_dir_info = dir_iterator.next()
1926
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1927
# there may be directories in the inventory even though
1928
# this path is not a file on disk: so mark it as end of
1930
current_dir_info = None
1934
if current_dir_info[0][0] == '':
1935
# remove .bzr from iteration
1936
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
1937
assert current_dir_info[1][bzr_index][0] == '.bzr'
1938
del current_dir_info[1][bzr_index]
1939
# walk until both the directory listing and the versioned metadata
1940
# are exhausted. TODO: reevaluate this, perhaps we should stop when
1941
# the versioned data runs out.
1942
if (block_index < len(state._dirblocks) and
1943
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
1944
current_block = state._dirblocks[block_index]
1946
current_block = None
1947
while (current_dir_info is not None or
1948
current_block is not None):
1949
if (current_dir_info and current_block
1950
and current_dir_info[0][0] != current_block[0]):
1951
if current_dir_info[0][0] < current_block[0] :
1952
# import pdb; pdb.set_trace()
1953
# print 'unversioned dir'
1954
# filesystem data refers to paths not covered by the dirblock.
1955
# this has two possibilities:
1956
# A) it is versioned but empty, so there is no block for it
1957
# B) it is not versioned.
1958
# in either case it was processed by the containing directories walk:
1959
# if it is root/foo, when we walked root we emitted it,
1960
# or if we ere given root/foo to walk specifically, we
1961
# emitted it when checking the walk-root entries
1962
# advance the iterator and loop - we dont need to emit it.
1964
current_dir_info = dir_iterator.next()
1965
except StopIteration:
1966
current_dir_info = None
1968
# We have a dirblock entry for this location, but there
1969
# is no filesystem path for this. This is most likely
1970
# because a directory was removed from the disk.
1971
# We don't have to report the missing directory,
1972
# because that should have already been handled, but we
1973
# need to handle all of the files that are contained
1975
for current_entry in current_block[1]:
1976
# entry referring to file not present on disk.
1977
# advance the entry only, after processing.
1978
for result in _process_entry(current_entry, None):
1979
# this check should probably be outside the loop: one
1980
# 'iterate two trees' api, and then _iter_changes filters
1981
# unchanged pairs. - RBC 20070226
1982
if (include_unchanged
1983
or result[2] # content change
1984
or result[3][0] != result[3][1] # versioned status
1985
or result[4][0] != result[4][1] # parent id
1986
or result[5][0] != result[5][1] # name
1987
or result[6][0] != result[6][1] # kind
1988
or result[7][0] != result[7][1] # executable
1990
result = (result[0],
1991
((utf8_decode(result[1][0])[0]),
1992
utf8_decode(result[1][1])[0]),) + result[2:]
1995
if (block_index < len(state._dirblocks) and
1996
osutils.is_inside(current_root,
1997
state._dirblocks[block_index][0])):
1998
current_block = state._dirblocks[block_index]
2000
current_block = None
2003
if current_block and entry_index < len(current_block[1]):
2004
current_entry = current_block[1][entry_index]
2006
current_entry = None
2007
advance_entry = True
2009
if current_dir_info and path_index < len(current_dir_info[1]):
2010
current_path_info = current_dir_info[1][path_index]
2012
current_path_info = None
2014
path_handled = False
2015
while (current_entry is not None or
2016
current_path_info is not None):
2017
if current_entry is None:
2018
# the check for path_handled when the path is adnvaced
2019
# will yield this path if needed.
2021
elif current_path_info is None:
2022
# no path is fine: the per entry code will handle it.
2023
for result in _process_entry(current_entry, current_path_info):
2024
# this check should probably be outside the loop: one
2025
# 'iterate two trees' api, and then _iter_changes filters
2026
# unchanged pairs. - RBC 20070226
2027
if (include_unchanged
2028
or result[2] # content change
2029
or result[3][0] != result[3][1] # versioned status
2030
or result[4][0] != result[4][1] # parent id
2031
or result[5][0] != result[5][1] # name
2032
or result[6][0] != result[6][1] # kind
2033
or result[7][0] != result[7][1] # executable
2035
result = (result[0],
2036
((utf8_decode(result[1][0])[0]),
2037
utf8_decode(result[1][1])[0]),) + result[2:]
2039
elif current_entry[0][1] != current_path_info[1]:
2040
if current_path_info[1] < current_entry[0][1]:
2041
# extra file on disk: pass for now, but only
2042
# increment the path, not the entry
2043
# import pdb; pdb.set_trace()
2044
# print 'unversioned file'
2045
advance_entry = False
2047
# entry referring to file not present on disk.
2048
# advance the entry only, after processing.
2049
for result in _process_entry(current_entry, None):
2050
# this check should probably be outside the loop: one
2051
# 'iterate two trees' api, and then _iter_changes filters
2052
# unchanged pairs. - RBC 20070226
2054
if (include_unchanged
2055
or result[2] # content change
2056
or result[3][0] != result[3][1] # versioned status
2057
or result[4][0] != result[4][1] # parent id
2058
or result[5][0] != result[5][1] # name
2059
or result[6][0] != result[6][1] # kind
2060
or result[7][0] != result[7][1] # executable
2062
result = (result[0],
2063
((utf8_decode(result[1][0])[0]),
2064
utf8_decode(result[1][1])[0]),) + result[2:]
2066
advance_path = False
2068
for result in _process_entry(current_entry, current_path_info):
2069
# this check should probably be outside the loop: one
2070
# 'iterate two trees' api, and then _iter_changes filters
2071
# unchanged pairs. - RBC 20070226
2073
if (include_unchanged
2074
or result[2] # content change
2075
or result[3][0] != result[3][1] # versioned status
2076
or result[4][0] != result[4][1] # parent id
2077
or result[5][0] != result[5][1] # name
2078
or result[6][0] != result[6][1] # kind
2079
or result[7][0] != result[7][1] # executable
2081
result = (result[0],
2082
((utf8_decode(result[1][0])[0]),
2083
utf8_decode(result[1][1])[0]),) + result[2:]
2085
if advance_entry and current_entry is not None:
2087
if entry_index < len(current_block[1]):
2088
current_entry = current_block[1][entry_index]
2090
current_entry = None
2092
advance_entry = True # reset the advance flaga
2093
if advance_path and current_path_info is not None:
2094
if not path_handled:
2095
# unversioned in all regards
2096
if want_unversioned:
2097
new_executable = bool(
2098
stat.S_ISREG(current_path_info[3].st_mode)
2099
and stat.S_IEXEC & current_path_info[3].st_mode)
2100
if want_unversioned:
2101
yield (None, (None, current_path_info[0]),
2105
(None, current_path_info[1]),
2106
(None, current_path_info[2]),
2107
(None, new_executable))
2108
# dont descend into this unversioned path if it is
2110
if current_path_info[2] == 'directory':
2111
del current_dir_info[1][path_index]
2114
if path_index < len(current_dir_info[1]):
2115
current_path_info = current_dir_info[1][path_index]
2117
current_path_info = None
2118
path_handled = False
2120
advance_path = True # reset the advance flagg.
2121
if current_block is not None:
2123
if (block_index < len(state._dirblocks) and
2124
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2125
current_block = state._dirblocks[block_index]
2127
current_block = None
2128
if current_dir_info is not None:
2130
current_dir_info = dir_iterator.next()
2131
except StopIteration:
2132
current_dir_info = None
2136
def is_compatible(source, target):
2137
# the target must be a dirstate working tree
2138
if not isinstance(target, WorkingTree4):
2140
# the source must be a revtreee or dirstate rev tree.
2141
if not isinstance(source,
2142
(revisiontree.RevisionTree, DirStateRevisionTree)):
2144
# the source revid must be in the target dirstate
2145
if not (source._revision_id == NULL_REVISION or
2146
source._revision_id in target.get_parent_ids()):
2147
# TODO: what about ghosts? it may well need to
2148
# check for them explicitly.
2152
InterTree.register_optimiser(InterDirStateTree)
added
removed
bzrlib/workingtree_4.py
