54
56
trees or versioned trees.
59
def changes_from(self, other, want_unchanged=False, specific_files=None,
60
extra_trees=None, require_versioned=False, include_root=False):
61
"""Return a TreeDelta of the changes from other to this tree.
63
:param other: A tree to compare with.
64
:param specific_files: An optional list of file paths to restrict the
65
comparison to. When mapping filenames to ids, all matches in all
66
trees (including optional extra_trees) are used, and all children of
67
matched directories are included.
68
:param want_unchanged: An optional boolean requesting the inclusion of
69
unchanged entries in the result.
70
:param extra_trees: An optional list of additional trees to use when
71
mapping the contents of specific_files (paths) to file_ids.
72
:param require_versioned: An optional boolean (defaults to False). When
73
supplied and True all the 'specific_files' must be versioned, or
74
a PathsNotVersionedError will be thrown.
76
The comparison will be performed by an InterTree object looked up on
79
# Martin observes that Tree.changes_from returns a TreeDelta and this
80
# may confuse people, because the class name of the returned object is
81
# a synonym of the object referenced in the method name.
82
return InterTree.get(other, self).compare(
83
want_unchanged=want_unchanged,
84
specific_files=specific_files,
85
extra_trees=extra_trees,
86
require_versioned=require_versioned,
87
include_root=include_root
90
def _iter_changes(self, from_tree, include_unchanged=False,
91
specific_file_ids=None, pb=None):
92
intertree = InterTree.get(from_tree, self)
93
return intertree._iter_changes(from_tree, self, include_unchanged,
94
specific_file_ids, pb)
97
"""Get a list of the conflicts in the tree.
99
Each conflict is an instance of bzrlib.conflicts.Conflict.
103
def get_parent_ids(self):
104
"""Get the parent ids for this tree.
106
:return: a list of parent ids. [] is returned to indicate
107
a tree with no parents.
108
:raises: BzrError if the parents are not known.
110
raise NotImplementedError(self.get_parent_ids)
57
112
def has_filename(self, filename):
58
113
"""True if the tree has given filename."""
59
114
raise NotImplementedError()
64
119
__contains__ = has_id
121
def has_or_had_id(self, file_id):
122
if file_id == self.inventory.root.file_id:
124
return self.inventory.has_id(file_id)
66
126
def __iter__(self):
67
127
return iter(self.inventory)
69
129
def id2path(self, file_id):
70
130
return self.inventory.id2path(file_id)
132
def is_control_filename(self, filename):
133
"""True if filename is the name of a control file in this tree.
135
:param filename: A filename within the tree. This is a relative path
136
from the root of this tree.
138
This is true IF and ONLY IF the filename is part of the meta data
139
that bzr controls in this tree. I.E. a random .bzr directory placed
140
on disk will not be a control file for this tree.
142
return self.bzrdir.is_control_filename(filename)
144
def iter_entries_by_dir(self, specific_file_ids=None):
145
"""Walk the tree in 'by_dir' order.
147
This will yield each entry in the tree as a (path, entry) tuple. The
148
order that they are yielded is: the contents of a directory are
149
preceeded by the parent of a directory, and all the contents of a
150
directory are grouped together.
152
return self.inventory.iter_entries_by_dir(
153
specific_file_ids=specific_file_ids)
155
def kind(self, file_id):
156
raise NotImplementedError("subclasses must implement kind")
158
def _comparison_data(self, entry, path):
159
"""Return a tuple of kind, executable, stat_value for a file.
161
entry may be None if there is no inventory entry for the file, but
162
path must always be supplied.
164
kind is None if there is no file present (even if an inventory id is
165
present). executable is False for non-file entries.
167
raise NotImplementedError(self._comparison_data)
169
def _file_size(entry, stat_value):
170
raise NotImplementedError(self._file_size)
72
172
def _get_inventory(self):
73
173
return self._inventory
175
def get_file(self, file_id):
176
"""Return a file object for the file file_id in the tree."""
177
raise NotImplementedError(self.get_file)
179
def get_file_by_path(self, path):
180
return self.get_file(self._inventory.path2id(path))
182
def annotate_iter(self, file_id):
183
"""Return an iterator of revision_id, line tuples
185
For working trees (and mutable trees in general), the special
186
revision_id 'current:' will be used for lines that are new in this
187
tree, e.g. uncommitted changes.
188
:param file_id: The file to produce an annotated version from
190
raise NotImplementedError(self.annotate_iter)
75
192
inventory = property(_get_inventory,
76
193
doc="Inventory of this Tree")
78
195
def _check_retrieved(self, ie, f):
79
198
fp = fingerprint_file(f)
82
if ie.text_size != None:
201
if ie.text_size is not None:
83
202
if ie.text_size != fp['size']:
84
bailout("mismatched size for file %r in %r" % (ie.file_id, self._store),
203
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
85
204
["inventory expects %d bytes" % ie.text_size,
86
205
"file is actually %d bytes" % fp['size'],
87
206
"store is probably damaged/corrupt"])
89
208
if ie.text_sha1 != fp['sha1']:
90
bailout("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
209
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
91
210
["inventory expects %s" % ie.text_sha1,
92
211
"file is actually %s" % fp['sha1'],
93
212
"store is probably damaged/corrupt"])
214
def path2id(self, path):
215
"""Return the id for path in this tree."""
216
return self._inventory.path2id(path)
96
def print_file(self, fileid):
97
"""Print file with id `fileid` to stdout."""
218
def print_file(self, file_id):
219
"""Print file with id `file_id` to stdout."""
99
pumpfile(self.get_file(fileid), sys.stdout)
102
def export(self, dest):
103
"""Export this tree to a new directory.
105
`dest` should not exist, and will be created holding the
106
contents of this tree.
108
TODO: To handle subdirectories we need to create the
111
:note: If the export fails, the destination directory will be
112
left in a half-assed state.
115
mutter('export version %r' % self)
117
for dp, ie in inv.iter_entries():
119
fullpath = appendpath(dest, dp)
120
if kind == 'directory':
123
pumpfile(self.get_file(ie.file_id), file(fullpath, 'wb'))
125
bailout("don't know how to export {%s} of kind %r" % (ie.file_id, kind))
126
mutter(" export {%s} kind %s to %s" % (ie.file_id, kind, fullpath))
130
class RevisionTree(Tree):
131
"""Tree viewing a previous revision.
133
File text can be retrieved from the text store.
135
TODO: Some kind of `__repr__` method, but a good one
136
probably means knowing the branch and revision number,
137
or at least passing a description to the constructor.
140
def __init__(self, store, inv):
142
self._inventory = inv
144
def get_file(self, file_id):
145
ie = self._inventory[file_id]
146
f = self._store[ie.text_id]
147
mutter(" get fileid{%s} from %r" % (file_id, self))
148
self._check_retrieved(ie, f)
151
def get_file_size(self, file_id):
152
return self._inventory[file_id].text_size
154
def get_file_sha1(self, file_id):
155
ie = self._inventory[file_id]
158
def has_filename(self, filename):
159
return bool(self.inventory.path2id(filename))
161
def list_files(self):
162
# The only files returned by this are those from the version
163
for path, entry in self.inventory.iter_entries():
164
yield path, 'V', entry.kind, entry.file_id
221
sys.stdout.write(self.get_file_text(file_id))
227
"""What files are present in this tree and unknown.
229
:return: an iterator over the unknown files.
236
def filter_unversioned_files(self, paths):
237
"""Filter out paths that are not versioned.
239
:return: set of paths.
241
# NB: we specifically *don't* call self.has_filename, because for
242
# WorkingTrees that can indicate files that exist on disk but that
244
pred = self.inventory.has_filename
245
return set((p for p in paths if not pred(p)))
167
248
class EmptyTree(Tree):
168
250
def __init__(self):
169
self._inventory = Inventory()
251
self._inventory = Inventory(root_id=None)
252
symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
253
' use repository.revision_tree instead.',
254
DeprecationWarning, stacklevel=2)
256
def get_parent_ids(self):
259
def get_symlink_target(self, file_id):
171
262
def has_filename(self, filename):
174
def list_files(self):
175
if False: # just to make it a generator
265
def kind(self, file_id):
266
assert self._inventory[file_id].kind == "directory"
269
def list_files(self, include_root=False):
272
def __contains__(self, file_id):
273
return (file_id in self._inventory)
275
def get_file_sha1(self, file_id, path=None, stat_value=None):
180
279
######################################################################
241
340
if old_name != new_name:
242
341
yield (old_name, new_name)
344
def find_ids_across_trees(filenames, trees, require_versioned=True):
345
"""Find the ids corresponding to specified filenames.
347
All matches in all trees will be used, and all children of matched
348
directories will be used.
350
:param filenames: The filenames to find file_ids for (if None, returns
352
:param trees: The trees to find file_ids within
353
:param require_versioned: if true, all specified filenames must occur in
355
:return: a set of file ids for the specified filenames and their children.
359
specified_ids = _find_filename_ids_across_trees(filenames, trees,
361
return _find_children_across_trees(specified_ids, trees)
364
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
365
"""Find the ids corresponding to specified filenames.
367
All matches in all trees will be used.
369
:param filenames: The filenames to find file_ids for
370
:param trees: The trees to find file_ids within
371
:param require_versioned: if true, all specified filenames must occur in
373
:return: a set of file ids for the specified filenames
376
interesting_ids = set()
377
for tree_path in filenames:
380
file_id = tree.inventory.path2id(tree_path)
381
if file_id is not None:
382
interesting_ids.add(file_id)
385
not_versioned.append(tree_path)
386
if len(not_versioned) > 0 and require_versioned:
387
raise errors.PathsNotVersionedError(not_versioned)
388
return interesting_ids
391
def _find_children_across_trees(specified_ids, trees):
392
"""Return a set including specified ids and their children
394
All matches in all trees will be used.
396
:param trees: The trees to find file_ids within
397
:return: a set containing all specified ids and their children
399
interesting_ids = set(specified_ids)
400
pending = interesting_ids
401
# now handle children of interesting ids
402
# we loop so that we handle all children of each id in both trees
403
while len(pending) > 0:
405
for file_id in pending:
407
if file_id not in tree:
409
entry = tree.inventory[file_id]
410
for child in getattr(entry, 'children', {}).itervalues():
411
if child.file_id not in interesting_ids:
412
new_pending.add(child.file_id)
413
interesting_ids.update(new_pending)
414
pending = new_pending
415
return interesting_ids
418
class InterTree(InterObject):
419
"""This class represents operations taking place between two Trees.
421
Its instances have methods like 'compare' and contain references to the
422
source and target trees these operations are to be carried out on.
424
clients of bzrlib should not need to use InterTree directly, rather they
425
should use the convenience methods on Tree such as 'Tree.compare()' which
426
will pass through to InterTree as appropriate.
432
def compare(self, want_unchanged=False, specific_files=None,
433
extra_trees=None, require_versioned=False, include_root=False):
434
"""Return the changes from source to target.
436
:return: A TreeDelta.
437
:param specific_files: An optional list of file paths to restrict the
438
comparison to. When mapping filenames to ids, all matches in all
439
trees (including optional extra_trees) are used, and all children of
440
matched directories are included.
441
:param want_unchanged: An optional boolean requesting the inclusion of
442
unchanged entries in the result.
443
:param extra_trees: An optional list of additional trees to use when
444
mapping the contents of specific_files (paths) to file_ids.
445
:param require_versioned: An optional boolean (defaults to False). When
446
supplied and True all the 'specific_files' must be versioned, or
447
a PathsNotVersionedError will be thrown.
449
# NB: show_status depends on being able to pass in non-versioned files and
450
# report them as unknown
451
trees = (self.source, self.target)
452
if extra_trees is not None:
453
trees = trees + tuple(extra_trees)
454
specific_file_ids = find_ids_across_trees(specific_files,
455
trees, require_versioned=require_versioned)
456
if specific_files and not specific_file_ids:
457
# All files are unversioned, so just return an empty delta
458
# _compare_trees would think we want a complete delta
459
return delta.TreeDelta()
460
return delta._compare_trees(self.source, self.target, want_unchanged,
461
specific_file_ids, include_root)
463
def _iter_changes(self, from_tree, to_tree, include_unchanged,
464
specific_file_ids, pb):
465
"""Generate an iterator of changes between trees.
468
(file_id, path, changed_content, versioned, parent, name, kind,
471
Path is relative to the to_tree. changed_content is True if the file's
472
content has changed. This includes changes to its kind, and to
475
versioned, parent, name, kind, executable are tuples of (from, to).
476
If a file is missing in a tree, its kind is None.
478
Iteration is done in parent-to-child order, relative to the to_tree.
481
from_entries_by_dir = list(from_tree.inventory.iter_entries_by_dir(
482
specific_file_ids=specific_file_ids))
483
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
484
to_entries_by_dir = list(to_tree.inventory.iter_entries_by_dir(
485
specific_file_ids=specific_file_ids))
486
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
488
for to_path, to_entry in to_entries_by_dir:
489
file_id = to_entry.file_id
490
to_paths[file_id] = to_path
492
changed_content = False
493
from_path, from_entry = from_data.get(file_id, (None, None))
494
from_versioned = (from_entry is not None)
495
if from_entry is not None:
496
from_versioned = True
497
from_name = from_entry.name
498
from_parent = from_entry.parent_id
499
from_kind, from_executable, from_stat = \
500
from_tree._comparison_data(from_entry, from_path)
503
from_versioned = False
507
from_executable = None
508
versioned = (from_versioned, True)
509
to_kind, to_executable, to_stat = \
510
to_tree._comparison_data(to_entry, to_path)
511
kind = (from_kind, to_kind)
512
if kind[0] != kind[1]:
513
changed_content = True
514
elif from_kind == 'file':
515
from_size = from_tree._file_size(from_entry, from_stat)
516
to_size = to_tree._file_size(to_entry, to_stat)
517
if from_size != to_size:
518
changed_content = True
519
elif (from_tree.get_file_sha1(file_id, from_path, from_stat) !=
520
to_tree.get_file_sha1(file_id, to_path, to_stat)):
521
changed_content = True
522
elif from_kind == 'symlink':
523
if (from_tree.get_symlink_target(file_id) !=
524
to_tree.get_symlink_target(file_id)):
525
changed_content = True
526
parent = (from_parent, to_entry.parent_id)
527
name = (from_name, to_entry.name)
528
executable = (from_executable, to_executable)
530
pb.update('comparing files', entry_count, num_entries)
531
if (changed_content is not False or versioned[0] != versioned[1]
532
or parent[0] != parent[1] or name[0] != name[1] or
533
executable[0] != executable[1] or include_unchanged):
534
yield (file_id, to_path, changed_content, versioned, parent,
535
name, kind, executable)
537
def get_to_path(from_entry):
538
if from_entry.parent_id is None:
541
if from_entry.parent_id not in to_paths:
542
get_to_path(from_tree.inventory[from_entry.parent_id])
543
to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
545
to_paths[from_entry.file_id] = to_path
548
for path, from_entry in from_entries_by_dir:
549
file_id = from_entry.file_id
550
if file_id in to_paths:
552
to_path = get_to_path(from_entry)
555
pb.update('comparing files', entry_count, num_entries)
556
versioned = (True, False)
557
parent = (from_entry.parent_id, None)
558
name = (from_entry.name, None)
559
from_kind, from_executable, stat_value = \
560
from_tree._comparison_data(from_entry, path)
561
kind = (from_kind, None)
562
executable = (from_executable, None)
563
changed_content = True
564
# the parent's path is necessarily known at this point.
565
yield(file_id, to_path, changed_content, versioned, parent,
566
name, kind, executable)
569
# This was deprecated before 0.12, but did not have an official warning
570
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
571
def RevisionTree(*args, **kwargs):
572
"""RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
574
Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
577
from bzrlib.revisiontree import RevisionTree as _RevisionTree
578
return _RevisionTree(*args, **kwargs)
added
removed
bzrlib/tree.py
