1
# Copyright (C) 2005, 2006 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 (
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,
100
from bzrlib.tree import Tree
101
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
104
class WorkingTree4(WorkingTree3):
105
"""This is the Format 4 working tree.
107
This differs from WorkingTree3 by:
108
- having a consolidated internal dirstate.
109
- not having a regular inventory attribute.
111
This is new in bzr TODO FIXME SETMEBEFORE MERGE.
114
def __init__(self, basedir,
119
"""Construct a WorkingTree for basedir.
121
If the branch is not supplied, it is opened automatically.
122
If the branch is supplied, it must be the branch for this basedir.
123
(branch.base is not cross checked, because for remote branches that
124
would be meaningless).
126
self._format = _format
127
self.bzrdir = _bzrdir
128
from bzrlib.hashcache import HashCache
129
from bzrlib.trace import note, mutter
130
assert isinstance(basedir, basestring), \
131
"base directory %r is not a string" % basedir
132
basedir = safe_unicode(basedir)
133
mutter("opening working tree %r", basedir)
134
self._branch = branch
135
assert isinstance(self.branch, bzrlib.branch.Branch), \
136
"branch %r is not a Branch" % self.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
assert isinstance(_control_files, LockableFiles), \
141
"_control_files must be a LockableFiles, not %r" % _control_files
142
self._control_files = _control_files
143
# update the whole cache up front and write to disk if anything changed;
144
# in the future we might want to do this more selectively
145
# two possible ways offer themselves : in self._unlock, write the cache
146
# if needed, or, when the cache sees a change, append it to the hash
147
# cache file, and have the parser take the most recent entry for a
149
cache_filename = self.bzrdir.get_workingtree_transport(None).local_abspath('stat-cache')
150
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
152
# is this scan needed ? it makes things kinda slow.
161
# during a read or write lock these objects are set, and are
162
# None the rest of the time.
163
self._dirstate = None
164
self._inventory = None
167
@needs_tree_write_lock
168
def _add(self, files, ids, kinds):
169
"""See MutableTree._add."""
170
state = self.current_dirstate()
171
for f, file_id, kind in zip(files, ids, kinds):
176
file_id = generate_ids.gen_file_id(f)
177
# deliberately add the file with no cached stat or sha1
178
# - on the first access it will be gathered, and we can
179
# always change this once tests are all passing.
180
state.add(f, file_id, kind, None, '')
183
def break_lock(self):
184
"""Break a lock if one is present from another instance.
186
Uses the ui factory to ask for confirmation if the lock may be from
189
This will probe the repository for its lock as well.
191
# if the dirstate is locked by an active process, reject the break lock
194
if self._dirstate is None:
198
state = self._current_dirstate()
199
if state._lock_token is not None:
200
# we already have it locked. sheese, cant break our own lock.
201
raise errors.LockActive(self.basedir)
204
# try for a write lock - need permission to get one anyhow
207
except errors.LockContention:
208
# oslocks fail when a process is still live: fail.
209
# TODO: get the locked lockdir info and give to the user to
210
# assist in debugging.
211
raise errors.LockActive(self.basedir)
216
self._dirstate = None
217
self._control_files.break_lock()
218
self.branch.break_lock()
220
def current_dirstate(self):
221
"""Return the current dirstate object.
223
This is not part of the tree interface and only exposed for ease of
226
:raises errors.NotWriteLocked: when not in a lock.
228
if not self._control_files._lock_count:
229
raise errors.ObjectNotLocked(self)
230
return self._current_dirstate()
232
def _current_dirstate(self):
233
"""Internal function that does not check lock status.
235
This is needed for break_lock which also needs the dirstate.
237
if self._dirstate is not None:
238
return self._dirstate
239
local_path = self.bzrdir.get_workingtree_transport(None
240
).local_abspath('dirstate')
241
self._dirstate = dirstate.DirState.on_file(local_path)
242
return self._dirstate
244
def filter_unversioned_files(self, paths):
245
"""Filter out paths that are not versioned.
247
:return: set of paths.
249
# TODO: make a generic multi-bisect routine roughly that should list
250
# the paths, then process one half at a time recursively, and feed the
251
# results of each bisect in further still
252
paths = sorted(paths)
254
state = self.current_dirstate()
255
# TODO we want a paths_to_dirblocks helper I think
257
dirname, basename = os.path.split(path.encode('utf8'))
258
_, _, _, path_is_versioned = state._get_block_entry_index(
259
dirname, basename, 0)
260
if path_is_versioned:
265
"""Write all cached data to disk."""
266
if self._control_files._lock_mode != 'w':
267
raise errors.NotWriteLocked(self)
268
self.current_dirstate().save()
269
self._inventory = None
272
def _generate_inventory(self):
273
"""Create and set self.inventory from the dirstate object.
275
This is relatively expensive: we have to walk the entire dirstate.
276
Ideally we would not, and can deprecate this function.
278
#: uncomment to trap on inventory requests.
279
# import pdb;pdb.set_trace()
280
state = self.current_dirstate()
281
state._read_dirblocks_if_needed()
282
root_key, current_entry = self._get_entry(path='')
283
current_id = root_key[2]
284
assert current_entry[0][0] == 'd' # directory
285
inv = Inventory(root_id=current_id)
286
# Turn some things into local variables
287
minikind_to_kind = dirstate.DirState._minikind_to_kind
288
factory = entry_factory
289
utf8_decode = cache_utf8._utf8_decode
291
# we could do this straight out of the dirstate; it might be fast
292
# and should be profiled - RBC 20070216
293
parent_ies = {'' : inv.root}
294
for block in state._dirblocks[1:]: # skip the root
297
parent_ie = parent_ies[dirname]
299
# all the paths in this block are not versioned in this tree
301
for key, entry in block[1]:
302
minikind, link_or_sha1, size, executable, stat = entry[0]
303
if minikind in ('a', 'r'): # absent, relocated
304
# a parent tree only entry
307
name_unicode = utf8_decode(name)[0]
309
kind = minikind_to_kind[minikind]
310
inv_entry = factory[kind](file_id, name_unicode,
313
# not strictly needed: working tree
314
#entry.executable = executable
315
#entry.text_size = size
316
#entry.text_sha1 = sha1
318
elif kind == 'directory':
319
# add this entry to the parent map.
320
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
321
# These checks cost us around 40ms on a 55k entry tree
322
assert file_id not in inv_byid, ('file_id %s already in'
323
' inventory as %s' % (file_id, inv_byid[file_id]))
324
assert name_unicode not in parent_ie.children
325
inv_byid[file_id] = inv_entry
326
parent_ie.children[name_unicode] = inv_entry
327
self._inventory = inv
329
def _get_entry(self, file_id=None, path=None):
330
"""Get the dirstate row for file_id or path.
332
If either file_id or path is supplied, it is used as the key to lookup.
333
If both are supplied, the fastest lookup is used, and an error is
334
raised if they do not both point at the same row.
336
:param file_id: An optional unicode file_id to be looked up.
337
:param path: An optional unicode path to be looked up.
338
:return: The dirstate row tuple for path/file_id, or (None, None)
340
if file_id is None and path is None:
341
raise errors.BzrError('must supply file_id or path')
342
state = self.current_dirstate()
344
path = path.encode('utf8')
345
return state._get_entry(0, fileid_utf8=file_id, path_utf8=path)
347
def get_file_sha1(self, file_id, path=None, stat_value=None):
348
# check file id is valid unconditionally.
349
key, details = self._get_entry(file_id=file_id, path=path)
350
assert key is not None, 'what error should this raise'
352
# if row stat is valid, use cached sha1, else, get a new sha1.
354
path = os.path.join(*key[0:2]).decode('utf8')
355
return self._hashcache.get_sha1(path, stat_value)
357
def _get_inventory(self):
358
"""Get the inventory for the tree. This is only valid within a lock."""
359
if self._inventory is not None:
360
return self._inventory
361
self._generate_inventory()
362
return self._inventory
364
inventory = property(_get_inventory,
365
doc="Inventory of this Tree")
368
def get_parent_ids(self):
369
"""See Tree.get_parent_ids.
371
This implementation requests the ids list from the dirstate file.
373
return self.current_dirstate().get_parent_ids()
376
def get_root_id(self):
377
"""Return the id of this trees root"""
378
return self._get_entry(path='')[0][2]
380
def has_id(self, file_id):
381
state = self.current_dirstate()
382
file_id = osutils.safe_file_id(file_id)
383
row, parents = self._get_entry(file_id=file_id)
386
return osutils.lexists(pathjoin(
387
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
390
def id2path(self, file_id):
391
file_id = osutils.safe_file_id(file_id)
392
state = self.current_dirstate()
393
entry = self._get_entry(file_id=file_id)
394
if entry == (None, None):
396
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
397
return path_utf8.decode('utf8')
401
"""Iterate through file_ids for this tree.
403
file_ids are in a WorkingTree if they are in the working inventory
404
and the working file exists.
407
for key, tree_details in self.current_dirstate()._iter_entries():
408
if tree_details[0][0] in ('a', 'r'): # absent, relocated
409
# not relevant to the working tree
411
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
412
if osutils.lexists(path):
413
result.append(key[2])
417
def _last_revision(self):
418
"""See Mutable.last_revision."""
419
parent_ids = self.current_dirstate().get_parent_ids()
426
super(WorkingTree4, self).lock_read()
427
if self._dirstate is None:
428
self.current_dirstate()
429
self._dirstate.lock_read()
431
def lock_tree_write(self):
432
super(WorkingTree4, self).lock_tree_write()
433
if self._dirstate is None:
434
self.current_dirstate()
435
self._dirstate.lock_write()
437
def lock_write(self):
438
super(WorkingTree4, self).lock_write()
439
if self._dirstate is None:
440
self.current_dirstate()
441
self._dirstate.lock_write()
443
@needs_tree_write_lock
444
def move(self, from_paths, to_dir, after=False):
445
"""See WorkingTree.move()."""
449
state = self.current_dirstate()
451
assert not isinstance(from_paths, basestring)
452
to_dir_utf8 = to_dir.encode('utf8')
453
to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
454
id_index = state._get_id_index()
455
# check destination directory
456
# get the details for it
457
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
458
state._get_block_entry_index(to_entry_dirname, to_basename, 0)
459
if not entry_present:
460
raise errors.BzrMoveFailedError('', to_dir,
461
errors.NotInWorkingDirectory(to_dir))
462
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
463
# get a handle on the block itself.
464
to_block_index = state._ensure_block(
465
to_entry_block_index, to_entry_entry_index, to_dir_utf8)
466
to_block = state._dirblocks[to_block_index]
467
to_abs = self.abspath(to_dir)
468
if not isdir(to_abs):
469
raise errors.BzrMoveFailedError('',to_dir,
470
errors.NotADirectory(to_abs))
472
if to_entry[1][0][0] != 'd':
473
raise errors.BzrMoveFailedError('',to_dir,
474
errors.NotADirectory(to_abs))
476
if self._inventory is not None:
477
update_inventory = True
479
to_dir_ie = inv[to_dir_id]
480
to_dir_id = to_entry[0][2]
482
update_inventory = False
485
def move_one(old_entry, from_path_utf8, minikind, executable,
486
fingerprint, packed_stat, size,
487
to_block, to_key, to_path_utf8):
488
state._make_absent(old_entry)
489
from_key = old_entry[0]
491
lambda:state.update_minimal(from_key,
493
executable=executable,
494
fingerprint=fingerprint,
495
packed_stat=packed_stat,
497
path_utf8=from_path_utf8))
498
state.update_minimal(to_key,
500
executable=executable,
501
fingerprint=fingerprint,
502
packed_stat=packed_stat,
504
path_utf8=to_path_utf8)
505
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
506
new_entry = to_block[1][added_entry_index]
507
rollbacks.append(lambda:state._make_absent(new_entry))
509
# create rename entries and tuples
510
for from_rel in from_paths:
511
# from_rel is 'pathinroot/foo/bar'
512
from_rel_utf8 = from_rel.encode('utf8')
513
from_dirname, from_tail = osutils.split(from_rel)
514
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
515
from_entry = self._get_entry(path=from_rel)
516
if from_entry == (None, None):
517
raise errors.BzrMoveFailedError(from_rel,to_dir,
518
errors.NotVersionedError(path=str(from_rel)))
520
from_id = from_entry[0][2]
521
to_rel = pathjoin(to_dir, from_tail)
522
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
523
item_to_entry = self._get_entry(path=to_rel)
524
if item_to_entry != (None, None):
525
raise errors.BzrMoveFailedError(from_rel, to_rel,
526
"Target is already versioned.")
528
if from_rel == to_rel:
529
raise errors.BzrMoveFailedError(from_rel, to_rel,
530
"Source and target are identical.")
532
from_missing = not self.has_filename(from_rel)
533
to_missing = not self.has_filename(to_rel)
540
raise errors.BzrMoveFailedError(from_rel, to_rel,
541
errors.NoSuchFile(path=to_rel,
542
extra="New file has not been created yet"))
544
# neither path exists
545
raise errors.BzrRenameFailedError(from_rel, to_rel,
546
errors.PathsDoNotExist(paths=(from_rel, to_rel)))
548
if from_missing: # implicitly just update our path mapping
551
raise errors.RenameFailedFilesExist(from_rel, to_rel,
552
extra="(Use --after to update the Bazaar id)")
555
def rollback_rename():
556
"""A single rename has failed, roll it back."""
558
for rollback in reversed(rollbacks):
562
import pdb;pdb.set_trace()
563
exc_info = sys.exc_info()
565
raise exc_info[0], exc_info[1], exc_info[2]
567
# perform the disk move first - its the most likely failure point.
569
from_rel_abs = self.abspath(from_rel)
570
to_rel_abs = self.abspath(to_rel)
572
osutils.rename(from_rel_abs, to_rel_abs)
574
raise errors.BzrMoveFailedError(from_rel, to_rel, e[1])
575
rollbacks.append(lambda: osutils.rename(to_rel_abs, from_rel_abs))
577
# perform the rename in the inventory next if needed: its easy
581
from_entry = inv[from_id]
582
current_parent = from_entry.parent_id
583
inv.rename(from_id, to_dir_id, from_tail)
585
lambda: inv.rename(from_id, current_parent, from_tail))
586
# finally do the rename in the dirstate, which is a little
587
# tricky to rollback, but least likely to need it.
588
old_block_index, old_entry_index, dir_present, file_present = \
589
state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
590
old_block = state._dirblocks[old_block_index][1]
591
old_entry = old_block[old_entry_index]
592
from_key, old_entry_details = old_entry
593
cur_details = old_entry_details[0]
595
to_key = ((to_block[0],) + from_key[1:3])
596
minikind = cur_details[0]
597
move_one(old_entry, from_path_utf8=from_rel_utf8,
599
executable=cur_details[3],
600
fingerprint=cur_details[1],
601
packed_stat=cur_details[4],
605
to_path_utf8=to_rel_utf8)
608
def update_dirblock(from_dir, to_key, to_dir_utf8):
609
"""all entries in this block need updating.
611
TODO: This is pretty ugly, and doesn't support
612
reverting, but it works.
614
assert from_dir != '', "renaming root not supported"
615
from_key = (from_dir, '')
616
from_block_idx, present = \
617
state._find_block_index_from_key(from_key)
619
# This is the old record, if it isn't present, then
620
# there is theoretically nothing to update.
621
# (Unless it isn't present because of lazy loading,
622
# but we don't do that yet)
624
from_block = state._dirblocks[from_block_idx]
625
to_block_index, to_entry_index, _, _ = \
626
state._get_block_entry_index(to_key[0], to_key[1], 0)
627
to_block_index = state._ensure_block(
628
to_block_index, to_entry_index, to_dir_utf8)
629
to_block = state._dirblocks[to_block_index]
630
for entry in from_block[1]:
631
assert entry[0][0] == from_dir
632
cur_details = entry[1][0]
633
to_key = (to_dir_utf8, entry[0][1], entry[0][2])
634
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
635
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
636
minikind = cur_details[0]
637
move_one(entry, from_path_utf8=from_path_utf8,
639
executable=cur_details[3],
640
fingerprint=cur_details[1],
641
packed_stat=cur_details[4],
645
to_path_utf8=to_rel_utf8)
647
# We need to move all the children of this
649
update_dirblock(from_path_utf8, to_key,
651
update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
655
state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
658
return #rename_tuples
661
"""Initialize the state in this tree to be a new tree."""
665
def path2id(self, path):
666
"""Return the id for path in this tree."""
667
entry = self._get_entry(path=path)
668
if entry == (None, None):
672
def paths2ids(self, paths, trees=[], require_versioned=True):
673
"""See Tree.paths2ids().
675
This specialisation fast-paths the case where all the trees are in the
680
parents = self.get_parent_ids()
682
if not (isinstance(tree, DirStateRevisionTree) and tree._revision_id in
684
return super(WorkingTree4, self).paths2ids(paths, trees, require_versioned)
685
search_indexes = [0] + [1 + parents.index(tree._revision_id) for tree in trees]
686
# -- make all paths utf8 --
689
paths_utf8.add(path.encode('utf8'))
691
# -- paths is now a utf8 path set --
692
# -- get the state object and prepare it.
693
state = self.current_dirstate()
694
if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY
695
and '' not in paths):
696
paths2ids = self._paths2ids_using_bisect
698
paths2ids = self._paths2ids_in_memory
699
return paths2ids(paths, search_indexes,
700
require_versioned=require_versioned)
702
def _paths2ids_in_memory(self, paths, search_indexes,
703
require_versioned=True):
704
state = self.current_dirstate()
705
state._read_dirblocks_if_needed()
706
def _entries_for_path(path):
707
"""Return a list with all the entries that match path for all ids.
709
dirname, basename = os.path.split(path)
710
key = (dirname, basename, '')
711
block_index, present = state._find_block_index_from_key(key)
713
# the block which should contain path is absent.
716
block = state._dirblocks[block_index][1]
717
entry_index, _ = state._find_entry_index(key, block)
718
# we may need to look at multiple entries at this path: walk while the paths match.
719
while (entry_index < len(block) and
720
block[entry_index][0][0:2] == key[0:2]):
721
result.append(block[entry_index])
724
if require_versioned:
725
# -- check all supplied paths are versioned in a search tree. --
728
path_entries = _entries_for_path(path)
730
# this specified path is not present at all: error
731
all_versioned = False
733
found_versioned = False
734
# for each id at this path
735
for entry in path_entries:
737
for index in search_indexes:
738
if entry[1][index][0] != 'a': # absent
739
found_versioned = True
740
# all good: found a versioned cell
742
if not found_versioned:
743
# none of the indexes was not 'absent' at all ids for this
745
all_versioned = False
747
if not all_versioned:
748
raise errors.PathsNotVersionedError(paths)
749
# -- remove redundancy in supplied paths to prevent over-scanning --
752
other_paths = paths.difference(set([path]))
753
if not osutils.is_inside_any(other_paths, path):
754
# this is a top level path, we must check it.
755
search_paths.add(path)
757
# for all search_indexs in each path at or under each element of
758
# search_paths, if the detail is relocated: add the id, and add the
759
# relocated path as one to search if its not searched already. If the
760
# detail is not relocated, add the id.
761
searched_paths = set()
763
def _process_entry(entry):
764
"""Look at search_indexes within entry.
766
If a specific tree's details are relocated, add the relocation
767
target to search_paths if not searched already. If it is absent, do
768
nothing. Otherwise add the id to found_ids.
770
for index in search_indexes:
771
if entry[1][index][0] == 'r': # relocated
772
if not osutils.is_inside_any(searched_paths, entry[1][index][1]):
773
search_paths.add(entry[1][index][1])
774
elif entry[1][index][0] != 'a': # absent
775
found_ids.add(entry[0][2])
777
current_root = search_paths.pop()
778
searched_paths.add(current_root)
779
# process the entries for this containing directory: the rest will be
780
# found by their parents recursively.
781
root_entries = _entries_for_path(current_root)
783
# this specified path is not present at all, skip it.
785
for entry in root_entries:
786
_process_entry(entry)
787
initial_key = (current_root, '', '')
788
block_index, _ = state._find_block_index_from_key(initial_key)
789
while (block_index < len(state._dirblocks) and
790
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
791
for entry in state._dirblocks[block_index][1]:
792
_process_entry(entry)
796
def _paths2ids_using_bisect(self, paths, search_indexes,
797
require_versioned=True):
798
state = self.current_dirstate()
801
split_paths = sorted(osutils.split(p) for p in paths)
802
found = state._bisect_recursive(split_paths)
804
if require_versioned:
805
found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
806
for dir_name in split_paths:
807
if dir_name not in found_dir_names:
808
raise errors.PathsNotVersionedError(paths)
810
for dir_name_id, trees_info in found.iteritems():
811
for index in search_indexes:
812
if trees_info[index][0] not in ('r', 'a'):
813
found_ids.add(dir_name_id[2])
816
def read_working_inventory(self):
817
"""Read the working inventory.
819
This is a meaningless operation for dirstate, but we obey it anyhow.
821
return self.inventory
824
def revision_tree(self, revision_id):
825
"""See Tree.revision_tree.
827
WorkingTree4 supplies revision_trees for any basis tree.
829
revision_id = osutils.safe_revision_id(revision_id)
830
dirstate = self.current_dirstate()
831
parent_ids = dirstate.get_parent_ids()
832
if revision_id not in parent_ids:
833
raise errors.NoSuchRevisionInTree(self, revision_id)
834
if revision_id in dirstate.get_ghosts():
835
raise errors.NoSuchRevisionInTree(self, revision_id)
836
return DirStateRevisionTree(dirstate, revision_id,
837
self.branch.repository)
839
@needs_tree_write_lock
840
def set_last_revision(self, new_revision):
841
"""Change the last revision in the working tree."""
842
new_revision = osutils.safe_revision_id(new_revision)
843
parents = self.get_parent_ids()
844
if new_revision in (NULL_REVISION, None):
845
assert len(parents) < 2, (
846
"setting the last parent to none with a pending merge is "
848
self.set_parent_ids([])
850
self.set_parent_ids([new_revision] + parents[1:],
851
allow_leftmost_as_ghost=True)
853
@needs_tree_write_lock
854
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
855
"""Set the parent ids to revision_ids.
857
See also set_parent_trees. This api will try to retrieve the tree data
858
for each element of revision_ids from the trees repository. If you have
859
tree data already available, it is more efficient to use
860
set_parent_trees rather than set_parent_ids. set_parent_ids is however
861
an easier API to use.
863
:param revision_ids: The revision_ids to set as the parent ids of this
864
working tree. Any of these may be ghosts.
866
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
868
for revision_id in revision_ids:
870
revtree = self.branch.repository.revision_tree(revision_id)
871
# TODO: jam 20070213 KnitVersionedFile raises
872
# RevisionNotPresent rather than NoSuchRevision if a
873
# given revision_id is not present. Should Repository be
874
# catching it and re-raising NoSuchRevision?
875
except (errors.NoSuchRevision, errors.RevisionNotPresent):
877
trees.append((revision_id, revtree))
878
self.set_parent_trees(trees,
879
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
881
@needs_tree_write_lock
882
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
883
"""Set the parents of the working tree.
885
:param parents_list: A list of (revision_id, tree) tuples.
886
If tree is None, then that element is treated as an unreachable
887
parent tree - i.e. a ghost.
889
dirstate = self.current_dirstate()
890
if len(parents_list) > 0:
891
if not allow_leftmost_as_ghost and parents_list[0][1] is None:
892
raise errors.GhostRevisionUnusableHere(parents_list[0][0])
895
# convert absent trees to the null tree, which we convert back to
897
for rev_id, tree in parents_list:
898
rev_id = osutils.safe_revision_id(rev_id)
900
real_trees.append((rev_id, tree))
902
real_trees.append((rev_id,
903
self.branch.repository.revision_tree(None)))
904
ghosts.append(rev_id)
905
dirstate.set_parent_trees(real_trees, ghosts=ghosts)
908
def _set_root_id(self, file_id):
909
"""See WorkingTree.set_root_id."""
910
state = self.current_dirstate()
911
state.set_path_id('', file_id)
912
self._dirty = state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED
915
"""Unlock in format 4 trees needs to write the entire dirstate."""
916
if self._control_files._lock_count == 1:
917
self._write_hashcache_if_dirty()
918
# eventually we should do signature checking during read locks for
920
if self._control_files._lock_mode == 'w':
923
if self._dirstate is not None:
924
self._dirstate.unlock()
925
self._dirstate = None
926
self._inventory = None
927
# reverse order of locking.
929
return self._control_files.unlock()
933
@needs_tree_write_lock
934
def unversion(self, file_ids):
935
"""Remove the file ids in file_ids from the current versioned set.
937
When a file_id is unversioned, all of its children are automatically
940
:param file_ids: The file ids to stop versioning.
941
:raises: NoSuchId if any fileid is not currently versioned.
945
state = self.current_dirstate()
946
state._read_dirblocks_if_needed()
947
ids_to_unversion = set()
948
for file_id in file_ids:
949
ids_to_unversion.add(osutils.safe_file_id(file_id))
950
paths_to_unversion = set()
952
# check if the root is to be unversioned, if so, assert for now.
953
# walk the state marking unversioned things as absent.
954
# if there are any un-unversioned ids at the end, raise
955
for key, details in state._dirblocks[0][1]:
956
if (details[0][0] not in ('a', 'r') and # absent or relocated
957
key[2] in ids_to_unversion):
958
# I haven't written the code to unversion / yet - it should be
960
raise errors.BzrError('Unversioning the / is not currently supported')
961
details_length = len(state._dirblocks[0][1][0][1])
963
while block_index < len(state._dirblocks):
964
# process one directory at a time.
965
block = state._dirblocks[block_index]
966
# first check: is the path one to remove - it or its children
968
for path in paths_to_unversion:
969
if (block[0].startswith(path) and
970
(len(block[0]) == len(path) or
971
block[0][len(path)] == '/')):
972
# this entire block should be deleted - its the block for a
973
# path to unversion; or the child of one
976
# TODO: trim paths_to_unversion as we pass by paths
978
# this block is to be deleted: process it.
979
# TODO: we can special case the no-parents case and
980
# just forget the whole block.
982
while entry_index < len(block[1]):
983
if not state._make_absent(block[1][entry_index]):
985
# go to the next block. (At the moment we dont delete empty
990
while entry_index < len(block[1]):
991
entry = block[1][entry_index]
992
if (entry[1][0][0] in ('a', 'r') or # absent, relocated
994
entry[0][2] not in ids_to_unversion):
995
# ^ not an id to unversion
998
if entry[1][0][0] == 'd':
999
paths_to_unversion.add(os.path.join(*entry[0][0:2]))
1000
if not state._make_absent(entry):
1002
# we have unversioned this id
1003
ids_to_unversion.remove(entry[0][2])
1005
if ids_to_unversion:
1006
raise errors.NoSuchId(self, iter(ids_to_unversion).next())
1008
# have to change the legacy inventory too.
1009
if self._inventory is not None:
1010
for file_id in file_ids:
1011
self._inventory.remove_recursive_id(file_id)
1013
@needs_tree_write_lock
1014
def _write_inventory(self, inv):
1015
"""Write inventory as the current inventory."""
1016
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1017
self.current_dirstate().set_state_from_inventory(inv)
1022
class WorkingTreeFormat4(WorkingTreeFormat3):
1023
"""The first consolidated dirstate working tree format.
1026
- exists within a metadir controlling .bzr
1027
- includes an explicit version marker for the workingtree control
1028
files, separate from the BzrDir format
1029
- modifies the hash cache format
1030
- is new in bzr TODO FIXME SETBEFOREMERGE
1031
- uses a LockDir to guard access to it.
1034
def get_format_string(self):
1035
"""See WorkingTreeFormat.get_format_string()."""
1036
return "Bazaar Working Tree format 4\n"
1038
def get_format_description(self):
1039
"""See WorkingTreeFormat.get_format_description()."""
1040
return "Working tree format 4"
1042
def initialize(self, a_bzrdir, revision_id=None):
1043
"""See WorkingTreeFormat.initialize().
1045
revision_id allows creating a working tree at a different
1046
revision than the branch is at.
1048
revision_id = osutils.safe_revision_id(revision_id)
1049
if not isinstance(a_bzrdir.transport, LocalTransport):
1050
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1051
transport = a_bzrdir.get_workingtree_transport(self)
1052
control_files = self._open_control_files(a_bzrdir)
1053
control_files.create_lock()
1054
control_files.lock_write()
1055
control_files.put_utf8('format', self.get_format_string())
1056
branch = a_bzrdir.open_branch()
1057
if revision_id is None:
1058
revision_id = branch.last_revision()
1059
local_path = transport.local_abspath('dirstate')
1060
state = dirstate.DirState.initialize(local_path)
1062
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1066
_control_files=control_files)
1070
#wt.current_dirstate().set_path_id('', NEWROOT)
1071
wt.set_last_revision(revision_id)
1073
basis = wt.basis_tree()
1075
transform.build_tree(basis, wt)
1078
control_files.unlock()
1083
def _open(self, a_bzrdir, control_files):
1084
"""Open the tree itself.
1086
:param a_bzrdir: the dir for the tree.
1087
:param control_files: the control files for the tree.
1089
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1090
branch=a_bzrdir.open_branch(),
1093
_control_files=control_files)
1096
class DirStateRevisionTree(Tree):
1097
"""A revision tree pulling the inventory from a dirstate."""
1099
def __init__(self, dirstate, revision_id, repository):
1100
self._dirstate = dirstate
1101
self._revision_id = osutils.safe_revision_id(revision_id)
1102
self._repository = repository
1103
self._inventory = None
1105
self._dirstate_locked = False
1107
def annotate_iter(self, file_id):
1108
"""See Tree.annotate_iter"""
1109
w = self._repository.weave_store.get_weave(file_id,
1110
self._repository.get_transaction())
1111
return w.annotate_iter(self.inventory[file_id].revision)
1113
def _comparison_data(self, entry, path):
1114
"""See Tree._comparison_data."""
1116
return None, False, None
1117
# trust the entry as RevisionTree does, but this may not be
1118
# sensible: the entry might not have come from us?
1119
return entry.kind, entry.executable, None
1121
def _file_size(self, entry, stat_value):
1122
return entry.text_size
1124
def filter_unversioned_files(self, paths):
1125
"""Filter out paths that are not versioned.
1127
:return: set of paths.
1129
pred = self.has_filename
1130
return set((p for p in paths if not pred(p)))
1132
def _get_parent_index(self):
1133
"""Return the index in the dirstate referenced by this tree."""
1134
return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1136
def _get_entry(self, file_id=None, path=None):
1137
"""Get the dirstate row for file_id or path.
1139
If either file_id or path is supplied, it is used as the key to lookup.
1140
If both are supplied, the fastest lookup is used, and an error is
1141
raised if they do not both point at the same row.
1143
:param file_id: An optional unicode file_id to be looked up.
1144
:param path: An optional unicode path to be looked up.
1145
:return: The dirstate row tuple for path/file_id, or (None, None)
1147
if file_id is None and path is None:
1148
raise errors.BzrError('must supply file_id or path')
1149
file_id = osutils.safe_file_id(file_id)
1150
if path is not None:
1151
path = path.encode('utf8')
1152
parent_index = self._get_parent_index()
1153
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
1155
def _generate_inventory(self):
1156
"""Create and set self.inventory from the dirstate object.
1158
This is relatively expensive: we have to walk the entire dirstate.
1159
Ideally we would not, and instead would """
1160
assert self._locked, 'cannot generate inventory of an unlocked '\
1161
'dirstate revision tree'
1162
# separate call for profiling - makes it clear where the costs are.
1163
self._dirstate._read_dirblocks_if_needed()
1164
assert self._revision_id in self._dirstate.get_parent_ids(), \
1165
'parent %s has disappeared from %s' % (
1166
self._revision_id, self._dirstate.get_parent_ids())
1167
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1168
# This is identical now to the WorkingTree _generate_inventory except
1169
# for the tree index use.
1170
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
1171
current_id = root_key[2]
1172
assert current_entry[parent_index][0] == 'd'
1173
inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1174
inv.root.revision = current_entry[parent_index][4]
1175
# Turn some things into local variables
1176
minikind_to_kind = dirstate.DirState._minikind_to_kind
1177
factory = entry_factory
1178
utf8_decode = cache_utf8._utf8_decode
1179
inv_byid = inv._byid
1180
# we could do this straight out of the dirstate; it might be fast
1181
# and should be profiled - RBC 20070216
1182
parent_ies = {'' : inv.root}
1183
for block in self._dirstate._dirblocks[1:]: #skip root
1186
parent_ie = parent_ies[dirname]
1188
# all the paths in this block are not versioned in this tree
1190
for key, entry in block[1]:
1191
minikind, link_or_sha1, size, executable, revid = entry[parent_index]
1192
if minikind in ('a', 'r'): # absent, relocated
1196
name_unicode = utf8_decode(name)[0]
1198
kind = minikind_to_kind[minikind]
1199
inv_entry = factory[kind](file_id, name_unicode,
1201
inv_entry.revision = revid
1203
inv_entry.executable = executable
1204
inv_entry.text_size = size
1205
inv_entry.text_sha1 = link_or_sha1
1206
elif kind == 'directory':
1207
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1208
elif kind == 'symlink':
1209
inv_entry.executable = False
1210
inv_entry.text_size = size
1211
inv_entry.symlink_target = utf8_decode(link_or_sha1)[0]
1213
raise Exception, kind
1214
# These checks cost us around 40ms on a 55k entry tree
1215
assert file_id not in inv_byid
1216
assert name_unicode not in parent_ie.children
1217
inv_byid[file_id] = inv_entry
1218
parent_ie.children[name_unicode] = inv_entry
1219
self._inventory = inv
1221
def get_file_sha1(self, file_id, path=None, stat_value=None):
1222
# TODO: if path is present, fast-path on that, as inventory
1223
# might not be present
1224
ie = self.inventory[file_id]
1225
if ie.kind == "file":
1229
def get_file(self, file_id):
1230
return StringIO(self.get_file_text(file_id))
1232
def get_file_lines(self, file_id):
1233
ie = self.inventory[file_id]
1234
return self._repository.weave_store.get_weave(file_id,
1235
self._repository.get_transaction()).get_lines(ie.revision)
1237
def get_file_size(self, file_id):
1238
return self.inventory[file_id].text_size
1240
def get_file_text(self, file_id):
1241
return ''.join(self.get_file_lines(file_id))
1243
def get_symlink_target(self, file_id):
1244
entry = self._get_entry(file_id=file_id)
1245
parent_index = self._get_parent_index()
1246
if entry[1][parent_index][0] != 'l':
1249
# At present, none of the tree implementations supports non-ascii
1250
# symlink targets. So we will just assume that the dirstate path is
1252
return entry[1][parent_index][1]
1254
def get_revision_id(self):
1255
"""Return the revision id for this tree."""
1256
return self._revision_id
1258
def _get_inventory(self):
1259
if self._inventory is not None:
1260
return self._inventory
1261
self._generate_inventory()
1262
return self._inventory
1264
inventory = property(_get_inventory,
1265
doc="Inventory of this Tree")
1267
def get_parent_ids(self):
1268
"""The parents of a tree in the dirstate are not cached."""
1269
return self._repository.get_revision(self._revision_id).parent_ids
1271
def has_filename(self, filename):
1272
return bool(self.path2id(filename))
1274
def kind(self, file_id):
1275
return self.inventory[file_id].kind
1277
def is_executable(self, file_id, path=None):
1278
ie = self.inventory[file_id]
1279
if ie.kind != "file":
1281
return ie.executable
1283
def list_files(self, include_root=False):
1284
# We use a standard implementation, because DirStateRevisionTree is
1285
# dealing with one of the parents of the current state
1286
inv = self._get_inventory()
1287
entries = inv.iter_entries()
1288
if self.inventory.root is not None and not include_root:
1290
for path, entry in entries:
1291
yield path, 'V', entry.kind, entry.file_id, entry
1293
def lock_read(self):
1294
"""Lock the tree for a set of operations."""
1295
if not self._locked:
1296
self._repository.lock_read()
1297
if self._dirstate._lock_token is None:
1298
self._dirstate.lock_read()
1299
self._dirstate_locked = True
1303
def path2id(self, path):
1304
"""Return the id for path in this tree."""
1305
# lookup by path: faster than splitting and walking the ivnentory.
1306
entry = self._get_entry(path=path)
1307
if entry == (None, None):
1312
"""Unlock, freeing any cache memory used during the lock."""
1313
# outside of a lock, the inventory is suspect: release it.
1315
if not self._locked:
1316
self._inventory = None
1318
if self._dirstate_locked:
1319
self._dirstate.unlock()
1320
self._dirstate_locked = False
1321
self._repository.unlock()
1323
def walkdirs(self, prefix=""):
1324
# TODO: jam 20070215 This is the cheap way by cheating and using the
1325
# RevisionTree implementation.
1326
# This should be cleaned up to use the much faster Dirstate code
1327
# This is a little tricky, though, because the dirstate is
1328
# indexed by current path, not by parent path.
1329
# So for now, we just build up the parent inventory, and extract
1330
# it the same way RevisionTree does.
1331
_directory = 'directory'
1332
inv = self._get_inventory()
1333
top_id = inv.path2id(prefix)
1337
pending = [(prefix, top_id)]
1340
relpath, file_id = pending.pop()
1341
# 0 - relpath, 1- file-id
1343
relroot = relpath + '/'
1346
# FIXME: stash the node in pending
1347
entry = inv[file_id]
1348
for name, child in entry.sorted_children():
1349
toppath = relroot + name
1350
dirblock.append((toppath, name, child.kind, None,
1351
child.file_id, child.kind
1353
yield (relpath, entry.file_id), dirblock
1354
# push the user specified dirs from dirblock
1355
for dir in reversed(dirblock):
1356
if dir[2] == _directory:
1357
pending.append((dir[0], dir[4]))
1360
class InterDirStateTree(InterTree):
1361
"""Fast path optimiser for changes_from with dirstate trees."""
1363
def __init__(self, source, target):
1364
super(InterDirStateTree, self).__init__(source, target)
1365
if not InterDirStateTree.is_compatible(source, target):
1366
raise Exception, "invalid source %r and target %r" % (source, target)
1369
def make_source_parent_tree(source, target):
1370
"""Change the source tree into a parent of the target."""
1371
revid = source.commit('record tree')
1372
target.branch.repository.fetch(source.branch.repository, revid)
1373
target.set_parent_ids([revid])
1374
return target.basis_tree(), target
1376
_matching_from_tree_format = WorkingTreeFormat4()
1377
_matching_to_tree_format = WorkingTreeFormat4()
1378
_test_mutable_trees_to_test_trees = make_source_parent_tree
1380
def _iter_changes(self, include_unchanged=False,
1381
specific_files=None, pb=None, extra_trees=[],
1382
require_versioned=True):
1383
"""Return the changes from source to target.
1385
:return: An iterator that yields tuples. See InterTree._iter_changes
1387
:param specific_files: An optional list of file paths to restrict the
1388
comparison to. When mapping filenames to ids, all matches in all
1389
trees (including optional extra_trees) are used, and all children of
1390
matched directories are included.
1391
:param include_unchanged: An optional boolean requesting the inclusion of
1392
unchanged entries in the result.
1393
:param extra_trees: An optional list of additional trees to use when
1394
mapping the contents of specific_files (paths) to file_ids.
1395
:param require_versioned: If True, all files in specific_files must be
1396
versioned in one of source, target, extra_trees or
1397
PathsNotVersionedError is raised.
1399
utf8_decode = cache_utf8._utf8_decode
1400
_minikind_to_kind = dirstate.DirState._minikind_to_kind
1401
# NB: show_status depends on being able to pass in non-versioned files
1402
# and report them as unknown
1403
# TODO: handle extra trees in the dirstate.
1405
for f in super(InterDirStateTree, self)._iter_changes(
1406
include_unchanged, specific_files, pb, extra_trees,
1410
parent_ids = self.target.get_parent_ids()
1412
if self.source._revision_id == NULL_REVISION:
1414
indices = (target_index,)
1416
assert (self.source._revision_id in parent_ids), \
1417
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
1418
self.source._revision_id, parent_ids)
1419
source_index = 1 + parent_ids.index(self.source._revision_id)
1420
indices = (source_index,target_index)
1421
# -- make all specific_files utf8 --
1423
specific_files_utf8 = set()
1424
for path in specific_files:
1425
specific_files_utf8.add(path.encode('utf8'))
1426
specific_files = specific_files_utf8
1428
specific_files = set([''])
1429
# -- specific_files is now a utf8 path set --
1430
# -- get the state object and prepare it.
1431
state = self.target.current_dirstate()
1432
state._read_dirblocks_if_needed()
1433
def _entries_for_path(path):
1434
"""Return a list with all the entries that match path for all ids.
1436
dirname, basename = os.path.split(path)
1437
key = (dirname, basename, '')
1438
block_index, present = state._find_block_index_from_key(key)
1440
# the block which should contain path is absent.
1443
block = state._dirblocks[block_index][1]
1444
entry_index, _ = state._find_entry_index(key, block)
1445
# we may need to look at multiple entries at this path: walk while the specific_files match.
1446
while (entry_index < len(block) and
1447
block[entry_index][0][0:2] == key[0:2]):
1448
result.append(block[entry_index])
1451
if require_versioned:
1452
# -- check all supplied paths are versioned in a search tree. --
1453
all_versioned = True
1454
for path in specific_files:
1455
path_entries = _entries_for_path(path)
1456
if not path_entries:
1457
# this specified path is not present at all: error
1458
all_versioned = False
1460
found_versioned = False
1461
# for each id at this path
1462
for entry in path_entries:
1464
for index in indices:
1465
if entry[1][index][0] != 'a': # absent
1466
found_versioned = True
1467
# all good: found a versioned cell
1469
if not found_versioned:
1470
# none of the indexes was not 'absent' at all ids for this
1472
all_versioned = False
1474
if not all_versioned:
1475
raise errors.PathsNotVersionedError(paths)
1476
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1477
search_specific_files = set()
1478
for path in specific_files:
1479
other_specific_files = specific_files.difference(set([path]))
1480
if not osutils.is_inside_any(other_specific_files, path):
1481
# this is a top level path, we must check it.
1482
search_specific_files.add(path)
1484
# compare source_index and target_index at or under each element of search_specific_files.
1485
# follow the following comparison table. Note that we only want to do diff operations when
1486
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1490
# Source | Target | disk | action
1491
# r | fdl | | add source to search, add id path move and perform
1492
# | | | diff check on source-target
1493
# r | fdl | a | dangling file that was present in the basis.
1495
# r | a | | add source to search
1497
# r | r | | this path is present in a non-examined tree, skip.
1498
# r | r | a | this path is present in a non-examined tree, skip.
1499
# a | fdl | | add new id
1500
# a | fdl | a | dangling locally added file, skip
1501
# a | a | | not present in either tree, skip
1502
# a | a | a | not present in any tree, skip
1503
# a | r | | not present in either tree at this path, skip as it
1504
# | | | may not be selected by the users list of paths.
1505
# a | r | a | not present in either tree at this path, skip as it
1506
# | | | may not be selected by the users list of paths.
1507
# fdl | fdl | | content in both: diff them
1508
# fdl | fdl | a | deleted locally, but not unversioned - show as deleted ?
1509
# fdl | a | | unversioned: output deleted id for now
1510
# fdl | a | a | unversioned and deleted: output deleted id
1511
# fdl | r | | relocated in this tree, so add target to search.
1512
# | | | Dont diff, we will see an r,fd; pair when we reach
1513
# | | | this id at the other path.
1514
# fdl | r | a | relocated in this tree, so add target to search.
1515
# | | | Dont diff, we will see an r,fd; pair when we reach
1516
# | | | this id at the other path.
1518
# for all search_indexs in each path at or under each element of
1519
# search_specific_files, if the detail is relocated: add the id, and add the
1520
# relocated path as one to search if its not searched already. If the
1521
# detail is not relocated, add the id.
1522
searched_specific_files = set()
1523
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1524
# Using a list so that we can access the values and change them in
1525
# nested scope. Each one is [path, file_id, entry]
1526
last_source_parent = [None, None, None]
1527
last_target_parent = [None, None, None]
1529
def _process_entry(entry, path_info):
1530
"""Compare an entry and real disk to generate delta information.
1532
:param path_info: top_relpath, basename, kind, lstat, abspath for
1533
the path of entry. If None, then the path is considered absent.
1534
(Perhaps we should pass in a concrete entry for this ?)
1536
# TODO: when a parent has been renamed, dont emit path renames for children,
1537
if source_index is None:
1538
source_details = NULL_PARENT_DETAILS
1540
source_details = entry[1][source_index]
1541
target_details = entry[1][target_index]
1542
source_minikind = source_details[0]
1543
target_minikind = target_details[0]
1544
if source_minikind in 'fdlr' and target_minikind in 'fdl':
1545
# claimed content in both: diff
1546
# r | fdl | | add source to search, add id path move and perform
1547
# | | | diff check on source-target
1548
# r | fdl | a | dangling file that was present in the basis.
1550
if source_minikind in 'r':
1551
# add the source to the search path to find any children it
1552
# has. TODO ? : only add if it is a container ?
1553
if not osutils.is_inside_any(searched_specific_files,
1555
search_specific_files.add(source_details[1])
1556
# generate the old path; this is needed for stating later
1558
old_path = source_details[1]
1559
old_dirname, old_basename = os.path.split(old_path)
1560
path = os.path.join(entry[0][0], entry[0][1])
1561
old_entry = state._get_entry(source_index,
1563
# update the source details variable to be the real
1565
source_details = old_entry[1][source_index]
1566
source_minikind = source_details[0]
1568
old_dirname = entry[0][0]
1569
old_basename = entry[0][1]
1570
old_path = path = os.path.join(old_dirname, old_basename)
1571
if path_info is None:
1572
# the file is missing on disk, show as removed.
1573
old_path = os.path.join(entry[0][0], entry[0][1])
1574
content_change = True
1578
# source and target are both versioned and disk file is present.
1579
target_kind = path_info[2]
1580
if target_kind == 'directory':
1581
if source_minikind != 'd':
1582
content_change = True
1584
# directories have no fingerprint
1585
content_change = False
1587
elif target_kind == 'file':
1588
if source_minikind != 'f':
1589
content_change = True
1591
# has it changed? fast path: size, slow path: sha1.
1592
if source_details[2] != path_info[3].st_size:
1593
content_change = True
1595
# maybe the same. Get the hash
1596
new_hash = self.target._hashcache.get_sha1(
1598
content_change = (new_hash != source_details[1])
1600
stat.S_ISREG(path_info[3].st_mode)
1601
and stat.S_IEXEC & path_info[3].st_mode)
1602
elif target_kind == 'symlink':
1603
if source_minikind != 'l':
1604
content_change = True
1606
# TODO: check symlink supported for windows users
1607
# and grab from target state here.
1608
link_target = os.readlink(path_info[4])
1609
content_change = (link_target != source_details[1])
1612
raise Exception, "unknown kind %s" % path_info[2]
1613
# parent id is the entry for the path in the target tree
1614
if old_dirname == last_source_parent[0]:
1615
source_parent_id = last_source_parent[1]
1617
source_parent_entry = state._get_entry(source_index,
1618
path_utf8=old_dirname)
1619
source_parent_id = source_parent_entry[0][2]
1620
if source_parent_id == entry[0][2]:
1621
# This is the root, so the parent is None
1622
source_parent_id = None
1624
last_source_parent[0] = old_dirname
1625
last_source_parent[1] = source_parent_id
1626
last_source_parent[2] = source_parent_entry
1628
new_dirname = entry[0][0]
1629
if new_dirname == last_target_parent[0]:
1630
target_parent_id = last_target_parent[1]
1632
# TODO: We don't always need to do the lookup, because the
1633
# parent entry will be the same as the source entry.
1634
target_parent_entry = state._get_entry(target_index,
1635
path_utf8=new_dirname)
1636
target_parent_id = target_parent_entry[0][2]
1637
if target_parent_id == entry[0][2]:
1638
# This is the root, so the parent is None
1639
target_parent_id = None
1641
last_target_parent[0] = new_dirname
1642
last_target_parent[1] = target_parent_id
1643
last_target_parent[2] = target_parent_entry
1645
source_exec = source_details[3]
1646
path_unicode = utf8_decode(path)[0]
1647
return ((entry[0][2], path_unicode, content_change,
1649
(source_parent_id, target_parent_id),
1650
(old_basename, entry[0][1]),
1651
(_minikind_to_kind[source_minikind], target_kind),
1652
(source_exec, target_exec)),)
1653
elif source_minikind in 'a' and target_minikind in 'fdl':
1654
# looks like a new file
1655
if path_info is not None:
1656
path = os.path.join(*entry[0][0:2])
1657
# parent id is the entry for the path in the target tree
1658
# TODO: these are the same for an entire directory: cache em.
1659
parent_id = state._get_entry(target_index, path_utf8=entry[0][0])[0][2]
1660
if parent_id == entry[0][2]:
1663
new_executable = bool(
1664
stat.S_ISREG(path_info[3].st_mode)
1665
and stat.S_IEXEC & path_info[3].st_mode)
1666
path_unicode = utf8_decode(path)[0]
1667
return ((entry[0][2], path_unicode, True,
1670
(None, entry[0][1]),
1671
(None, path_info[2]),
1672
(None, new_executable)),)
1674
# but its not on disk: we deliberately treat this as just
1675
# never-present. (Why ?! - RBC 20070224)
1677
elif source_minikind in 'fdl' and target_minikind in 'a':
1678
# unversioned, possibly, or possibly not deleted: we dont care.
1679
# if its still on disk, *and* theres no other entry at this
1680
# path [we dont know this in this routine at the moment -
1681
# perhaps we should change this - then it would be an unknown.
1682
old_path = os.path.join(*entry[0][0:2])
1683
# parent id is the entry for the path in the target tree
1684
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1685
if parent_id == entry[0][2]:
1687
old_path_unicode = utf8_decode(old_path)[0]
1688
return ((entry[0][2], old_path_unicode, True,
1691
(entry[0][1], None),
1692
(_minikind_to_kind[source_minikind], None),
1693
(source_details[3], None)),)
1694
elif source_minikind in 'fdl' and target_minikind in 'r':
1695
# a rename; could be a true rename, or a rename inherited from
1696
# a renamed parent. TODO: handle this efficiently. Its not
1697
# common case to rename dirs though, so a correct but slow
1698
# implementation will do.
1699
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1700
search_specific_files.add(target_details[1])
1702
import pdb;pdb.set_trace()
1704
while search_specific_files:
1705
# TODO: the pending list should be lexically sorted?
1706
current_root = search_specific_files.pop()
1707
searched_specific_files.add(current_root)
1708
# process the entries for this containing directory: the rest will be
1709
# found by their parents recursively.
1710
root_entries = _entries_for_path(current_root)
1711
root_abspath = self.target.abspath(current_root)
1713
root_stat = os.lstat(root_abspath)
1715
if e.errno == errno.ENOENT:
1716
# the path does not exist: let _process_entry know that.
1717
root_dir_info = None
1719
# some other random error: hand it up.
1722
root_dir_info = ('', current_root,
1723
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
1725
if not root_entries and not root_dir_info:
1726
# this specified path is not present at all, skip it.
1728
for entry in root_entries:
1729
for result in _process_entry(entry, root_dir_info):
1730
# this check should probably be outside the loop: one
1731
# 'iterate two trees' api, and then _iter_changes filters
1732
# unchanged pairs. - RBC 20070226
1733
if (include_unchanged
1734
or result[2] # content change
1735
or result[3][0] != result[3][1] # versioned status
1736
or result[4][0] != result[4][1] # parent id
1737
or result[5][0] != result[5][1] # name
1738
or result[6][0] != result[6][1] # kind
1739
or result[7][0] != result[7][1] # executable
1742
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
1743
initial_key = (current_root, '', '')
1744
block_index, _ = state._find_block_index_from_key(initial_key)
1745
if block_index == 0:
1746
# we have processed the total root already, but because the
1747
# initial key matched it we should skip it here.
1750
current_dir_info = dir_iterator.next()
1752
if e.errno in (errno.ENOENT, errno.ENOTDIR):
1753
# there may be directories in the inventory even though
1754
# this path is not a file on disk: so mark it as end of
1756
current_dir_info = None
1760
if current_dir_info[0][0] == '':
1761
# remove .bzr from iteration
1762
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
1763
assert current_dir_info[1][bzr_index][0] == '.bzr'
1764
del current_dir_info[1][bzr_index]
1765
# walk until both the directory listing and the versioned metadata
1766
# are exhausted. TODO: reevaluate this, perhaps we should stop when
1767
# the versioned data runs out.
1768
if (block_index < len(state._dirblocks) and
1769
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
1770
current_block = state._dirblocks[block_index]
1772
current_block = None
1773
while (current_dir_info is not None or
1774
current_block is not None):
1775
if (current_dir_info and current_block
1776
and current_dir_info[0][0] != current_block[0]):
1777
if current_dir_info[0][0] < current_block[0] :
1778
# import pdb; pdb.set_trace()
1779
# print 'unversioned dir'
1780
# filesystem data refers to paths not covered by the dirblock.
1781
# this has two possibilities:
1782
# A) it is versioned but empty, so there is no block for it
1783
# B) it is not versioned.
1784
# in either case it was processed by the containing directories walk:
1785
# if it is root/foo, when we walked root we emitted it,
1786
# or if we ere given root/foo to walk specifically, we
1787
# emitted it when checking the walk-root entries
1788
# advance the iterator and loop - we dont need to emit it.
1790
current_dir_info = dir_iterator.next()
1791
except StopIteration:
1792
current_dir_info = None
1794
# We have a dirblock entry for this location, but there
1795
# is no filesystem path for this. This is most likely
1796
# because a directory was removed from the disk.
1797
# We don't have to report the missing directory,
1798
# because that should have already been handled, but we
1799
# need to handle all of the files that are contained
1801
for current_entry in current_block[1]:
1802
# entry referring to file not present on disk.
1803
# advance the entry only, after processing.
1804
for result in _process_entry(current_entry, None):
1805
# this check should probably be outside the loop: one
1806
# 'iterate two trees' api, and then _iter_changes filters
1807
# unchanged pairs. - RBC 20070226
1808
if (include_unchanged
1809
or result[2] # content change
1810
or result[3][0] != result[3][1] # versioned status
1811
or result[4][0] != result[4][1] # parent id
1812
or result[5][0] != result[5][1] # name
1813
or result[6][0] != result[6][1] # kind
1814
or result[7][0] != result[7][1] # executable
1818
if (block_index < len(state._dirblocks) and
1819
osutils.is_inside(current_root,
1820
state._dirblocks[block_index][0])):
1821
current_block = state._dirblocks[block_index]
1823
current_block = None
1826
if current_block and entry_index < len(current_block[1]):
1827
current_entry = current_block[1][entry_index]
1829
current_entry = None
1830
advance_entry = True
1832
if current_dir_info and path_index < len(current_dir_info[1]):
1833
current_path_info = current_dir_info[1][path_index]
1835
current_path_info = None
1837
while (current_entry is not None or
1838
current_path_info is not None):
1839
if current_entry is None:
1840
# no more entries: yield current_pathinfo as an
1841
# unversioned file: its not the same as a path in any
1842
# tree in the dirstate.
1843
new_executable = bool(
1844
stat.S_ISREG(current_path_info[3].st_mode)
1845
and stat.S_IEXEC & current_path_info[3].st_mode)
1846
yield (None, current_path_info[0], True,
1849
(None, current_path_info[1]),
1850
(None, current_path_info[2]),
1851
(None, new_executable))
1852
elif current_path_info is None:
1853
# no path is fine: the per entry code will handle it.
1854
for result in _process_entry(current_entry, current_path_info):
1855
# this check should probably be outside the loop: one
1856
# 'iterate two trees' api, and then _iter_changes filters
1857
# unchanged pairs. - RBC 20070226
1858
if (include_unchanged
1859
or result[2] # content change
1860
or result[3][0] != result[3][1] # versioned status
1861
or result[4][0] != result[4][1] # parent id
1862
or result[5][0] != result[5][1] # name
1863
or result[6][0] != result[6][1] # kind
1864
or result[7][0] != result[7][1] # executable
1867
elif current_entry[0][1] != current_path_info[1]:
1868
if current_path_info[1] < current_entry[0][1]:
1869
# extra file on disk: pass for now, but only
1870
# increment the path, not the entry
1871
# import pdb; pdb.set_trace()
1872
# print 'unversioned file'
1873
advance_entry = False
1875
# entry referring to file not present on disk.
1876
# advance the entry only, after processing.
1877
for result in _process_entry(current_entry, None):
1878
# this check should probably be outside the loop: one
1879
# 'iterate two trees' api, and then _iter_changes filters
1880
# unchanged pairs. - RBC 20070226
1881
if (include_unchanged
1882
or result[2] # content change
1883
or result[3][0] != result[3][1] # versioned status
1884
or result[4][0] != result[4][1] # parent id
1885
or result[5][0] != result[5][1] # name
1886
or result[6][0] != result[6][1] # kind
1887
or result[7][0] != result[7][1] # executable
1890
advance_path = False
1892
for result in _process_entry(current_entry, current_path_info):
1893
# this check should probably be outside the loop: one
1894
# 'iterate two trees' api, and then _iter_changes filters
1895
# 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
1905
if advance_entry and current_entry is not None:
1907
if entry_index < len(current_block[1]):
1908
current_entry = current_block[1][entry_index]
1910
current_entry = None
1912
advance_entry = True # reset the advance flaga
1913
if advance_path and current_path_info is not None:
1915
if path_index < len(current_dir_info[1]):
1916
current_path_info = current_dir_info[1][path_index]
1918
current_path_info = None
1920
advance_path = True # reset the advance flagg.
1921
if current_block is not None:
1923
if (block_index < len(state._dirblocks) and
1924
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
1925
current_block = state._dirblocks[block_index]
1927
current_block = None
1928
if current_dir_info is not None:
1930
current_dir_info = dir_iterator.next()
1931
except StopIteration:
1932
current_dir_info = None
1936
def is_compatible(source, target):
1937
# the target must be a dirstate working tree
1938
if not isinstance(target, WorkingTree4):
1940
# the source must be a revtreee or dirstate rev tree.
1941
if not isinstance(source,
1942
(revisiontree.RevisionTree, DirStateRevisionTree)):
1944
# the source revid must be in the target dirstate
1945
if not (source._revision_id == NULL_REVISION or
1946
source._revision_id in target.get_parent_ids()):
1947
# TODO: what about ghosts? it may well need to
1948
# check for them explicitly.
1952
InterTree.register_optimiser(InterDirStateTree)
added
removed
bzrlib/workingtree_4.py
