84
87
specific_files=specific_files,
85
88
extra_trees=extra_trees,
86
89
require_versioned=require_versioned,
87
include_root=include_root
90
include_root=include_root,
91
want_unversioned=want_unversioned,
90
def _iter_changes(self, from_tree, include_unchanged=False,
91
specific_file_ids=None, pb=None):
94
def _iter_changes(self, from_tree, include_unchanged=False,
95
specific_files=None, pb=None, extra_trees=None,
96
require_versioned=True, want_unversioned=False):
92
97
intertree = InterTree.get(from_tree, self)
93
return intertree._iter_changes(from_tree, self, include_unchanged,
94
specific_file_ids, pb)
98
return intertree._iter_changes(include_unchanged, specific_files, pb,
99
extra_trees, require_versioned, want_unversioned=want_unversioned)
96
101
def conflicts(self):
97
102
"""Get a list of the conflicts in the tree.
174
211
def get_file(self, file_id):
175
212
"""Return a file object for the file file_id in the tree."""
176
213
raise NotImplementedError(self.get_file)
215
def get_file_mtime(self, file_id, path=None):
216
"""Return the modification time for a file.
218
:param file_id: The handle for this file.
219
:param path: The path that this file can be found at.
220
These must point to the same object.
222
raise NotImplementedError(self.get_file_mtime)
178
224
def get_file_by_path(self, path):
179
225
return self.get_file(self._inventory.path2id(path))
227
def get_symlink_target(self, file_id):
228
"""Get the target for a given file_id.
230
It is assumed that the caller already knows that file_id is referencing
232
:param file_id: Handle for the symlink entry.
233
:return: The path the symlink points to.
235
raise NotImplementedError(self.get_symlink_target)
181
237
def annotate_iter(self, file_id):
182
238
"""Return an iterator of revision_id, line tuples
210
266
"file is actually %s" % fp['sha1'],
211
267
"store is probably damaged/corrupt"])
213
270
def path2id(self, path):
214
271
"""Return the id for path in this tree."""
215
272
return self._inventory.path2id(path)
274
def paths2ids(self, paths, trees=[], require_versioned=True):
275
"""Return all the ids that can be reached by walking from paths.
277
Each path is looked up in each this tree and any extras provided in
278
trees, and this is repeated recursively: the children in an extra tree
279
of a directory that has been renamed under a provided path in this tree
280
are all returned, even if none exist until a provided path in this
281
tree, and vice versa.
283
:param paths: An iterable of paths to start converting to ids from.
284
Alternatively, if paths is None, no ids should be calculated and None
285
will be returned. This is offered to make calling the api unconditional
286
for code that *might* take a list of files.
287
:param trees: Additional trees to consider.
288
:param require_versioned: If False, do not raise NotVersionedError if
289
an element of paths is not versioned in this tree and all of trees.
291
return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
217
293
def print_file(self, file_id):
218
294
"""Print file with id `file_id` to stdout."""
295
file_id = osutils.safe_file_id(file_id)
220
297
sys.stdout.write(self.get_file_text(file_id))
222
299
def lock_read(self):
302
def revision_tree(self, revision_id):
303
"""Obtain a revision tree for the revision revision_id.
305
The intention of this method is to allow access to possibly cached
306
tree data. Implementors of this method should raise NoSuchRevision if
307
the tree is not locally available, even if they could obtain the
308
tree via a repository or some other means. Callers are responsible
309
for finding the ultimate source for a revision tree.
311
:param revision_id: The revision_id of the requested tree.
313
:raises: NoSuchRevision if the tree cannot be obtained.
315
raise errors.NoSuchRevisionInTree(self, revision_id)
225
317
def unknowns(self):
226
318
"""What files are present in this tree and unknown.
243
335
pred = self.inventory.has_filename
244
336
return set((p for p in paths if not pred(p)))
338
def walkdirs(self, prefix=""):
339
"""Walk the contents of this tree from path down.
341
This yields all the data about the contents of a directory at a time.
342
After each directory has been yielded, if the caller has mutated the
343
list to exclude some directories, they are then not descended into.
345
The data yielded is of the form:
346
((directory-relpath, directory-path-from-root, directory-fileid),
347
[(relpath, basename, kind, lstat, path_from_tree_root, file_id,
348
versioned_kind), ...]),
349
- directory-relpath is the containing dirs relpath from prefix
350
- directory-path-from-root is the containing dirs path from /
351
- directory-fileid is the id of the directory if it is versioned.
352
- relpath is the relative path within the subtree being walked.
353
- basename is the basename
354
- kind is the kind of the file now. If unknonwn then the file is not
355
present within the tree - but it may be recorded as versioned. See
357
- lstat is the stat data *if* the file was statted.
358
- path_from_tree_root is the path from the root of the tree.
359
- file_id is the file_id is the entry is versioned.
360
- versioned_kind is the kind of the file as last recorded in the
361
versioning system. If 'unknown' the file is not versioned.
362
One of 'kind' and 'versioned_kind' must not be 'unknown'.
364
:param prefix: Start walking from prefix within the tree rather than
365
at the root. This allows one to walk a subtree but get paths that are
366
relative to a tree rooted higher up.
367
:return: an iterator over the directory data.
369
raise NotImplementedError(self.walkdirs)
247
372
class EmptyTree(Tree):
355
483
if not filenames:
357
specified_ids = _find_filename_ids_across_trees(filenames, trees,
359
return _find_children_across_trees(specified_ids, trees)
362
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
485
specified_path_ids = _find_ids_across_trees(filenames, trees,
487
return _find_children_across_trees(specified_path_ids, trees)
490
def _find_ids_across_trees(filenames, trees, require_versioned):
363
491
"""Find the ids corresponding to specified filenames.
365
All matches in all trees will be used.
493
All matches in all trees will be used, but subdirectories are not scanned.
367
495
:param filenames: The filenames to find file_ids for
368
496
:param trees: The trees to find file_ids within
369
497
:param require_versioned: if true, all specified filenames must occur in
371
:return: a set of file ids for the specified filenames
499
:return: a set of (path, file ids) for the specified filenames
373
501
not_versioned = []
374
502
interesting_ids = set()
375
503
for tree_path in filenames:
377
505
for tree in trees:
378
file_id = tree.inventory.path2id(tree_path)
506
file_id = tree.path2id(tree_path)
379
507
if file_id is not None:
380
508
interesting_ids.add(file_id)
381
509
not_found = False
443
572
:param require_versioned: An optional boolean (defaults to False). When
444
573
supplied and True all the 'specific_files' must be versioned, or
445
574
a PathsNotVersionedError will be thrown.
575
:param want_unversioned: Scan for unversioned paths.
447
# NB: show_status depends on being able to pass in non-versioned files and
448
# report them as unknown
449
trees = (self.source, self.target)
577
# NB: show_status depends on being able to pass in non-versioned files
578
# and report them as unknown
579
trees = (self.source,)
450
580
if extra_trees is not None:
451
581
trees = trees + tuple(extra_trees)
452
specific_file_ids = find_ids_across_trees(specific_files,
453
trees, require_versioned=require_versioned)
582
# target is usually the newer tree:
583
specific_file_ids = self.target.paths2ids(specific_files, trees,
584
require_versioned=require_versioned)
454
585
if specific_files and not specific_file_ids:
455
586
# All files are unversioned, so just return an empty delta
456
587
# _compare_trees would think we want a complete delta
457
return delta.TreeDelta()
588
result = delta.TreeDelta()
589
fake_entry = InventoryFile('unused', 'unused', 'unused')
590
result.unversioned = [(path, None,
591
self.target._comparison_data(fake_entry, path)[0]) for path in
458
594
return delta._compare_trees(self.source, self.target, want_unchanged,
459
specific_file_ids, include_root)
595
specific_files, include_root, extra_trees=extra_trees,
596
want_unversioned=want_unversioned)
461
def _iter_changes(self, from_tree, to_tree, include_unchanged,
462
specific_file_ids, pb):
598
def _iter_changes(self, include_unchanged=False,
599
specific_files=None, pb=None, extra_trees=[],
600
require_versioned=True, want_unversioned=False):
463
601
"""Generate an iterator of changes between trees.
465
603
A tuple is returned:
466
(file_id, path, changed_content, versioned, parent, name, kind,
604
(file_id, (path_in_source, path_in_target),
605
changed_content, versioned, parent, name, kind,
469
Path is relative to the to_tree. changed_content is True if the file's
470
content has changed. This includes changes to its kind, and to
608
Changed_content is True if the file's content has changed. This
609
includes changes to its kind, and to a symlink's target.
473
611
versioned, parent, name, kind, executable are tuples of (from, to).
474
612
If a file is missing in a tree, its kind is None.
476
Iteration is done in parent-to-child order, relative to the to_tree.
614
Iteration is done in parent-to-child order, relative to the target
617
There is no guarantee that all paths are in sorted order: the
618
requirement to expand the search due to renames may result in children
619
that should be found early being found late in the search, after
620
lexically later results have been returned.
621
:param require_versioned: Raise errors.PathsNotVersionedError if a
622
path in the specific_files list is not versioned in one of
623
source, target or extra_trees.
624
:param want_unversioned: Should unversioned files be returned in the
625
output. An unversioned file is defined as one with (False, False)
626
for the versioned pair.
629
lookup_trees = [self.source]
631
lookup_trees.extend(extra_trees)
632
specific_file_ids = self.target.paths2ids(specific_files,
633
lookup_trees, require_versioned=require_versioned)
635
all_unversioned = sorted([(p.split('/'), p) for p in self.target.extras()
636
if not specific_files or
637
osutils.is_inside_any(specific_files, p)])
638
all_unversioned = deque(all_unversioned)
640
all_unversioned = deque()
479
from_entries_by_dir = list(from_tree.inventory.iter_entries_by_dir())
642
from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
643
specific_file_ids=specific_file_ids))
480
644
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
481
to_entries_by_dir = list(to_tree.inventory.iter_entries_by_dir())
482
if specific_file_ids is not None:
483
specific_file_ids = set(specific_file_ids)
484
num_entries = len(specific_file_ids)
486
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
645
to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
646
specific_file_ids=specific_file_ids))
647
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
649
# the unversioned path lookup only occurs on real trees - where there
650
# can be extras. So the fake_entry is solely used to look up
651
# executable it values when execute is not supported.
652
fake_entry = InventoryFile('unused', 'unused', 'unused')
488
653
for to_path, to_entry in to_entries_by_dir:
654
while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
655
unversioned_path = all_unversioned.popleft()
656
to_kind, to_executable, to_stat = \
657
self.target._comparison_data(fake_entry, unversioned_path[1])
658
yield (None, (None, unversioned_path[1]), True, (False, False),
660
(None, unversioned_path[0][-1]),
662
(None, to_executable))
489
663
file_id = to_entry.file_id
490
664
to_paths[file_id] = to_path
491
if (specific_file_ids is not None and
492
file_id not in specific_file_ids):
495
666
changed_content = False
496
667
from_path, from_entry = from_data.get(file_id, (None, None))
511
681
from_executable = None
512
682
versioned = (from_versioned, True)
513
683
to_kind, to_executable, to_stat = \
514
to_tree._comparison_data(to_entry, to_path)
684
self.target._comparison_data(to_entry, to_path)
515
685
kind = (from_kind, to_kind)
516
686
if kind[0] != kind[1]:
517
687
changed_content = True
518
688
elif from_kind == 'file':
519
from_size = from_tree._file_size(from_entry, from_stat)
520
to_size = to_tree._file_size(to_entry, to_stat)
689
from_size = self.source._file_size(from_entry, from_stat)
690
to_size = self.target._file_size(to_entry, to_stat)
521
691
if from_size != to_size:
522
692
changed_content = True
523
elif (from_tree.get_file_sha1(file_id, from_path, from_stat) !=
524
to_tree.get_file_sha1(file_id, to_path, to_stat)):
693
elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
694
self.target.get_file_sha1(file_id, to_path, to_stat)):
525
695
changed_content = True
526
696
elif from_kind == 'symlink':
527
if (from_tree.get_symlink_target(file_id) !=
528
to_tree.get_symlink_target(file_id)):
697
if (self.source.get_symlink_target(file_id) !=
698
self.target.get_symlink_target(file_id)):
529
699
changed_content = True
700
elif from_kind == 'tree-reference':
701
if (self.source.get_reference_revision(file_id, from_path)
702
!= self.target.get_reference_revision(file_id, to_path)):
703
changed_content = True
530
704
parent = (from_parent, to_entry.parent_id)
531
705
name = (from_name, to_entry.name)
532
706
executable = (from_executable, to_executable)
533
707
if pb is not None:
534
708
pb.update('comparing files', entry_count, num_entries)
535
if (changed_content is not False or versioned[0] != versioned[1]
709
if (changed_content is not False or versioned[0] != versioned[1]
536
710
or parent[0] != parent[1] or name[0] != name[1] or
537
711
executable[0] != executable[1] or include_unchanged):
538
yield (file_id, to_path, changed_content, versioned, parent,
539
name, kind, executable)
712
yield (file_id, (from_path, to_path), changed_content,
713
versioned, parent, name, kind, executable)
715
while all_unversioned:
716
# yield any trailing unversioned paths
717
unversioned_path = all_unversioned.popleft()
718
to_kind, to_executable, to_stat = \
719
self.target._comparison_data(fake_entry, unversioned_path[1])
720
yield (None, (None, unversioned_path[1]), True, (False, False),
722
(None, unversioned_path[0][-1]),
724
(None, to_executable))
726
def get_to_path(to_entry):
727
if to_entry.parent_id is None:
728
to_path = '' # the root
730
if to_entry.parent_id not in to_paths:
732
return get_to_path(self.target.inventory[to_entry.parent_id])
733
to_path = osutils.pathjoin(to_paths[to_entry.parent_id],
735
to_paths[to_entry.file_id] = to_path
541
738
for path, from_entry in from_entries_by_dir:
542
739
file_id = from_entry.file_id
543
740
if file_id in to_paths:
545
if from_entry.parent_id is None:
743
if not file_id in self.target.inventory:
744
# common case - paths we have not emitted are not present in
548
to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
550
to_paths[file_id] = to_path
551
if (specific_file_ids is not None and
552
file_id not in specific_file_ids):
748
to_path = get_to_path(self.target.inventory[file_id])
555
750
if pb is not None:
556
751
pb.update('comparing files', entry_count, num_entries)
added
removed
bzrlib/tree.py
