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 (
84
from bzrlib.trace import mutter, note
85
from bzrlib.transport.local import LocalTransport
86
from bzrlib.tree import InterTree
87
from bzrlib.progress import DummyProgress, ProgressPhase
88
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
89
from bzrlib.rio import RioReader, rio_file, Stanza
90
from bzrlib.symbol_versioning import (deprecated_passed,
95
from bzrlib.tree import Tree
96
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
99
# This is the Windows equivalent of ENOTDIR
100
# It is defined in pywin32.winerror, but we don't want a strong dependency for
101
# just an error code.
102
ERROR_DIRECTORY = 267
105
class WorkingTree4(WorkingTree3):
106
"""This is the Format 4 working tree.
108
This differs from WorkingTree3 by:
109
- Having a consolidated internal dirstate, stored in a
110
randomly-accessible sorted file on disk.
111
- Not having a regular inventory attribute. One can be synthesized
112
on demand but this is expensive and should be avoided.
114
This is new in bzr 0.15.
117
def __init__(self, basedir,
122
"""Construct a WorkingTree for basedir.
124
If the branch is not supplied, it is opened automatically.
125
If the branch is supplied, it must be the branch for this basedir.
126
(branch.base is not cross checked, because for remote branches that
127
would be meaningless).
129
self._format = _format
130
self.bzrdir = _bzrdir
131
from bzrlib.trace import note, mutter
132
assert isinstance(basedir, basestring), \
133
"base directory %r is not a string" % basedir
134
basedir = safe_unicode(basedir)
135
mutter("opening working tree %r", basedir)
136
self._branch = branch
137
assert isinstance(self.branch, bzrlib.branch.Branch), \
138
"branch %r is not a Branch" % self.branch
139
self.basedir = realpath(basedir)
140
# if branch is at our basedir and is a format 6 or less
141
# assume all other formats have their own control files.
142
assert isinstance(_control_files, LockableFiles), \
143
"_control_files must be a LockableFiles, not %r" % _control_files
144
self._control_files = _control_files
147
# during a read or write lock these objects are set, and are
148
# None the rest of the time.
149
self._dirstate = None
150
self._inventory = None
153
@needs_tree_write_lock
154
def _add(self, files, ids, kinds):
155
"""See MutableTree._add."""
156
state = self.current_dirstate()
157
for f, file_id, kind in zip(files, ids, kinds):
162
# special case tree root handling.
163
if f == '' and self.path2id(f) == ROOT_ID:
164
state.set_path_id('', generate_ids.gen_file_id(f))
167
file_id = generate_ids.gen_file_id(f)
168
# deliberately add the file with no cached stat or sha1
169
# - on the first access it will be gathered, and we can
170
# always change this once tests are all passing.
171
state.add(f, file_id, kind, None, '')
172
self._make_dirty(reset_inventory=True)
174
def _make_dirty(self, reset_inventory):
175
"""Make the tree state dirty.
177
:param reset_inventory: True if the cached inventory should be removed
178
(presuming there is one).
181
if reset_inventory and self._inventory is not None:
182
self._inventory = None
184
@needs_tree_write_lock
185
def add_reference(self, sub_tree):
186
# use standard implementation, which calls back to self._add
188
# So we don't store the reference_revision in the working dirstate,
189
# it's just recorded at the moment of commit.
190
self._add_reference(sub_tree)
192
def break_lock(self):
193
"""Break a lock if one is present from another instance.
195
Uses the ui factory to ask for confirmation if the lock may be from
198
This will probe the repository for its lock as well.
200
# if the dirstate is locked by an active process, reject the break lock
203
if self._dirstate is None:
207
state = self._current_dirstate()
208
if state._lock_token is not None:
209
# we already have it locked. sheese, cant break our own lock.
210
raise errors.LockActive(self.basedir)
213
# try for a write lock - need permission to get one anyhow
216
except errors.LockContention:
217
# oslocks fail when a process is still live: fail.
218
# TODO: get the locked lockdir info and give to the user to
219
# assist in debugging.
220
raise errors.LockActive(self.basedir)
225
self._dirstate = None
226
self._control_files.break_lock()
227
self.branch.break_lock()
229
def _comparison_data(self, entry, path):
230
kind, executable, stat_value = \
231
WorkingTree3._comparison_data(self, entry, path)
232
# it looks like a plain directory, but it's really a reference -- see
234
if (self._repo_supports_tree_reference and
235
kind == 'directory' and
236
self._directory_is_tree_reference(path)):
237
kind = 'tree-reference'
238
return kind, executable, stat_value
241
def commit(self, message=None, revprops=None, *args, **kwargs):
242
# mark the tree as dirty post commit - commit
243
# can change the current versioned list by doing deletes.
244
result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
245
self._make_dirty(reset_inventory=True)
248
def current_dirstate(self):
249
"""Return the current dirstate object.
251
This is not part of the tree interface and only exposed for ease of
254
:raises errors.NotWriteLocked: when not in a lock.
256
self._must_be_locked()
257
return self._current_dirstate()
259
def _current_dirstate(self):
260
"""Internal function that does not check lock status.
262
This is needed for break_lock which also needs the dirstate.
264
if self._dirstate is not None:
265
return self._dirstate
266
local_path = self.bzrdir.get_workingtree_transport(None
267
).local_abspath('dirstate')
268
self._dirstate = dirstate.DirState.on_file(local_path)
269
return self._dirstate
271
def _directory_is_tree_reference(self, relpath):
272
# as a special case, if a directory contains control files then
273
# it's a tree reference, except that the root of the tree is not
274
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
275
# TODO: We could ask all the control formats whether they
276
# recognize this directory, but at the moment there's no cheap api
277
# to do that. Since we probably can only nest bzr checkouts and
278
# they always use this name it's ok for now. -- mbp 20060306
280
# FIXME: There is an unhandled case here of a subdirectory
281
# containing .bzr but not a branch; that will probably blow up
282
# when you try to commit it. It might happen if there is a
283
# checkout in a subdirectory. This can be avoided by not adding
286
def filter_unversioned_files(self, paths):
287
"""Filter out paths that are versioned.
289
:return: set of paths.
291
# TODO: make a generic multi-bisect routine roughly that should list
292
# the paths, then process one half at a time recursively, and feed the
293
# results of each bisect in further still
294
paths = sorted(paths)
296
state = self.current_dirstate()
297
# TODO we want a paths_to_dirblocks helper I think
299
dirname, basename = os.path.split(path.encode('utf8'))
300
_, _, _, path_is_versioned = state._get_block_entry_index(
301
dirname, basename, 0)
302
if not path_is_versioned:
307
"""Write all cached data to disk."""
308
if self._control_files._lock_mode != 'w':
309
raise errors.NotWriteLocked(self)
310
self.current_dirstate().save()
311
self._inventory = None
314
@needs_tree_write_lock
315
def _gather_kinds(self, files, kinds):
316
"""See MutableTree._gather_kinds."""
317
for pos, f in enumerate(files):
318
if kinds[pos] is None:
319
kinds[pos] = self._kind(f)
321
def _generate_inventory(self):
322
"""Create and set self.inventory from the dirstate object.
324
This is relatively expensive: we have to walk the entire dirstate.
325
Ideally we would not, and can deprecate this function.
327
#: uncomment to trap on inventory requests.
328
# import pdb;pdb.set_trace()
329
state = self.current_dirstate()
330
state._read_dirblocks_if_needed()
331
root_key, current_entry = self._get_entry(path='')
332
current_id = root_key[2]
333
assert current_entry[0][0] == 'd' # directory
334
inv = Inventory(root_id=current_id)
335
# Turn some things into local variables
336
minikind_to_kind = dirstate.DirState._minikind_to_kind
337
factory = entry_factory
338
utf8_decode = cache_utf8._utf8_decode
340
# we could do this straight out of the dirstate; it might be fast
341
# and should be profiled - RBC 20070216
342
parent_ies = {'' : inv.root}
343
for block in state._dirblocks[1:]: # skip the root
346
parent_ie = parent_ies[dirname]
348
# all the paths in this block are not versioned in this tree
350
for key, entry in block[1]:
351
minikind, link_or_sha1, size, executable, stat = entry[0]
352
if minikind in ('a', 'r'): # absent, relocated
353
# a parent tree only entry
356
name_unicode = utf8_decode(name)[0]
358
kind = minikind_to_kind[minikind]
359
inv_entry = factory[kind](file_id, name_unicode,
362
# This is only needed on win32, where this is the only way
363
# we know the executable bit.
364
inv_entry.executable = executable
365
# not strictly needed: working tree
366
#inv_entry.text_size = size
367
#inv_entry.text_sha1 = sha1
368
elif kind == 'directory':
369
# add this entry to the parent map.
370
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
371
elif kind == 'tree-reference':
372
assert self._repo_supports_tree_reference, \
373
"repository of %r " \
374
"doesn't support tree references " \
375
"required by entry %r" \
377
inv_entry.reference_revision = link_or_sha1 or None
378
elif kind != 'symlink':
379
raise AssertionError("unknown kind %r" % kind)
380
# These checks cost us around 40ms on a 55k entry tree
381
assert file_id not in inv_byid, ('file_id %s already in'
382
' inventory as %s' % (file_id, inv_byid[file_id]))
383
assert name_unicode not in parent_ie.children
384
inv_byid[file_id] = inv_entry
385
parent_ie.children[name_unicode] = inv_entry
386
self._inventory = inv
388
def _get_entry(self, file_id=None, path=None):
389
"""Get the dirstate row for file_id or path.
391
If either file_id or path is supplied, it is used as the key to lookup.
392
If both are supplied, the fastest lookup is used, and an error is
393
raised if they do not both point at the same row.
395
:param file_id: An optional unicode file_id to be looked up.
396
:param path: An optional unicode path to be looked up.
397
:return: The dirstate row tuple for path/file_id, or (None, None)
399
if file_id is None and path is None:
400
raise errors.BzrError('must supply file_id or path')
401
state = self.current_dirstate()
403
path = path.encode('utf8')
404
return state._get_entry(0, fileid_utf8=file_id, path_utf8=path)
406
def get_file_sha1(self, file_id, path=None, stat_value=None):
407
# check file id is valid unconditionally.
408
entry = self._get_entry(file_id=file_id, path=path)
409
assert entry[0] is not None, 'what error should this raise'
411
path = pathjoin(entry[0][0], entry[0][1]).decode('utf8')
413
file_abspath = self.abspath(path)
414
state = self.current_dirstate()
415
link_or_sha1 = state.update_entry(entry, file_abspath,
416
stat_value=stat_value)
417
if entry[1][0][0] == 'f':
421
def _get_inventory(self):
422
"""Get the inventory for the tree. This is only valid within a lock."""
423
if self._inventory is not None:
424
return self._inventory
425
self._must_be_locked()
426
self._generate_inventory()
427
return self._inventory
429
inventory = property(_get_inventory,
430
doc="Inventory of this Tree")
433
def get_parent_ids(self):
434
"""See Tree.get_parent_ids.
436
This implementation requests the ids list from the dirstate file.
438
return self.current_dirstate().get_parent_ids()
440
def get_reference_revision(self, file_id, path=None):
441
# referenced tree's revision is whatever's currently there
442
return self.get_nested_tree(file_id, path).last_revision()
444
def get_nested_tree(self, file_id, path=None):
446
path = self.id2path(file_id)
447
# else: check file_id is at path?
448
return WorkingTree.open(self.abspath(path))
451
def get_root_id(self):
452
"""Return the id of this trees root"""
453
return self._get_entry(path='')[0][2]
455
def has_id(self, file_id):
456
state = self.current_dirstate()
457
file_id = osutils.safe_file_id(file_id)
458
row, parents = self._get_entry(file_id=file_id)
461
return osutils.lexists(pathjoin(
462
self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
465
def id2path(self, file_id):
466
file_id = osutils.safe_file_id(file_id)
467
state = self.current_dirstate()
468
entry = self._get_entry(file_id=file_id)
469
if entry == (None, None):
470
raise errors.NoSuchId(tree=self, file_id=file_id)
471
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
472
return path_utf8.decode('utf8')
474
if not osutils.supports_executable():
476
def is_executable(self, file_id, path=None):
477
file_id = osutils.safe_file_id(file_id)
478
entry = self._get_entry(file_id=file_id, path=path)
479
if entry == (None, None):
481
return entry[1][0][3]
484
def is_executable(self, file_id, path=None):
486
file_id = osutils.safe_file_id(file_id)
487
path = self.id2path(file_id)
488
mode = os.lstat(self.abspath(path)).st_mode
489
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
493
"""Iterate through file_ids for this tree.
495
file_ids are in a WorkingTree if they are in the working inventory
496
and the working file exists.
499
for key, tree_details in self.current_dirstate()._iter_entries():
500
if tree_details[0][0] in ('a', 'r'): # absent, relocated
501
# not relevant to the working tree
503
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
504
if osutils.lexists(path):
505
result.append(key[2])
508
def iter_references(self):
509
for key, tree_details in self.current_dirstate()._iter_entries():
510
if tree_details[0][0] in ('a', 'r'): # absent, relocated
511
# not relevant to the working tree
514
# the root is not a reference.
516
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))
518
if self._kind(path) == 'tree-reference':
520
except errors.NoSuchFile:
521
# path is missing on disk.
525
def kind(self, file_id):
526
"""Return the kind of a file.
528
This is always the actual kind that's on disk, regardless of what it
531
relpath = self.id2path(file_id)
532
assert relpath != None, \
533
"path for id {%s} is None!" % file_id
534
return self._kind(relpath)
536
def _kind(self, relpath):
537
abspath = self.abspath(relpath)
538
kind = file_kind(abspath)
539
if (self._repo_supports_tree_reference and
540
kind == 'directory' and
541
self._directory_is_tree_reference(relpath)):
542
kind = 'tree-reference'
546
def _last_revision(self):
547
"""See Mutable.last_revision."""
548
parent_ids = self.current_dirstate().get_parent_ids()
555
"""See Branch.lock_read, and WorkingTree.unlock."""
556
self.branch.lock_read()
558
self._control_files.lock_read()
560
state = self.current_dirstate()
561
if not state._lock_token:
563
# set our support for tree references from the repository in
565
self._repo_supports_tree_reference = getattr(
566
self.branch.repository._format, "support_tree_reference",
569
self._control_files.unlock()
575
def _lock_self_write(self):
576
"""This should be called after the branch is locked."""
578
self._control_files.lock_write()
580
state = self.current_dirstate()
581
if not state._lock_token:
583
# set our support for tree references from the repository in
585
self._repo_supports_tree_reference = getattr(
586
self.branch.repository._format, "support_tree_reference",
589
self._control_files.unlock()
595
def lock_tree_write(self):
596
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
597
self.branch.lock_read()
598
self._lock_self_write()
600
def lock_write(self):
601
"""See MutableTree.lock_write, and WorkingTree.unlock."""
602
self.branch.lock_write()
603
self._lock_self_write()
605
@needs_tree_write_lock
606
def move(self, from_paths, to_dir, after=False):
607
"""See WorkingTree.move()."""
612
state = self.current_dirstate()
614
assert not isinstance(from_paths, basestring)
615
to_dir_utf8 = to_dir.encode('utf8')
616
to_entry_dirname, to_basename = os.path.split(to_dir_utf8)
617
id_index = state._get_id_index()
618
# check destination directory
619
# get the details for it
620
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \
621
state._get_block_entry_index(to_entry_dirname, to_basename, 0)
622
if not entry_present:
623
raise errors.BzrMoveFailedError('', to_dir,
624
errors.NotVersionedError(to_dir))
625
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
626
# get a handle on the block itself.
627
to_block_index = state._ensure_block(
628
to_entry_block_index, to_entry_entry_index, to_dir_utf8)
629
to_block = state._dirblocks[to_block_index]
630
to_abs = self.abspath(to_dir)
631
if not isdir(to_abs):
632
raise errors.BzrMoveFailedError('',to_dir,
633
errors.NotADirectory(to_abs))
635
if to_entry[1][0][0] != 'd':
636
raise errors.BzrMoveFailedError('',to_dir,
637
errors.NotADirectory(to_abs))
639
if self._inventory is not None:
640
update_inventory = True
642
to_dir_ie = inv[to_dir_id]
643
to_dir_id = to_entry[0][2]
645
update_inventory = False
648
def move_one(old_entry, from_path_utf8, minikind, executable,
649
fingerprint, packed_stat, size,
650
to_block, to_key, to_path_utf8):
651
state._make_absent(old_entry)
652
from_key = old_entry[0]
654
lambda:state.update_minimal(from_key,
656
executable=executable,
657
fingerprint=fingerprint,
658
packed_stat=packed_stat,
660
path_utf8=from_path_utf8))
661
state.update_minimal(to_key,
663
executable=executable,
664
fingerprint=fingerprint,
665
packed_stat=packed_stat,
667
path_utf8=to_path_utf8)
668
added_entry_index, _ = state._find_entry_index(to_key, to_block[1])
669
new_entry = to_block[1][added_entry_index]
670
rollbacks.append(lambda:state._make_absent(new_entry))
672
# create rename entries and tuples
673
for from_rel in from_paths:
674
# from_rel is 'pathinroot/foo/bar'
675
from_rel_utf8 = from_rel.encode('utf8')
676
from_dirname, from_tail = osutils.split(from_rel)
677
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
678
from_entry = self._get_entry(path=from_rel)
679
if from_entry == (None, None):
680
raise errors.BzrMoveFailedError(from_rel,to_dir,
681
errors.NotVersionedError(path=str(from_rel)))
683
from_id = from_entry[0][2]
684
to_rel = pathjoin(to_dir, from_tail)
685
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8)
686
item_to_entry = self._get_entry(path=to_rel)
687
if item_to_entry != (None, None):
688
raise errors.BzrMoveFailedError(from_rel, to_rel,
689
"Target is already versioned.")
691
if from_rel == to_rel:
692
raise errors.BzrMoveFailedError(from_rel, to_rel,
693
"Source and target are identical.")
695
from_missing = not self.has_filename(from_rel)
696
to_missing = not self.has_filename(to_rel)
703
raise errors.BzrMoveFailedError(from_rel, to_rel,
704
errors.NoSuchFile(path=to_rel,
705
extra="New file has not been created yet"))
707
# neither path exists
708
raise errors.BzrRenameFailedError(from_rel, to_rel,
709
errors.PathsDoNotExist(paths=(from_rel, to_rel)))
711
if from_missing: # implicitly just update our path mapping
714
raise errors.RenameFailedFilesExist(from_rel, to_rel,
715
extra="(Use --after to update the Bazaar id)")
718
def rollback_rename():
719
"""A single rename has failed, roll it back."""
720
# roll back everything, even if we encounter trouble doing one
723
# TODO: at least log the other exceptions rather than just
724
# losing them mbp 20070307
726
for rollback in reversed(rollbacks):
730
exc_info = sys.exc_info()
732
raise exc_info[0], exc_info[1], exc_info[2]
734
# perform the disk move first - its the most likely failure point.
736
from_rel_abs = self.abspath(from_rel)
737
to_rel_abs = self.abspath(to_rel)
739
osutils.rename(from_rel_abs, to_rel_abs)
741
raise errors.BzrMoveFailedError(from_rel, to_rel, e[1])
742
rollbacks.append(lambda: osutils.rename(to_rel_abs, from_rel_abs))
744
# perform the rename in the inventory next if needed: its easy
748
from_entry = inv[from_id]
749
current_parent = from_entry.parent_id
750
inv.rename(from_id, to_dir_id, from_tail)
752
lambda: inv.rename(from_id, current_parent, from_tail))
753
# finally do the rename in the dirstate, which is a little
754
# tricky to rollback, but least likely to need it.
755
old_block_index, old_entry_index, dir_present, file_present = \
756
state._get_block_entry_index(from_dirname, from_tail_utf8, 0)
757
old_block = state._dirblocks[old_block_index][1]
758
old_entry = old_block[old_entry_index]
759
from_key, old_entry_details = old_entry
760
cur_details = old_entry_details[0]
762
to_key = ((to_block[0],) + from_key[1:3])
763
minikind = cur_details[0]
764
move_one(old_entry, from_path_utf8=from_rel_utf8,
766
executable=cur_details[3],
767
fingerprint=cur_details[1],
768
packed_stat=cur_details[4],
772
to_path_utf8=to_rel_utf8)
775
def update_dirblock(from_dir, to_key, to_dir_utf8):
776
"""all entries in this block need updating.
778
TODO: This is pretty ugly, and doesn't support
779
reverting, but it works.
781
assert from_dir != '', "renaming root not supported"
782
from_key = (from_dir, '')
783
from_block_idx, present = \
784
state._find_block_index_from_key(from_key)
786
# This is the old record, if it isn't present, then
787
# there is theoretically nothing to update.
788
# (Unless it isn't present because of lazy loading,
789
# but we don't do that yet)
791
from_block = state._dirblocks[from_block_idx]
792
to_block_index, to_entry_index, _, _ = \
793
state._get_block_entry_index(to_key[0], to_key[1], 0)
794
to_block_index = state._ensure_block(
795
to_block_index, to_entry_index, to_dir_utf8)
796
to_block = state._dirblocks[to_block_index]
797
for entry in from_block[1]:
798
assert entry[0][0] == from_dir
799
cur_details = entry[1][0]
800
to_key = (to_dir_utf8, entry[0][1], entry[0][2])
801
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
802
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])
803
minikind = cur_details[0]
804
move_one(entry, from_path_utf8=from_path_utf8,
806
executable=cur_details[3],
807
fingerprint=cur_details[1],
808
packed_stat=cur_details[4],
812
to_path_utf8=to_rel_utf8)
814
# We need to move all the children of this
816
update_dirblock(from_path_utf8, to_key,
818
update_dirblock(from_rel_utf8, to_key, to_rel_utf8)
822
result.append((from_rel, to_rel))
823
state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
824
self._make_dirty(reset_inventory=False)
828
def _must_be_locked(self):
829
if not self._control_files._lock_count:
830
raise errors.ObjectNotLocked(self)
833
"""Initialize the state in this tree to be a new tree."""
837
def path2id(self, path):
838
"""Return the id for path in this tree."""
839
path = path.strip('/')
840
entry = self._get_entry(path=path)
841
if entry == (None, None):
845
def paths2ids(self, paths, trees=[], require_versioned=True):
846
"""See Tree.paths2ids().
848
This specialisation fast-paths the case where all the trees are in the
853
parents = self.get_parent_ids()
855
if not (isinstance(tree, DirStateRevisionTree) and tree._revision_id in
857
return super(WorkingTree4, self).paths2ids(paths, trees, require_versioned)
858
search_indexes = [0] + [1 + parents.index(tree._revision_id) for tree in trees]
859
# -- make all paths utf8 --
862
paths_utf8.add(path.encode('utf8'))
864
# -- paths is now a utf8 path set --
865
# -- get the state object and prepare it.
866
state = self.current_dirstate()
867
if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY
868
and '' not in paths):
869
paths2ids = self._paths2ids_using_bisect
871
paths2ids = self._paths2ids_in_memory
872
return paths2ids(paths, search_indexes,
873
require_versioned=require_versioned)
875
def _paths2ids_in_memory(self, paths, search_indexes,
876
require_versioned=True):
877
state = self.current_dirstate()
878
state._read_dirblocks_if_needed()
879
def _entries_for_path(path):
880
"""Return a list with all the entries that match path for all ids.
882
dirname, basename = os.path.split(path)
883
key = (dirname, basename, '')
884
block_index, present = state._find_block_index_from_key(key)
886
# the block which should contain path is absent.
889
block = state._dirblocks[block_index][1]
890
entry_index, _ = state._find_entry_index(key, block)
891
# we may need to look at multiple entries at this path: walk while the paths match.
892
while (entry_index < len(block) and
893
block[entry_index][0][0:2] == key[0:2]):
894
result.append(block[entry_index])
897
if require_versioned:
898
# -- check all supplied paths are versioned in a search tree. --
901
path_entries = _entries_for_path(path)
903
# this specified path is not present at all: error
904
all_versioned = False
906
found_versioned = False
907
# for each id at this path
908
for entry in path_entries:
910
for index in search_indexes:
911
if entry[1][index][0] != 'a': # absent
912
found_versioned = True
913
# all good: found a versioned cell
915
if not found_versioned:
916
# none of the indexes was not 'absent' at all ids for this
918
all_versioned = False
920
if not all_versioned:
921
raise errors.PathsNotVersionedError(paths)
922
# -- remove redundancy in supplied paths to prevent over-scanning --
925
other_paths = paths.difference(set([path]))
926
if not osutils.is_inside_any(other_paths, path):
927
# this is a top level path, we must check it.
928
search_paths.add(path)
930
# for all search_indexs in each path at or under each element of
931
# search_paths, if the detail is relocated: add the id, and add the
932
# relocated path as one to search if its not searched already. If the
933
# detail is not relocated, add the id.
934
searched_paths = set()
936
def _process_entry(entry):
937
"""Look at search_indexes within entry.
939
If a specific tree's details are relocated, add the relocation
940
target to search_paths if not searched already. If it is absent, do
941
nothing. Otherwise add the id to found_ids.
943
for index in search_indexes:
944
if entry[1][index][0] == 'r': # relocated
945
if not osutils.is_inside_any(searched_paths, entry[1][index][1]):
946
search_paths.add(entry[1][index][1])
947
elif entry[1][index][0] != 'a': # absent
948
found_ids.add(entry[0][2])
950
current_root = search_paths.pop()
951
searched_paths.add(current_root)
952
# process the entries for this containing directory: the rest will be
953
# found by their parents recursively.
954
root_entries = _entries_for_path(current_root)
956
# this specified path is not present at all, skip it.
958
for entry in root_entries:
959
_process_entry(entry)
960
initial_key = (current_root, '', '')
961
block_index, _ = state._find_block_index_from_key(initial_key)
962
while (block_index < len(state._dirblocks) and
963
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
964
for entry in state._dirblocks[block_index][1]:
965
_process_entry(entry)
969
def _paths2ids_using_bisect(self, paths, search_indexes,
970
require_versioned=True):
971
state = self.current_dirstate()
974
split_paths = sorted(osutils.split(p) for p in paths)
975
found = state._bisect_recursive(split_paths)
977
if require_versioned:
978
found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
979
for dir_name in split_paths:
980
if dir_name not in found_dir_names:
981
raise errors.PathsNotVersionedError(paths)
983
for dir_name_id, trees_info in found.iteritems():
984
for index in search_indexes:
985
if trees_info[index][0] not in ('r', 'a'):
986
found_ids.add(dir_name_id[2])
989
def read_working_inventory(self):
990
"""Read the working inventory.
992
This is a meaningless operation for dirstate, but we obey it anyhow.
994
return self.inventory
997
def revision_tree(self, revision_id):
998
"""See Tree.revision_tree.
1000
WorkingTree4 supplies revision_trees for any basis tree.
1002
revision_id = osutils.safe_revision_id(revision_id)
1003
dirstate = self.current_dirstate()
1004
parent_ids = dirstate.get_parent_ids()
1005
if revision_id not in parent_ids:
1006
raise errors.NoSuchRevisionInTree(self, revision_id)
1007
if revision_id in dirstate.get_ghosts():
1008
raise errors.NoSuchRevisionInTree(self, revision_id)
1009
return DirStateRevisionTree(dirstate, revision_id,
1010
self.branch.repository)
1012
@needs_tree_write_lock
1013
def set_last_revision(self, new_revision):
1014
"""Change the last revision in the working tree."""
1015
new_revision = osutils.safe_revision_id(new_revision)
1016
parents = self.get_parent_ids()
1017
if new_revision in (NULL_REVISION, None):
1018
assert len(parents) < 2, (
1019
"setting the last parent to none with a pending merge is "
1021
self.set_parent_ids([])
1023
self.set_parent_ids([new_revision] + parents[1:],
1024
allow_leftmost_as_ghost=True)
1026
@needs_tree_write_lock
1027
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1028
"""Set the parent ids to revision_ids.
1030
See also set_parent_trees. This api will try to retrieve the tree data
1031
for each element of revision_ids from the trees repository. If you have
1032
tree data already available, it is more efficient to use
1033
set_parent_trees rather than set_parent_ids. set_parent_ids is however
1034
an easier API to use.
1036
:param revision_ids: The revision_ids to set as the parent ids of this
1037
working tree. Any of these may be ghosts.
1039
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1041
for revision_id in revision_ids:
1043
revtree = self.branch.repository.revision_tree(revision_id)
1044
# TODO: jam 20070213 KnitVersionedFile raises
1045
# RevisionNotPresent rather than NoSuchRevision if a
1046
# given revision_id is not present. Should Repository be
1047
# catching it and re-raising NoSuchRevision?
1048
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1050
trees.append((revision_id, revtree))
1051
self.current_dirstate()._validate()
1052
self.set_parent_trees(trees,
1053
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1054
self.current_dirstate()._validate()
1056
@needs_tree_write_lock
1057
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1058
"""Set the parents of the working tree.
1060
:param parents_list: A list of (revision_id, tree) tuples.
1061
If tree is None, then that element is treated as an unreachable
1062
parent tree - i.e. a ghost.
1064
dirstate = self.current_dirstate()
1065
dirstate._validate()
1066
if len(parents_list) > 0:
1067
if not allow_leftmost_as_ghost and parents_list[0][1] is None:
1068
raise errors.GhostRevisionUnusableHere(parents_list[0][0])
1071
# convert absent trees to the null tree, which we convert back to
1072
# missing on access.
1073
for rev_id, tree in parents_list:
1074
rev_id = osutils.safe_revision_id(rev_id)
1075
if tree is not None:
1076
real_trees.append((rev_id, tree))
1078
real_trees.append((rev_id,
1079
self.branch.repository.revision_tree(None)))
1080
ghosts.append(rev_id)
1081
dirstate._validate()
1082
dirstate.set_parent_trees(real_trees, ghosts=ghosts)
1083
dirstate._validate()
1084
self._make_dirty(reset_inventory=False)
1085
dirstate._validate()
1087
def _set_root_id(self, file_id):
1088
"""See WorkingTree.set_root_id."""
1089
state = self.current_dirstate()
1090
state.set_path_id('', file_id)
1091
if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:
1092
self._make_dirty(reset_inventory=True)
1095
def supports_tree_reference(self):
1096
return self._repo_supports_tree_reference
1099
"""Unlock in format 4 trees needs to write the entire dirstate."""
1100
if self._control_files._lock_count == 1:
1101
# eventually we should do signature checking during read locks for
1103
if self._control_files._lock_mode == 'w':
1106
if self._dirstate is not None:
1107
# This is a no-op if there are no modifications.
1108
self._dirstate.save()
1109
self._dirstate.unlock()
1110
# TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
1111
# point. Instead, it could check if the header has been
1112
# modified when it is locked, and if not, it can hang on to
1113
# the data it has in memory.
1114
self._dirstate = None
1115
self._inventory = None
1116
# reverse order of locking.
1118
return self._control_files.unlock()
1120
self.branch.unlock()
1122
@needs_tree_write_lock
1123
def unversion(self, file_ids):
1124
"""Remove the file ids in file_ids from the current versioned set.
1126
When a file_id is unversioned, all of its children are automatically
1129
:param file_ids: The file ids to stop versioning.
1130
:raises: NoSuchId if any fileid is not currently versioned.
1134
state = self.current_dirstate()
1135
state._read_dirblocks_if_needed()
1136
ids_to_unversion = set()
1137
for file_id in file_ids:
1138
ids_to_unversion.add(osutils.safe_file_id(file_id))
1139
paths_to_unversion = set()
1141
# check if the root is to be unversioned, if so, assert for now.
1142
# walk the state marking unversioned things as absent.
1143
# if there are any un-unversioned ids at the end, raise
1144
for key, details in state._dirblocks[0][1]:
1145
if (details[0][0] not in ('a', 'r') and # absent or relocated
1146
key[2] in ids_to_unversion):
1147
# I haven't written the code to unversion / yet - it should be
1149
raise errors.BzrError('Unversioning the / is not currently supported')
1151
while block_index < len(state._dirblocks):
1152
# process one directory at a time.
1153
block = state._dirblocks[block_index]
1154
# first check: is the path one to remove - it or its children
1155
delete_block = False
1156
for path in paths_to_unversion:
1157
if (block[0].startswith(path) and
1158
(len(block[0]) == len(path) or
1159
block[0][len(path)] == '/')):
1160
# this entire block should be deleted - its the block for a
1161
# path to unversion; or the child of one
1164
# TODO: trim paths_to_unversion as we pass by paths
1166
# this block is to be deleted: process it.
1167
# TODO: we can special case the no-parents case and
1168
# just forget the whole block.
1170
while entry_index < len(block[1]):
1171
# Mark this file id as having been removed
1172
entry = block[1][entry_index]
1173
ids_to_unversion.discard(entry[0][2])
1174
if (entry[1][0][0] == 'a'
1175
or not state._make_absent(entry)):
1177
# go to the next block. (At the moment we dont delete empty
1182
while entry_index < len(block[1]):
1183
entry = block[1][entry_index]
1184
if (entry[1][0][0] in ('a', 'r') or # absent, relocated
1185
# ^ some parent row.
1186
entry[0][2] not in ids_to_unversion):
1187
# ^ not an id to unversion
1190
if entry[1][0][0] == 'd':
1191
paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))
1192
if not state._make_absent(entry):
1194
# we have unversioned this id
1195
ids_to_unversion.remove(entry[0][2])
1197
if ids_to_unversion:
1198
raise errors.NoSuchId(self, iter(ids_to_unversion).next())
1199
self._make_dirty(reset_inventory=False)
1200
# have to change the legacy inventory too.
1201
if self._inventory is not None:
1202
for file_id in file_ids:
1203
self._inventory.remove_recursive_id(file_id)
1205
@needs_tree_write_lock
1206
def _write_inventory(self, inv):
1207
"""Write inventory as the current inventory."""
1208
assert not self._dirty, "attempting to write an inventory when the dirstate is dirty will cause data loss"
1209
self.current_dirstate().set_state_from_inventory(inv)
1210
self._make_dirty(reset_inventory=False)
1211
if self._inventory is not None:
1212
self._inventory = inv
1216
class WorkingTreeFormat4(WorkingTreeFormat3):
1217
"""The first consolidated dirstate working tree format.
1220
- exists within a metadir controlling .bzr
1221
- includes an explicit version marker for the workingtree control
1222
files, separate from the BzrDir format
1223
- modifies the hash cache format
1224
- is new in bzr 0.15
1225
- uses a LockDir to guard access to it.
1228
upgrade_recommended = False
1230
def get_format_string(self):
1231
"""See WorkingTreeFormat.get_format_string()."""
1232
return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1234
def get_format_description(self):
1235
"""See WorkingTreeFormat.get_format_description()."""
1236
return "Working tree format 4"
1238
def initialize(self, a_bzrdir, revision_id=None):
1239
"""See WorkingTreeFormat.initialize().
1241
:param revision_id: allows creating a working tree at a different
1242
revision than the branch is at.
1244
These trees get an initial random root id.
1246
revision_id = osutils.safe_revision_id(revision_id)
1247
if not isinstance(a_bzrdir.transport, LocalTransport):
1248
raise errors.NotLocalUrl(a_bzrdir.transport.base)
1249
transport = a_bzrdir.get_workingtree_transport(self)
1250
control_files = self._open_control_files(a_bzrdir)
1251
control_files.create_lock()
1252
control_files.lock_write()
1253
control_files.put_utf8('format', self.get_format_string())
1254
branch = a_bzrdir.open_branch()
1255
if revision_id is None:
1256
revision_id = branch.last_revision()
1257
local_path = transport.local_abspath('dirstate')
1258
# write out new dirstate (must exist when we create the tree)
1259
state = dirstate.DirState.initialize(local_path)
1261
wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1265
_control_files=control_files)
1267
wt.lock_tree_write()
1270
if revision_id in (None, NULL_REVISION):
1271
wt._set_root_id(generate_ids.gen_root_id())
1273
wt.current_dirstate()._validate()
1274
wt.set_last_revision(revision_id)
1276
basis = wt.basis_tree()
1278
# if the basis has a root id we have to use that; otherwise we use
1280
basis_root_id = basis.get_root_id()
1281
if basis_root_id is not None:
1282
wt._set_root_id(basis_root_id)
1284
transform.build_tree(basis, wt)
1287
control_files.unlock()
1291
def _open(self, a_bzrdir, control_files):
1292
"""Open the tree itself.
1294
:param a_bzrdir: the dir for the tree.
1295
:param control_files: the control files for the tree.
1297
return WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1298
branch=a_bzrdir.open_branch(),
1301
_control_files=control_files)
1303
def __get_matchingbzrdir(self):
1304
# please test against something that will let us do tree references
1305
return bzrdir.format_registry.make_bzrdir(
1306
'dirstate-with-subtree')
1308
_matchingbzrdir = property(__get_matchingbzrdir)
1311
class DirStateRevisionTree(Tree):
1312
"""A revision tree pulling the inventory from a dirstate."""
1314
def __init__(self, dirstate, revision_id, repository):
1315
self._dirstate = dirstate
1316
self._revision_id = osutils.safe_revision_id(revision_id)
1317
self._repository = repository
1318
self._inventory = None
1320
self._dirstate_locked = False
1323
return "<%s of %s in %s>" % \
1324
(self.__class__.__name__, self._revision_id, self._dirstate)
1326
def annotate_iter(self, file_id):
1327
"""See Tree.annotate_iter"""
1328
w = self._repository.weave_store.get_weave(file_id,
1329
self._repository.get_transaction())
1330
return w.annotate_iter(self.inventory[file_id].revision)
1332
def _comparison_data(self, entry, path):
1333
"""See Tree._comparison_data."""
1335
return None, False, None
1336
# trust the entry as RevisionTree does, but this may not be
1337
# sensible: the entry might not have come from us?
1338
return entry.kind, entry.executable, None
1340
def _file_size(self, entry, stat_value):
1341
return entry.text_size
1343
def filter_unversioned_files(self, paths):
1344
"""Filter out paths that are not versioned.
1346
:return: set of paths.
1348
pred = self.has_filename
1349
return set((p for p in paths if not pred(p)))
1351
def get_root_id(self):
1352
return self.path2id('')
1354
def _get_parent_index(self):
1355
"""Return the index in the dirstate referenced by this tree."""
1356
return self._dirstate.get_parent_ids().index(self._revision_id) + 1
1358
def _get_entry(self, file_id=None, path=None):
1359
"""Get the dirstate row for file_id or path.
1361
If either file_id or path is supplied, it is used as the key to lookup.
1362
If both are supplied, the fastest lookup is used, and an error is
1363
raised if they do not both point at the same row.
1365
:param file_id: An optional unicode file_id to be looked up.
1366
:param path: An optional unicode path to be looked up.
1367
:return: The dirstate row tuple for path/file_id, or (None, None)
1369
if file_id is None and path is None:
1370
raise errors.BzrError('must supply file_id or path')
1371
file_id = osutils.safe_file_id(file_id)
1372
if path is not None:
1373
path = path.encode('utf8')
1374
parent_index = self._get_parent_index()
1375
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
1377
def _generate_inventory(self):
1378
"""Create and set self.inventory from the dirstate object.
1380
(So this is only called the first time the inventory is requested for
1381
this tree; it then remains in memory until it's out of date.)
1383
This is relatively expensive: we have to walk the entire dirstate.
1385
assert self._locked, 'cannot generate inventory of an unlocked '\
1386
'dirstate revision tree'
1387
# separate call for profiling - makes it clear where the costs are.
1388
self._dirstate._read_dirblocks_if_needed()
1389
assert self._revision_id in self._dirstate.get_parent_ids(), \
1390
'parent %s has disappeared from %s' % (
1391
self._revision_id, self._dirstate.get_parent_ids())
1392
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1
1393
# This is identical now to the WorkingTree _generate_inventory except
1394
# for the tree index use.
1395
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')
1396
current_id = root_key[2]
1397
assert current_entry[parent_index][0] == 'd'
1398
inv = Inventory(root_id=current_id, revision_id=self._revision_id)
1399
inv.root.revision = current_entry[parent_index][4]
1400
# Turn some things into local variables
1401
minikind_to_kind = dirstate.DirState._minikind_to_kind
1402
factory = entry_factory
1403
utf8_decode = cache_utf8._utf8_decode
1404
inv_byid = inv._byid
1405
# we could do this straight out of the dirstate; it might be fast
1406
# and should be profiled - RBC 20070216
1407
parent_ies = {'' : inv.root}
1408
for block in self._dirstate._dirblocks[1:]: #skip root
1411
parent_ie = parent_ies[dirname]
1413
# all the paths in this block are not versioned in this tree
1415
for key, entry in block[1]:
1416
minikind, fingerprint, size, executable, revid = entry[parent_index]
1417
if minikind in ('a', 'r'): # absent, relocated
1421
name_unicode = utf8_decode(name)[0]
1423
kind = minikind_to_kind[minikind]
1424
inv_entry = factory[kind](file_id, name_unicode,
1426
inv_entry.revision = revid
1428
inv_entry.executable = executable
1429
inv_entry.text_size = size
1430
inv_entry.text_sha1 = fingerprint
1431
elif kind == 'directory':
1432
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1433
elif kind == 'symlink':
1434
inv_entry.executable = False
1435
inv_entry.text_size = None
1436
inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1437
elif kind == 'tree-reference':
1438
inv_entry.reference_revision = fingerprint or None
1440
raise AssertionError("cannot convert entry %r into an InventoryEntry"
1442
# These checks cost us around 40ms on a 55k entry tree
1443
assert file_id not in inv_byid
1444
assert name_unicode not in parent_ie.children
1445
inv_byid[file_id] = inv_entry
1446
parent_ie.children[name_unicode] = inv_entry
1447
self._inventory = inv
1449
def get_file_mtime(self, file_id, path=None):
1450
"""Return the modification time for this record.
1452
We return the timestamp of the last-changed revision.
1454
# Make sure the file exists
1455
entry = self._get_entry(file_id, path=path)
1456
if entry == (None, None): # do we raise?
1458
parent_index = self._get_parent_index()
1459
last_changed_revision = entry[1][parent_index][4]
1460
return self._repository.get_revision(last_changed_revision).timestamp
1462
def get_file_sha1(self, file_id, path=None, stat_value=None):
1463
entry = self._get_entry(file_id=file_id, path=path)
1464
parent_index = self._get_parent_index()
1465
parent_details = entry[1][parent_index]
1466
if parent_details[0] == 'f':
1467
return parent_details[1]
1470
def get_file(self, file_id):
1471
return StringIO(self.get_file_text(file_id))
1473
def get_file_lines(self, file_id):
1474
ie = self.inventory[file_id]
1475
return self._repository.weave_store.get_weave(file_id,
1476
self._repository.get_transaction()).get_lines(ie.revision)
1478
def get_file_size(self, file_id):
1479
return self.inventory[file_id].text_size
1481
def get_file_text(self, file_id):
1482
return ''.join(self.get_file_lines(file_id))
1484
def get_reference_revision(self, file_id, path=None):
1485
return self.inventory[file_id].reference_revision
1487
def get_symlink_target(self, file_id):
1488
entry = self._get_entry(file_id=file_id)
1489
parent_index = self._get_parent_index()
1490
if entry[1][parent_index][0] != 'l':
1493
# At present, none of the tree implementations supports non-ascii
1494
# symlink targets. So we will just assume that the dirstate path is
1496
return entry[1][parent_index][1]
1498
def get_revision_id(self):
1499
"""Return the revision id for this tree."""
1500
return self._revision_id
1502
def _get_inventory(self):
1503
if self._inventory is not None:
1504
return self._inventory
1505
self._must_be_locked()
1506
self._generate_inventory()
1507
return self._inventory
1509
inventory = property(_get_inventory,
1510
doc="Inventory of this Tree")
1512
def get_parent_ids(self):
1513
"""The parents of a tree in the dirstate are not cached."""
1514
return self._repository.get_revision(self._revision_id).parent_ids
1516
def has_filename(self, filename):
1517
return bool(self.path2id(filename))
1519
def kind(self, file_id):
1520
return self.inventory[file_id].kind
1522
def is_executable(self, file_id, path=None):
1523
ie = self.inventory[file_id]
1524
if ie.kind != "file":
1526
return ie.executable
1528
def list_files(self, include_root=False):
1529
# We use a standard implementation, because DirStateRevisionTree is
1530
# dealing with one of the parents of the current state
1531
inv = self._get_inventory()
1532
entries = inv.iter_entries()
1533
if self.inventory.root is not None and not include_root:
1535
for path, entry in entries:
1536
yield path, 'V', entry.kind, entry.file_id, entry
1538
def lock_read(self):
1539
"""Lock the tree for a set of operations."""
1540
if not self._locked:
1541
self._repository.lock_read()
1542
if self._dirstate._lock_token is None:
1543
self._dirstate.lock_read()
1544
self._dirstate_locked = True
1547
def _must_be_locked(self):
1548
if not self._locked:
1549
raise errors.ObjectNotLocked(self)
1552
def path2id(self, path):
1553
"""Return the id for path in this tree."""
1554
# lookup by path: faster than splitting and walking the ivnentory.
1555
entry = self._get_entry(path=path)
1556
if entry == (None, None):
1561
"""Unlock, freeing any cache memory used during the lock."""
1562
# outside of a lock, the inventory is suspect: release it.
1564
if not self._locked:
1565
self._inventory = None
1567
if self._dirstate_locked:
1568
self._dirstate.unlock()
1569
self._dirstate_locked = False
1570
self._repository.unlock()
1572
def walkdirs(self, prefix=""):
1573
# TODO: jam 20070215 This is the lazy way by using the RevisionTree
1574
# implementation based on an inventory.
1575
# This should be cleaned up to use the much faster Dirstate code
1576
# So for now, we just build up the parent inventory, and extract
1577
# it the same way RevisionTree does.
1578
_directory = 'directory'
1579
inv = self._get_inventory()
1580
top_id = inv.path2id(prefix)
1584
pending = [(prefix, top_id)]
1587
relpath, file_id = pending.pop()
1588
# 0 - relpath, 1- file-id
1590
relroot = relpath + '/'
1593
# FIXME: stash the node in pending
1594
entry = inv[file_id]
1595
for name, child in entry.sorted_children():
1596
toppath = relroot + name
1597
dirblock.append((toppath, name, child.kind, None,
1598
child.file_id, child.kind
1600
yield (relpath, entry.file_id), dirblock
1601
# push the user specified dirs from dirblock
1602
for dir in reversed(dirblock):
1603
if dir[2] == _directory:
1604
pending.append((dir[0], dir[4]))
1607
class InterDirStateTree(InterTree):
1608
"""Fast path optimiser for changes_from with dirstate trees.
1610
This is used only when both trees are in the dirstate working file, and
1611
the source is any parent within the dirstate, and the destination is
1612
the current working tree of the same dirstate.
1614
# this could be generalized to allow comparisons between any trees in the
1615
# dirstate, and possibly between trees stored in different dirstates.
1617
def __init__(self, source, target):
1618
super(InterDirStateTree, self).__init__(source, target)
1619
if not InterDirStateTree.is_compatible(source, target):
1620
raise Exception, "invalid source %r and target %r" % (source, target)
1623
def make_source_parent_tree(source, target):
1624
"""Change the source tree into a parent of the target."""
1625
revid = source.commit('record tree')
1626
target.branch.repository.fetch(source.branch.repository, revid)
1627
target.set_parent_ids([revid])
1628
return target.basis_tree(), target
1630
_matching_from_tree_format = WorkingTreeFormat4()
1631
_matching_to_tree_format = WorkingTreeFormat4()
1632
_test_mutable_trees_to_test_trees = make_source_parent_tree
1634
def _iter_changes(self, include_unchanged=False,
1635
specific_files=None, pb=None, extra_trees=[],
1636
require_versioned=True, want_unversioned=False):
1637
"""Return the changes from source to target.
1639
:return: An iterator that yields tuples. See InterTree._iter_changes
1641
:param specific_files: An optional list of file paths to restrict the
1642
comparison to. When mapping filenames to ids, all matches in all
1643
trees (including optional extra_trees) are used, and all children of
1644
matched directories are included.
1645
:param include_unchanged: An optional boolean requesting the inclusion of
1646
unchanged entries in the result.
1647
:param extra_trees: An optional list of additional trees to use when
1648
mapping the contents of specific_files (paths) to file_ids.
1649
:param require_versioned: If True, all files in specific_files must be
1650
versioned in one of source, target, extra_trees or
1651
PathsNotVersionedError is raised.
1652
:param want_unversioned: Should unversioned files be returned in the
1653
output. An unversioned file is defined as one with (False, False)
1654
for the versioned pair.
1656
utf8_decode_or_none = cache_utf8._utf8_decode_with_None
1657
_minikind_to_kind = dirstate.DirState._minikind_to_kind
1658
# NB: show_status depends on being able to pass in non-versioned files
1659
# and report them as unknown
1660
# TODO: handle extra trees in the dirstate.
1661
# TODO: handle comparisons as an empty tree as a different special
1662
# case? mbp 20070226
1663
if extra_trees or (self.source._revision_id == NULL_REVISION):
1664
# we can't fast-path these cases (yet)
1665
for f in super(InterDirStateTree, self)._iter_changes(
1666
include_unchanged, specific_files, pb, extra_trees,
1667
require_versioned, want_unversioned=want_unversioned):
1670
parent_ids = self.target.get_parent_ids()
1671
assert (self.source._revision_id in parent_ids), \
1672
"revision {%s} is not stored in {%s}, but %s " \
1673
"can only be used for trees stored in the dirstate" \
1674
% (self.source._revision_id, self.target, self._iter_changes)
1676
if self.source._revision_id == NULL_REVISION:
1678
indices = (target_index,)
1680
assert (self.source._revision_id in parent_ids), \
1681
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % (
1682
self.source._revision_id, parent_ids)
1683
source_index = 1 + parent_ids.index(self.source._revision_id)
1684
indices = (source_index,target_index)
1685
# -- make all specific_files utf8 --
1687
specific_files_utf8 = set()
1688
for path in specific_files:
1689
specific_files_utf8.add(path.encode('utf8'))
1690
specific_files = specific_files_utf8
1692
specific_files = set([''])
1693
# -- specific_files is now a utf8 path set --
1694
# -- get the state object and prepare it.
1695
state = self.target.current_dirstate()
1696
state._read_dirblocks_if_needed()
1697
def _entries_for_path(path):
1698
"""Return a list with all the entries that match path for all ids.
1700
dirname, basename = os.path.split(path)
1701
key = (dirname, basename, '')
1702
block_index, present = state._find_block_index_from_key(key)
1704
# the block which should contain path is absent.
1707
block = state._dirblocks[block_index][1]
1708
entry_index, _ = state._find_entry_index(key, block)
1709
# we may need to look at multiple entries at this path: walk while the specific_files match.
1710
while (entry_index < len(block) and
1711
block[entry_index][0][0:2] == key[0:2]):
1712
result.append(block[entry_index])
1715
if require_versioned:
1716
# -- check all supplied paths are versioned in a search tree. --
1717
all_versioned = True
1718
for path in specific_files:
1719
path_entries = _entries_for_path(path)
1720
if not path_entries:
1721
# this specified path is not present at all: error
1722
all_versioned = False
1724
found_versioned = False
1725
# for each id at this path
1726
for entry in path_entries:
1728
for index in indices:
1729
if entry[1][index][0] != 'a': # absent
1730
found_versioned = True
1731
# all good: found a versioned cell
1733
if not found_versioned:
1734
# none of the indexes was not 'absent' at all ids for this
1736
all_versioned = False
1738
if not all_versioned:
1739
raise errors.PathsNotVersionedError(specific_files)
1740
# -- remove redundancy in supplied specific_files to prevent over-scanning --
1741
search_specific_files = set()
1742
for path in specific_files:
1743
other_specific_files = specific_files.difference(set([path]))
1744
if not osutils.is_inside_any(other_specific_files, path):
1745
# this is a top level path, we must check it.
1746
search_specific_files.add(path)
1748
# compare source_index and target_index at or under each element of search_specific_files.
1749
# follow the following comparison table. Note that we only want to do diff operations when
1750
# the target is fdl because thats when the walkdirs logic will have exposed the pathinfo
1754
# Source | Target | disk | action
1755
# r | fdlt | | add source to search, add id path move and perform
1756
# | | | diff check on source-target
1757
# r | fdlt | a | dangling file that was present in the basis.
1759
# r | a | | add source to search
1761
# r | r | | this path is present in a non-examined tree, skip.
1762
# r | r | a | this path is present in a non-examined tree, skip.
1763
# a | fdlt | | add new id
1764
# a | fdlt | a | dangling locally added file, skip
1765
# a | a | | not present in either tree, skip
1766
# a | a | a | not present in any tree, skip
1767
# a | r | | not present in either tree at this path, skip as it
1768
# | | | may not be selected by the users list of paths.
1769
# a | r | a | not present in either tree at this path, skip as it
1770
# | | | may not be selected by the users list of paths.
1771
# fdlt | fdlt | | content in both: diff them
1772
# fdlt | fdlt | a | deleted locally, but not unversioned - show as deleted ?
1773
# fdlt | a | | unversioned: output deleted id for now
1774
# fdlt | a | a | unversioned and deleted: output deleted id
1775
# fdlt | r | | relocated in this tree, so add target to search.
1776
# | | | Dont diff, we will see an r,fd; pair when we reach
1777
# | | | this id at the other path.
1778
# fdlt | r | a | relocated in this tree, so add target to search.
1779
# | | | Dont diff, we will see an r,fd; pair when we reach
1780
# | | | this id at the other path.
1782
# for all search_indexs in each path at or under each element of
1783
# search_specific_files, if the detail is relocated: add the id, and add the
1784
# relocated path as one to search if its not searched already. If the
1785
# detail is not relocated, add the id.
1786
searched_specific_files = set()
1787
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1788
# Using a list so that we can access the values and change them in
1789
# nested scope. Each one is [path, file_id, entry]
1790
last_source_parent = [None, None, None]
1791
last_target_parent = [None, None, None]
1793
use_filesystem_for_exec = (sys.platform != 'win32')
1795
def _process_entry(entry, path_info):
1796
"""Compare an entry and real disk to generate delta information.
1798
:param path_info: top_relpath, basename, kind, lstat, abspath for
1799
the path of entry. If None, then the path is considered absent.
1800
(Perhaps we should pass in a concrete entry for this ?)
1801
Basename is returned as a utf8 string because we expect this
1802
tuple will be ignored, and don't want to take the time to
1805
if source_index is None:
1806
source_details = NULL_PARENT_DETAILS
1808
source_details = entry[1][source_index]
1809
target_details = entry[1][target_index]
1810
target_minikind = target_details[0]
1811
if path_info is not None and target_minikind in 'fdlt':
1812
assert target_index == 0
1813
link_or_sha1 = state.update_entry(entry, abspath=path_info[4],
1814
stat_value=path_info[3])
1815
# The entry may have been modified by update_entry
1816
target_details = entry[1][target_index]
1817
target_minikind = target_details[0]
1820
source_minikind = source_details[0]
1821
if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1822
# claimed content in both: diff
1823
# r | fdlt | | add source to search, add id path move and perform
1824
# | | | diff check on source-target
1825
# r | fdlt | a | dangling file that was present in the basis.
1827
if source_minikind in 'r':
1828
# add the source to the search path to find any children it
1829
# has. TODO ? : only add if it is a container ?
1830
if not osutils.is_inside_any(searched_specific_files,
1832
search_specific_files.add(source_details[1])
1833
# generate the old path; this is needed for stating later
1835
old_path = source_details[1]
1836
old_dirname, old_basename = os.path.split(old_path)
1837
path = pathjoin(entry[0][0], entry[0][1])
1838
old_entry = state._get_entry(source_index,
1840
# update the source details variable to be the real
1842
source_details = old_entry[1][source_index]
1843
source_minikind = source_details[0]
1845
old_dirname = entry[0][0]
1846
old_basename = entry[0][1]
1847
old_path = path = pathjoin(old_dirname, old_basename)
1848
if path_info is None:
1849
# the file is missing on disk, show as removed.
1850
content_change = True
1854
# source and target are both versioned and disk file is present.
1855
target_kind = path_info[2]
1856
if target_kind == 'directory':
1857
if source_minikind != 'd':
1858
content_change = True
1860
# directories have no fingerprint
1861
content_change = False
1863
elif target_kind == 'file':
1864
if source_minikind != 'f':
1865
content_change = True
1867
# We could check the size, but we already have the
1869
content_change = (link_or_sha1 != source_details[1])
1870
# Target details is updated at update_entry time
1871
if use_filesystem_for_exec:
1872
# We don't need S_ISREG here, because we are sure
1873
# we are dealing with a file.
1874
target_exec = bool(stat.S_IEXEC & path_info[3].st_mode)
1876
target_exec = target_details[3]
1877
elif target_kind == 'symlink':
1878
if source_minikind != 'l':
1879
content_change = True
1881
content_change = (link_or_sha1 != source_details[1])
1883
elif target_kind == 'tree-reference':
1884
if source_minikind != 't':
1885
content_change = True
1887
content_change = False
1890
raise Exception, "unknown kind %s" % path_info[2]
1891
# parent id is the entry for the path in the target tree
1892
if old_dirname == last_source_parent[0]:
1893
source_parent_id = last_source_parent[1]
1895
source_parent_entry = state._get_entry(source_index,
1896
path_utf8=old_dirname)
1897
source_parent_id = source_parent_entry[0][2]
1898
if source_parent_id == entry[0][2]:
1899
# This is the root, so the parent is None
1900
source_parent_id = None
1902
last_source_parent[0] = old_dirname
1903
last_source_parent[1] = source_parent_id
1904
last_source_parent[2] = source_parent_entry
1905
new_dirname = entry[0][0]
1906
if new_dirname == last_target_parent[0]:
1907
target_parent_id = last_target_parent[1]
1909
# TODO: We don't always need to do the lookup, because the
1910
# parent entry will be the same as the source entry.
1911
target_parent_entry = state._get_entry(target_index,
1912
path_utf8=new_dirname)
1913
target_parent_id = target_parent_entry[0][2]
1914
if target_parent_id == entry[0][2]:
1915
# This is the root, so the parent is None
1916
target_parent_id = None
1918
last_target_parent[0] = new_dirname
1919
last_target_parent[1] = target_parent_id
1920
last_target_parent[2] = target_parent_entry
1922
source_exec = source_details[3]
1923
return ((entry[0][2], (old_path, path), content_change,
1925
(source_parent_id, target_parent_id),
1926
(old_basename, entry[0][1]),
1927
(_minikind_to_kind[source_minikind], target_kind),
1928
(source_exec, target_exec)),)
1929
elif source_minikind in 'a' and target_minikind in 'fdlt':
1930
# looks like a new file
1931
if path_info is not None:
1932
path = pathjoin(entry[0][0], entry[0][1])
1933
# parent id is the entry for the path in the target tree
1934
# TODO: these are the same for an entire directory: cache em.
1935
parent_id = state._get_entry(target_index,
1936
path_utf8=entry[0][0])[0][2]
1937
if parent_id == entry[0][2]:
1939
if use_filesystem_for_exec:
1940
# We need S_ISREG here, because we aren't sure if this
1943
stat.S_ISREG(path_info[3].st_mode)
1944
and stat.S_IEXEC & path_info[3].st_mode)
1946
target_exec = target_details[3]
1947
return ((entry[0][2], (None, path), True,
1950
(None, entry[0][1]),
1951
(None, path_info[2]),
1952
(None, target_exec)),)
1954
# but its not on disk: we deliberately treat this as just
1955
# never-present. (Why ?! - RBC 20070224)
1957
elif source_minikind in 'fdlt' and target_minikind in 'a':
1958
# unversioned, possibly, or possibly not deleted: we dont care.
1959
# if its still on disk, *and* theres no other entry at this
1960
# path [we dont know this in this routine at the moment -
1961
# perhaps we should change this - then it would be an unknown.
1962
old_path = pathjoin(entry[0][0], entry[0][1])
1963
# parent id is the entry for the path in the target tree
1964
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
1965
if parent_id == entry[0][2]:
1967
return ((entry[0][2], (old_path, None), True,
1970
(entry[0][1], None),
1971
(_minikind_to_kind[source_minikind], None),
1972
(source_details[3], None)),)
1973
elif source_minikind in 'fdlt' and target_minikind in 'r':
1974
# a rename; could be a true rename, or a rename inherited from
1975
# a renamed parent. TODO: handle this efficiently. Its not
1976
# common case to rename dirs though, so a correct but slow
1977
# implementation will do.
1978
if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1979
search_specific_files.add(target_details[1])
1980
elif source_minikind in 'ra' and target_minikind in 'ra':
1981
# neither of the selected trees contain this file,
1982
# so skip over it. This is not currently directly tested, but
1983
# is indirectly via test_too_much.TestCommands.test_conflicts.
1986
raise AssertionError("don't know how to compare "
1987
"source_minikind=%r, target_minikind=%r"
1988
% (source_minikind, target_minikind))
1989
## import pdb;pdb.set_trace()
1992
while search_specific_files:
1993
# TODO: the pending list should be lexically sorted? the
1994
# interface doesn't require it.
1995
current_root = search_specific_files.pop()
1996
current_root_unicode = current_root.decode('utf8')
1997
searched_specific_files.add(current_root)
1998
# process the entries for this containing directory: the rest will be
1999
# found by their parents recursively.
2000
root_entries = _entries_for_path(current_root)
2001
root_abspath = self.target.abspath(current_root_unicode)
2003
root_stat = os.lstat(root_abspath)
2005
if e.errno == errno.ENOENT:
2006
# the path does not exist: let _process_entry know that.
2007
root_dir_info = None
2009
# some other random error: hand it up.
2012
root_dir_info = ('', current_root,
2013
osutils.file_kind_from_stat_mode(root_stat.st_mode), root_stat,
2015
if root_dir_info[2] == 'directory':
2016
if self.target._directory_is_tree_reference(
2017
current_root.decode('utf8')):
2018
root_dir_info = root_dir_info[:2] + \
2019
('tree-reference',) + root_dir_info[3:]
2021
if not root_entries and not root_dir_info:
2022
# this specified path is not present at all, skip it.
2024
path_handled = False
2025
for entry in root_entries:
2026
for result in _process_entry(entry, root_dir_info):
2027
# this check should probably be outside the loop: one
2028
# 'iterate two trees' api, and then _iter_changes filters
2029
# unchanged pairs. - RBC 20070226
2031
if (include_unchanged
2032
or result[2] # content change
2033
or result[3][0] != result[3][1] # versioned status
2034
or result[4][0] != result[4][1] # parent id
2035
or result[5][0] != result[5][1] # name
2036
or result[6][0] != result[6][1] # kind
2037
or result[7][0] != result[7][1] # executable
2040
(utf8_decode_or_none(result[1][0]),
2041
utf8_decode_or_none(result[1][1])),
2045
(utf8_decode_or_none(result[5][0]),
2046
utf8_decode_or_none(result[5][1])),
2050
if want_unversioned and not path_handled and root_dir_info:
2051
new_executable = bool(
2052
stat.S_ISREG(root_dir_info[3].st_mode)
2053
and stat.S_IEXEC & root_dir_info[3].st_mode)
2055
(None, current_root_unicode),
2059
(None, splitpath(current_root_unicode)[-1]),
2060
(None, root_dir_info[2]),
2061
(None, new_executable)
2063
initial_key = (current_root, '', '')
2064
block_index, _ = state._find_block_index_from_key(initial_key)
2065
if block_index == 0:
2066
# we have processed the total root already, but because the
2067
# initial key matched it we should skip it here.
2069
if root_dir_info and root_dir_info[2] == 'tree-reference':
2070
current_dir_info = None
2072
dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
2074
current_dir_info = dir_iterator.next()
2076
# on win32, python2.4 has e.errno == ERROR_DIRECTORY, but
2077
# python 2.5 has e.errno == EINVAL,
2078
# and e.winerror == ERROR_DIRECTORY
2079
e_winerror = getattr(e, 'winerror', None)
2080
# there may be directories in the inventory even though
2081
# this path is not a file on disk: so mark it as end of
2083
if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2084
current_dir_info = None
2085
elif (sys.platform == 'win32'
2086
and ERROR_DIRECTORY in (e.errno, e_winerror)):
2087
current_dir_info = None
2091
if current_dir_info[0][0] == '':
2092
# remove .bzr from iteration
2093
bzr_index = bisect_left(current_dir_info[1], ('.bzr',))
2094
assert current_dir_info[1][bzr_index][0] == '.bzr'
2095
del current_dir_info[1][bzr_index]
2096
# walk until both the directory listing and the versioned metadata
2098
if (block_index < len(state._dirblocks) and
2099
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2100
current_block = state._dirblocks[block_index]
2102
current_block = None
2103
while (current_dir_info is not None or
2104
current_block is not None):
2105
if (current_dir_info and current_block
2106
and current_dir_info[0][0] != current_block[0]):
2107
if current_dir_info[0][0] < current_block[0] :
2108
# filesystem data refers to paths not covered by the dirblock.
2109
# this has two possibilities:
2110
# A) it is versioned but empty, so there is no block for it
2111
# B) it is not versioned.
2112
# in either case it was processed by the containing directories walk:
2113
# if it is root/foo, when we walked root we emitted it,
2114
# or if we ere given root/foo to walk specifically, we
2115
# emitted it when checking the walk-root entries
2116
# advance the iterator and loop - we dont need to emit it.
2118
current_dir_info = dir_iterator.next()
2119
except StopIteration:
2120
current_dir_info = None
2122
# We have a dirblock entry for this location, but there
2123
# is no filesystem path for this. This is most likely
2124
# because a directory was removed from the disk.
2125
# We don't have to report the missing directory,
2126
# because that should have already been handled, but we
2127
# need to handle all of the files that are contained
2129
for current_entry in current_block[1]:
2130
# entry referring to file not present on disk.
2131
# advance the entry only, after processing.
2132
for result in _process_entry(current_entry, None):
2133
# this check should probably be outside the loop: one
2134
# 'iterate two trees' api, and then _iter_changes filters
2135
# unchanged pairs. - RBC 20070226
2136
if (include_unchanged
2137
or result[2] # content change
2138
or result[3][0] != result[3][1] # versioned status
2139
or result[4][0] != result[4][1] # parent id
2140
or result[5][0] != result[5][1] # name
2141
or result[6][0] != result[6][1] # kind
2142
or result[7][0] != result[7][1] # executable
2145
(utf8_decode_or_none(result[1][0]),
2146
utf8_decode_or_none(result[1][1])),
2150
(utf8_decode_or_none(result[5][0]),
2151
utf8_decode_or_none(result[5][1])),
2156
if (block_index < len(state._dirblocks) and
2157
osutils.is_inside(current_root,
2158
state._dirblocks[block_index][0])):
2159
current_block = state._dirblocks[block_index]
2161
current_block = None
2164
if current_block and entry_index < len(current_block[1]):
2165
current_entry = current_block[1][entry_index]
2167
current_entry = None
2168
advance_entry = True
2170
if current_dir_info and path_index < len(current_dir_info[1]):
2171
current_path_info = current_dir_info[1][path_index]
2172
if current_path_info[2] == 'directory':
2173
if self.target._directory_is_tree_reference(
2174
current_path_info[0].decode('utf8')):
2175
current_path_info = current_path_info[:2] + \
2176
('tree-reference',) + current_path_info[3:]
2178
current_path_info = None
2180
path_handled = False
2181
while (current_entry is not None or
2182
current_path_info is not None):
2183
if current_entry is None:
2184
# the check for path_handled when the path is adnvaced
2185
# will yield this path if needed.
2187
elif current_path_info is None:
2188
# no path is fine: the per entry code will handle it.
2189
for result in _process_entry(current_entry, current_path_info):
2190
# this check should probably be outside the loop: one
2191
# 'iterate two trees' api, and then _iter_changes filters
2192
# unchanged pairs. - RBC 20070226
2193
if (include_unchanged
2194
or result[2] # content change
2195
or result[3][0] != result[3][1] # versioned status
2196
or result[4][0] != result[4][1] # parent id
2197
or result[5][0] != result[5][1] # name
2198
or result[6][0] != result[6][1] # kind
2199
or result[7][0] != result[7][1] # executable
2202
(utf8_decode_or_none(result[1][0]),
2203
utf8_decode_or_none(result[1][1])),
2207
(utf8_decode_or_none(result[5][0]),
2208
utf8_decode_or_none(result[5][1])),
2212
elif current_entry[0][1] != current_path_info[1]:
2213
if current_path_info[1] < current_entry[0][1]:
2214
# extra file on disk: pass for now, but only
2215
# increment the path, not the entry
2216
advance_entry = False
2218
# entry referring to file not present on disk.
2219
# advance the entry only, after processing.
2220
for result in _process_entry(current_entry, None):
2221
# this check should probably be outside the loop: one
2222
# 'iterate two trees' api, and then _iter_changes filters
2223
# unchanged pairs. - RBC 20070226
2225
if (include_unchanged
2226
or result[2] # content change
2227
or result[3][0] != result[3][1] # versioned status
2228
or result[4][0] != result[4][1] # parent id
2229
or result[5][0] != result[5][1] # name
2230
or result[6][0] != result[6][1] # kind
2231
or result[7][0] != result[7][1] # executable
2234
(utf8_decode_or_none(result[1][0]),
2235
utf8_decode_or_none(result[1][1])),
2239
(utf8_decode_or_none(result[5][0]),
2240
utf8_decode_or_none(result[5][1])),
2244
advance_path = False
2246
for result in _process_entry(current_entry, current_path_info):
2247
# this check should probably be outside the loop: one
2248
# 'iterate two trees' api, and then _iter_changes filters
2249
# unchanged pairs. - RBC 20070226
2251
if (include_unchanged
2252
or result[2] # content change
2253
or result[3][0] != result[3][1] # versioned status
2254
or result[4][0] != result[4][1] # parent id
2255
or result[5][0] != result[5][1] # name
2256
or result[6][0] != result[6][1] # kind
2257
or result[7][0] != result[7][1] # executable
2260
(utf8_decode_or_none(result[1][0]),
2261
utf8_decode_or_none(result[1][1])),
2265
(utf8_decode_or_none(result[5][0]),
2266
utf8_decode_or_none(result[5][1])),
2270
if advance_entry and current_entry is not None:
2272
if entry_index < len(current_block[1]):
2273
current_entry = current_block[1][entry_index]
2275
current_entry = None
2277
advance_entry = True # reset the advance flaga
2278
if advance_path and current_path_info is not None:
2279
if not path_handled:
2280
# unversioned in all regards
2281
if want_unversioned:
2282
new_executable = bool(
2283
stat.S_ISREG(current_path_info[3].st_mode)
2284
and stat.S_IEXEC & current_path_info[3].st_mode)
2285
if want_unversioned:
2287
(None, utf8_decode_or_none(current_path_info[0])),
2291
(None, utf8_decode_or_none(current_path_info[1])),
2292
(None, current_path_info[2]),
2293
(None, new_executable))
2294
# dont descend into this unversioned path if it is
2296
if current_path_info[2] in ('directory'):
2297
del current_dir_info[1][path_index]
2299
# dont descend the disk iterator into any tree
2301
if current_path_info[2] == 'tree-reference':
2302
del current_dir_info[1][path_index]
2305
if path_index < len(current_dir_info[1]):
2306
current_path_info = current_dir_info[1][path_index]
2307
if current_path_info[2] == 'directory':
2308
if self.target._directory_is_tree_reference(
2309
current_path_info[0].decode('utf8')):
2310
current_path_info = current_path_info[:2] + \
2311
('tree-reference',) + current_path_info[3:]
2313
current_path_info = None
2314
path_handled = False
2316
advance_path = True # reset the advance flagg.
2317
if current_block is not None:
2319
if (block_index < len(state._dirblocks) and
2320
osutils.is_inside(current_root, state._dirblocks[block_index][0])):
2321
current_block = state._dirblocks[block_index]
2323
current_block = None
2324
if current_dir_info is not None:
2326
current_dir_info = dir_iterator.next()
2327
except StopIteration:
2328
current_dir_info = None
2332
def is_compatible(source, target):
2333
# the target must be a dirstate working tree
2334
if not isinstance(target, WorkingTree4):
2336
# the source must be a revtreee or dirstate rev tree.
2337
if not isinstance(source,
2338
(revisiontree.RevisionTree, DirStateRevisionTree)):
2340
# the source revid must be in the target dirstate
2341
if not (source._revision_id == NULL_REVISION or
2342
source._revision_id in target.get_parent_ids()):
2343
# TODO: what about ghosts? it may well need to
2344
# check for them explicitly.
2348
InterTree.register_optimiser(InterDirStateTree)
2351
class Converter3to4(object):
2352
"""Perform an in-place upgrade of format 3 to format 4 trees."""
2355
self.target_format = WorkingTreeFormat4()
2357
def convert(self, tree):
2358
# lock the control files not the tree, so that we dont get tree
2359
# on-unlock behaviours, and so that noone else diddles with the
2360
# tree during upgrade.
2361
tree._control_files.lock_write()
2363
tree.read_working_inventory()
2364
self.create_dirstate_data(tree)
2365
self.update_format(tree)
2366
self.remove_xml_files(tree)
2368
tree._control_files.unlock()
2370
def create_dirstate_data(self, tree):
2371
"""Create the dirstate based data for tree."""
2372
local_path = tree.bzrdir.get_workingtree_transport(None
2373
).local_abspath('dirstate')
2374
state = dirstate.DirState.from_tree(tree, local_path)
2378
def remove_xml_files(self, tree):
2379
"""Remove the oldformat 3 data."""
2380
transport = tree.bzrdir.get_workingtree_transport(None)
2381
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
2382
'pending-merges', 'stat-cache']:
2384
transport.delete(path)
2385
except errors.NoSuchFile:
2386
# some files are optional - just deal.
2389
def update_format(self, tree):
2390
"""Change the format marker."""
2391
tree._control_files.put_utf8('format',
2392
self.target_format.get_format_string())
added
removed
bzrlib/workingtree_4.py
