210
"""Construct a WorkingTree for basedir.
195
"""Construct a WorkingTree instance. This is not a public API.
212
If the branch is not supplied, it is opened automatically.
213
If the branch is supplied, it must be the branch for this basedir.
214
(branch.base is not cross checked, because for remote branches that
215
would be meaningless).
197
:param branch: A branch to override probing for the branch.
217
199
self._format = _format
218
200
self.bzrdir = _bzrdir
219
201
if not _internal:
220
# not created via open etc.
221
warn("WorkingTree() is deprecated as of bzr version 0.8. "
222
"Please use bzrdir.open_workingtree or WorkingTree.open().",
225
wt = WorkingTree.open(basedir)
226
self.branch = wt.branch
227
self.basedir = wt.basedir
228
self._control_files = wt._control_files
229
self._hashcache = wt._hashcache
230
self._set_inventory(wt._inventory)
231
self._format = wt._format
232
self.bzrdir = wt.bzrdir
233
from bzrlib.hashcache import HashCache
234
from bzrlib.trace import note, mutter
235
assert isinstance(basedir, basestring), \
236
"base directory %r is not a string" % basedir
202
raise errors.BzrError("Please use bzrdir.open_workingtree or "
203
"WorkingTree.open() to obtain a WorkingTree.")
237
204
basedir = safe_unicode(basedir)
238
205
mutter("opening working tree %r", basedir)
239
206
if deprecated_passed(branch):
241
warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
242
" Please use bzrdir.open_workingtree() or"
243
" WorkingTree.open().",
207
self._branch = branch
249
self.branch = self.bzrdir.open_branch()
250
assert isinstance(self.branch, Branch), \
251
"branch %r is not a Branch" % self.branch
209
self._branch = self.bzrdir.open_branch()
252
210
self.basedir = realpath(basedir)
253
211
# if branch is at our basedir and is a format 6 or less
254
212
if isinstance(self._format, WorkingTreeFormat2):
255
213
# share control object
256
214
self._control_files = self.branch.control_files
258
# only ready for format 3
259
assert isinstance(self._format, WorkingTreeFormat3)
260
assert isinstance(_control_files, LockableFiles), \
261
"_control_files must be a LockableFiles, not %r" \
216
# assume all other formats have their own control files.
263
217
self._control_files = _control_files
218
self._transport = self._control_files._transport
264
219
# update the whole cache up front and write to disk if anything changed;
265
220
# in the future we might want to do this more selectively
266
221
# two possible ways offer themselves : in self._unlock, write the cache
267
222
# if needed, or, when the cache sees a change, append it to the hash
268
223
# cache file, and have the parser take the most recent entry for a
269
224
# given path only.
270
cache_filename = self.bzrdir.get_workingtree_transport(None).abspath('stat-cache')
271
hc = self._hashcache = HashCache(basedir, cache_filename, self._control_files._file_mode)
225
wt_trans = self.bzrdir.get_workingtree_transport(None)
226
cache_filename = wt_trans.local_abspath('stat-cache')
227
self._hashcache = hashcache.HashCache(basedir, cache_filename,
228
self.bzrdir._get_file_mode())
273
231
# is this scan needed ? it makes things kinda slow.
276
234
if hc.needs_write:
277
235
mutter("write hc")
280
238
if _inventory is None:
281
self._set_inventory(self.read_working_inventory())
283
self._set_inventory(_inventory)
285
def _set_inventory(self, inv):
239
# This will be acquired on lock_read() or lock_write()
240
self._inventory_is_modified = False
241
self._inventory = None
243
# the caller of __init__ has provided an inventory,
244
# we assume they know what they are doing - as its only
245
# the Format factory and creation methods that are
246
# permitted to do this.
247
self._set_inventory(_inventory, dirty=False)
248
self._detect_case_handling()
249
self._rules_searcher = None
251
def _detect_case_handling(self):
252
wt_trans = self.bzrdir.get_workingtree_transport(None)
254
wt_trans.stat("FoRMaT")
255
except errors.NoSuchFile:
256
self.case_sensitive = True
258
self.case_sensitive = False
260
self._setup_directory_is_tree_reference()
263
fget=lambda self: self._branch,
264
doc="""The branch this WorkingTree is connected to.
266
This cannot be set - it is reflective of the actual disk structure
267
the working tree has been constructed from.
270
def break_lock(self):
271
"""Break a lock if one is present from another instance.
273
Uses the ui factory to ask for confirmation if the lock may be from
276
This will probe the repository for its lock as well.
278
self._control_files.break_lock()
279
self.branch.break_lock()
281
def requires_rich_root(self):
282
return self._format.requires_rich_root
284
def supports_tree_reference(self):
287
def _set_inventory(self, inv, dirty):
288
"""Set the internal cached inventory.
290
:param inv: The inventory to set.
291
:param dirty: A boolean indicating whether the inventory is the same
292
logical inventory as whats on disk. If True the inventory is not
293
the same and should be written to disk or data will be lost, if
294
False then the inventory is the same as that on disk and any
295
serialisation would be unneeded overhead.
286
297
self._inventory = inv
287
self.path2id = self._inventory.path2id
289
def is_control_filename(self, filename):
290
"""True if filename is the name of a control file in this tree.
292
This is true IF and ONLY IF the filename is part of the meta data
293
that bzr controls in this tree. I.E. a random .bzr directory placed
294
on disk will not be a control file for this tree.
297
self.bzrdir.transport.relpath(self.abspath(filename))
299
except errors.PathNotChild:
298
self._inventory_is_modified = dirty
303
301
def open(path=None, _unsupported=False):
342
362
inv = self._inventory
343
363
for path, ie in inv.iter_entries():
344
if bzrlib.osutils.lexists(self.abspath(path)):
364
if osutils.lexists(self.abspath(path)):
367
def all_file_ids(self):
368
"""See Tree.iter_all_file_ids"""
369
return set(self.inventory)
347
371
def __repr__(self):
348
372
return "<%s of %s>" % (self.__class__.__name__,
349
373
getattr(self, 'basedir', None))
351
375
def abspath(self, filename):
352
376
return pathjoin(self.basedir, filename)
354
378
def basis_tree(self):
355
"""Return RevisionTree for the current last revision."""
356
revision_id = self.last_revision()
357
if revision_id is not None:
359
xml = self.read_basis_inventory()
360
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
363
if inv is not None and inv.revision_id == revision_id:
364
return bzrlib.tree.RevisionTree(self.branch.repository, inv,
366
# FIXME? RBC 20060403 should we cache the inventory here ?
367
return self.branch.repository.revision_tree(revision_id)
370
@deprecated_method(zero_eight)
371
def create(branch, directory):
372
"""Create a workingtree for branch at directory.
374
If existing_directory already exists it must have a .bzr directory.
375
If it does not exist, it will be created.
377
This returns a new WorkingTree object for the new checkout.
379
TODO FIXME RBC 20060124 when we have checkout formats in place this
380
should accept an optional revisionid to checkout [and reject this if
381
checking out into the same dir as a pre-checkout-aware branch format.]
383
XXX: When BzrDir is present, these should be created through that
386
warn('delete WorkingTree.create', stacklevel=3)
387
transport = get_transport(directory)
388
if branch.bzrdir.root_transport.base == transport.base:
390
return branch.bzrdir.create_workingtree()
391
# different directory,
392
# create a branch reference
393
# and now a working tree.
394
raise NotImplementedError
397
@deprecated_method(zero_eight)
398
def create_standalone(directory):
399
"""Create a checkout and a branch and a repo at directory.
401
Directory must exist and be empty.
403
please use BzrDir.create_standalone_workingtree
405
return bzrdir.BzrDir.create_standalone_workingtree(directory)
407
def relpath(self, abs):
408
"""Return the local path portion from a given absolute path."""
409
return relpath(self.basedir, abs)
379
"""Return RevisionTree for the current last revision.
381
If the left most parent is a ghost then the returned tree will be an
382
empty tree - one obtained by calling
383
repository.revision_tree(NULL_REVISION).
386
revision_id = self.get_parent_ids()[0]
388
# no parents, return an empty revision tree.
389
# in the future this should return the tree for
390
# 'empty:' - the implicit root empty tree.
391
return self.branch.repository.revision_tree(
392
_mod_revision.NULL_REVISION)
394
return self.revision_tree(revision_id)
395
except errors.NoSuchRevision:
397
# No cached copy available, retrieve from the repository.
398
# FIXME? RBC 20060403 should we cache the inventory locally
401
return self.branch.repository.revision_tree(revision_id)
402
except (errors.RevisionNotPresent, errors.NoSuchRevision):
403
# the basis tree *may* be a ghost or a low level error may have
404
# occured. If the revision is present, its a problem, if its not
406
if self.branch.repository.has_revision(revision_id):
408
# the basis tree is a ghost so return an empty tree.
409
return self.branch.repository.revision_tree(
410
_mod_revision.NULL_REVISION)
413
self._flush_ignore_list_cache()
415
def relpath(self, path):
416
"""Return the local path portion from a given path.
418
The path may be absolute or relative. If its a relative path it is
419
interpreted relative to the python current working directory.
421
return osutils.relpath(self.basedir, path)
411
423
def has_filename(self, filename):
412
return bzrlib.osutils.lexists(self.abspath(filename))
414
def get_file(self, file_id):
415
return self.get_file_byname(self.id2path(file_id))
424
return osutils.lexists(self.abspath(filename))
426
def get_file(self, file_id, path=None):
427
return self.get_file_with_stat(file_id, path)[0]
429
def get_file_with_stat(self, file_id, path=None, _fstat=os.fstat):
430
"""See MutableTree.get_file_with_stat."""
432
path = self.id2path(file_id)
433
file_obj = self.get_file_byname(path)
434
return (file_obj, _fstat(file_obj.fileno()))
417
436
def get_file_byname(self, filename):
418
437
return file(self.abspath(filename), 'rb')
439
def get_file_lines(self, file_id, path=None):
440
"""See Tree.get_file_lines()"""
441
file = self.get_file(file_id, path)
443
return file.readlines()
448
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
449
"""See Tree.annotate_iter
451
This implementation will use the basis tree implementation if possible.
452
Lines not in the basis are attributed to CURRENT_REVISION
454
If there are pending merges, lines added by those merges will be
455
incorrectly attributed to CURRENT_REVISION (but after committing, the
456
attribution will be correct).
458
basis = self.basis_tree()
461
changes = self.iter_changes(basis, True, [self.id2path(file_id)],
462
require_versioned=True).next()
463
changed_content, kind = changes[2], changes[6]
464
if not changed_content:
465
return basis.annotate_iter(file_id)
469
if kind[0] != 'file':
472
old_lines = list(basis.annotate_iter(file_id))
474
for tree in self.branch.repository.revision_trees(
475
self.get_parent_ids()[1:]):
476
if file_id not in tree:
478
old.append(list(tree.annotate_iter(file_id)))
479
return annotate.reannotate(old, self.get_file(file_id).readlines(),
484
def _get_ancestors(self, default_revision):
485
ancestors = set([default_revision])
486
for parent_id in self.get_parent_ids():
487
ancestors.update(self.branch.repository.get_ancestry(
488
parent_id, topo_sorted=False))
491
def get_parent_ids(self):
492
"""See Tree.get_parent_ids.
494
This implementation reads the pending merges list and last_revision
495
value and uses that to decide what the parents list should be.
497
last_rev = _mod_revision.ensure_null(self._last_revision())
498
if _mod_revision.NULL_REVISION == last_rev:
503
merges_file = self._transport.get('pending-merges')
504
except errors.NoSuchFile:
507
for l in merges_file.readlines():
508
revision_id = l.rstrip('\n')
509
parents.append(revision_id)
420
513
def get_root_id(self):
421
514
"""Return the id of this trees root"""
422
inv = self.read_working_inventory()
423
return inv.root.file_id
515
return self._inventory.root.file_id
425
517
def _get_store_filename(self, file_id):
426
518
## XXX: badly named; this is not in the store at all
427
519
return self.abspath(self.id2path(file_id))
430
def clone(self, to_bzrdir, revision_id=None, basis=None):
522
def clone(self, to_bzrdir, revision_id=None):
431
523
"""Duplicate this working tree into to_bzr, including all state.
433
525
Specifically modified files are kept as modified, but
493
568
__contains__ = has_id
495
570
def get_file_size(self, file_id):
496
return os.path.getsize(self.id2abspath(file_id))
571
"""See Tree.get_file_size"""
573
return os.path.getsize(self.id2abspath(file_id))
575
if e.errno != errno.ENOENT:
499
def get_file_sha1(self, file_id):
500
path = self._inventory.id2path(file_id)
501
return self._hashcache.get_sha1(path)
503
def is_executable(self, file_id):
504
if not supports_executable():
581
def get_file_sha1(self, file_id, path=None, stat_value=None):
583
path = self._inventory.id2path(file_id)
584
return self._hashcache.get_sha1(path, stat_value)
586
def get_file_mtime(self, file_id, path=None):
588
path = self.inventory.id2path(file_id)
589
return os.lstat(self.abspath(path)).st_mtime
591
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
592
file_id = self.path2id(path)
593
return self._inventory[file_id].executable
595
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
596
mode = stat_result.st_mode
597
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
599
if not supports_executable():
600
def is_executable(self, file_id, path=None):
505
601
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
603
_is_executable_from_path_and_stat = \
604
_is_executable_from_path_and_stat_from_basis
606
def is_executable(self, file_id, path=None):
608
path = self.id2path(file_id)
508
609
mode = os.lstat(self.abspath(path)).st_mode
509
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
512
def add(self, files, ids=None):
513
"""Make files versioned.
515
Note that the command line normally calls smart_add instead,
516
which can automatically recurse.
518
This adds the files to the inventory, so that they will be
519
recorded by the next commit.
522
List of paths to add, relative to the base of the tree.
525
If set, use these instead of automatically generated ids.
526
Must be the same length as the list of files, but may
527
contain None for ids that are to be autogenerated.
529
TODO: Perhaps have an option to add the ids even if the files do
532
TODO: Perhaps callback with the ids and paths as they're added.
610
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
612
_is_executable_from_path_and_stat = \
613
_is_executable_from_path_and_stat_from_stat
615
@needs_tree_write_lock
616
def _add(self, files, ids, kinds):
617
"""See MutableTree._add."""
534
618
# TODO: Re-adding a file that is removed in the working copy
535
619
# should probably put it back with the previous ID.
536
if isinstance(files, basestring):
537
assert(ids is None or isinstance(ids, basestring))
543
ids = [None] * len(files)
545
assert(len(ids) == len(files))
547
inv = self.read_working_inventory()
548
for f,file_id in zip(files, ids):
549
if self.is_control_filename(f):
550
raise BzrError("cannot add control file %s" % quotefn(f))
555
raise BzrError("cannot add top-level %r" % f)
557
fullpath = normpath(self.abspath(f))
560
kind = file_kind(fullpath)
562
if e.errno == errno.ENOENT:
563
raise NoSuchFile(fullpath)
564
# maybe something better?
565
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
567
if not InventoryEntry.versionable_kind(kind):
568
raise BzrError('cannot add: not a versionable file ('
569
'i.e. regular file, symlink or directory): %s' % quotefn(f))
620
# the read and write working inventory should not occur in this
621
# function - they should be part of lock_write and unlock.
623
for f, file_id, kind in zip(files, ids, kinds):
571
624
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
625
inv.add_path(f, kind=kind)
627
inv.add_path(f, kind=kind, file_id=file_id)
628
self._inventory_is_modified = True
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
self._write_inventory(inv)
630
@needs_tree_write_lock
631
def _gather_kinds(self, files, kinds):
632
"""See MutableTree._gather_kinds."""
633
for pos, f in enumerate(files):
634
if kinds[pos] is None:
635
fullpath = normpath(self.abspath(f))
637
kinds[pos] = file_kind(fullpath)
639
if e.errno == errno.ENOENT:
640
raise errors.NoSuchFile(fullpath)
578
642
@needs_write_lock
643
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
644
"""Add revision_id as a parent.
646
This is equivalent to retrieving the current list of parent ids
647
and setting the list to its value plus revision_id.
649
:param revision_id: The revision id to add to the parent list. It may
650
be a ghost revision as long as its not the first parent to be added,
651
or the allow_leftmost_as_ghost parameter is set True.
652
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
654
parents = self.get_parent_ids() + [revision_id]
655
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
656
or allow_leftmost_as_ghost)
658
@needs_tree_write_lock
659
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
660
"""Add revision_id, tree tuple as a parent.
662
This is equivalent to retrieving the current list of parent trees
663
and setting the list to its value plus parent_tuple. See also
664
add_parent_tree_id - if you only have a parent id available it will be
665
simpler to use that api. If you have the parent already available, using
666
this api is preferred.
668
:param parent_tuple: The (revision id, tree) to add to the parent list.
669
If the revision_id is a ghost, pass None for the tree.
670
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
672
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
673
if len(parent_ids) > 1:
674
# the leftmost may have already been a ghost, preserve that if it
676
allow_leftmost_as_ghost = True
677
self.set_parent_ids(parent_ids,
678
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
680
@needs_tree_write_lock
579
681
def add_pending_merge(self, *revision_ids):
580
682
# TODO: Perhaps should check at this point that the
581
683
# history of the revision is actually present?
582
p = self.pending_merges()
684
parents = self.get_parent_ids()
584
686
for rev_id in revision_ids:
687
if rev_id in parents:
689
parents.append(rev_id)
590
self.set_pending_merges(p)
593
def pending_merges(self):
594
"""Return a list of pending merges.
596
These are revisions that have been merged into the working
597
directory but not yet committed.
692
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
694
def path_content_summary(self, path, _lstat=os.lstat,
695
_mapper=osutils.file_kind_from_stat_mode):
696
"""See Tree.path_content_summary."""
697
abspath = self.abspath(path)
600
merges_file = self._control_files.get_utf8('pending-merges')
699
stat_result = _lstat(abspath)
601
700
except OSError, e:
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
701
if getattr(e, 'errno', None) == errno.ENOENT:
703
return ('missing', None, None, None)
704
# propagate other errors
706
kind = _mapper(stat_result.st_mode)
708
size = stat_result.st_size
709
# try for a stat cache lookup
710
executable = self._is_executable_from_path_and_stat(path, stat_result)
711
return (kind, size, executable, self._sha_from_stat(
713
elif kind == 'directory':
714
# perhaps it looks like a plain directory, but it's really a
716
if self._directory_is_tree_reference(path):
717
kind = 'tree-reference'
718
return kind, None, None, None
719
elif kind == 'symlink':
720
return ('symlink', None, None, os.readlink(abspath))
722
return (kind, None, None, None)
724
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
725
"""Common ghost checking functionality from set_parent_*.
727
This checks that the left hand-parent exists if there are any
730
if len(revision_ids) > 0:
731
leftmost_id = revision_ids[0]
732
if (not allow_leftmost_as_ghost and not
733
self.branch.repository.has_revision(leftmost_id)):
734
raise errors.GhostRevisionUnusableHere(leftmost_id)
736
def _set_merges_from_parent_ids(self, parent_ids):
737
merges = parent_ids[1:]
738
self._transport.put_bytes('pending-merges', '\n'.join(merges),
739
mode=self._control_files._file_mode)
741
def _filter_parent_ids_by_ancestry(self, revision_ids):
742
"""Check that all merged revisions are proper 'heads'.
744
This will always return the first revision_id, and any merged revisions
747
if len(revision_ids) == 0:
749
graph = self.branch.repository.get_graph()
750
heads = graph.heads(revision_ids)
751
new_revision_ids = revision_ids[:1]
752
for revision_id in revision_ids[1:]:
753
if revision_id in heads and revision_id not in new_revision_ids:
754
new_revision_ids.append(revision_id)
755
if new_revision_ids != revision_ids:
756
trace.mutter('requested to set revision_ids = %s,'
757
' but filtered to %s', revision_ids, new_revision_ids)
758
return new_revision_ids
760
@needs_tree_write_lock
761
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
762
"""Set the parent ids to revision_ids.
764
See also set_parent_trees. This api will try to retrieve the tree data
765
for each element of revision_ids from the trees repository. If you have
766
tree data already available, it is more efficient to use
767
set_parent_trees rather than set_parent_ids. set_parent_ids is however
768
an easier API to use.
770
:param revision_ids: The revision_ids to set as the parent ids of this
771
working tree. Any of these may be ghosts.
773
self._check_parents_for_ghosts(revision_ids,
774
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
775
for revision_id in revision_ids:
776
_mod_revision.check_not_reserved_id(revision_id)
778
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
780
if len(revision_ids) > 0:
781
self.set_last_revision(revision_ids[0])
783
self.set_last_revision(_mod_revision.NULL_REVISION)
785
self._set_merges_from_parent_ids(revision_ids)
787
@needs_tree_write_lock
788
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
789
"""See MutableTree.set_parent_trees."""
790
parent_ids = [rev for (rev, tree) in parents_list]
791
for revision_id in parent_ids:
792
_mod_revision.check_not_reserved_id(revision_id)
794
self._check_parents_for_ghosts(parent_ids,
795
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
797
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
799
if len(parent_ids) == 0:
800
leftmost_parent_id = _mod_revision.NULL_REVISION
801
leftmost_parent_tree = None
803
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
805
if self._change_last_revision(leftmost_parent_id):
806
if leftmost_parent_tree is None:
807
# If we don't have a tree, fall back to reading the
808
# parent tree from the repository.
809
self._cache_basis_inventory(leftmost_parent_id)
811
inv = leftmost_parent_tree.inventory
812
xml = self._create_basis_xml_from_inventory(
813
leftmost_parent_id, inv)
814
self._write_basis_inventory(xml)
815
self._set_merges_from_parent_ids(parent_ids)
817
@needs_tree_write_lock
611
818
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
819
parents = self.get_parent_ids()
820
leftmost = parents[:1]
821
new_parents = leftmost + rev_list
822
self.set_parent_ids(new_parents)
824
@needs_tree_write_lock
615
825
def set_merge_modified(self, modified_hashes):
616
826
def iter_stanzas():
617
827
for file_id, hash in modified_hashes.iteritems():
618
yield Stanza(file_id=file_id, hash=hash)
828
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
619
829
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
831
def _sha_from_stat(self, path, stat_result):
832
"""Get a sha digest from the tree's stat cache.
834
The default implementation assumes no stat cache is present.
836
:param path: The path.
837
:param stat_result: The stat result being looked up.
622
841
def _put_rio(self, filename, stanzas, header):
842
self._must_be_locked()
623
843
my_file = rio_file(stanzas, header)
624
self._control_files.put(filename, my_file)
844
self._transport.put_file(filename, my_file,
845
mode=self._control_files._file_mode)
847
@needs_write_lock # because merge pulls data into the branch.
848
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
850
"""Merge from a branch into this working tree.
852
:param branch: The branch to merge from.
853
:param to_revision: If non-None, the merge will merge to to_revision,
854
but not beyond it. to_revision does not need to be in the history
855
of the branch when it is supplied. If None, to_revision defaults to
856
branch.last_revision().
858
from bzrlib.merge import Merger, Merge3Merger
859
pb = bzrlib.ui.ui_factory.nested_progress_bar()
861
merger = Merger(self.branch, this_tree=self, pb=pb)
862
merger.pp = ProgressPhase("Merge phase", 5, pb)
863
merger.pp.next_phase()
864
# check that there are no
866
merger.check_basis(check_clean=True, require_commits=False)
867
if to_revision is None:
868
to_revision = _mod_revision.ensure_null(branch.last_revision())
869
merger.other_rev_id = to_revision
870
if _mod_revision.is_null(merger.other_rev_id):
871
raise errors.NoCommits(branch)
872
self.branch.fetch(branch, last_revision=merger.other_rev_id)
873
merger.other_basis = merger.other_rev_id
874
merger.other_tree = self.branch.repository.revision_tree(
876
merger.other_branch = branch
877
merger.pp.next_phase()
878
if from_revision is None:
881
merger.set_base_revision(from_revision, branch)
882
if merger.base_rev_id == merger.other_rev_id:
883
raise errors.PointlessMerge
884
merger.backup_files = False
885
if merge_type is None:
886
merger.merge_type = Merge3Merger
888
merger.merge_type = merge_type
889
merger.set_interesting_files(None)
890
merger.show_base = False
891
merger.reprocess = False
892
conflicts = merger.do_merge()
627
899
def merge_modified(self):
900
"""Return a dictionary of files modified by a merge.
902
The list is initialized by WorkingTree.set_merge_modified, which is
903
typically called after we make some automatic updates to the tree
906
This returns a map of file_id->sha1, containing only files which are
907
still in the working inventory and have that text hash.
629
hashfile = self._control_files.get('merge-hashes')
910
hashfile = self._transport.get('merge-hashes')
911
except errors.NoSuchFile:
634
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
635
raise MergeModifiedFormatError()
636
except StopIteration:
637
raise MergeModifiedFormatError()
638
for s in RioReader(hashfile):
639
file_id = s.get("file_id")
640
if file_id not in self.inventory:
643
if hash == self.get_file_sha1(file_id):
644
merge_hashes[file_id] = hash
916
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
917
raise errors.MergeModifiedFormatError()
918
except StopIteration:
919
raise errors.MergeModifiedFormatError()
920
for s in RioReader(hashfile):
921
# RioReader reads in Unicode, so convert file_ids back to utf8
922
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
923
if file_id not in self.inventory:
925
text_hash = s.get("hash")
926
if text_hash == self.get_file_sha1(file_id):
927
merge_hashes[file_id] = text_hash
933
def mkdir(self, path, file_id=None):
934
"""See MutableTree.mkdir()."""
936
file_id = generate_ids.gen_file_id(os.path.basename(path))
937
os.mkdir(self.abspath(path))
938
self.add(path, file_id, 'directory')
647
941
def get_symlink_target(self, file_id):
648
942
return os.readlink(self.id2abspath(file_id))
650
def file_class(self, filename):
651
if self.path2id(filename):
653
elif self.is_ignored(filename):
658
def list_files(self):
659
"""Recursively list all files as (path, class, kind, id).
945
def subsume(self, other_tree):
946
def add_children(inventory, entry):
947
for child_entry in entry.children.values():
948
inventory._byid[child_entry.file_id] = child_entry
949
if child_entry.kind == 'directory':
950
add_children(inventory, child_entry)
951
if other_tree.get_root_id() == self.get_root_id():
952
raise errors.BadSubsumeSource(self, other_tree,
953
'Trees have the same root')
955
other_tree_path = self.relpath(other_tree.basedir)
956
except errors.PathNotChild:
957
raise errors.BadSubsumeSource(self, other_tree,
958
'Tree is not contained by the other')
959
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
960
if new_root_parent is None:
961
raise errors.BadSubsumeSource(self, other_tree,
962
'Parent directory is not versioned.')
963
# We need to ensure that the result of a fetch will have a
964
# versionedfile for the other_tree root, and only fetching into
965
# RepositoryKnit2 guarantees that.
966
if not self.branch.repository.supports_rich_root():
967
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
968
other_tree.lock_tree_write()
970
new_parents = other_tree.get_parent_ids()
971
other_root = other_tree.inventory.root
972
other_root.parent_id = new_root_parent
973
other_root.name = osutils.basename(other_tree_path)
974
self.inventory.add(other_root)
975
add_children(self.inventory, other_root)
976
self._write_inventory(self.inventory)
977
# normally we don't want to fetch whole repositories, but i think
978
# here we really do want to consolidate the whole thing.
979
for parent_id in other_tree.get_parent_ids():
980
self.branch.fetch(other_tree.branch, parent_id)
981
self.add_parent_tree_id(parent_id)
984
other_tree.bzrdir.retire_bzrdir()
986
def _setup_directory_is_tree_reference(self):
987
if self._branch.repository._format.supports_tree_reference:
988
self._directory_is_tree_reference = \
989
self._directory_may_be_tree_reference
991
self._directory_is_tree_reference = \
992
self._directory_is_never_tree_reference
994
def _directory_is_never_tree_reference(self, relpath):
997
def _directory_may_be_tree_reference(self, relpath):
998
# as a special case, if a directory contains control files then
999
# it's a tree reference, except that the root of the tree is not
1000
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1001
# TODO: We could ask all the control formats whether they
1002
# recognize this directory, but at the moment there's no cheap api
1003
# to do that. Since we probably can only nest bzr checkouts and
1004
# they always use this name it's ok for now. -- mbp 20060306
1006
# FIXME: There is an unhandled case here of a subdirectory
1007
# containing .bzr but not a branch; that will probably blow up
1008
# when you try to commit it. It might happen if there is a
1009
# checkout in a subdirectory. This can be avoided by not adding
1012
@needs_tree_write_lock
1013
def extract(self, file_id, format=None):
1014
"""Extract a subtree from this tree.
1016
A new branch will be created, relative to the path for this tree.
1020
segments = osutils.splitpath(path)
1021
transport = self.branch.bzrdir.root_transport
1022
for name in segments:
1023
transport = transport.clone(name)
1024
transport.ensure_base()
1027
sub_path = self.id2path(file_id)
1028
branch_transport = mkdirs(sub_path)
1030
format = self.bzrdir.cloning_metadir()
1031
branch_transport.ensure_base()
1032
branch_bzrdir = format.initialize_on_transport(branch_transport)
1034
repo = branch_bzrdir.find_repository()
1035
except errors.NoRepositoryPresent:
1036
repo = branch_bzrdir.create_repository()
1037
if not repo.supports_rich_root():
1038
raise errors.RootNotRich()
1039
new_branch = branch_bzrdir.create_branch()
1040
new_branch.pull(self.branch)
1041
for parent_id in self.get_parent_ids():
1042
new_branch.fetch(self.branch, parent_id)
1043
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1044
if tree_transport.base != branch_transport.base:
1045
tree_bzrdir = format.initialize_on_transport(tree_transport)
1046
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1048
tree_bzrdir = branch_bzrdir
1049
wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1050
wt.set_parent_ids(self.get_parent_ids())
1051
my_inv = self.inventory
1052
child_inv = Inventory(root_id=None)
1053
new_root = my_inv[file_id]
1054
my_inv.remove_recursive_id(file_id)
1055
new_root.parent_id = None
1056
child_inv.add(new_root)
1057
self._write_inventory(my_inv)
1058
wt._write_inventory(child_inv)
1061
def _serialize(self, inventory, out_file):
1062
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1065
def _deserialize(selt, in_file):
1066
return xml5.serializer_v5.read_inventory(in_file)
1069
"""Write the in memory inventory to disk."""
1070
# TODO: Maybe this should only write on dirty ?
1071
if self._control_files._lock_mode != 'w':
1072
raise errors.NotWriteLocked(self)
1074
self._serialize(self._inventory, sio)
1076
self._transport.put_file('inventory', sio,
1077
mode=self._control_files._file_mode)
1078
self._inventory_is_modified = False
1080
def _kind(self, relpath):
1081
return osutils.file_kind(self.abspath(relpath))
1083
def list_files(self, include_root=False):
1084
"""Recursively list all files as (path, class, kind, id, entry).
661
1086
Lists, but does not descend into unversioned directories.
666
1091
Skips the control directory.
668
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
1093
# list_files is an iterator, so @needs_read_lock doesn't work properly
1094
# with it. So callers should be careful to always read_lock the tree.
1095
if not self.is_locked():
1096
raise errors.ObjectNotLocked(self)
1098
inv = self.inventory
1099
if include_root is True:
1100
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1101
# Convert these into local objects to save lookup times
1102
pathjoin = osutils.pathjoin
1103
file_kind = self._kind
1105
# transport.base ends in a slash, we want the piece
1106
# between the last two slashes
1107
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1109
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1111
# directory file_id, relative path, absolute path, reverse sorted children
1112
children = os.listdir(self.basedir)
1114
# jam 20060527 The kernel sized tree seems equivalent whether we
1115
# use a deque and popleft to keep them sorted, or if we use a plain
1116
# list and just reverse() them.
1117
children = collections.deque(children)
1118
stack = [(inv.root.file_id, u'', self.basedir, children)]
1120
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1123
f = children.popleft()
674
1124
## TODO: If we find a subdirectory with its own .bzr
675
1125
## directory, then that is a separate tree and we
676
1126
## should exclude it.
678
1128
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
1129
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
1132
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1133
# and 'f' doesn't begin with one, we can do a string op, rather
1134
# than the checks of pathjoin(), all relative paths will have an extra slash
1136
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
1139
fap = from_dir_abspath + '/' + f
688
1141
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
1144
elif self.is_ignored(fp[1:]):
1147
# we may not have found this file, because of a unicode issue
1148
f_norm, can_access = osutils.normalized_filename(f)
1149
if f == f_norm or not can_access:
1150
# No change, so treat this file normally
1153
# this file can be accessed by a normalized path
1154
# check again if it is versioned
1155
# these lines are repeated here for performance
1157
fp = from_dir_relpath + '/' + f
1158
fap = from_dir_abspath + '/' + f
1159
f_ie = inv.get_child(from_dir_id, f)
1162
elif self.is_ignored(fp[1:]):
696
1167
fk = file_kind(fap)
700
raise BzrCheckError("file %r entered as kind %r id %r, "
702
% (fap, f_ie.kind, f_ie.file_id, fk))
704
1169
# make a last minute entry
1171
yield fp[1:], c, fk, f_ie.file_id, f_ie
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
1174
yield fp[1:], c, fk, None, fk_entries[fk]()
1176
yield fp[1:], c, fk, None, TreeEntry()
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
719
1179
if fk != 'directory':
723
# don't descend unversioned directories
726
for ff in descend(fp, f_ie.file_id, fap):
729
for f in descend(u'', inv.root.file_id, self.basedir):
733
def move(self, from_paths, to_name):
1182
# But do this child first
1183
new_children = os.listdir(fap)
1185
new_children = collections.deque(new_children)
1186
stack.append((f_ie.file_id, fp, fap, new_children))
1187
# Break out of inner loop,
1188
# so that we start outer loop with child
1191
# if we finished all children, pop it off the stack
1194
@needs_tree_write_lock
1195
def move(self, from_paths, to_dir=None, after=False, **kwargs):
734
1196
"""Rename files.
736
to_name must exist in the inventory.
1198
to_dir must exist in the inventory.
738
If to_name exists and is a directory, the files are moved into
1200
If to_dir exists and is a directory, the files are moved into
739
1201
it, keeping their old names.
741
Note that to_name is only the last component of the new name;
1203
Note that to_dir is only the last component of the new name;
742
1204
this doesn't change the directory.
1206
For each entry in from_paths the move mode will be determined
1209
The first mode moves the file in the filesystem and updates the
1210
inventory. The second mode only updates the inventory without
1211
touching the file on the filesystem. This is the new mode introduced
1214
move uses the second mode if 'after == True' and the target is not
1215
versioned but present in the working tree.
1217
move uses the second mode if 'after == False' and the source is
1218
versioned but no longer in the working tree, and the target is not
1219
versioned but present in the working tree.
1221
move uses the first mode if 'after == False' and the source is
1222
versioned and present in the working tree, and the target is not
1223
versioned and not present in the working tree.
1225
Everything else results in an error.
744
1227
This returns a list of (from_path, to_path) pairs for each
745
1228
entry that is moved.
748
## TODO: Option to move IDs only
749
assert not isinstance(from_paths, basestring)
1233
# check for deprecated use of signature
1235
to_dir = kwargs.get('to_name', None)
1237
raise TypeError('You must supply a target directory')
1239
symbol_versioning.warn('The parameter to_name was deprecated'
1240
' in version 0.13. Use to_dir instead',
1243
# check destination directory
1244
if isinstance(from_paths, basestring):
750
1246
inv = self.inventory
751
to_abs = self.abspath(to_name)
1247
to_abs = self.abspath(to_dir)
752
1248
if not isdir(to_abs):
753
raise BzrError("destination %r is not a directory" % to_abs)
754
if not self.has_filename(to_name):
755
raise BzrError("destination %r not in working directory" % to_abs)
756
to_dir_id = inv.path2id(to_name)
757
if to_dir_id == None and to_name != '':
758
raise BzrError("destination %r is not a versioned directory" % to_name)
1249
raise errors.BzrMoveFailedError('',to_dir,
1250
errors.NotADirectory(to_abs))
1251
if not self.has_filename(to_dir):
1252
raise errors.BzrMoveFailedError('',to_dir,
1253
errors.NotInWorkingDirectory(to_dir))
1254
to_dir_id = inv.path2id(to_dir)
1255
if to_dir_id is None:
1256
raise errors.BzrMoveFailedError('',to_dir,
1257
errors.NotVersionedError(path=str(to_dir)))
759
1259
to_dir_ie = inv[to_dir_id]
760
if to_dir_ie.kind not in ('directory', 'root_directory'):
761
raise BzrError("destination %r is not a directory" % to_abs)
763
to_idpath = inv.get_idpath(to_dir_id)
766
if not self.has_filename(f):
767
raise BzrError("%r does not exist in working tree" % f)
768
f_id = inv.path2id(f)
770
raise BzrError("%r is not versioned" % f)
771
name_tail = splitpath(f)[-1]
772
dest_path = appendpath(to_name, name_tail)
773
if self.has_filename(dest_path):
774
raise BzrError("destination %r already exists" % dest_path)
775
if f_id in to_idpath:
776
raise BzrError("can't move %r to a subdirectory of itself" % f)
778
# OK, so there's a race here, it's possible that someone will
779
# create a file in this interval and then the rename might be
780
# left half-done. But we should have caught most problems.
781
orig_inv = deepcopy(self.inventory)
1260
if to_dir_ie.kind != 'directory':
1261
raise errors.BzrMoveFailedError('',to_dir,
1262
errors.NotADirectory(to_abs))
1264
# create rename entries and tuples
1265
for from_rel in from_paths:
1266
from_tail = splitpath(from_rel)[-1]
1267
from_id = inv.path2id(from_rel)
1269
raise errors.BzrMoveFailedError(from_rel,to_dir,
1270
errors.NotVersionedError(path=str(from_rel)))
1272
from_entry = inv[from_id]
1273
from_parent_id = from_entry.parent_id
1274
to_rel = pathjoin(to_dir, from_tail)
1275
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1277
from_tail=from_tail,
1278
from_parent_id=from_parent_id,
1279
to_rel=to_rel, to_tail=from_tail,
1280
to_parent_id=to_dir_id)
1281
rename_entries.append(rename_entry)
1282
rename_tuples.append((from_rel, to_rel))
1284
# determine which move mode to use. checks also for movability
1285
rename_entries = self._determine_mv_mode(rename_entries, after)
1287
original_modified = self._inventory_is_modified
784
name_tail = splitpath(f)[-1]
785
dest_path = appendpath(to_name, name_tail)
786
result.append((f, dest_path))
787
inv.rename(inv.path2id(f), to_dir_id, name_tail)
789
rename(self.abspath(f), self.abspath(dest_path))
791
raise BzrError("failed to rename %r to %r: %s" %
792
(f, dest_path, e[1]),
793
["rename rolled back"])
1290
self._inventory_is_modified = True
1291
self._move(rename_entries)
795
1293
# restore the inventory on error
796
self._set_inventory(orig_inv)
1294
self._inventory_is_modified = original_modified
798
1296
self._write_inventory(inv)
802
def rename_one(self, from_rel, to_rel):
1297
return rename_tuples
1299
def _determine_mv_mode(self, rename_entries, after=False):
1300
"""Determines for each from-to pair if both inventory and working tree
1301
or only the inventory has to be changed.
1303
Also does basic plausability tests.
1305
inv = self.inventory
1307
for rename_entry in rename_entries:
1308
# store to local variables for easier reference
1309
from_rel = rename_entry.from_rel
1310
from_id = rename_entry.from_id
1311
to_rel = rename_entry.to_rel
1312
to_id = inv.path2id(to_rel)
1313
only_change_inv = False
1315
# check the inventory for source and destination
1317
raise errors.BzrMoveFailedError(from_rel,to_rel,
1318
errors.NotVersionedError(path=str(from_rel)))
1319
if to_id is not None:
1320
raise errors.BzrMoveFailedError(from_rel,to_rel,
1321
errors.AlreadyVersionedError(path=str(to_rel)))
1323
# try to determine the mode for rename (only change inv or change
1324
# inv and file system)
1326
if not self.has_filename(to_rel):
1327
raise errors.BzrMoveFailedError(from_id,to_rel,
1328
errors.NoSuchFile(path=str(to_rel),
1329
extra="New file has not been created yet"))
1330
only_change_inv = True
1331
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1332
only_change_inv = True
1333
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1334
only_change_inv = False
1335
elif (not self.case_sensitive
1336
and from_rel.lower() == to_rel.lower()
1337
and self.has_filename(from_rel)):
1338
only_change_inv = False
1340
# something is wrong, so lets determine what exactly
1341
if not self.has_filename(from_rel) and \
1342
not self.has_filename(to_rel):
1343
raise errors.BzrRenameFailedError(from_rel,to_rel,
1344
errors.PathsDoNotExist(paths=(str(from_rel),
1347
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1348
rename_entry.only_change_inv = only_change_inv
1349
return rename_entries
1351
def _move(self, rename_entries):
1352
"""Moves a list of files.
1354
Depending on the value of the flag 'only_change_inv', the
1355
file will be moved on the file system or not.
1357
inv = self.inventory
1360
for entry in rename_entries:
1362
self._move_entry(entry)
1364
self._rollback_move(moved)
1368
def _rollback_move(self, moved):
1369
"""Try to rollback a previous move in case of an filesystem error."""
1370
inv = self.inventory
1373
self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1374
entry.to_tail, entry.to_parent_id, entry.from_rel,
1375
entry.from_tail, entry.from_parent_id,
1376
entry.only_change_inv))
1377
except errors.BzrMoveFailedError, e:
1378
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1379
" The working tree is in an inconsistent state."
1380
" Please consider doing a 'bzr revert'."
1381
" Error message is: %s" % e)
1383
def _move_entry(self, entry):
1384
inv = self.inventory
1385
from_rel_abs = self.abspath(entry.from_rel)
1386
to_rel_abs = self.abspath(entry.to_rel)
1387
if from_rel_abs == to_rel_abs:
1388
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1389
"Source and target are identical.")
1391
if not entry.only_change_inv:
1393
osutils.rename(from_rel_abs, to_rel_abs)
1395
raise errors.BzrMoveFailedError(entry.from_rel,
1397
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1399
@needs_tree_write_lock
1400
def rename_one(self, from_rel, to_rel, after=False):
803
1401
"""Rename one file.
805
1403
This can change the directory or the filename or both.
1405
rename_one has several 'modes' to work. First, it can rename a physical
1406
file and change the file_id. That is the normal mode. Second, it can
1407
only change the file_id without touching any physical file. This is
1408
the new mode introduced in version 0.15.
1410
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1411
versioned but present in the working tree.
1413
rename_one uses the second mode if 'after == False' and 'from_rel' is
1414
versioned but no longer in the working tree, and 'to_rel' is not
1415
versioned but present in the working tree.
1417
rename_one uses the first mode if 'after == False' and 'from_rel' is
1418
versioned and present in the working tree, and 'to_rel' is not
1419
versioned and not present in the working tree.
1421
Everything else results in an error.
807
1423
inv = self.inventory
808
if not self.has_filename(from_rel):
809
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
810
if self.has_filename(to_rel):
811
raise BzrError("can't rename: new working file %r already exists" % to_rel)
813
file_id = inv.path2id(from_rel)
815
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
818
from_parent = entry.parent_id
819
from_name = entry.name
821
if inv.path2id(to_rel):
822
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1426
# create rename entries and tuples
1427
from_tail = splitpath(from_rel)[-1]
1428
from_id = inv.path2id(from_rel)
1430
raise errors.BzrRenameFailedError(from_rel,to_rel,
1431
errors.NotVersionedError(path=str(from_rel)))
1432
from_entry = inv[from_id]
1433
from_parent_id = from_entry.parent_id
824
1434
to_dir, to_tail = os.path.split(to_rel)
825
1435
to_dir_id = inv.path2id(to_dir)
826
if to_dir_id == None and to_dir != '':
827
raise BzrError("can't determine destination directory id for %r" % to_dir)
829
mutter("rename_one:")
830
mutter(" file_id {%s}" % file_id)
831
mutter(" from_rel %r" % from_rel)
832
mutter(" to_rel %r" % to_rel)
833
mutter(" to_dir %r" % to_dir)
834
mutter(" to_dir_id {%s}" % to_dir_id)
836
inv.rename(file_id, to_dir_id, to_tail)
838
from_abs = self.abspath(from_rel)
839
to_abs = self.abspath(to_rel)
841
rename(from_abs, to_abs)
843
inv.rename(file_id, from_parent, from_name)
844
raise BzrError("failed to rename %r to %r: %s"
845
% (from_abs, to_abs, e[1]),
846
["rename rolled back"])
1436
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1438
from_tail=from_tail,
1439
from_parent_id=from_parent_id,
1440
to_rel=to_rel, to_tail=to_tail,
1441
to_parent_id=to_dir_id)
1442
rename_entries.append(rename_entry)
1444
# determine which move mode to use. checks also for movability
1445
rename_entries = self._determine_mv_mode(rename_entries, after)
1447
# check if the target changed directory and if the target directory is
1449
if to_dir_id is None:
1450
raise errors.BzrMoveFailedError(from_rel,to_rel,
1451
errors.NotVersionedError(path=str(to_dir)))
1453
# all checks done. now we can continue with our actual work
1454
mutter('rename_one:\n'
1459
' to_dir_id {%s}\n',
1460
from_id, from_rel, to_rel, to_dir, to_dir_id)
1462
self._move(rename_entries)
847
1463
self._write_inventory(inv)
1465
class _RenameEntry(object):
1466
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1467
to_rel, to_tail, to_parent_id, only_change_inv=False):
1468
self.from_rel = from_rel
1469
self.from_id = from_id
1470
self.from_tail = from_tail
1471
self.from_parent_id = from_parent_id
1472
self.to_rel = to_rel
1473
self.to_tail = to_tail
1474
self.to_parent_id = to_parent_id
1475
self.only_change_inv = only_change_inv
849
1477
@needs_read_lock
850
1478
def unknowns(self):
851
1479
"""Return all unknown files.
853
1481
These are files in the working directory that are not versioned or
854
1482
control files or ignored.
856
>>> from bzrlib.bzrdir import ScratchDir
857
>>> d = ScratchDir(files=['foo', 'foo~'])
858
>>> b = d.open_branch()
859
>>> tree = d.open_workingtree()
860
>>> map(str, tree.unknowns())
863
>>> list(b.unknowns())
865
>>> tree.remove('foo')
866
>>> list(b.unknowns())
869
for subp in self.extras():
870
if not self.is_ignored(subp):
873
@deprecated_method(zero_eight)
874
def iter_conflicts(self):
875
"""List all files in the tree that have text or content conflicts.
876
DEPRECATED. Use conflicts instead."""
877
return self._iter_conflicts()
1484
# force the extras method to be fully executed before returning, to
1485
# prevent race conditions with the lock
1487
[subp for subp in self.extras() if not self.is_ignored(subp)])
1489
@needs_tree_write_lock
1490
def unversion(self, file_ids):
1491
"""Remove the file ids in file_ids from the current versioned set.
1493
When a file_id is unversioned, all of its children are automatically
1496
:param file_ids: The file ids to stop versioning.
1497
:raises: NoSuchId if any fileid is not currently versioned.
1499
for file_id in file_ids:
1500
if self._inventory.has_id(file_id):
1501
self._inventory.remove_recursive_id(file_id)
1503
raise errors.NoSuchId(self, file_id)
1505
# in the future this should just set a dirty bit to wait for the
1506
# final unlock. However, until all methods of workingtree start
1507
# with the current in -memory inventory rather than triggering
1508
# a read, it is more complex - we need to teach read_inventory
1509
# to know when to read, and when to not read first... and possibly
1510
# to save first when the in memory one may be corrupted.
1511
# so for now, we just only write it if it is indeed dirty.
1513
self._write_inventory(self._inventory)
879
1515
def _iter_conflicts(self):
880
1516
conflicted = set()
881
for path in (s[0] for s in self.list_files()):
1517
for info in self.list_files():
882
1519
stem = get_conflicted_stem(path)
883
1520
if stem is None:
1056
1782
This is used to allow WorkingTree3 instances to not affect branch
1057
1783
when their last revision is set.
1059
if new_revision is None:
1785
if _mod_revision.is_null(new_revision):
1060
1786
self.branch.set_revision_history([])
1062
# current format is locked in with the branch
1063
revision_history = self.branch.revision_history()
1065
position = revision_history.index(new_revision)
1067
raise errors.NoSuchRevision(self.branch, new_revision)
1068
self.branch.set_revision_history(revision_history[:position + 1])
1789
self.branch.generate_revision_history(new_revision)
1790
except errors.NoSuchRevision:
1791
# not present in the repo - dont try to set it deeper than the tip
1792
self.branch.set_revision_history([new_revision])
1795
def _write_basis_inventory(self, xml):
1796
"""Write the basis inventory XML to the basis-inventory file"""
1797
path = self._basis_inventory_name()
1799
self._transport.put_file(path, sio,
1800
mode=self._control_files._file_mode)
1802
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1803
"""Create the text that will be saved in basis-inventory"""
1804
inventory.revision_id = revision_id
1805
return xml7.serializer_v7.write_inventory_to_string(inventory)
1071
1807
def _cache_basis_inventory(self, new_revision):
1072
1808
"""Cache new_revision as the basis inventory."""
1809
# TODO: this should allow the ready-to-use inventory to be passed in,
1810
# as commit already has that ready-to-use [while the format is the
1074
1813
# this double handles the inventory - unpack and repack -
1075
1814
# but is easier to understand. We can/should put a conditional
1076
1815
# in here based on whether the inventory is in the latest format
1077
1816
# - perhaps we should repack all inventories on a repository
1079
inv = self.branch.repository.get_inventory(new_revision)
1080
inv.revision_id = new_revision
1081
xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1083
path = self._basis_inventory_name()
1084
self._control_files.put_utf8(path, xml)
1085
except WeaveRevisionNotPresent:
1818
# the fast path is to copy the raw xml from the repository. If the
1819
# xml contains 'revision_id="', then we assume the right
1820
# revision_id is set. We must check for this full string, because a
1821
# root node id can legitimately look like 'revision_id' but cannot
1823
xml = self.branch.repository.get_inventory_xml(new_revision)
1824
firstline = xml.split('\n', 1)[0]
1825
if (not 'revision_id="' in firstline or
1826
'format="7"' not in firstline):
1827
inv = self.branch.repository.deserialise_inventory(
1829
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1830
self._write_basis_inventory(xml)
1831
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1834
def read_basis_inventory(self):
1089
1835
"""Read the cached basis inventory."""
1090
1836
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1837
return self._transport.get_bytes(path)
1093
1839
@needs_read_lock
1094
1840
def read_working_inventory(self):
1095
"""Read the working inventory."""
1841
"""Read the working inventory.
1843
:raises errors.InventoryModified: read_working_inventory will fail
1844
when the current in memory inventory has been modified.
1846
# conceptually this should be an implementation detail of the tree.
1847
# XXX: Deprecate this.
1096
1848
# ElementTree does its own conversion from UTF-8, so open in
1098
result = bzrlib.xml5.serializer_v5.read_inventory(
1099
self._control_files.get('inventory'))
1100
self._set_inventory(result)
1850
if self._inventory_is_modified:
1851
raise errors.InventoryModified(self)
1852
result = self._deserialize(self._transport.get('inventory'))
1853
self._set_inventory(result, dirty=False)
1104
def remove(self, files, verbose=False):
1105
"""Remove nominated files from the working inventory..
1107
This does not remove their text. This does not run on XXX on what? RBC
1109
TODO: Refuse to remove modified files unless --force is given?
1111
TODO: Do something useful with directories.
1113
TODO: Should this remove the text or not? Tough call; not
1114
removing may be useful and the user can just use use rm, and
1115
is the opposite of add. Removing it is consistent with most
1116
other tools. Maybe an option.
1856
@needs_tree_write_lock
1857
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1859
"""Remove nominated files from the working inventory.
1861
:files: File paths relative to the basedir.
1862
:keep_files: If true, the files will also be kept.
1863
:force: Delete files and directories, even if they are changed and
1864
even if the directories are not empty.
1118
## TODO: Normalize names
1119
## TODO: Remove nested loops; better scalability
1120
1866
if isinstance(files, basestring):
1121
1867
files = [files]
1123
inv = self.inventory
1125
# do this before any modifications
1872
unknown_nested_files=set()
1874
def recurse_directory_to_add_files(directory):
1875
# Recurse directory and add all files
1876
# so we can check if they have changed.
1877
for parent_info, file_infos in\
1878
self.walkdirs(directory):
1879
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1880
# Is it versioned or ignored?
1881
if self.path2id(relpath) or self.is_ignored(relpath):
1882
# Add nested content for deletion.
1883
new_files.add(relpath)
1885
# Files which are not versioned and not ignored
1886
# should be treated as unknown.
1887
unknown_nested_files.add((relpath, None, kind))
1889
for filename in files:
1890
# Get file name into canonical form.
1891
abspath = self.abspath(filename)
1892
filename = self.relpath(abspath)
1893
if len(filename) > 0:
1894
new_files.add(filename)
1895
recurse_directory_to_add_files(filename)
1897
files = list(new_files)
1900
return # nothing to do
1902
# Sort needed to first handle directory content before the directory
1903
files.sort(reverse=True)
1905
# Bail out if we are going to delete files we shouldn't
1906
if not keep_files and not force:
1907
has_changed_files = len(unknown_nested_files) > 0
1908
if not has_changed_files:
1909
for (file_id, path, content_change, versioned, parent_id, name,
1910
kind, executable) in self.iter_changes(self.basis_tree(),
1911
include_unchanged=True, require_versioned=False,
1912
want_unversioned=True, specific_files=files):
1913
if versioned == (False, False):
1914
# The record is unknown ...
1915
if not self.is_ignored(path[1]):
1916
# ... but not ignored
1917
has_changed_files = True
1919
elif content_change and (kind[1] is not None):
1920
# Versioned and changed, but not deleted
1921
has_changed_files = True
1924
if has_changed_files:
1925
# Make delta show ALL applicable changes in error message.
1926
tree_delta = self.changes_from(self.basis_tree(),
1927
require_versioned=False, want_unversioned=True,
1928
specific_files=files)
1929
for unknown_file in unknown_nested_files:
1930
if unknown_file not in tree_delta.unversioned:
1931
tree_delta.unversioned.extend((unknown_file,))
1932
raise errors.BzrRemoveChangedFilesError(tree_delta)
1934
# Build inv_delta and delete files where applicaple,
1935
# do this before any modifications to inventory.
1126
1936
for f in files:
1127
fid = inv.path2id(f)
1937
fid = self.path2id(f)
1129
# TODO: Perhaps make this just a warning, and continue?
1130
# This tends to happen when
1131
raise NotVersionedError(path=f)
1132
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
1134
# having remove it, it must be either ignored or unknown
1135
if self.is_ignored(f):
1139
show_status(new_status, inv[fid].kind, quotefn(f))
1142
self._write_inventory(inv)
1145
def revert(self, filenames, old_tree=None, backups=True,
1146
pb=DummyProgress()):
1147
from transform import revert
1148
from conflicts import resolve
1940
message = "%s is not versioned." % (f,)
1943
# having removed it, it must be either ignored or unknown
1944
if self.is_ignored(f):
1948
textui.show_status(new_status, self.kind(fid), f,
1951
inv_delta.append((f, None, fid, None))
1952
message = "removed %s" % (f,)
1955
abs_path = self.abspath(f)
1956
if osutils.lexists(abs_path):
1957
if (osutils.isdir(abs_path) and
1958
len(os.listdir(abs_path)) > 0):
1960
osutils.rmtree(abs_path)
1962
message = "%s is not an empty directory "\
1963
"and won't be deleted." % (f,)
1965
osutils.delete_any(abs_path)
1966
message = "deleted %s" % (f,)
1967
elif message is not None:
1968
# Only care if we haven't done anything yet.
1969
message = "%s does not exist." % (f,)
1971
# Print only one message (if any) per file.
1972
if message is not None:
1974
self.apply_inventory_delta(inv_delta)
1976
@needs_tree_write_lock
1977
def revert(self, filenames=None, old_tree=None, backups=True,
1978
pb=DummyProgress(), report_changes=False):
1979
from bzrlib.conflicts import resolve
1982
symbol_versioning.warn('Using [] to revert all files is deprecated'
1983
' as of bzr 0.91. Please use None (the default) instead.',
1984
DeprecationWarning, stacklevel=2)
1149
1985
if old_tree is None:
1150
old_tree = self.basis_tree()
1151
conflicts = revert(self, old_tree, filenames, backups, pb)
1152
if not len(filenames):
1153
self.set_pending_merges([])
1986
basis_tree = self.basis_tree()
1987
basis_tree.lock_read()
1988
old_tree = basis_tree
1156
resolve(self, filenames, ignore_misses=True)
1992
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1994
if filenames is None and len(self.get_parent_ids()) > 1:
1996
last_revision = self.last_revision()
1997
if last_revision != NULL_REVISION:
1998
if basis_tree is None:
1999
basis_tree = self.basis_tree()
2000
basis_tree.lock_read()
2001
parent_trees.append((last_revision, basis_tree))
2002
self.set_parent_trees(parent_trees)
2005
resolve(self, filenames, ignore_misses=True, recursive=True)
2007
if basis_tree is not None:
1157
2009
return conflicts
2011
def revision_tree(self, revision_id):
2012
"""See Tree.revision_tree.
2014
WorkingTree can supply revision_trees for the basis revision only
2015
because there is only one cached inventory in the bzr directory.
2017
if revision_id == self.last_revision():
2019
xml = self.read_basis_inventory()
2020
except errors.NoSuchFile:
2024
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2025
# dont use the repository revision_tree api because we want
2026
# to supply the inventory.
2027
if inv.revision_id == revision_id:
2028
return revisiontree.RevisionTree(self.branch.repository,
2030
except errors.BadInventoryFormat:
2032
# raise if there was no inventory, or if we read the wrong inventory.
2033
raise errors.NoSuchRevisionInTree(self, revision_id)
1159
2035
# XXX: This method should be deprecated in favour of taking in a proper
1160
2036
# new Inventory object.
2037
@needs_tree_write_lock
1162
2038
def set_inventory(self, new_inventory_list):
1163
2039
from bzrlib.inventory import (Inventory,
1164
2040
InventoryDirectory,
1204
2102
between multiple working trees, i.e. via shared storage, then we
1205
2103
would probably want to lock both the local tree, and the branch.
1207
# FIXME: We want to write out the hashcache only when the last lock on
1208
# this working copy is released. Peeking at the lock count is a bit
1209
# of a nasty hack; probably it's better to have a transaction object,
1210
# which can do some finalization when it's either successfully or
1211
# unsuccessfully completed. (Denys's original patch did that.)
1212
# RBC 20060206 hookinhg into transaction will couple lock and transaction
1213
# wrongly. Hookinh into unllock on the control files object is fine though.
1215
# TODO: split this per format so there is no ugly if block
1216
if self._hashcache.needs_write and (
1217
# dedicated lock files
1218
self._control_files._lock_count==1 or
1220
(self._control_files is self.branch.control_files and
1221
self._control_files._lock_count==3)):
1222
self._hashcache.write()
1223
# reverse order of locking.
1224
result = self._control_files.unlock()
1226
self.branch.unlock()
2105
raise NotImplementedError(self.unlock)
2107
def update(self, change_reporter=None, possible_transports=None):
1232
2108
"""Update a working tree along its branch.
1234
This will update the branch if its bound too, which means we have multiple trees involved:
1235
The new basis tree of the master.
1236
The old basis tree of the branch.
1237
The old basis tree of the working tree.
1238
The current working tree state.
1239
pathologically all three may be different, and non ancestors of each other.
1240
Conceptually we want to:
1241
Preserve the wt.basis->wt.state changes
1242
Transform the wt.basis to the new master basis.
1243
Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1244
Restore the wt.basis->wt.state changes.
2110
This will update the branch if its bound too, which means we have
2111
multiple trees involved:
2113
- The new basis tree of the master.
2114
- The old basis tree of the branch.
2115
- The old basis tree of the working tree.
2116
- The current working tree state.
2118
Pathologically, all three may be different, and non-ancestors of each
2119
other. Conceptually we want to:
2121
- Preserve the wt.basis->wt.state changes
2122
- Transform the wt.basis to the new master basis.
2123
- Apply a merge of the old branch basis to get any 'local' changes from
2125
- Restore the wt.basis->wt.state changes.
1246
2127
There isn't a single operation at the moment to do that, so we:
1247
Merge current state -> basis tree of the master w.r.t. the old tree basis.
1248
Do a 'normal' merge of the old branch basis if it is relevant.
1250
old_tip = self.branch.update()
1251
if old_tip is not None:
1252
self.add_pending_merge(old_tip)
1253
self.branch.lock_read()
1256
if self.last_revision() != self.branch.last_revision():
1257
# merge tree state up to new branch tip.
1258
basis = self.basis_tree()
2128
- Merge current state -> basis tree of the master w.r.t. the old tree
2130
- Do a 'normal' merge of the old branch basis if it is relevant.
2132
if self.branch.get_bound_location() is not None:
2134
update_branch = True
2136
self.lock_tree_write()
2137
update_branch = False
2140
old_tip = self.branch.update(possible_transports)
2143
return self._update_tree(old_tip, change_reporter)
2147
@needs_tree_write_lock
2148
def _update_tree(self, old_tip=None, change_reporter=None):
2149
"""Update a tree to the master branch.
2151
:param old_tip: if supplied, the previous tip revision the branch,
2152
before it was changed to the master branch's tip.
2154
# here if old_tip is not None, it is the old tip of the branch before
2155
# it was updated from the master branch. This should become a pending
2156
# merge in the working tree to preserve the user existing work. we
2157
# cant set that until we update the working trees last revision to be
2158
# one from the new branch, because it will just get absorbed by the
2159
# parent de-duplication logic.
2161
# We MUST save it even if an error occurs, because otherwise the users
2162
# local work is unreferenced and will appear to have been lost.
2166
last_rev = self.get_parent_ids()[0]
2168
last_rev = _mod_revision.NULL_REVISION
2169
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2170
# merge tree state up to new branch tip.
2171
basis = self.basis_tree()
1259
2174
to_tree = self.branch.basis_tree()
1260
result += merge_inner(self.branch,
2175
if basis.inventory.root is None:
2176
self.set_root_id(to_tree.get_root_id())
2178
result += merge.merge_inner(
1264
self.set_last_revision(self.branch.last_revision())
1265
if old_tip and old_tip != self.last_revision():
1266
# our last revision was not the prior branch last reivison
1267
# and we have converted that last revision to a pending merge.
1268
# base is somewhere between the branch tip now
1269
# and the now pending merge
1270
from bzrlib.revision import common_ancestor
1272
base_rev_id = common_ancestor(self.branch.last_revision(),
1274
self.branch.repository)
1275
except errors.NoCommonAncestor:
1277
base_tree = self.branch.repository.revision_tree(base_rev_id)
1278
other_tree = self.branch.repository.revision_tree(old_tip)
1279
result += merge_inner(self.branch,
1285
self.branch.unlock()
2183
change_reporter=change_reporter)
2186
# TODO - dedup parents list with things merged by pull ?
2187
# reuse the tree we've updated to to set the basis:
2188
parent_trees = [(self.branch.last_revision(), to_tree)]
2189
merges = self.get_parent_ids()[1:]
2190
# Ideally we ask the tree for the trees here, that way the working
2191
# tree can decide whether to give us teh entire tree or give us a
2192
# lazy initialised tree. dirstate for instance will have the trees
2193
# in ram already, whereas a last-revision + basis-inventory tree
2194
# will not, but also does not need them when setting parents.
2195
for parent in merges:
2196
parent_trees.append(
2197
(parent, self.branch.repository.revision_tree(parent)))
2198
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2199
parent_trees.append(
2200
(old_tip, self.branch.repository.revision_tree(old_tip)))
2201
self.set_parent_trees(parent_trees)
2202
last_rev = parent_trees[0][0]
2204
# the working tree had the same last-revision as the master
2205
# branch did. We may still have pivot local work from the local
2206
# branch into old_tip:
2207
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2208
self.add_parent_tree_id(old_tip)
2209
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2210
and old_tip != last_rev):
2211
# our last revision was not the prior branch last revision
2212
# and we have converted that last revision to a pending merge.
2213
# base is somewhere between the branch tip now
2214
# and the now pending merge
2216
# Since we just modified the working tree and inventory, flush out
2217
# the current state, before we modify it again.
2218
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2219
# requires it only because TreeTransform directly munges the
2220
# inventory and calls tree._write_inventory(). Ultimately we
2221
# should be able to remove this extra flush.
2223
graph = self.branch.repository.get_graph()
2224
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2226
base_tree = self.branch.repository.revision_tree(base_rev_id)
2227
other_tree = self.branch.repository.revision_tree(old_tip)
2228
result += merge.merge_inner(
2233
change_reporter=change_reporter)
2236
def _write_hashcache_if_dirty(self):
2237
"""Write out the hashcache if it is dirty."""
2238
if self._hashcache.needs_write:
2240
self._hashcache.write()
2242
if e.errno not in (errno.EPERM, errno.EACCES):
2244
# TODO: jam 20061219 Should this be a warning? A single line
2245
# warning might be sufficient to let the user know what
2247
mutter('Could not write hashcache for %s\nError: %s',
2248
self._hashcache.cache_file_name(), e)
2250
@needs_tree_write_lock
1288
2251
def _write_inventory(self, inv):
1289
2252
"""Write inventory as the current inventory."""
1291
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1293
self._control_files.put('inventory', sio)
1294
self._set_inventory(inv)
1295
mutter('wrote working inventory')
2253
self._set_inventory(inv, dirty=True)
1297
2256
def set_conflicts(self, arg):
1298
raise UnsupportedOperation(self.set_conflicts, self)
2257
raise errors.UnsupportedOperation(self.set_conflicts, self)
2259
def add_conflicts(self, arg):
2260
raise errors.UnsupportedOperation(self.add_conflicts, self)
1300
2262
@needs_read_lock
1301
2263
def conflicts(self):
1302
conflicts = ConflictList()
2264
conflicts = _mod_conflicts.ConflictList()
1303
2265
for conflicted in self._iter_conflicts():
1306
2268
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
2270
except errors.NoSuchFile:
1313
2272
if text is True:
1314
2273
for suffix in ('.THIS', '.OTHER'):
1316
2275
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
2278
except errors.NoSuchFile:
1326
2282
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
2283
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
2285
file_id=self.path2id(conflicted)))
1329
2286
return conflicts
2288
def walkdirs(self, prefix=""):
2289
"""Walk the directories of this tree.
2291
returns a generator which yields items in the form:
2292
((curren_directory_path, fileid),
2293
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2296
This API returns a generator, which is only valid during the current
2297
tree transaction - within a single lock_read or lock_write duration.
2299
If the tree is not locked, it may cause an error to be raised,
2300
depending on the tree implementation.
2302
disk_top = self.abspath(prefix)
2303
if disk_top.endswith('/'):
2304
disk_top = disk_top[:-1]
2305
top_strip_len = len(disk_top) + 1
2306
inventory_iterator = self._walkdirs(prefix)
2307
disk_iterator = osutils.walkdirs(disk_top, prefix)
2309
current_disk = disk_iterator.next()
2310
disk_finished = False
2312
if not (e.errno == errno.ENOENT or
2313
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2316
disk_finished = True
2318
current_inv = inventory_iterator.next()
2319
inv_finished = False
2320
except StopIteration:
2323
while not inv_finished or not disk_finished:
2325
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2326
cur_disk_dir_content) = current_disk
2328
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2329
cur_disk_dir_content) = ((None, None), None)
2330
if not disk_finished:
2331
# strip out .bzr dirs
2332
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2333
len(cur_disk_dir_content) > 0):
2334
# osutils.walkdirs can be made nicer -
2335
# yield the path-from-prefix rather than the pathjoined
2337
bzrdir_loc = bisect_left(cur_disk_dir_content,
2339
if (bzrdir_loc < len(cur_disk_dir_content)
2340
and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2341
# we dont yield the contents of, or, .bzr itself.
2342
del cur_disk_dir_content[bzrdir_loc]
2344
# everything is unknown
2347
# everything is missing
2350
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2352
# disk is before inventory - unknown
2353
dirblock = [(relpath, basename, kind, stat, None, None) for
2354
relpath, basename, kind, stat, top_path in
2355
cur_disk_dir_content]
2356
yield (cur_disk_dir_relpath, None), dirblock
2358
current_disk = disk_iterator.next()
2359
except StopIteration:
2360
disk_finished = True
2362
# inventory is before disk - missing.
2363
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2364
for relpath, basename, dkind, stat, fileid, kind in
2366
yield (current_inv[0][0], current_inv[0][1]), dirblock
2368
current_inv = inventory_iterator.next()
2369
except StopIteration:
2372
# versioned present directory
2373
# merge the inventory and disk data together
2375
for relpath, subiterator in itertools.groupby(sorted(
2376
current_inv[1] + cur_disk_dir_content,
2377
key=operator.itemgetter(0)), operator.itemgetter(1)):
2378
path_elements = list(subiterator)
2379
if len(path_elements) == 2:
2380
inv_row, disk_row = path_elements
2381
# versioned, present file
2382
dirblock.append((inv_row[0],
2383
inv_row[1], disk_row[2],
2384
disk_row[3], inv_row[4],
2386
elif len(path_elements[0]) == 5:
2388
dirblock.append((path_elements[0][0],
2389
path_elements[0][1], path_elements[0][2],
2390
path_elements[0][3], None, None))
2391
elif len(path_elements[0]) == 6:
2392
# versioned, absent file.
2393
dirblock.append((path_elements[0][0],
2394
path_elements[0][1], 'unknown', None,
2395
path_elements[0][4], path_elements[0][5]))
2397
raise NotImplementedError('unreachable code')
2398
yield current_inv[0], dirblock
2400
current_inv = inventory_iterator.next()
2401
except StopIteration:
2404
current_disk = disk_iterator.next()
2405
except StopIteration:
2406
disk_finished = True
2408
def _walkdirs(self, prefix=""):
2409
"""Walk the directories of this tree.
2411
:prefix: is used as the directrory to start with.
2412
returns a generator which yields items in the form:
2413
((curren_directory_path, fileid),
2414
[(file1_path, file1_name, file1_kind, None, file1_id,
2417
_directory = 'directory'
2418
# get the root in the inventory
2419
inv = self.inventory
2420
top_id = inv.path2id(prefix)
2424
pending = [(prefix, '', _directory, None, top_id, None)]
2427
currentdir = pending.pop()
2428
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2429
top_id = currentdir[4]
2431
relroot = currentdir[0] + '/'
2434
# FIXME: stash the node in pending
2436
if entry.kind == 'directory':
2437
for name, child in entry.sorted_children():
2438
dirblock.append((relroot + name, name, child.kind, None,
2439
child.file_id, child.kind
2441
yield (currentdir[0], entry.file_id), dirblock
2442
# push the user specified dirs from dirblock
2443
for dir in reversed(dirblock):
2444
if dir[2] == _directory:
2447
@needs_tree_write_lock
2448
def auto_resolve(self):
2449
"""Automatically resolve text conflicts according to contents.
2451
Only text conflicts are auto_resolvable. Files with no conflict markers
2452
are considered 'resolved', because bzr always puts conflict markers
2453
into files that have text conflicts. The corresponding .THIS .BASE and
2454
.OTHER files are deleted, as per 'resolve'.
2455
:return: a tuple of ConflictLists: (un_resolved, resolved).
2457
un_resolved = _mod_conflicts.ConflictList()
2458
resolved = _mod_conflicts.ConflictList()
2459
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2460
for conflict in self.conflicts():
2461
if (conflict.typestring != 'text conflict' or
2462
self.kind(conflict.file_id) != 'file'):
2463
un_resolved.append(conflict)
2465
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2467
for line in my_file:
2468
if conflict_re.search(line):
2469
un_resolved.append(conflict)
2472
resolved.append(conflict)
2475
resolved.remove_files(self)
2476
self.set_conflicts(un_resolved)
2477
return un_resolved, resolved
2481
tree_basis = self.basis_tree()
2482
tree_basis.lock_read()
2484
repo_basis = self.branch.repository.revision_tree(
2485
self.last_revision())
2486
if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2487
raise errors.BzrCheckError(
2488
"Mismatched basis inventory content.")
2493
def _validate(self):
2494
"""Validate internal structures.
2496
This is meant mostly for the test suite. To give it a chance to detect
2497
corruption after actions have occurred. The default implementation is a
2500
:return: None. An exception should be raised if there is an error.
2505
def _get_rules_searcher(self, default_searcher):
2506
"""See Tree._get_rules_searcher."""
2507
if self._rules_searcher is None:
2508
self._rules_searcher = super(WorkingTree,
2509
self)._get_rules_searcher(default_searcher)
2510
return self._rules_searcher
2512
def get_shelf_manager(self):
2513
"""Return the ShelfManager for this WorkingTree."""
2514
from bzrlib.shelf import ShelfManager
2515
return ShelfManager(self, self._transport)
2518
class WorkingTree2(WorkingTree):
2519
"""This is the Format 2 working tree.
2521
This was the first weave based working tree.
2522
- uses os locks for locking.
2523
- uses the branch last-revision.
2526
def __init__(self, *args, **kwargs):
2527
super(WorkingTree2, self).__init__(*args, **kwargs)
2528
# WorkingTree2 has more of a constraint that self._inventory must
2529
# exist. Because this is an older format, we don't mind the overhead
2530
# caused by the extra computation here.
2532
# Newer WorkingTree's should only have self._inventory set when they
2534
if self._inventory is None:
2535
self.read_working_inventory()
2537
def lock_tree_write(self):
2538
"""See WorkingTree.lock_tree_write().
2540
In Format2 WorkingTrees we have a single lock for the branch and tree
2541
so lock_tree_write() degrades to lock_write().
2543
self.branch.lock_write()
2545
return self._control_files.lock_write()
2547
self.branch.unlock()
2551
# do non-implementation specific cleanup
2554
# we share control files:
2555
if self._control_files._lock_count == 3:
2556
# _inventory_is_modified is always False during a read lock.
2557
if self._inventory_is_modified:
2559
self._write_hashcache_if_dirty()
2561
# reverse order of locking.
2563
return self._control_files.unlock()
2565
self.branch.unlock()
1332
2568
class WorkingTree3(WorkingTree):
1333
2569
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
