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()
250
def _detect_case_handling(self):
251
wt_trans = self.bzrdir.get_workingtree_transport(None)
253
wt_trans.stat("FoRMaT")
254
except errors.NoSuchFile:
255
self.case_sensitive = True
257
self.case_sensitive = False
259
self._setup_directory_is_tree_reference()
262
fget=lambda self: self._branch,
263
doc="""The branch this WorkingTree is connected to.
265
This cannot be set - it is reflective of the actual disk structure
266
the working tree has been constructed from.
269
def break_lock(self):
270
"""Break a lock if one is present from another instance.
272
Uses the ui factory to ask for confirmation if the lock may be from
275
This will probe the repository for its lock as well.
277
self._control_files.break_lock()
278
self.branch.break_lock()
280
def requires_rich_root(self):
281
return self._format.requires_rich_root
283
def supports_tree_reference(self):
286
def _set_inventory(self, inv, dirty):
287
"""Set the internal cached inventory.
289
:param inv: The inventory to set.
290
:param dirty: A boolean indicating whether the inventory is the same
291
logical inventory as whats on disk. If True the inventory is not
292
the same and should be written to disk or data will be lost, if
293
False then the inventory is the same as that on disk and any
294
serialisation would be unneeded overhead.
286
296
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:
297
self._inventory_is_modified = dirty
303
300
def open(path=None, _unsupported=False):
342
361
inv = self._inventory
343
362
for path, ie in inv.iter_entries():
344
if bzrlib.osutils.lexists(self.abspath(path)):
363
if osutils.lexists(self.abspath(path)):
366
def all_file_ids(self):
367
"""See Tree.iter_all_file_ids"""
368
return set(self.inventory)
347
370
def __repr__(self):
348
371
return "<%s of %s>" % (self.__class__.__name__,
349
372
getattr(self, 'basedir', None))
351
374
def abspath(self, filename):
352
375
return pathjoin(self.basedir, filename)
354
377
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)
378
"""Return RevisionTree for the current last revision.
380
If the left most parent is a ghost then the returned tree will be an
381
empty tree - one obtained by calling repository.revision_tree(None).
384
revision_id = self.get_parent_ids()[0]
386
# no parents, return an empty revision tree.
387
# in the future this should return the tree for
388
# 'empty:' - the implicit root empty tree.
389
return self.branch.repository.revision_tree(None)
391
return self.revision_tree(revision_id)
392
except errors.NoSuchRevision:
394
# No cached copy available, retrieve from the repository.
395
# FIXME? RBC 20060403 should we cache the inventory locally
398
return self.branch.repository.revision_tree(revision_id)
399
except errors.RevisionNotPresent:
400
# the basis tree *may* be a ghost or a low level error may have
401
# occured. If the revision is present, its a problem, if its not
403
if self.branch.repository.has_revision(revision_id):
405
# the basis tree is a ghost so return an empty tree.
406
return self.branch.repository.revision_tree(None)
409
self._flush_ignore_list_cache()
411
def relpath(self, path):
412
"""Return the local path portion from a given path.
414
The path may be absolute or relative. If its a relative path it is
415
interpreted relative to the python current working directory.
417
return osutils.relpath(self.basedir, path)
411
419
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))
420
return osutils.lexists(self.abspath(filename))
422
def get_file(self, file_id, path=None):
424
path = self.id2path(file_id)
425
return self.get_file_byname(path)
427
def get_file_text(self, file_id):
428
return self.get_file(file_id).read()
417
430
def get_file_byname(self, filename):
418
431
return file(self.abspath(filename), 'rb')
434
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
435
"""See Tree.annotate_iter
437
This implementation will use the basis tree implementation if possible.
438
Lines not in the basis are attributed to CURRENT_REVISION
440
If there are pending merges, lines added by those merges will be
441
incorrectly attributed to CURRENT_REVISION (but after committing, the
442
attribution will be correct).
444
basis = self.basis_tree()
447
changes = self.iter_changes(basis, True, [self.id2path(file_id)],
448
require_versioned=True).next()
449
changed_content, kind = changes[2], changes[6]
450
if not changed_content:
451
return basis.annotate_iter(file_id)
455
if kind[0] != 'file':
458
old_lines = list(basis.annotate_iter(file_id))
460
for tree in self.branch.repository.revision_trees(
461
self.get_parent_ids()[1:]):
462
if file_id not in tree:
464
old.append(list(tree.annotate_iter(file_id)))
465
return annotate.reannotate(old, self.get_file(file_id).readlines(),
470
def _get_ancestors(self, default_revision):
471
ancestors = set([default_revision])
472
for parent_id in self.get_parent_ids():
473
ancestors.update(self.branch.repository.get_ancestry(
474
parent_id, topo_sorted=False))
477
def get_parent_ids(self):
478
"""See Tree.get_parent_ids.
480
This implementation reads the pending merges list and last_revision
481
value and uses that to decide what the parents list should be.
483
last_rev = _mod_revision.ensure_null(self._last_revision())
484
if _mod_revision.NULL_REVISION == last_rev:
489
merges_file = self._transport.get('pending-merges')
490
except errors.NoSuchFile:
493
for l in merges_file.readlines():
494
revision_id = l.rstrip('\n')
495
parents.append(revision_id)
420
499
def get_root_id(self):
421
500
"""Return the id of this trees root"""
422
inv = self.read_working_inventory()
423
return inv.root.file_id
501
return self._inventory.root.file_id
425
503
def _get_store_filename(self, file_id):
426
504
## XXX: badly named; this is not in the store at all
427
505
return self.abspath(self.id2path(file_id))
430
def clone(self, to_bzrdir, revision_id=None, basis=None):
508
def clone(self, to_bzrdir, revision_id=None):
431
509
"""Duplicate this working tree into to_bzr, including all state.
433
511
Specifically modified files are kept as modified, but
493
554
__contains__ = has_id
495
556
def get_file_size(self, file_id):
496
return os.path.getsize(self.id2abspath(file_id))
557
"""See Tree.get_file_size"""
559
return os.path.getsize(self.id2abspath(file_id))
561
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():
567
def get_file_sha1(self, file_id, path=None, stat_value=None):
569
path = self._inventory.id2path(file_id)
570
return self._hashcache.get_sha1(path, stat_value)
572
def get_file_mtime(self, file_id, path=None):
574
path = self.inventory.id2path(file_id)
575
return os.lstat(self.abspath(path)).st_mtime
577
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
578
file_id = self.path2id(path)
579
return self._inventory[file_id].executable
581
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
582
mode = stat_result.st_mode
583
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
585
if not supports_executable():
586
def is_executable(self, file_id, path=None):
505
587
return self._inventory[file_id].executable
507
path = self._inventory.id2path(file_id)
589
_is_executable_from_path_and_stat = \
590
_is_executable_from_path_and_stat_from_basis
592
def is_executable(self, file_id, path=None):
594
path = self.id2path(file_id)
508
595
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.
596
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
598
_is_executable_from_path_and_stat = \
599
_is_executable_from_path_and_stat_from_stat
601
@needs_tree_write_lock
602
def _add(self, files, ids, kinds):
603
"""See MutableTree._add."""
534
604
# TODO: Re-adding a file that is removed in the working copy
535
605
# 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))
606
# the read and write working inventory should not occur in this
607
# function - they should be part of lock_write and unlock.
609
for f, file_id, kind in zip(files, ids, kinds):
571
610
if file_id is None:
572
file_id = gen_file_id(f)
573
inv.add_path(f, kind=kind, file_id=file_id)
611
inv.add_path(f, kind=kind)
613
inv.add_path(f, kind=kind, file_id=file_id)
614
self._inventory_is_modified = True
575
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
576
self._write_inventory(inv)
616
@needs_tree_write_lock
617
def _gather_kinds(self, files, kinds):
618
"""See MutableTree._gather_kinds."""
619
for pos, f in enumerate(files):
620
if kinds[pos] is None:
621
fullpath = normpath(self.abspath(f))
623
kinds[pos] = file_kind(fullpath)
625
if e.errno == errno.ENOENT:
626
raise errors.NoSuchFile(fullpath)
578
628
@needs_write_lock
629
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
630
"""Add revision_id as a parent.
632
This is equivalent to retrieving the current list of parent ids
633
and setting the list to its value plus revision_id.
635
:param revision_id: The revision id to add to the parent list. It may
636
be a ghost revision as long as its not the first parent to be added,
637
or the allow_leftmost_as_ghost parameter is set True.
638
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
640
parents = self.get_parent_ids() + [revision_id]
641
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
642
or allow_leftmost_as_ghost)
644
@needs_tree_write_lock
645
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
646
"""Add revision_id, tree tuple as a parent.
648
This is equivalent to retrieving the current list of parent trees
649
and setting the list to its value plus parent_tuple. See also
650
add_parent_tree_id - if you only have a parent id available it will be
651
simpler to use that api. If you have the parent already available, using
652
this api is preferred.
654
:param parent_tuple: The (revision id, tree) to add to the parent list.
655
If the revision_id is a ghost, pass None for the tree.
656
:param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
658
parent_ids = self.get_parent_ids() + [parent_tuple[0]]
659
if len(parent_ids) > 1:
660
# the leftmost may have already been a ghost, preserve that if it
662
allow_leftmost_as_ghost = True
663
self.set_parent_ids(parent_ids,
664
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
666
@needs_tree_write_lock
579
667
def add_pending_merge(self, *revision_ids):
580
668
# TODO: Perhaps should check at this point that the
581
669
# history of the revision is actually present?
582
p = self.pending_merges()
670
parents = self.get_parent_ids()
584
672
for rev_id in revision_ids:
673
if rev_id in parents:
675
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.
678
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
680
def path_content_summary(self, path, _lstat=os.lstat,
681
_mapper=osutils.file_kind_from_stat_mode):
682
"""See Tree.path_content_summary."""
683
abspath = self.abspath(path)
600
merges_file = self._control_files.get_utf8('pending-merges')
685
stat_result = _lstat(abspath)
601
686
except OSError, e:
602
if e.errno != errno.ENOENT:
606
for l in merges_file.readlines():
607
p.append(l.rstrip('\n'))
687
if getattr(e, 'errno', None) == errno.ENOENT:
689
return ('missing', None, None, None)
690
# propagate other errors
692
kind = _mapper(stat_result.st_mode)
694
size = stat_result.st_size
695
# try for a stat cache lookup
696
executable = self._is_executable_from_path_and_stat(path, stat_result)
697
return (kind, size, executable, self._sha_from_stat(
699
elif kind == 'directory':
700
# perhaps it looks like a plain directory, but it's really a
702
if self._directory_is_tree_reference(path):
703
kind = 'tree-reference'
704
return kind, None, None, None
705
elif kind == 'symlink':
706
return ('symlink', None, None, os.readlink(abspath))
708
return (kind, None, None, None)
710
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
711
"""Common ghost checking functionality from set_parent_*.
713
This checks that the left hand-parent exists if there are any
716
if len(revision_ids) > 0:
717
leftmost_id = revision_ids[0]
718
if (not allow_leftmost_as_ghost and not
719
self.branch.repository.has_revision(leftmost_id)):
720
raise errors.GhostRevisionUnusableHere(leftmost_id)
722
def _set_merges_from_parent_ids(self, parent_ids):
723
merges = parent_ids[1:]
724
self._transport.put_bytes('pending-merges', '\n'.join(merges),
725
mode=self._control_files._file_mode)
727
def _filter_parent_ids_by_ancestry(self, revision_ids):
728
"""Check that all merged revisions are proper 'heads'.
730
This will always return the first revision_id, and any merged revisions
733
if len(revision_ids) == 0:
735
graph = self.branch.repository.get_graph()
736
heads = graph.heads(revision_ids)
737
new_revision_ids = revision_ids[:1]
738
for revision_id in revision_ids[1:]:
739
if revision_id in heads and revision_id not in new_revision_ids:
740
new_revision_ids.append(revision_id)
741
if new_revision_ids != revision_ids:
742
trace.mutter('requested to set revision_ids = %s,'
743
' but filtered to %s', revision_ids, new_revision_ids)
744
return new_revision_ids
746
@needs_tree_write_lock
747
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
748
"""Set the parent ids to revision_ids.
750
See also set_parent_trees. This api will try to retrieve the tree data
751
for each element of revision_ids from the trees repository. If you have
752
tree data already available, it is more efficient to use
753
set_parent_trees rather than set_parent_ids. set_parent_ids is however
754
an easier API to use.
756
:param revision_ids: The revision_ids to set as the parent ids of this
757
working tree. Any of these may be ghosts.
759
self._check_parents_for_ghosts(revision_ids,
760
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
761
for revision_id in revision_ids:
762
_mod_revision.check_not_reserved_id(revision_id)
764
revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
766
if len(revision_ids) > 0:
767
self.set_last_revision(revision_ids[0])
769
self.set_last_revision(_mod_revision.NULL_REVISION)
771
self._set_merges_from_parent_ids(revision_ids)
773
@needs_tree_write_lock
774
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
775
"""See MutableTree.set_parent_trees."""
776
parent_ids = [rev for (rev, tree) in parents_list]
777
for revision_id in parent_ids:
778
_mod_revision.check_not_reserved_id(revision_id)
780
self._check_parents_for_ghosts(parent_ids,
781
allow_leftmost_as_ghost=allow_leftmost_as_ghost)
783
parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
785
if len(parent_ids) == 0:
786
leftmost_parent_id = _mod_revision.NULL_REVISION
787
leftmost_parent_tree = None
789
leftmost_parent_id, leftmost_parent_tree = parents_list[0]
791
if self._change_last_revision(leftmost_parent_id):
792
if leftmost_parent_tree is None:
793
# If we don't have a tree, fall back to reading the
794
# parent tree from the repository.
795
self._cache_basis_inventory(leftmost_parent_id)
797
inv = leftmost_parent_tree.inventory
798
xml = self._create_basis_xml_from_inventory(
799
leftmost_parent_id, inv)
800
self._write_basis_inventory(xml)
801
self._set_merges_from_parent_ids(parent_ids)
803
@needs_tree_write_lock
611
804
def set_pending_merges(self, rev_list):
612
self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
805
parents = self.get_parent_ids()
806
leftmost = parents[:1]
807
new_parents = leftmost + rev_list
808
self.set_parent_ids(new_parents)
810
@needs_tree_write_lock
615
811
def set_merge_modified(self, modified_hashes):
616
812
def iter_stanzas():
617
813
for file_id, hash in modified_hashes.iteritems():
618
yield Stanza(file_id=file_id, hash=hash)
814
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
619
815
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
817
def _sha_from_stat(self, path, stat_result):
818
"""Get a sha digest from the tree's stat cache.
820
The default implementation assumes no stat cache is present.
822
:param path: The path.
823
:param stat_result: The stat result being looked up.
622
827
def _put_rio(self, filename, stanzas, header):
828
self._must_be_locked()
623
829
my_file = rio_file(stanzas, header)
624
self._control_files.put(filename, my_file)
830
self._transport.put_file(filename, my_file,
831
mode=self._control_files._file_mode)
833
@needs_write_lock # because merge pulls data into the branch.
834
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
836
"""Merge from a branch into this working tree.
838
:param branch: The branch to merge from.
839
:param to_revision: If non-None, the merge will merge to to_revision,
840
but not beyond it. to_revision does not need to be in the history
841
of the branch when it is supplied. If None, to_revision defaults to
842
branch.last_revision().
844
from bzrlib.merge import Merger, Merge3Merger
845
pb = bzrlib.ui.ui_factory.nested_progress_bar()
847
merger = Merger(self.branch, this_tree=self, pb=pb)
848
merger.pp = ProgressPhase("Merge phase", 5, pb)
849
merger.pp.next_phase()
850
# check that there are no
852
merger.check_basis(check_clean=True, require_commits=False)
853
if to_revision is None:
854
to_revision = _mod_revision.ensure_null(branch.last_revision())
855
merger.other_rev_id = to_revision
856
if _mod_revision.is_null(merger.other_rev_id):
857
raise errors.NoCommits(branch)
858
self.branch.fetch(branch, last_revision=merger.other_rev_id)
859
merger.other_basis = merger.other_rev_id
860
merger.other_tree = self.branch.repository.revision_tree(
862
merger.other_branch = branch
863
merger.pp.next_phase()
864
if from_revision is None:
867
merger.set_base_revision(from_revision, branch)
868
if merger.base_rev_id == merger.other_rev_id:
869
raise errors.PointlessMerge
870
merger.backup_files = False
871
if merge_type is None:
872
merger.merge_type = Merge3Merger
874
merger.merge_type = merge_type
875
merger.set_interesting_files(None)
876
merger.show_base = False
877
merger.reprocess = False
878
conflicts = merger.do_merge()
627
885
def merge_modified(self):
886
"""Return a dictionary of files modified by a merge.
888
The list is initialized by WorkingTree.set_merge_modified, which is
889
typically called after we make some automatic updates to the tree
892
This returns a map of file_id->sha1, containing only files which are
893
still in the working inventory and have that text hash.
629
hashfile = self._control_files.get('merge-hashes')
896
hashfile = self._transport.get('merge-hashes')
897
except errors.NoSuchFile:
632
899
merge_hashes = {}
634
901
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
635
raise MergeModifiedFormatError()
902
raise errors.MergeModifiedFormatError()
636
903
except StopIteration:
637
raise MergeModifiedFormatError()
904
raise errors.MergeModifiedFormatError()
638
905
for s in RioReader(hashfile):
639
file_id = s.get("file_id")
906
# RioReader reads in Unicode, so convert file_ids back to utf8
907
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
640
908
if file_id not in self.inventory:
643
if hash == self.get_file_sha1(file_id):
644
merge_hashes[file_id] = hash
910
text_hash = s.get("hash")
911
if text_hash == self.get_file_sha1(file_id):
912
merge_hashes[file_id] = text_hash
645
913
return merge_hashes
916
def mkdir(self, path, file_id=None):
917
"""See MutableTree.mkdir()."""
919
file_id = generate_ids.gen_file_id(os.path.basename(path))
920
os.mkdir(self.abspath(path))
921
self.add(path, file_id, 'directory')
647
924
def get_symlink_target(self, file_id):
648
925
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).
928
def subsume(self, other_tree):
929
def add_children(inventory, entry):
930
for child_entry in entry.children.values():
931
inventory._byid[child_entry.file_id] = child_entry
932
if child_entry.kind == 'directory':
933
add_children(inventory, child_entry)
934
if other_tree.get_root_id() == self.get_root_id():
935
raise errors.BadSubsumeSource(self, other_tree,
936
'Trees have the same root')
938
other_tree_path = self.relpath(other_tree.basedir)
939
except errors.PathNotChild:
940
raise errors.BadSubsumeSource(self, other_tree,
941
'Tree is not contained by the other')
942
new_root_parent = self.path2id(osutils.dirname(other_tree_path))
943
if new_root_parent is None:
944
raise errors.BadSubsumeSource(self, other_tree,
945
'Parent directory is not versioned.')
946
# We need to ensure that the result of a fetch will have a
947
# versionedfile for the other_tree root, and only fetching into
948
# RepositoryKnit2 guarantees that.
949
if not self.branch.repository.supports_rich_root():
950
raise errors.SubsumeTargetNeedsUpgrade(other_tree)
951
other_tree.lock_tree_write()
953
new_parents = other_tree.get_parent_ids()
954
other_root = other_tree.inventory.root
955
other_root.parent_id = new_root_parent
956
other_root.name = osutils.basename(other_tree_path)
957
self.inventory.add(other_root)
958
add_children(self.inventory, other_root)
959
self._write_inventory(self.inventory)
960
# normally we don't want to fetch whole repositories, but i think
961
# here we really do want to consolidate the whole thing.
962
for parent_id in other_tree.get_parent_ids():
963
self.branch.fetch(other_tree.branch, parent_id)
964
self.add_parent_tree_id(parent_id)
967
other_tree.bzrdir.retire_bzrdir()
969
def _setup_directory_is_tree_reference(self):
970
if self._branch.repository._format.supports_tree_reference:
971
self._directory_is_tree_reference = \
972
self._directory_may_be_tree_reference
974
self._directory_is_tree_reference = \
975
self._directory_is_never_tree_reference
977
def _directory_is_never_tree_reference(self, relpath):
980
def _directory_may_be_tree_reference(self, relpath):
981
# as a special case, if a directory contains control files then
982
# it's a tree reference, except that the root of the tree is not
983
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
984
# TODO: We could ask all the control formats whether they
985
# recognize this directory, but at the moment there's no cheap api
986
# to do that. Since we probably can only nest bzr checkouts and
987
# they always use this name it's ok for now. -- mbp 20060306
989
# FIXME: There is an unhandled case here of a subdirectory
990
# containing .bzr but not a branch; that will probably blow up
991
# when you try to commit it. It might happen if there is a
992
# checkout in a subdirectory. This can be avoided by not adding
995
@needs_tree_write_lock
996
def extract(self, file_id, format=None):
997
"""Extract a subtree from this tree.
999
A new branch will be created, relative to the path for this tree.
1003
segments = osutils.splitpath(path)
1004
transport = self.branch.bzrdir.root_transport
1005
for name in segments:
1006
transport = transport.clone(name)
1007
transport.ensure_base()
1010
sub_path = self.id2path(file_id)
1011
branch_transport = mkdirs(sub_path)
1013
format = self.bzrdir.cloning_metadir()
1014
branch_transport.ensure_base()
1015
branch_bzrdir = format.initialize_on_transport(branch_transport)
1017
repo = branch_bzrdir.find_repository()
1018
except errors.NoRepositoryPresent:
1019
repo = branch_bzrdir.create_repository()
1020
if not repo.supports_rich_root():
1021
raise errors.RootNotRich()
1022
new_branch = branch_bzrdir.create_branch()
1023
new_branch.pull(self.branch)
1024
for parent_id in self.get_parent_ids():
1025
new_branch.fetch(self.branch, parent_id)
1026
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1027
if tree_transport.base != branch_transport.base:
1028
tree_bzrdir = format.initialize_on_transport(tree_transport)
1029
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1031
tree_bzrdir = branch_bzrdir
1032
wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1033
wt.set_parent_ids(self.get_parent_ids())
1034
my_inv = self.inventory
1035
child_inv = Inventory(root_id=None)
1036
new_root = my_inv[file_id]
1037
my_inv.remove_recursive_id(file_id)
1038
new_root.parent_id = None
1039
child_inv.add(new_root)
1040
self._write_inventory(my_inv)
1041
wt._write_inventory(child_inv)
1044
def _serialize(self, inventory, out_file):
1045
xml5.serializer_v5.write_inventory(self._inventory, out_file,
1048
def _deserialize(selt, in_file):
1049
return xml5.serializer_v5.read_inventory(in_file)
1052
"""Write the in memory inventory to disk."""
1053
# TODO: Maybe this should only write on dirty ?
1054
if self._control_files._lock_mode != 'w':
1055
raise errors.NotWriteLocked(self)
1057
self._serialize(self._inventory, sio)
1059
self._transport.put_file('inventory', sio,
1060
mode=self._control_files._file_mode)
1061
self._inventory_is_modified = False
1063
def _kind(self, relpath):
1064
return osutils.file_kind(self.abspath(relpath))
1066
def list_files(self, include_root=False):
1067
"""Recursively list all files as (path, class, kind, id, entry).
661
1069
Lists, but does not descend into unversioned directories.
666
1074
Skips the control directory.
668
inv = self._inventory
670
def descend(from_dir_relpath, from_dir_id, dp):
1076
# list_files is an iterator, so @needs_read_lock doesn't work properly
1077
# with it. So callers should be careful to always read_lock the tree.
1078
if not self.is_locked():
1079
raise errors.ObjectNotLocked(self)
1081
inv = self.inventory
1082
if include_root is True:
1083
yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1084
# Convert these into local objects to save lookup times
1085
pathjoin = osutils.pathjoin
1086
file_kind = self._kind
1088
# transport.base ends in a slash, we want the piece
1089
# between the last two slashes
1090
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1092
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1094
# directory file_id, relative path, absolute path, reverse sorted children
1095
children = os.listdir(self.basedir)
1097
# jam 20060527 The kernel sized tree seems equivalent whether we
1098
# use a deque and popleft to keep them sorted, or if we use a plain
1099
# list and just reverse() them.
1100
children = collections.deque(children)
1101
stack = [(inv.root.file_id, u'', self.basedir, children)]
1103
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1106
f = children.popleft()
674
1107
## TODO: If we find a subdirectory with its own .bzr
675
1108
## directory, then that is a separate tree and we
676
1109
## should exclude it.
678
1111
# the bzrdir for this tree
679
if self.bzrdir.transport.base.endswith(f + '/'):
1112
if transport_base_dir == f:
683
fp = appendpath(from_dir_relpath, f)
1115
# we know that from_dir_relpath and from_dir_abspath never end in a slash
1116
# and 'f' doesn't begin with one, we can do a string op, rather
1117
# than the checks of pathjoin(), all relative paths will have an extra slash
1119
fp = from_dir_relpath + '/' + f
686
fap = appendpath(dp, f)
1122
fap = from_dir_abspath + '/' + f
688
1124
f_ie = inv.get_child(from_dir_id, f)
691
elif self.is_ignored(fp):
1127
elif self.is_ignored(fp[1:]):
1130
# we may not have found this file, because of a unicode issue
1131
f_norm, can_access = osutils.normalized_filename(f)
1132
if f == f_norm or not can_access:
1133
# No change, so treat this file normally
1136
# this file can be accessed by a normalized path
1137
# check again if it is versioned
1138
# these lines are repeated here for performance
1140
fp = from_dir_relpath + '/' + f
1141
fap = from_dir_abspath + '/' + f
1142
f_ie = inv.get_child(from_dir_id, f)
1145
elif self.is_ignored(fp[1:]):
696
1150
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
1152
# make a last minute entry
1154
yield fp[1:], c, fk, f_ie.file_id, f_ie
708
if fk == 'directory':
709
entry = TreeDirectory()
712
elif fk == 'symlink':
1157
yield fp[1:], c, fk, None, fk_entries[fk]()
1159
yield fp[1:], c, fk, None, TreeEntry()
717
yield fp, c, fk, (f_ie and f_ie.file_id), entry
719
1162
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):
1165
# But do this child first
1166
new_children = os.listdir(fap)
1168
new_children = collections.deque(new_children)
1169
stack.append((f_ie.file_id, fp, fap, new_children))
1170
# Break out of inner loop,
1171
# so that we start outer loop with child
1174
# if we finished all children, pop it off the stack
1177
@needs_tree_write_lock
1178
def move(self, from_paths, to_dir=None, after=False, **kwargs):
734
1179
"""Rename files.
736
to_name must exist in the inventory.
1181
to_dir must exist in the inventory.
738
If to_name exists and is a directory, the files are moved into
1183
If to_dir exists and is a directory, the files are moved into
739
1184
it, keeping their old names.
741
Note that to_name is only the last component of the new name;
1186
Note that to_dir is only the last component of the new name;
742
1187
this doesn't change the directory.
1189
For each entry in from_paths the move mode will be determined
1192
The first mode moves the file in the filesystem and updates the
1193
inventory. The second mode only updates the inventory without
1194
touching the file on the filesystem. This is the new mode introduced
1197
move uses the second mode if 'after == True' and the target is not
1198
versioned but present in the working tree.
1200
move uses the second mode if 'after == False' and the source is
1201
versioned but no longer in the working tree, and the target is not
1202
versioned but present in the working tree.
1204
move uses the first mode if 'after == False' and the source is
1205
versioned and present in the working tree, and the target is not
1206
versioned and not present in the working tree.
1208
Everything else results in an error.
744
1210
This returns a list of (from_path, to_path) pairs for each
745
1211
entry that is moved.
748
## TODO: Option to move IDs only
749
assert not isinstance(from_paths, basestring)
1216
# check for deprecated use of signature
1218
to_dir = kwargs.get('to_name', None)
1220
raise TypeError('You must supply a target directory')
1222
symbol_versioning.warn('The parameter to_name was deprecated'
1223
' in version 0.13. Use to_dir instead',
1226
# check destination directory
1227
if isinstance(from_paths, basestring):
750
1229
inv = self.inventory
751
to_abs = self.abspath(to_name)
1230
to_abs = self.abspath(to_dir)
752
1231
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)
1232
raise errors.BzrMoveFailedError('',to_dir,
1233
errors.NotADirectory(to_abs))
1234
if not self.has_filename(to_dir):
1235
raise errors.BzrMoveFailedError('',to_dir,
1236
errors.NotInWorkingDirectory(to_dir))
1237
to_dir_id = inv.path2id(to_dir)
1238
if to_dir_id is None:
1239
raise errors.BzrMoveFailedError('',to_dir,
1240
errors.NotVersionedError(path=str(to_dir)))
759
1242
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)
1243
if to_dir_ie.kind != 'directory':
1244
raise errors.BzrMoveFailedError('',to_dir,
1245
errors.NotADirectory(to_abs))
1247
# create rename entries and tuples
1248
for from_rel in from_paths:
1249
from_tail = splitpath(from_rel)[-1]
1250
from_id = inv.path2id(from_rel)
1252
raise errors.BzrMoveFailedError(from_rel,to_dir,
1253
errors.NotVersionedError(path=str(from_rel)))
1255
from_entry = inv[from_id]
1256
from_parent_id = from_entry.parent_id
1257
to_rel = pathjoin(to_dir, from_tail)
1258
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1260
from_tail=from_tail,
1261
from_parent_id=from_parent_id,
1262
to_rel=to_rel, to_tail=from_tail,
1263
to_parent_id=to_dir_id)
1264
rename_entries.append(rename_entry)
1265
rename_tuples.append((from_rel, to_rel))
1267
# determine which move mode to use. checks also for movability
1268
rename_entries = self._determine_mv_mode(rename_entries, after)
1270
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"])
1273
self._inventory_is_modified = True
1274
self._move(rename_entries)
795
1276
# restore the inventory on error
796
self._set_inventory(orig_inv)
1277
self._inventory_is_modified = original_modified
798
1279
self._write_inventory(inv)
802
def rename_one(self, from_rel, to_rel):
1280
return rename_tuples
1282
def _determine_mv_mode(self, rename_entries, after=False):
1283
"""Determines for each from-to pair if both inventory and working tree
1284
or only the inventory has to be changed.
1286
Also does basic plausability tests.
1288
inv = self.inventory
1290
for rename_entry in rename_entries:
1291
# store to local variables for easier reference
1292
from_rel = rename_entry.from_rel
1293
from_id = rename_entry.from_id
1294
to_rel = rename_entry.to_rel
1295
to_id = inv.path2id(to_rel)
1296
only_change_inv = False
1298
# check the inventory for source and destination
1300
raise errors.BzrMoveFailedError(from_rel,to_rel,
1301
errors.NotVersionedError(path=str(from_rel)))
1302
if to_id is not None:
1303
raise errors.BzrMoveFailedError(from_rel,to_rel,
1304
errors.AlreadyVersionedError(path=str(to_rel)))
1306
# try to determine the mode for rename (only change inv or change
1307
# inv and file system)
1309
if not self.has_filename(to_rel):
1310
raise errors.BzrMoveFailedError(from_id,to_rel,
1311
errors.NoSuchFile(path=str(to_rel),
1312
extra="New file has not been created yet"))
1313
only_change_inv = True
1314
elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1315
only_change_inv = True
1316
elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1317
only_change_inv = False
1318
elif (sys.platform == 'win32'
1319
and from_rel.lower() == to_rel.lower()
1320
and self.has_filename(from_rel)):
1321
only_change_inv = False
1323
# something is wrong, so lets determine what exactly
1324
if not self.has_filename(from_rel) and \
1325
not self.has_filename(to_rel):
1326
raise errors.BzrRenameFailedError(from_rel,to_rel,
1327
errors.PathsDoNotExist(paths=(str(from_rel),
1330
raise errors.RenameFailedFilesExist(from_rel, to_rel)
1331
rename_entry.only_change_inv = only_change_inv
1332
return rename_entries
1334
def _move(self, rename_entries):
1335
"""Moves a list of files.
1337
Depending on the value of the flag 'only_change_inv', the
1338
file will be moved on the file system or not.
1340
inv = self.inventory
1343
for entry in rename_entries:
1345
self._move_entry(entry)
1347
self._rollback_move(moved)
1351
def _rollback_move(self, moved):
1352
"""Try to rollback a previous move in case of an filesystem error."""
1353
inv = self.inventory
1356
self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1357
entry.to_tail, entry.to_parent_id, entry.from_rel,
1358
entry.from_tail, entry.from_parent_id,
1359
entry.only_change_inv))
1360
except errors.BzrMoveFailedError, e:
1361
raise errors.BzrMoveFailedError( '', '', "Rollback failed."
1362
" The working tree is in an inconsistent state."
1363
" Please consider doing a 'bzr revert'."
1364
" Error message is: %s" % e)
1366
def _move_entry(self, entry):
1367
inv = self.inventory
1368
from_rel_abs = self.abspath(entry.from_rel)
1369
to_rel_abs = self.abspath(entry.to_rel)
1370
if from_rel_abs == to_rel_abs:
1371
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
1372
"Source and target are identical.")
1374
if not entry.only_change_inv:
1376
osutils.rename(from_rel_abs, to_rel_abs)
1378
raise errors.BzrMoveFailedError(entry.from_rel,
1380
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1382
@needs_tree_write_lock
1383
def rename_one(self, from_rel, to_rel, after=False):
803
1384
"""Rename one file.
805
1386
This can change the directory or the filename or both.
1388
rename_one has several 'modes' to work. First, it can rename a physical
1389
file and change the file_id. That is the normal mode. Second, it can
1390
only change the file_id without touching any physical file. This is
1391
the new mode introduced in version 0.15.
1393
rename_one uses the second mode if 'after == True' and 'to_rel' is not
1394
versioned but present in the working tree.
1396
rename_one uses the second mode if 'after == False' and 'from_rel' is
1397
versioned but no longer in the working tree, and 'to_rel' is not
1398
versioned but present in the working tree.
1400
rename_one uses the first mode if 'after == False' and 'from_rel' is
1401
versioned and present in the working tree, and 'to_rel' is not
1402
versioned and not present in the working tree.
1404
Everything else results in an error.
807
1406
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)
1409
# create rename entries and tuples
1410
from_tail = splitpath(from_rel)[-1]
1411
from_id = inv.path2id(from_rel)
1413
raise errors.BzrRenameFailedError(from_rel,to_rel,
1414
errors.NotVersionedError(path=str(from_rel)))
1415
from_entry = inv[from_id]
1416
from_parent_id = from_entry.parent_id
824
1417
to_dir, to_tail = os.path.split(to_rel)
825
1418
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"])
1419
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
1421
from_tail=from_tail,
1422
from_parent_id=from_parent_id,
1423
to_rel=to_rel, to_tail=to_tail,
1424
to_parent_id=to_dir_id)
1425
rename_entries.append(rename_entry)
1427
# determine which move mode to use. checks also for movability
1428
rename_entries = self._determine_mv_mode(rename_entries, after)
1430
# check if the target changed directory and if the target directory is
1432
if to_dir_id is None:
1433
raise errors.BzrMoveFailedError(from_rel,to_rel,
1434
errors.NotVersionedError(path=str(to_dir)))
1436
# all checks done. now we can continue with our actual work
1437
mutter('rename_one:\n'
1442
' to_dir_id {%s}\n',
1443
from_id, from_rel, to_rel, to_dir, to_dir_id)
1445
self._move(rename_entries)
847
1446
self._write_inventory(inv)
1448
class _RenameEntry(object):
1449
def __init__(self, from_rel, from_id, from_tail, from_parent_id,
1450
to_rel, to_tail, to_parent_id, only_change_inv=False):
1451
self.from_rel = from_rel
1452
self.from_id = from_id
1453
self.from_tail = from_tail
1454
self.from_parent_id = from_parent_id
1455
self.to_rel = to_rel
1456
self.to_tail = to_tail
1457
self.to_parent_id = to_parent_id
1458
self.only_change_inv = only_change_inv
849
1460
@needs_read_lock
850
1461
def unknowns(self):
851
1462
"""Return all unknown files.
853
1464
These are files in the working directory that are not versioned or
854
1465
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()
1467
# force the extras method to be fully executed before returning, to
1468
# prevent race conditions with the lock
1470
[subp for subp in self.extras() if not self.is_ignored(subp)])
1472
@needs_tree_write_lock
1473
def unversion(self, file_ids):
1474
"""Remove the file ids in file_ids from the current versioned set.
1476
When a file_id is unversioned, all of its children are automatically
1479
:param file_ids: The file ids to stop versioning.
1480
:raises: NoSuchId if any fileid is not currently versioned.
1482
for file_id in file_ids:
1483
if self._inventory.has_id(file_id):
1484
self._inventory.remove_recursive_id(file_id)
1486
raise errors.NoSuchId(self, file_id)
1488
# in the future this should just set a dirty bit to wait for the
1489
# final unlock. However, until all methods of workingtree start
1490
# with the current in -memory inventory rather than triggering
1491
# a read, it is more complex - we need to teach read_inventory
1492
# to know when to read, and when to not read first... and possibly
1493
# to save first when the in memory one may be corrupted.
1494
# so for now, we just only write it if it is indeed dirty.
1496
self._write_inventory(self._inventory)
879
1498
def _iter_conflicts(self):
880
1499
conflicted = set()
881
for path in (s[0] for s in self.list_files()):
1500
for info in self.list_files():
882
1502
stem = get_conflicted_stem(path)
883
1503
if stem is None:
1056
1758
This is used to allow WorkingTree3 instances to not affect branch
1057
1759
when their last revision is set.
1059
if new_revision is None:
1761
if _mod_revision.is_null(new_revision):
1060
1762
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])
1765
self.branch.generate_revision_history(new_revision)
1766
except errors.NoSuchRevision:
1767
# not present in the repo - dont try to set it deeper than the tip
1768
self.branch.set_revision_history([new_revision])
1771
def _write_basis_inventory(self, xml):
1772
"""Write the basis inventory XML to the basis-inventory file"""
1773
path = self._basis_inventory_name()
1775
self._transport.put_file(path, sio,
1776
mode=self._control_files._file_mode)
1778
def _create_basis_xml_from_inventory(self, revision_id, inventory):
1779
"""Create the text that will be saved in basis-inventory"""
1780
inventory.revision_id = revision_id
1781
return xml7.serializer_v7.write_inventory_to_string(inventory)
1071
1783
def _cache_basis_inventory(self, new_revision):
1072
1784
"""Cache new_revision as the basis inventory."""
1785
# TODO: this should allow the ready-to-use inventory to be passed in,
1786
# as commit already has that ready-to-use [while the format is the
1074
1789
# this double handles the inventory - unpack and repack -
1075
1790
# but is easier to understand. We can/should put a conditional
1076
1791
# in here based on whether the inventory is in the latest format
1077
1792
# - 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:
1794
# the fast path is to copy the raw xml from the repository. If the
1795
# xml contains 'revision_id="', then we assume the right
1796
# revision_id is set. We must check for this full string, because a
1797
# root node id can legitimately look like 'revision_id' but cannot
1799
xml = self.branch.repository.get_inventory_xml(new_revision)
1800
firstline = xml.split('\n', 1)[0]
1801
if (not 'revision_id="' in firstline or
1802
'format="7"' not in firstline):
1803
inv = self.branch.repository.deserialise_inventory(
1805
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1806
self._write_basis_inventory(xml)
1807
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1088
1810
def read_basis_inventory(self):
1089
1811
"""Read the cached basis inventory."""
1090
1812
path = self._basis_inventory_name()
1091
return self._control_files.get_utf8(path).read()
1813
return self._transport.get_bytes(path)
1093
1815
@needs_read_lock
1094
1816
def read_working_inventory(self):
1095
"""Read the working inventory."""
1817
"""Read the working inventory.
1819
:raises errors.InventoryModified: read_working_inventory will fail
1820
when the current in memory inventory has been modified.
1822
# conceptually this should be an implementation detail of the tree.
1823
# XXX: Deprecate this.
1096
1824
# 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)
1826
if self._inventory_is_modified:
1827
raise errors.InventoryModified(self)
1828
result = self._deserialize(self._transport.get('inventory'))
1829
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.
1832
@needs_tree_write_lock
1833
def remove(self, files, verbose=False, to_file=None, keep_files=True,
1835
"""Remove nominated files from the working inventory.
1837
:files: File paths relative to the basedir.
1838
:keep_files: If true, the files will also be kept.
1839
:force: Delete files and directories, even if they are changed and
1840
even if the directories are not empty.
1118
## TODO: Normalize names
1119
## TODO: Remove nested loops; better scalability
1120
1842
if isinstance(files, basestring):
1121
1843
files = [files]
1123
inv = self.inventory
1125
# do this before any modifications
1848
unknown_nested_files=set()
1850
def recurse_directory_to_add_files(directory):
1851
# Recurse directory and add all files
1852
# so we can check if they have changed.
1853
for parent_info, file_infos in\
1854
osutils.walkdirs(self.abspath(directory),
1856
for relpath, basename, kind, lstat, abspath in file_infos:
1857
# Is it versioned or ignored?
1858
if self.path2id(relpath) or self.is_ignored(relpath):
1859
# Add nested content for deletion.
1860
new_files.add(relpath)
1862
# Files which are not versioned and not ignored
1863
# should be treated as unknown.
1864
unknown_nested_files.add((relpath, None, kind))
1866
for filename in files:
1867
# Get file name into canonical form.
1868
abspath = self.abspath(filename)
1869
filename = self.relpath(abspath)
1870
if len(filename) > 0:
1871
new_files.add(filename)
1872
if osutils.isdir(abspath):
1873
recurse_directory_to_add_files(filename)
1875
files = list(new_files)
1878
return # nothing to do
1880
# Sort needed to first handle directory content before the directory
1881
files.sort(reverse=True)
1883
# Bail out if we are going to delete files we shouldn't
1884
if not keep_files and not force:
1885
has_changed_files = len(unknown_nested_files) > 0
1886
if not has_changed_files:
1887
for (file_id, path, content_change, versioned, parent_id, name,
1888
kind, executable) in self.iter_changes(self.basis_tree(),
1889
include_unchanged=True, require_versioned=False,
1890
want_unversioned=True, specific_files=files):
1891
if versioned == (False, False):
1892
# The record is unknown ...
1893
if not self.is_ignored(path[1]):
1894
# ... but not ignored
1895
has_changed_files = True
1897
elif content_change and (kind[1] is not None):
1898
# Versioned and changed, but not deleted
1899
has_changed_files = True
1902
if has_changed_files:
1903
# Make delta show ALL applicable changes in error message.
1904
tree_delta = self.changes_from(self.basis_tree(),
1905
require_versioned=False, want_unversioned=True,
1906
specific_files=files)
1907
for unknown_file in unknown_nested_files:
1908
if unknown_file not in tree_delta.unversioned:
1909
tree_delta.unversioned.extend((unknown_file,))
1910
raise errors.BzrRemoveChangedFilesError(tree_delta)
1912
# Build inv_delta and delete files where applicaple,
1913
# do this before any modifications to inventory.
1126
1914
for f in files:
1127
fid = inv.path2id(f)
1915
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
1918
message = "%s is not versioned." % (f,)
1921
# having removed it, it must be either ignored or unknown
1922
if self.is_ignored(f):
1926
textui.show_status(new_status, self.kind(fid), f,
1929
inv_delta.append((f, None, fid, None))
1930
message = "removed %s" % (f,)
1933
abs_path = self.abspath(f)
1934
if osutils.lexists(abs_path):
1935
if (osutils.isdir(abs_path) and
1936
len(os.listdir(abs_path)) > 0):
1938
osutils.rmtree(abs_path)
1940
message = "%s is not an empty directory "\
1941
"and won't be deleted." % (f,)
1943
osutils.delete_any(abs_path)
1944
message = "deleted %s" % (f,)
1945
elif message is not None:
1946
# Only care if we haven't done anything yet.
1947
message = "%s does not exist." % (f,)
1949
# Print only one message (if any) per file.
1950
if message is not None:
1952
self.apply_inventory_delta(inv_delta)
1954
@needs_tree_write_lock
1955
def revert(self, filenames=None, old_tree=None, backups=True,
1956
pb=DummyProgress(), report_changes=False):
1957
from bzrlib.conflicts import resolve
1960
symbol_versioning.warn('Using [] to revert all files is deprecated'
1961
' as of bzr 0.91. Please use None (the default) instead.',
1962
DeprecationWarning, stacklevel=2)
1149
1963
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([])
1964
basis_tree = self.basis_tree()
1965
basis_tree.lock_read()
1966
old_tree = basis_tree
1156
resolve(self, filenames, ignore_misses=True)
1970
conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1972
if filenames is None and len(self.get_parent_ids()) > 1:
1974
last_revision = self.last_revision()
1975
if last_revision != NULL_REVISION:
1976
if basis_tree is None:
1977
basis_tree = self.basis_tree()
1978
basis_tree.lock_read()
1979
parent_trees.append((last_revision, basis_tree))
1980
self.set_parent_trees(parent_trees)
1983
resolve(self, filenames, ignore_misses=True, recursive=True)
1985
if basis_tree is not None:
1157
1987
return conflicts
1989
def revision_tree(self, revision_id):
1990
"""See Tree.revision_tree.
1992
WorkingTree can supply revision_trees for the basis revision only
1993
because there is only one cached inventory in the bzr directory.
1995
if revision_id == self.last_revision():
1997
xml = self.read_basis_inventory()
1998
except errors.NoSuchFile:
2002
inv = xml7.serializer_v7.read_inventory_from_string(xml)
2003
# dont use the repository revision_tree api because we want
2004
# to supply the inventory.
2005
if inv.revision_id == revision_id:
2006
return revisiontree.RevisionTree(self.branch.repository,
2008
except errors.BadInventoryFormat:
2010
# raise if there was no inventory, or if we read the wrong inventory.
2011
raise errors.NoSuchRevisionInTree(self, revision_id)
1159
2013
# XXX: This method should be deprecated in favour of taking in a proper
1160
2014
# new Inventory object.
2015
@needs_tree_write_lock
1162
2016
def set_inventory(self, new_inventory_list):
1163
2017
from bzrlib.inventory import (Inventory,
1164
2018
InventoryDirectory,
1204
2080
between multiple working trees, i.e. via shared storage, then we
1205
2081
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()
2083
raise NotImplementedError(self.unlock)
2085
def update(self, change_reporter=None, possible_transports=None):
1232
2086
"""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.
2088
This will update the branch if its bound too, which means we have
2089
multiple trees involved:
2091
- The new basis tree of the master.
2092
- The old basis tree of the branch.
2093
- The old basis tree of the working tree.
2094
- The current working tree state.
2096
Pathologically, all three may be different, and non-ancestors of each
2097
other. Conceptually we want to:
2099
- Preserve the wt.basis->wt.state changes
2100
- Transform the wt.basis to the new master basis.
2101
- Apply a merge of the old branch basis to get any 'local' changes from
2103
- Restore the wt.basis->wt.state changes.
1246
2105
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()
2106
- Merge current state -> basis tree of the master w.r.t. the old tree
2108
- Do a 'normal' merge of the old branch basis if it is relevant.
2110
if self.branch.get_bound_location() is not None:
2112
update_branch = True
2114
self.lock_tree_write()
2115
update_branch = False
2118
old_tip = self.branch.update(possible_transports)
2121
return self._update_tree(old_tip, change_reporter)
2125
@needs_tree_write_lock
2126
def _update_tree(self, old_tip=None, change_reporter=None):
2127
"""Update a tree to the master branch.
2129
:param old_tip: if supplied, the previous tip revision the branch,
2130
before it was changed to the master branch's tip.
2132
# here if old_tip is not None, it is the old tip of the branch before
2133
# it was updated from the master branch. This should become a pending
2134
# merge in the working tree to preserve the user existing work. we
2135
# cant set that until we update the working trees last revision to be
2136
# one from the new branch, because it will just get absorbed by the
2137
# parent de-duplication logic.
2139
# We MUST save it even if an error occurs, because otherwise the users
2140
# local work is unreferenced and will appear to have been lost.
2144
last_rev = self.get_parent_ids()[0]
2146
last_rev = _mod_revision.NULL_REVISION
2147
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2148
# merge tree state up to new branch tip.
2149
basis = self.basis_tree()
1259
2152
to_tree = self.branch.basis_tree()
1260
result += merge_inner(self.branch,
2153
if basis.inventory.root is None:
2154
self.set_root_id(to_tree.get_root_id())
2156
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()
2161
change_reporter=change_reporter)
2164
# TODO - dedup parents list with things merged by pull ?
2165
# reuse the tree we've updated to to set the basis:
2166
parent_trees = [(self.branch.last_revision(), to_tree)]
2167
merges = self.get_parent_ids()[1:]
2168
# Ideally we ask the tree for the trees here, that way the working
2169
# tree can decide whether to give us teh entire tree or give us a
2170
# lazy initialised tree. dirstate for instance will have the trees
2171
# in ram already, whereas a last-revision + basis-inventory tree
2172
# will not, but also does not need them when setting parents.
2173
for parent in merges:
2174
parent_trees.append(
2175
(parent, self.branch.repository.revision_tree(parent)))
2176
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2177
parent_trees.append(
2178
(old_tip, self.branch.repository.revision_tree(old_tip)))
2179
self.set_parent_trees(parent_trees)
2180
last_rev = parent_trees[0][0]
2182
# the working tree had the same last-revision as the master
2183
# branch did. We may still have pivot local work from the local
2184
# branch into old_tip:
2185
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2186
self.add_parent_tree_id(old_tip)
2187
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2188
and old_tip != last_rev):
2189
# our last revision was not the prior branch last revision
2190
# and we have converted that last revision to a pending merge.
2191
# base is somewhere between the branch tip now
2192
# and the now pending merge
2194
# Since we just modified the working tree and inventory, flush out
2195
# the current state, before we modify it again.
2196
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2197
# requires it only because TreeTransform directly munges the
2198
# inventory and calls tree._write_inventory(). Ultimately we
2199
# should be able to remove this extra flush.
2201
graph = self.branch.repository.get_graph()
2202
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2204
base_tree = self.branch.repository.revision_tree(base_rev_id)
2205
other_tree = self.branch.repository.revision_tree(old_tip)
2206
result += merge.merge_inner(
2211
change_reporter=change_reporter)
2214
def _write_hashcache_if_dirty(self):
2215
"""Write out the hashcache if it is dirty."""
2216
if self._hashcache.needs_write:
2218
self._hashcache.write()
2220
if e.errno not in (errno.EPERM, errno.EACCES):
2222
# TODO: jam 20061219 Should this be a warning? A single line
2223
# warning might be sufficient to let the user know what
2225
mutter('Could not write hashcache for %s\nError: %s',
2226
self._hashcache.cache_file_name(), e)
2228
@needs_tree_write_lock
1288
2229
def _write_inventory(self, inv):
1289
2230
"""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')
2231
self._set_inventory(inv, dirty=True)
1297
2234
def set_conflicts(self, arg):
1298
raise UnsupportedOperation(self.set_conflicts, self)
2235
raise errors.UnsupportedOperation(self.set_conflicts, self)
2237
def add_conflicts(self, arg):
2238
raise errors.UnsupportedOperation(self.add_conflicts, self)
1300
2240
@needs_read_lock
1301
2241
def conflicts(self):
1302
conflicts = ConflictList()
2242
conflicts = _mod_conflicts.ConflictList()
1303
2243
for conflicted in self._iter_conflicts():
1306
2246
if file_kind(self.abspath(conflicted)) != "file":
1309
if e.errno == errno.ENOENT:
2248
except errors.NoSuchFile:
1313
2250
if text is True:
1314
2251
for suffix in ('.THIS', '.OTHER'):
1316
2253
kind = file_kind(self.abspath(conflicted+suffix))
1318
if e.errno == errno.ENOENT:
2256
except errors.NoSuchFile:
1326
2260
ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1327
conflicts.append(Conflict.factory(ctype, path=conflicted,
2261
conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1328
2263
file_id=self.path2id(conflicted)))
1329
2264
return conflicts
2266
def walkdirs(self, prefix=""):
2267
"""Walk the directories of this tree.
2269
returns a generator which yields items in the form:
2270
((curren_directory_path, fileid),
2271
[(file1_path, file1_name, file1_kind, (lstat), file1_id,
2274
This API returns a generator, which is only valid during the current
2275
tree transaction - within a single lock_read or lock_write duration.
2277
If the tree is not locked, it may cause an error to be raised,
2278
depending on the tree implementation.
2280
disk_top = self.abspath(prefix)
2281
if disk_top.endswith('/'):
2282
disk_top = disk_top[:-1]
2283
top_strip_len = len(disk_top) + 1
2284
inventory_iterator = self._walkdirs(prefix)
2285
disk_iterator = osutils.walkdirs(disk_top, prefix)
2287
current_disk = disk_iterator.next()
2288
disk_finished = False
2290
if not (e.errno == errno.ENOENT or
2291
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
2294
disk_finished = True
2296
current_inv = inventory_iterator.next()
2297
inv_finished = False
2298
except StopIteration:
2301
while not inv_finished or not disk_finished:
2303
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2304
cur_disk_dir_content) = current_disk
2306
((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2307
cur_disk_dir_content) = ((None, None), None)
2308
if not disk_finished:
2309
# strip out .bzr dirs
2310
if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2311
len(cur_disk_dir_content) > 0):
2312
# osutils.walkdirs can be made nicer -
2313
# yield the path-from-prefix rather than the pathjoined
2315
bzrdir_loc = bisect_left(cur_disk_dir_content,
2317
if cur_disk_dir_content[bzrdir_loc][0] == '.bzr':
2318
# we dont yield the contents of, or, .bzr itself.
2319
del cur_disk_dir_content[bzrdir_loc]
2321
# everything is unknown
2324
# everything is missing
2327
direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
2329
# disk is before inventory - unknown
2330
dirblock = [(relpath, basename, kind, stat, None, None) for
2331
relpath, basename, kind, stat, top_path in
2332
cur_disk_dir_content]
2333
yield (cur_disk_dir_relpath, None), dirblock
2335
current_disk = disk_iterator.next()
2336
except StopIteration:
2337
disk_finished = True
2339
# inventory is before disk - missing.
2340
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2341
for relpath, basename, dkind, stat, fileid, kind in
2343
yield (current_inv[0][0], current_inv[0][1]), dirblock
2345
current_inv = inventory_iterator.next()
2346
except StopIteration:
2349
# versioned present directory
2350
# merge the inventory and disk data together
2352
for relpath, subiterator in itertools.groupby(sorted(
2353
current_inv[1] + cur_disk_dir_content,
2354
key=operator.itemgetter(0)), operator.itemgetter(1)):
2355
path_elements = list(subiterator)
2356
if len(path_elements) == 2:
2357
inv_row, disk_row = path_elements
2358
# versioned, present file
2359
dirblock.append((inv_row[0],
2360
inv_row[1], disk_row[2],
2361
disk_row[3], inv_row[4],
2363
elif len(path_elements[0]) == 5:
2365
dirblock.append((path_elements[0][0],
2366
path_elements[0][1], path_elements[0][2],
2367
path_elements[0][3], None, None))
2368
elif len(path_elements[0]) == 6:
2369
# versioned, absent file.
2370
dirblock.append((path_elements[0][0],
2371
path_elements[0][1], 'unknown', None,
2372
path_elements[0][4], path_elements[0][5]))
2374
raise NotImplementedError('unreachable code')
2375
yield current_inv[0], dirblock
2377
current_inv = inventory_iterator.next()
2378
except StopIteration:
2381
current_disk = disk_iterator.next()
2382
except StopIteration:
2383
disk_finished = True
2385
def _walkdirs(self, prefix=""):
2386
"""Walk the directories of this tree.
2388
:prefix: is used as the directrory to start with.
2389
returns a generator which yields items in the form:
2390
((curren_directory_path, fileid),
2391
[(file1_path, file1_name, file1_kind, None, file1_id,
2394
_directory = 'directory'
2395
# get the root in the inventory
2396
inv = self.inventory
2397
top_id = inv.path2id(prefix)
2401
pending = [(prefix, '', _directory, None, top_id, None)]
2404
currentdir = pending.pop()
2405
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2406
top_id = currentdir[4]
2408
relroot = currentdir[0] + '/'
2411
# FIXME: stash the node in pending
2413
for name, child in entry.sorted_children():
2414
dirblock.append((relroot + name, name, child.kind, None,
2415
child.file_id, child.kind
2417
yield (currentdir[0], entry.file_id), dirblock
2418
# push the user specified dirs from dirblock
2419
for dir in reversed(dirblock):
2420
if dir[2] == _directory:
2423
@needs_tree_write_lock
2424
def auto_resolve(self):
2425
"""Automatically resolve text conflicts according to contents.
2427
Only text conflicts are auto_resolvable. Files with no conflict markers
2428
are considered 'resolved', because bzr always puts conflict markers
2429
into files that have text conflicts. The corresponding .THIS .BASE and
2430
.OTHER files are deleted, as per 'resolve'.
2431
:return: a tuple of ConflictLists: (un_resolved, resolved).
2433
un_resolved = _mod_conflicts.ConflictList()
2434
resolved = _mod_conflicts.ConflictList()
2435
conflict_re = re.compile('^(<{7}|={7}|>{7})')
2436
for conflict in self.conflicts():
2437
if (conflict.typestring != 'text conflict' or
2438
self.kind(conflict.file_id) != 'file'):
2439
un_resolved.append(conflict)
2441
my_file = open(self.id2abspath(conflict.file_id), 'rb')
2443
for line in my_file:
2444
if conflict_re.search(line):
2445
un_resolved.append(conflict)
2448
resolved.append(conflict)
2451
resolved.remove_files(self)
2452
self.set_conflicts(un_resolved)
2453
return un_resolved, resolved
2455
def _validate(self):
2456
"""Validate internal structures.
2458
This is meant mostly for the test suite. To give it a chance to detect
2459
corruption after actions have occurred. The default implementation is a
2462
:return: None. An exception should be raised if there is an error.
2467
class WorkingTree2(WorkingTree):
2468
"""This is the Format 2 working tree.
2470
This was the first weave based working tree.
2471
- uses os locks for locking.
2472
- uses the branch last-revision.
2475
def __init__(self, *args, **kwargs):
2476
super(WorkingTree2, self).__init__(*args, **kwargs)
2477
# WorkingTree2 has more of a constraint that self._inventory must
2478
# exist. Because this is an older format, we don't mind the overhead
2479
# caused by the extra computation here.
2481
# Newer WorkingTree's should only have self._inventory set when they
2483
if self._inventory is None:
2484
self.read_working_inventory()
2486
def lock_tree_write(self):
2487
"""See WorkingTree.lock_tree_write().
2489
In Format2 WorkingTrees we have a single lock for the branch and tree
2490
so lock_tree_write() degrades to lock_write().
2492
self.branch.lock_write()
2494
return self._control_files.lock_write()
2496
self.branch.unlock()
2500
# do non-implementation specific cleanup
2503
# we share control files:
2504
if self._control_files._lock_count == 3:
2505
# _inventory_is_modified is always False during a read lock.
2506
if self._inventory_is_modified:
2508
self._write_hashcache_if_dirty()
2510
# reverse order of locking.
2512
return self._control_files.unlock()
2514
self.branch.unlock()
1332
2517
class WorkingTree3(WorkingTree):
1333
2518
"""This is the Format 3 working tree.
added
removed
bzrlib/workingtree.py
