56
52
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)
112
55
def has_filename(self, filename):
113
56
"""True if the tree has given filename."""
114
57
raise NotImplementedError()
116
59
def has_id(self, file_id):
117
60
return self.inventory.has_id(file_id)
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)
127
return iter(self.inventory)
63
"""Return set of all ids in this tree."""
64
return self.inventory.id_set()
129
66
def id2path(self, file_id):
130
67
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)
172
69
def _get_inventory(self):
173
70
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)
192
72
inventory = property(_get_inventory,
193
73
doc="Inventory of this Tree")
195
75
def _check_retrieved(self, ie, f):
198
76
fp = fingerprint_file(f)
201
79
if ie.text_size is not None:
202
80
if ie.text_size != fp['size']:
203
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
81
bailout("mismatched size for file %r in %r" % (ie.file_id, self._store),
204
82
["inventory expects %d bytes" % ie.text_size,
205
83
"file is actually %d bytes" % fp['size'],
206
84
"store is probably damaged/corrupt"])
208
86
if ie.text_sha1 != fp['sha1']:
209
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
87
bailout("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
210
88
["inventory expects %s" % ie.text_sha1,
211
89
"file is actually %s" % fp['sha1'],
212
90
"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)
218
def print_file(self, file_id):
219
"""Print file with id `file_id` to stdout."""
221
sys.stdout.write(self.get_file_text(file_id))
93
def export(self, dest):
94
"""Export this tree to a new directory.
96
`dest` should not exist, and will be created holding the
97
contents of this tree.
99
:todo: To handle subdirectories we need to create the
102
:note: If the export fails, the destination directory will be
103
left in a half-assed state.
106
mutter('export version %r' % self)
108
for dp, ie in inv.iter_entries():
110
fullpath = appendpath(dest, dp)
111
if kind == 'directory':
114
pumpfile(self.get_file(ie.file_id), file(fullpath, 'wb'))
116
bailout("don't know how to export {%s} of kind %r", fid, kind)
117
mutter(" export {%s} kind %s to %s" % (ie.file_id, kind, fullpath))
121
class WorkingTree(Tree):
122
"""Working copy tree.
124
The inventory is held in the `Branch` working-inventory, and the
125
files are in a directory on disk.
127
It is possible for a `WorkingTree` to have a filename which is
128
not listed in the Inventory and vice versa.
130
def __init__(self, basedir, inv):
131
self._inventory = inv
132
self.basedir = basedir
133
self.path2id = inv.path2id
136
return "<%s of %s>" % (self.__class__.__name__,
139
def abspath(self, filename):
140
return os.path.join(self.basedir, filename)
142
def has_filename(self, filename):
143
return os.path.exists(self.abspath(filename))
145
def get_file(self, file_id):
146
return self.get_file_byname(self.id2path(file_id))
148
def get_file_byname(self, filename):
149
return file(self.abspath(filename), 'rb')
151
def _get_store_filename(self, file_id):
152
return self.abspath(self.id2path(file_id))
154
def has_id(self, file_id):
155
# files that have been deleted are excluded
156
if not self.inventory.has_id(file_id):
158
return os.access(self.abspath(self.inventory.id2path(file_id)), os.F_OK)
160
def get_file_size(self, file_id):
161
return os.stat(self._get_store_filename(file_id))[ST_SIZE]
163
def get_file_sha1(self, file_id):
164
f = self.get_file(file_id)
168
def file_class(self, filename):
169
if self.path2id(filename):
171
elif self.is_ignored(filename):
177
def list_files(self):
178
"""Recursively list all files as (path, class, kind, id).
180
Lists, but does not descend into unversioned directories.
182
This does not include files that have been deleted in this
185
Skips the control directory.
189
def descend(from_dir, from_dir_id, dp):
193
## TODO: If we find a subdirectory with its own .bzr
194
## directory, then that is a separate tree and we
195
## should exclude it.
196
if bzrlib.BZRDIR == f:
200
fp = appendpath(from_dir, f)
203
fap = appendpath(dp, f)
205
f_ie = inv.get_child(from_dir_id, f)
208
elif self.is_ignored(fp):
217
bailout("file %r entered as kind %r id %r, now of kind %r"
218
% (fap, f_ie.kind, f_ie.file_id, fk))
220
yield fp, c, fk, (f_ie and f_ie.file_id)
222
if fk != 'directory':
226
# don't descend unversioned directories
229
for ff in descend(fp, f_ie.file_id, fap):
232
for f in descend('', None, self.basedir):
226
237
def unknowns(self):
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)))
238
for subp in self.extras():
239
if not self.is_ignored(subp):
244
"""Yield all unknown files in this WorkingTree.
246
If there are any unknown directories then only the directory is
247
returned, not all its children. But if there are unknown files
248
under a versioned subdirectory, they are returned.
250
Currently returned depth-first, sorted by name within directories.
252
## TODO: Work from given directory downwards
254
for path, dir_entry in self.inventory.directories():
255
mutter("search for unknowns in %r" % path)
256
dirabs = self.abspath(path)
257
if not isdir(dirabs):
258
# e.g. directory deleted
262
for subf in os.listdir(dirabs):
264
and (subf not in dir_entry.children)):
269
subp = appendpath(path, subf)
273
def ignored_files(self):
274
"""Yield list of PATH, IGNORE_PATTERN"""
275
for subp in self.extras():
276
pat = self.is_ignored(subp)
281
def get_ignore_list(self):
282
"""Return list of ignore patterns.
284
Cached in the Tree object after the first call.
286
if hasattr(self, '_ignorelist'):
287
return self._ignorelist
289
l = bzrlib.DEFAULT_IGNORE[:]
290
if self.has_filename(bzrlib.IGNORE_FILENAME):
291
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
292
l.extend([line.rstrip("\n\r") for line in f.readlines()])
297
def is_ignored(self, filename):
298
"""Check whether the filename matches an ignore pattern.
300
Patterns containing '/' need to match the whole path; others
301
match against only the last component.
303
If the file is ignored, returns the pattern which caused it to
304
be ignored, otherwise None. So this can simply be used as a
305
boolean if desired."""
307
## TODO: Use '**' to match directories, and other extended globbing stuff from cvs/rsync.
309
for pat in self.get_ignore_list():
311
if fnmatch.fnmatchcase(filename, pat):
314
if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):
322
class RevisionTree(Tree):
323
"""Tree viewing a previous revision.
325
File text can be retrieved from the text store.
327
:todo: Some kind of `__repr__` method, but a good one
328
probably means knowing the branch and revision number,
329
or at least passing a description to the constructor.
332
def __init__(self, store, inv):
334
self._inventory = inv
336
def get_file(self, file_id):
337
ie = self._inventory[file_id]
338
f = self._store[ie.text_id]
339
mutter(" get fileid{%s} from %r" % (file_id, self))
340
self._check_retrieved(ie, f)
343
def get_file_size(self, file_id):
344
return self._inventory[file_id].text_size
346
def get_file_sha1(self, file_id):
347
ie = self._inventory[file_id]
350
def has_filename(self, filename):
351
return bool(self.inventory.path2id(filename))
353
def list_files(self):
354
# The only files returned by this are those from the version
355
for path, entry in self.inventory.iter_entries():
356
yield path, 'V', entry.kind, entry.file_id
248
359
class EmptyTree(Tree):
250
360
def __init__(self):
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):
361
self._inventory = Inventory()
262
363
def has_filename(self, filename):
265
def kind(self, file_id):
266
assert self._inventory[file_id].kind == "directory"
269
def list_files(self, include_root=False):
366
def list_files(self):
367
if False: # just to make it a generator
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):
279
372
######################################################################
334
def find_renames(old_inv, new_inv):
335
for file_id in old_inv:
336
if file_id not in new_inv:
338
old_name = old_inv.id2path(file_id)
339
new_name = new_inv.id2path(file_id)
340
if old_name != new_name:
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
351
:param trees: The trees to find file_ids within
352
:param require_versioned: if true, all specified filenames must occur in
354
:return: a set of file ids for the specified filenames and their children.
358
specified_ids = _find_filename_ids_across_trees(filenames, trees,
360
return _find_children_across_trees(specified_ids, trees)
363
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
364
"""Find the ids corresponding to specified filenames.
366
All matches in all trees will be used.
368
:param filenames: The filenames to find file_ids for
369
:param trees: The trees to find file_ids within
370
:param require_versioned: if true, all specified filenames must occur in
372
:return: a set of file ids for the specified filenames
375
interesting_ids = set()
376
for tree_path in filenames:
379
file_id = tree.inventory.path2id(tree_path)
380
if file_id is not None:
381
interesting_ids.add(file_id)
384
not_versioned.append(tree_path)
385
if len(not_versioned) > 0 and require_versioned:
386
raise errors.PathsNotVersionedError(not_versioned)
387
return interesting_ids
390
def _find_children_across_trees(specified_ids, trees):
391
"""Return a set including specified ids and their children
393
All matches in all trees will be used.
395
:param trees: The trees to find file_ids within
396
:return: a set containing all specified ids and their children
398
interesting_ids = set(specified_ids)
399
pending = interesting_ids
400
# now handle children of interesting ids
401
# we loop so that we handle all children of each id in both trees
402
while len(pending) > 0:
404
for file_id in pending:
406
if file_id not in tree:
408
entry = tree.inventory[file_id]
409
for child in getattr(entry, 'children', {}).itervalues():
410
if child.file_id not in interesting_ids:
411
new_pending.add(child.file_id)
412
interesting_ids.update(new_pending)
413
pending = new_pending
414
return interesting_ids
417
class InterTree(InterObject):
418
"""This class represents operations taking place between two Trees.
420
Its instances have methods like 'compare' and contain references to the
421
source and target trees these operations are to be carried out on.
423
clients of bzrlib should not need to use InterTree directly, rather they
424
should use the convenience methods on Tree such as 'Tree.compare()' which
425
will pass through to InterTree as appropriate.
431
def compare(self, want_unchanged=False, specific_files=None,
432
extra_trees=None, require_versioned=False, include_root=False):
433
"""Return the changes from source to target.
435
:return: A TreeDelta.
436
:param specific_files: An optional list of file paths to restrict the
437
comparison to. When mapping filenames to ids, all matches in all
438
trees (including optional extra_trees) are used, and all children of
439
matched directories are included.
440
:param want_unchanged: An optional boolean requesting the inclusion of
441
unchanged entries in the result.
442
:param extra_trees: An optional list of additional trees to use when
443
mapping the contents of specific_files (paths) to file_ids.
444
:param require_versioned: An optional boolean (defaults to False). When
445
supplied and True all the 'specific_files' must be versioned, or
446
a PathsNotVersionedError will be thrown.
448
# NB: show_status depends on being able to pass in non-versioned files and
449
# report them as unknown
450
trees = (self.source, self.target)
451
if extra_trees is not None:
452
trees = trees + tuple(extra_trees)
453
specific_file_ids = find_ids_across_trees(specific_files,
454
trees, require_versioned=require_versioned)
455
if specific_files and not specific_file_ids:
456
# All files are unversioned, so just return an empty delta
457
# _compare_trees would think we want a complete delta
458
return delta.TreeDelta()
459
return delta._compare_trees(self.source, self.target, want_unchanged,
460
specific_file_ids, include_root)
462
def _iter_changes(self, from_tree, to_tree, include_unchanged,
463
specific_file_ids, pb):
464
"""Generate an iterator of changes between trees.
467
(file_id, path, changed_content, versioned, parent, name, kind,
470
Path is relative to the to_tree. changed_content is True if the file's
471
content has changed. This includes changes to its kind, and to
474
versioned, parent, name, kind, executable are tuples of (from, to).
475
If a file is missing in a tree, its kind is None.
477
Iteration is done in parent-to-child order, relative to the to_tree.
480
from_entries_by_dir = list(from_tree.inventory.iter_entries_by_dir(
481
specific_file_ids=specific_file_ids))
482
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
483
to_entries_by_dir = list(to_tree.inventory.iter_entries_by_dir(
484
specific_file_ids=specific_file_ids))
485
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
487
for to_path, to_entry in to_entries_by_dir:
488
file_id = to_entry.file_id
489
to_paths[file_id] = to_path
491
changed_content = False
492
from_path, from_entry = from_data.get(file_id, (None, None))
493
from_versioned = (from_entry is not None)
494
if from_entry is not None:
495
from_versioned = True
496
from_name = from_entry.name
497
from_parent = from_entry.parent_id
498
from_kind, from_executable, from_stat = \
499
from_tree._comparison_data(from_entry, from_path)
502
from_versioned = False
506
from_executable = None
507
versioned = (from_versioned, True)
508
to_kind, to_executable, to_stat = \
509
to_tree._comparison_data(to_entry, to_path)
510
kind = (from_kind, to_kind)
511
if kind[0] != kind[1]:
512
changed_content = True
513
elif from_kind == 'file':
514
from_size = from_tree._file_size(from_entry, from_stat)
515
to_size = to_tree._file_size(to_entry, to_stat)
516
if from_size != to_size:
517
changed_content = True
518
elif (from_tree.get_file_sha1(file_id, from_path, from_stat) !=
519
to_tree.get_file_sha1(file_id, to_path, to_stat)):
520
changed_content = True
521
elif from_kind == 'symlink':
522
if (from_tree.get_symlink_target(file_id) !=
523
to_tree.get_symlink_target(file_id)):
524
changed_content = True
525
parent = (from_parent, to_entry.parent_id)
526
name = (from_name, to_entry.name)
527
executable = (from_executable, to_executable)
529
pb.update('comparing files', entry_count, num_entries)
530
if (changed_content is not False or versioned[0] != versioned[1]
531
or parent[0] != parent[1] or name[0] != name[1] or
532
executable[0] != executable[1] or include_unchanged):
533
yield (file_id, to_path, changed_content, versioned, parent,
534
name, kind, executable)
536
def get_to_path(from_entry):
537
if from_entry.parent_id is None:
540
if from_entry.parent_id not in to_paths:
541
get_to_path(from_tree.inventory[from_entry.parent_id])
542
to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
544
to_paths[from_entry.file_id] = to_path
547
for path, from_entry in from_entries_by_dir:
548
file_id = from_entry.file_id
549
if file_id in to_paths:
551
to_path = get_to_path(from_entry)
554
pb.update('comparing files', entry_count, num_entries)
555
versioned = (True, False)
556
parent = (from_entry.parent_id, None)
557
name = (from_entry.name, None)
558
from_kind, from_executable, stat_value = \
559
from_tree._comparison_data(from_entry, path)
560
kind = (from_kind, None)
561
executable = (from_executable, None)
562
changed_content = True
563
# the parent's path is necessarily known at this point.
564
yield(file_id, to_path, changed_content, versioned, parent,
565
name, kind, executable)
568
# This was deprecated before 0.12, but did not have an official warning
569
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
570
def RevisionTree(*args, **kwargs):
571
"""RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
573
Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
576
from bzrlib.revisiontree import RevisionTree as _RevisionTree
577
return _RevisionTree(*args, **kwargs)
added
removed
bzrlib/tree.py
