60
49
Trees can be compared, etc, regardless of whether they are working
61
50
trees or versioned trees.
64
def changes_from(self, other, want_unchanged=False, specific_files=None,
65
extra_trees=None, require_versioned=False, include_root=False,
66
want_unversioned=False):
67
"""Return a TreeDelta of the changes from other to this tree.
69
:param other: A tree to compare with.
70
:param specific_files: An optional list of file paths to restrict the
71
comparison to. When mapping filenames to ids, all matches in all
72
trees (including optional extra_trees) are used, and all children of
73
matched directories are included.
74
:param want_unchanged: An optional boolean requesting the inclusion of
75
unchanged entries in the result.
76
:param extra_trees: An optional list of additional trees to use when
77
mapping the contents of specific_files (paths) to file_ids.
78
:param require_versioned: An optional boolean (defaults to False). When
79
supplied and True all the 'specific_files' must be versioned, or
80
a PathsNotVersionedError will be thrown.
81
:param want_unversioned: Scan for unversioned paths.
83
The comparison will be performed by an InterTree object looked up on
86
# Martin observes that Tree.changes_from returns a TreeDelta and this
87
# may confuse people, because the class name of the returned object is
88
# a synonym of the object referenced in the method name.
89
return InterTree.get(other, self).compare(
90
want_unchanged=want_unchanged,
91
specific_files=specific_files,
92
extra_trees=extra_trees,
93
require_versioned=require_versioned,
94
include_root=include_root,
95
want_unversioned=want_unversioned,
98
def iter_changes(self, from_tree, include_unchanged=False,
99
specific_files=None, pb=None, extra_trees=None,
100
require_versioned=True, want_unversioned=False):
101
intertree = InterTree.get(from_tree, self)
102
return intertree.iter_changes(include_unchanged, specific_files, pb,
103
extra_trees, require_versioned, want_unversioned=want_unversioned)
105
53
def conflicts(self):
106
54
"""Get a list of the conflicts in the tree.
108
56
Each conflict is an instance of bzrlib.conflicts.Conflict.
110
return _mod_conflicts.ConflictList()
113
"""For trees that can have unversioned files, return all such paths."""
116
60
def get_parent_ids(self):
117
"""Get the parent ids for this tree.
61
"""Get the parent ids for this tree.
119
63
:return: a list of parent ids. [] is returned to indicate
120
64
a tree with no parents.
121
65
:raises: BzrError if the parents are not known.
123
67
raise NotImplementedError(self.get_parent_ids)
125
69
def has_filename(self, filename):
126
70
"""True if the tree has given filename."""
127
raise NotImplementedError(self.has_filename)
71
raise NotImplementedError()
129
73
def has_id(self, file_id):
130
74
return self.inventory.has_id(file_id)
132
def __contains__(self, file_id):
133
return self.has_id(file_id)
135
76
def has_or_had_id(self, file_id):
77
if file_id == self.inventory.root.file_id:
136
79
return self.inventory.has_id(file_id)
138
def is_ignored(self, filename):
139
"""Check whether the filename is ignored by this tree.
141
:param filename: The relative filename within the tree.
142
:return: True if the filename is ignored.
146
83
def __iter__(self):
147
84
return iter(self.inventory)
149
def all_file_ids(self):
150
"""Iterate through all file ids, including ids for missing files."""
151
return set(self.inventory)
153
86
def id2path(self, file_id):
154
"""Return the path for a file id.
158
87
return self.inventory.id2path(file_id)
160
def is_control_filename(self, filename):
161
"""True if filename is the name of a control file in this tree.
163
:param filename: A filename within the tree. This is a relative path
164
from the root of this tree.
166
This is true IF and ONLY IF the filename is part of the meta data
167
that bzr controls in this tree. I.E. a random .bzr directory placed
168
on disk will not be a control file for this tree.
170
return self.bzrdir.is_control_filename(filename)
173
def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
174
"""Walk the tree in 'by_dir' order.
176
This will yield each entry in the tree as a (path, entry) tuple.
177
The order that they are yielded is:
179
Directories are walked in a depth-first lexicographical order,
180
however, whenever a directory is reached, all of its direct child
181
nodes are yielded in lexicographical order before yielding the
184
For example, in the tree::
194
The yield order (ignoring root) would be::
195
a, f, a/b, a/d, a/b/c, a/d/e, f/g
197
:param yield_parents: If True, yield the parents from the root leading
198
down to specific_file_ids that have been requested. This has no
199
impact if specific_file_ids is None.
201
return self.inventory.iter_entries_by_dir(
202
specific_file_ids=specific_file_ids, yield_parents=yield_parents)
204
def iter_references(self):
205
if self.supports_tree_reference():
206
for path, entry in self.iter_entries_by_dir():
207
if entry.kind == 'tree-reference':
208
yield path, entry.file_id
210
89
def kind(self, file_id):
211
raise NotImplementedError("Tree subclass %s must implement kind"
212
% self.__class__.__name__)
214
def stored_kind(self, file_id):
215
"""File kind stored for this file_id.
217
May not match kind on disk for working trees. Always available
218
for versioned files, even when the file itself is missing.
220
return self.kind(file_id)
222
def path_content_summary(self, path):
223
"""Get a summary of the information about path.
225
All the attributes returned are for the canonical form, not the
226
convenient form (if content filters are in use.)
228
:param path: A relative path within the tree.
229
:return: A tuple containing kind, size, exec, sha1-or-link.
230
Kind is always present (see tree.kind()).
231
size is present if kind is file and the size of the
232
canonical form can be cheaply determined, None otherwise.
233
exec is None unless kind is file and the platform supports the 'x'
235
sha1-or-link is the link target if kind is symlink, or the sha1 if
236
it can be obtained without reading the file.
238
raise NotImplementedError(self.path_content_summary)
240
def get_reference_revision(self, file_id, path=None):
241
raise NotImplementedError("Tree subclass %s must implement "
242
"get_reference_revision"
243
% self.__class__.__name__)
245
def _comparison_data(self, entry, path):
246
"""Return a tuple of kind, executable, stat_value for a file.
248
entry may be None if there is no inventory entry for the file, but
249
path must always be supplied.
251
kind is None if there is no file present (even if an inventory id is
252
present). executable is False for non-file entries.
254
raise NotImplementedError(self._comparison_data)
256
def _file_size(self, entry, stat_value):
257
raise NotImplementedError(self._file_size)
90
raise NotImplementedError("subclasses must implement kind")
259
92
def _get_inventory(self):
260
93
return self._inventory
262
def get_file(self, file_id, path=None):
263
"""Return a file object for the file file_id in the tree.
265
If both file_id and path are defined, it is implementation defined as
266
to which one is used.
268
raise NotImplementedError(self.get_file)
270
def get_file_with_stat(self, file_id, path=None):
271
"""Get a file handle and stat object for file_id.
273
The default implementation returns (self.get_file, None) for backwards
276
:param file_id: The file id to read.
277
:param path: The path of the file, if it is known.
278
:return: A tuple (file_handle, stat_value_or_None). If the tree has
279
no stat facility, or need for a stat cache feedback during commit,
280
it may return None for the second element of the tuple.
282
return (self.get_file(file_id, path), None)
284
def get_file_text(self, file_id, path=None):
285
"""Return the byte content of a file.
287
:param file_id: The file_id of the file.
288
:param path: The path of the file.
289
If both file_id and path are supplied, an implementation may use
292
my_file = self.get_file(file_id, path)
294
return my_file.read()
298
def get_file_lines(self, file_id, path=None):
299
"""Return the content of a file, as lines.
301
:param file_id: The file_id of the file.
302
:param path: The path of the file.
303
If both file_id and path are supplied, an implementation may use
306
return osutils.split_lines(self.get_file_text(file_id, path))
308
def get_file_mtime(self, file_id, path=None):
309
"""Return the modification time for a file.
311
:param file_id: The handle for this file.
312
:param path: The path that this file can be found at.
313
These must point to the same object.
315
raise NotImplementedError(self.get_file_mtime)
317
def get_file_size(self, file_id):
318
"""Return the size of a file in bytes.
320
This applies only to regular files. If invoked on directories or
321
symlinks, it will return None.
322
:param file_id: The file-id of the file
324
raise NotImplementedError(self.get_file_size)
326
95
def get_file_by_path(self, path):
327
return self.get_file(self._inventory.path2id(path), path)
329
def iter_files_bytes(self, desired_files):
330
"""Iterate through file contents.
332
Files will not necessarily be returned in the order they occur in
333
desired_files. No specific order is guaranteed.
335
Yields pairs of identifier, bytes_iterator. identifier is an opaque
336
value supplied by the caller as part of desired_files. It should
337
uniquely identify the file version in the caller's context. (Examples:
338
an index number or a TreeTransform trans_id.)
340
bytes_iterator is an iterable of bytestrings for the file. The
341
kind of iterable and length of the bytestrings are unspecified, but for
342
this implementation, it is a tuple containing a single bytestring with
343
the complete text of the file.
345
:param desired_files: a list of (file_id, identifier) pairs
347
for file_id, identifier in desired_files:
348
# We wrap the string in a tuple so that we can return an iterable
349
# of bytestrings. (Technically, a bytestring is also an iterable
350
# of bytestrings, but iterating through each character is not
352
cur_file = (self.get_file_text(file_id),)
353
yield identifier, cur_file
355
def get_symlink_target(self, file_id):
356
"""Get the target for a given file_id.
358
It is assumed that the caller already knows that file_id is referencing
360
:param file_id: Handle for the symlink entry.
361
:return: The path the symlink points to.
363
raise NotImplementedError(self.get_symlink_target)
365
def get_canonical_inventory_paths(self, paths):
366
"""Like get_canonical_inventory_path() but works on multiple items.
368
:param paths: A sequence of paths relative to the root of the tree.
369
:return: A list of paths, with each item the corresponding input path
370
adjusted to account for existing elements that match case
373
return list(self._yield_canonical_inventory_paths(paths))
375
def get_canonical_inventory_path(self, path):
376
"""Returns the first inventory item that case-insensitively matches path.
378
If a path matches exactly, it is returned. If no path matches exactly
379
but more than one path matches case-insensitively, it is implementation
380
defined which is returned.
382
If no path matches case-insensitively, the input path is returned, but
383
with as many path entries that do exist changed to their canonical
386
If you need to resolve many names from the same tree, you should
387
use get_canonical_inventory_paths() to avoid O(N) behaviour.
389
:param path: A paths relative to the root of the tree.
390
:return: The input path adjusted to account for existing elements
391
that match case insensitively.
393
return self._yield_canonical_inventory_paths([path]).next()
395
def _yield_canonical_inventory_paths(self, paths):
397
# First, if the path as specified exists exactly, just use it.
398
if self.path2id(path) is not None:
402
cur_id = self.get_root_id()
404
bit_iter = iter(path.split("/"))
407
for child in self.iter_children(cur_id):
409
child_base = os.path.basename(self.id2path(child))
410
if child_base.lower() == lelt:
412
cur_path = osutils.pathjoin(cur_path, child_base)
415
# before a change is committed we can see this error...
418
# got to the end of this directory and no entries matched.
419
# Return what matched so far, plus the rest as specified.
420
cur_path = osutils.pathjoin(cur_path, elt, *list(bit_iter))
425
def get_root_id(self):
426
"""Return the file_id for the root of this tree."""
427
raise NotImplementedError(self.get_root_id)
429
def annotate_iter(self, file_id,
430
default_revision=_mod_revision.CURRENT_REVISION):
431
"""Return an iterator of revision_id, line tuples.
433
For working trees (and mutable trees in general), the special
434
revision_id 'current:' will be used for lines that are new in this
435
tree, e.g. uncommitted changes.
436
:param file_id: The file to produce an annotated version from
437
:param default_revision: For lines that don't match a basis, mark them
438
with this revision id. Not all implementations will make use of
441
raise NotImplementedError(self.annotate_iter)
443
def _get_plan_merge_data(self, file_id, other, base):
444
from bzrlib import versionedfile
445
vf = versionedfile._PlanMergeVersionedFile(file_id)
446
last_revision_a = self._get_file_revision(file_id, vf, 'this:')
447
last_revision_b = other._get_file_revision(file_id, vf, 'other:')
449
last_revision_base = None
451
last_revision_base = base._get_file_revision(file_id, vf, 'base:')
452
return vf, last_revision_a, last_revision_b, last_revision_base
454
def plan_file_merge(self, file_id, other, base=None):
455
"""Generate a merge plan based on annotations.
457
If the file contains uncommitted changes in this tree, they will be
458
attributed to the 'current:' pseudo-revision. If the file contains
459
uncommitted changes in the other tree, they will be assigned to the
460
'other:' pseudo-revision.
462
data = self._get_plan_merge_data(file_id, other, base)
463
vf, last_revision_a, last_revision_b, last_revision_base = data
464
return vf.plan_merge(last_revision_a, last_revision_b,
467
def plan_file_lca_merge(self, file_id, other, base=None):
468
"""Generate a merge plan based lca-newness.
470
If the file contains uncommitted changes in this tree, they will be
471
attributed to the 'current:' pseudo-revision. If the file contains
472
uncommitted changes in the other tree, they will be assigned to the
473
'other:' pseudo-revision.
475
data = self._get_plan_merge_data(file_id, other, base)
476
vf, last_revision_a, last_revision_b, last_revision_base = data
477
return vf.plan_lca_merge(last_revision_a, last_revision_b,
480
def _iter_parent_trees(self):
481
"""Iterate through parent trees, defaulting to Tree.revision_tree."""
482
for revision_id in self.get_parent_ids():
484
yield self.revision_tree(revision_id)
485
except errors.NoSuchRevisionInTree:
486
yield self.repository.revision_tree(revision_id)
489
def _file_revision(revision_tree, file_id):
490
"""Determine the revision associated with a file in a given tree."""
491
revision_tree.lock_read()
493
return revision_tree.inventory[file_id].revision
495
revision_tree.unlock()
497
def _get_file_revision(self, file_id, vf, tree_revision):
498
"""Ensure that file_id, tree_revision is in vf to plan the merge."""
500
if getattr(self, '_repository', None) is None:
501
last_revision = tree_revision
502
parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
503
self._iter_parent_trees()]
504
vf.add_lines((file_id, last_revision), parent_keys,
505
self.get_file(file_id).readlines())
506
repo = self.branch.repository
509
last_revision = self._file_revision(self, file_id)
510
base_vf = self._repository.texts
511
if base_vf not in vf.fallback_versionedfiles:
512
vf.fallback_versionedfiles.append(base_vf)
96
return self.get_file(self._inventory.path2id(path))
515
98
inventory = property(_get_inventory,
516
99
doc="Inventory of this Tree")
518
101
def _check_retrieved(self, ie, f):
519
102
if not __debug__:
521
104
fp = fingerprint_file(f)
524
if ie.text_size is not None:
107
if ie.text_size != None:
525
108
if ie.text_size != fp['size']:
526
109
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
527
110
["inventory expects %d bytes" % ie.text_size,
594
139
def filter_unversioned_files(self, paths):
595
"""Filter out paths that are versioned.
140
"""Filter out paths that are not versioned.
597
142
:return: set of paths.
599
144
# NB: we specifically *don't* call self.has_filename, because for
600
# WorkingTrees that can indicate files that exist on disk but that
145
# WorkingTrees that can indicate files that exist on disk but that
601
146
# are not versioned.
602
147
pred = self.inventory.has_filename
603
148
return set((p for p in paths if not pred(p)))
605
def walkdirs(self, prefix=""):
606
"""Walk the contents of this tree from path down.
608
This yields all the data about the contents of a directory at a time.
609
After each directory has been yielded, if the caller has mutated the
610
list to exclude some directories, they are then not descended into.
612
The data yielded is of the form:
613
((directory-relpath, directory-path-from-root, directory-fileid),
614
[(relpath, basename, kind, lstat, path_from_tree_root, file_id,
615
versioned_kind), ...]),
616
- directory-relpath is the containing dirs relpath from prefix
617
- directory-path-from-root is the containing dirs path from /
618
- directory-fileid is the id of the directory if it is versioned.
619
- relpath is the relative path within the subtree being walked.
620
- basename is the basename
621
- kind is the kind of the file now. If unknonwn then the file is not
622
present within the tree - but it may be recorded as versioned. See
624
- lstat is the stat data *if* the file was statted.
625
- path_from_tree_root is the path from the root of the tree.
626
- file_id is the file_id if the entry is versioned.
627
- versioned_kind is the kind of the file as last recorded in the
628
versioning system. If 'unknown' the file is not versioned.
629
One of 'kind' and 'versioned_kind' must not be 'unknown'.
631
:param prefix: Start walking from prefix within the tree rather than
632
at the root. This allows one to walk a subtree but get paths that are
633
relative to a tree rooted higher up.
634
:return: an iterator over the directory data.
636
raise NotImplementedError(self.walkdirs)
638
def supports_content_filtering(self):
151
class RevisionTree(Tree):
152
"""Tree viewing a previous revision.
154
File text can be retrieved from the text store.
156
TODO: Some kind of `__repr__` method, but a good one
157
probably means knowing the branch and revision number,
158
or at least passing a description to the constructor.
161
def __init__(self, branch, inv, revision_id):
162
# for compatability the 'branch' parameter has not been renamed to
163
# repository at this point. However, we should change RevisionTree's
164
# construction to always be via Repository and not via direct
165
# construction - this will mean that we can change the constructor
166
# with much less chance of breaking client code.
167
self._repository = branch
168
self._weave_store = branch.weave_store
169
self._inventory = inv
170
self._revision_id = revision_id
172
def get_parent_ids(self):
173
"""See Tree.get_parent_ids.
175
A RevisionTree's parents match the revision graph.
177
parent_ids = self._repository.get_revision(self._revision_id).parent_ids
180
def get_revision_id(self):
181
"""Return the revision id associated with this tree."""
182
return self._revision_id
184
def get_weave(self, file_id):
185
return self._weave_store.get_weave(file_id,
186
self._repository.get_transaction())
188
def get_file_lines(self, file_id):
189
ie = self._inventory[file_id]
190
weave = self.get_weave(file_id)
191
return weave.get_lines(ie.revision)
193
def get_file_text(self, file_id):
194
return ''.join(self.get_file_lines(file_id))
196
def get_file(self, file_id):
197
return StringIO(self.get_file_text(file_id))
199
def get_file_size(self, file_id):
200
return self._inventory[file_id].text_size
202
def get_file_sha1(self, file_id, path=None):
203
ie = self._inventory[file_id]
204
if ie.kind == "file":
208
def get_file_mtime(self, file_id, path=None):
209
ie = self._inventory[file_id]
210
revision = self._repository.get_revision(ie.revision)
211
return revision.timestamp
213
def is_executable(self, file_id, path=None):
214
ie = self._inventory[file_id]
215
if ie.kind != "file":
217
return self._inventory[file_id].executable
219
def has_filename(self, filename):
220
return bool(self.inventory.path2id(filename))
222
def list_files(self):
223
# The only files returned by this are those from the version
224
for path, entry in self.inventory.iter_entries():
225
yield path, 'V', entry.kind, entry.file_id, entry
227
def get_symlink_target(self, file_id):
228
ie = self._inventory[file_id]
229
return ie.symlink_target;
231
def kind(self, file_id):
232
return self._inventory[file_id].kind
235
self._repository.lock_read()
238
self._repository.unlock()
241
class EmptyTree(Tree):
244
self._inventory = Inventory()
246
def get_parent_ids(self):
247
"""See Tree.get_parent_ids.
249
An EmptyTree always has NULL_REVISION as the only parent.
253
def get_symlink_target(self, file_id):
256
def has_filename(self, filename):
641
def _content_filter_stack(self, path=None, file_id=None):
642
"""The stack of content filters for a path if filtering is supported.
644
Readers will be applied in first-to-last order.
645
Writers will be applied in last-to-first order.
646
Either the path or the file-id needs to be provided.
648
:param path: path relative to the root of the tree
650
:param file_id: file_id or None if unknown
651
:return: the list of filters - [] if there are none
653
filter_pref_names = filters._get_registered_names()
654
if len(filter_pref_names) == 0:
657
path = self.id2path(file_id)
658
prefs = self.iter_search_rules([path], filter_pref_names).next()
659
stk = filters._get_filter_stack_for(prefs)
660
if 'filters' in debug.debug_flags:
661
note("*** %s content-filter: %s => %r" % (path,prefs,stk))
664
def _content_filter_stack_provider(self):
665
"""A function that returns a stack of ContentFilters.
667
The function takes a path (relative to the top of the tree) and a
668
file-id as parameters.
670
:return: None if content filtering is not supported by this tree.
672
if self.supports_content_filtering():
673
return lambda path, file_id: \
674
self._content_filter_stack(path, file_id)
678
def iter_search_rules(self, path_names, pref_names=None,
679
_default_searcher=None):
680
"""Find the preferences for filenames in a tree.
682
:param path_names: an iterable of paths to find attributes for.
683
Paths are given relative to the root of the tree.
684
:param pref_names: the list of preferences to lookup - None for all
685
:param _default_searcher: private parameter to assist testing - don't use
686
:return: an iterator of tuple sequences, one per path-name.
687
See _RulesSearcher.get_items for details on the tuple sequence.
689
if _default_searcher is None:
690
_default_searcher = rules._per_user_searcher
691
searcher = self._get_rules_searcher(_default_searcher)
692
if searcher is not None:
693
if pref_names is not None:
694
for path in path_names:
695
yield searcher.get_selected_items(path, pref_names)
697
for path in path_names:
698
yield searcher.get_items(path)
700
def _get_rules_searcher(self, default_searcher):
701
"""Get the RulesSearcher for this tree given the default one."""
702
searcher = default_searcher
259
def kind(self, file_id):
260
assert self._inventory[file_id].kind == "root_directory"
261
return "root_directory"
263
def list_files(self):
266
def __contains__(self, file_id):
267
return file_id in self._inventory
269
def get_file_sha1(self, file_id, path=None):
270
assert self._inventory[file_id].kind == "root_directory"
706
274
######################################################################
830
398
new_pending = set()
831
399
for file_id in pending:
832
400
for tree in trees:
833
if not tree.has_or_had_id(file_id):
401
if file_id not in tree:
835
for child_id in tree.iter_children(file_id):
836
if child_id not in interesting_ids:
837
new_pending.add(child_id)
403
entry = tree.inventory[file_id]
404
for child in getattr(entry, 'children', {}).itervalues():
405
if child.file_id not in interesting_ids:
406
new_pending.add(child.file_id)
838
407
interesting_ids.update(new_pending)
839
408
pending = new_pending
840
409
return interesting_ids
843
class InterTree(InterObject):
844
"""This class represents operations taking place between two Trees.
846
Its instances have methods like 'compare' and contain references to the
847
source and target trees these operations are to be carried out on.
849
Clients of bzrlib should not need to use InterTree directly, rather they
850
should use the convenience methods on Tree such as 'Tree.compare()' which
851
will pass through to InterTree as appropriate.
854
# Formats that will be used to test this InterTree. If both are
855
# None, this InterTree will not be tested (e.g. because a complex
857
_matching_from_tree_format = None
858
_matching_to_tree_format = None
862
def _changes_from_entries(self, source_entry, target_entry,
863
source_path=None, target_path=None):
864
"""Generate a iter_changes tuple between source_entry and target_entry.
866
:param source_entry: An inventory entry from self.source, or None.
867
:param target_entry: An inventory entry from self.target, or None.
868
:param source_path: The path of source_entry, if known. If not known
869
it will be looked up.
870
:param target_path: The path of target_entry, if known. If not known
871
it will be looked up.
872
:return: A tuple, item 0 of which is an iter_changes result tuple, and
873
item 1 is True if there are any changes in the result tuple.
875
if source_entry is None:
876
if target_entry is None:
878
file_id = target_entry.file_id
880
file_id = source_entry.file_id
881
if source_entry is not None:
882
source_versioned = True
883
source_name = source_entry.name
884
source_parent = source_entry.parent_id
885
if source_path is None:
886
source_path = self.source.id2path(file_id)
887
source_kind, source_executable, source_stat = \
888
self.source._comparison_data(source_entry, source_path)
890
source_versioned = False
894
source_executable = None
895
if target_entry is not None:
896
target_versioned = True
897
target_name = target_entry.name
898
target_parent = target_entry.parent_id
899
if target_path is None:
900
target_path = self.target.id2path(file_id)
901
target_kind, target_executable, target_stat = \
902
self.target._comparison_data(target_entry, target_path)
904
target_versioned = False
908
target_executable = None
909
versioned = (source_versioned, target_versioned)
910
kind = (source_kind, target_kind)
911
changed_content = False
912
if source_kind != target_kind:
913
changed_content = True
914
elif source_kind == 'file':
915
if (self.source.get_file_sha1(file_id, source_path, source_stat) !=
916
self.target.get_file_sha1(file_id, target_path, target_stat)):
917
changed_content = True
918
elif source_kind == 'symlink':
919
if (self.source.get_symlink_target(file_id) !=
920
self.target.get_symlink_target(file_id)):
921
changed_content = True
922
# XXX: Yes, the indentation below is wrong. But fixing it broke
923
# test_merge.TestMergerEntriesLCAOnDisk.
924
# test_nested_tree_subtree_renamed_and_modified. We'll wait for
925
# the fix from bzr.dev -- vila 2009026
926
elif source_kind == 'tree-reference':
927
if (self.source.get_reference_revision(file_id, source_path)
928
!= self.target.get_reference_revision(file_id, target_path)):
929
changed_content = True
930
parent = (source_parent, target_parent)
931
name = (source_name, target_name)
932
executable = (source_executable, target_executable)
933
if (changed_content is not False or versioned[0] != versioned[1]
934
or parent[0] != parent[1] or name[0] != name[1] or
935
executable[0] != executable[1]):
939
return (file_id, (source_path, target_path), changed_content,
940
versioned, parent, name, kind, executable), changes
943
def compare(self, want_unchanged=False, specific_files=None,
944
extra_trees=None, require_versioned=False, include_root=False,
945
want_unversioned=False):
946
"""Return the changes from source to target.
948
:return: A TreeDelta.
949
:param specific_files: An optional list of file paths to restrict the
950
comparison to. When mapping filenames to ids, all matches in all
951
trees (including optional extra_trees) are used, and all children of
952
matched directories are included.
953
:param want_unchanged: An optional boolean requesting the inclusion of
954
unchanged entries in the result.
955
:param extra_trees: An optional list of additional trees to use when
956
mapping the contents of specific_files (paths) to file_ids.
957
:param require_versioned: An optional boolean (defaults to False). When
958
supplied and True all the 'specific_files' must be versioned, or
959
a PathsNotVersionedError will be thrown.
960
:param want_unversioned: Scan for unversioned paths.
962
trees = (self.source,)
963
if extra_trees is not None:
964
trees = trees + tuple(extra_trees)
965
# target is usually the newer tree:
966
specific_file_ids = self.target.paths2ids(specific_files, trees,
967
require_versioned=require_versioned)
968
if specific_files and not specific_file_ids:
969
# All files are unversioned, so just return an empty delta
970
# _compare_trees would think we want a complete delta
971
result = delta.TreeDelta()
972
fake_entry = InventoryFile('unused', 'unused', 'unused')
973
result.unversioned = [(path, None,
974
self.target._comparison_data(fake_entry, path)[0]) for path in
977
return delta._compare_trees(self.source, self.target, want_unchanged,
978
specific_files, include_root, extra_trees=extra_trees,
979
require_versioned=require_versioned,
980
want_unversioned=want_unversioned)
982
def iter_changes(self, include_unchanged=False,
983
specific_files=None, pb=None, extra_trees=[],
984
require_versioned=True, want_unversioned=False):
985
"""Generate an iterator of changes between trees.
988
(file_id, (path_in_source, path_in_target),
989
changed_content, versioned, parent, name, kind,
992
Changed_content is True if the file's content has changed. This
993
includes changes to its kind, and to a symlink's target.
995
versioned, parent, name, kind, executable are tuples of (from, to).
996
If a file is missing in a tree, its kind is None.
998
Iteration is done in parent-to-child order, relative to the target
1001
There is no guarantee that all paths are in sorted order: the
1002
requirement to expand the search due to renames may result in children
1003
that should be found early being found late in the search, after
1004
lexically later results have been returned.
1005
:param require_versioned: Raise errors.PathsNotVersionedError if a
1006
path in the specific_files list is not versioned in one of
1007
source, target or extra_trees.
1008
:param specific_files: An optional list of file paths to restrict the
1009
comparison to. When mapping filenames to ids, all matches in all
1010
trees (including optional extra_trees) are used, and all children
1011
of matched directories are included. The parents in the target tree
1012
of the specific files up to and including the root of the tree are
1013
always evaluated for changes too.
1014
:param want_unversioned: Should unversioned files be returned in the
1015
output. An unversioned file is defined as one with (False, False)
1016
for the versioned pair.
1018
lookup_trees = [self.source]
1020
lookup_trees.extend(extra_trees)
1021
# The ids of items we need to examine to insure delta consistency.
1022
precise_file_ids = set()
1023
changed_file_ids = []
1024
if specific_files == []:
1025
specific_file_ids = []
1027
specific_file_ids = self.target.paths2ids(specific_files,
1028
lookup_trees, require_versioned=require_versioned)
1029
if specific_files is not None:
1030
# reparented or added entries must have their parents included
1031
# so that valid deltas can be created. The seen_parents set
1032
# tracks the parents that we need to have.
1033
# The seen_dirs set tracks directory entries we've yielded.
1034
# After outputting version object in to_entries we set difference
1035
# the two seen sets and start checking parents.
1036
seen_parents = set()
1038
if want_unversioned:
1039
all_unversioned = sorted([(p.split('/'), p) for p in
1040
self.target.extras()
1041
if specific_files is None or
1042
osutils.is_inside_any(specific_files, p)])
1043
all_unversioned = deque(all_unversioned)
1045
all_unversioned = deque()
1047
from_entries_by_dir = list(self.source.iter_entries_by_dir(
1048
specific_file_ids=specific_file_ids))
1049
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
1050
to_entries_by_dir = list(self.target.iter_entries_by_dir(
1051
specific_file_ids=specific_file_ids))
1052
num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
1054
# the unversioned path lookup only occurs on real trees - where there
1055
# can be extras. So the fake_entry is solely used to look up
1056
# executable it values when execute is not supported.
1057
fake_entry = InventoryFile('unused', 'unused', 'unused')
1058
for target_path, target_entry in to_entries_by_dir:
1059
while (all_unversioned and
1060
all_unversioned[0][0] < target_path.split('/')):
1061
unversioned_path = all_unversioned.popleft()
1062
target_kind, target_executable, target_stat = \
1063
self.target._comparison_data(fake_entry, unversioned_path[1])
1064
yield (None, (None, unversioned_path[1]), True, (False, False),
1066
(None, unversioned_path[0][-1]),
1067
(None, target_kind),
1068
(None, target_executable))
1069
source_path, source_entry = from_data.get(target_entry.file_id,
1071
result, changes = self._changes_from_entries(source_entry,
1072
target_entry, source_path=source_path, target_path=target_path)
1073
to_paths[result[0]] = result[1][1]
1078
pb.update('comparing files', entry_count, num_entries)
1079
if changes or include_unchanged:
1080
if specific_file_ids is not None:
1081
new_parent_id = result[4][1]
1082
precise_file_ids.add(new_parent_id)
1083
changed_file_ids.append(result[0])
1085
# Ensure correct behaviour for reparented/added specific files.
1086
if specific_files is not None:
1087
# Record output dirs
1088
if result[6][1] == 'directory':
1089
seen_dirs.add(result[0])
1090
# Record parents of reparented/added entries.
1091
versioned = result[3]
1093
if not versioned[0] or parents[0] != parents[1]:
1094
seen_parents.add(parents[1])
1095
while all_unversioned:
1096
# yield any trailing unversioned paths
1097
unversioned_path = all_unversioned.popleft()
1098
to_kind, to_executable, to_stat = \
1099
self.target._comparison_data(fake_entry, unversioned_path[1])
1100
yield (None, (None, unversioned_path[1]), True, (False, False),
1102
(None, unversioned_path[0][-1]),
1104
(None, to_executable))
1105
# Yield all remaining source paths
1106
for path, from_entry in from_entries_by_dir:
1107
file_id = from_entry.file_id
1108
if file_id in to_paths:
1111
if file_id not in self.target.all_file_ids():
1112
# common case - paths we have not emitted are not present in
1116
to_path = self.target.id2path(file_id)
1119
pb.update('comparing files', entry_count, num_entries)
1120
versioned = (True, False)
1121
parent = (from_entry.parent_id, None)
1122
name = (from_entry.name, None)
1123
from_kind, from_executable, stat_value = \
1124
self.source._comparison_data(from_entry, path)
1125
kind = (from_kind, None)
1126
executable = (from_executable, None)
1127
changed_content = from_kind is not None
1128
# the parent's path is necessarily known at this point.
1129
changed_file_ids.append(file_id)
1130
yield(file_id, (path, to_path), changed_content, versioned, parent,
1131
name, kind, executable)
1132
changed_file_ids = set(changed_file_ids)
1133
if specific_file_ids is not None:
1134
for result in self._handle_precise_ids(precise_file_ids,
1138
def _get_entry(self, tree, file_id):
1139
"""Get an inventory entry from a tree, with missing entries as None.
1141
If the tree raises NotImplementedError on accessing .inventory, then
1142
this is worked around using iter_entries_by_dir on just the file id
1145
:param tree: The tree to lookup the entry in.
1146
:param file_id: The file_id to lookup.
1149
inventory = tree.inventory
1150
except NotImplementedError:
1151
# No inventory available.
1153
iterator = tree.iter_entries_by_dir(specific_file_ids=[file_id])
1154
return iterator.next()[1]
1155
except StopIteration:
1159
return inventory[file_id]
1160
except errors.NoSuchId:
1163
def _handle_precise_ids(self, precise_file_ids, changed_file_ids,
1164
discarded_changes=None):
1165
"""Fill out a partial iter_changes to be consistent.
1167
:param precise_file_ids: The file ids of parents that were seen during
1169
:param changed_file_ids: The file ids of already emitted items.
1170
:param discarded_changes: An optional dict of precalculated
1171
iter_changes items which the partial iter_changes had not output
1173
:return: A generator of iter_changes items to output.
1175
# process parents of things that had changed under the users
1176
# requested paths to prevent incorrect paths or parent ids which
1177
# aren't in the tree.
1178
while precise_file_ids:
1179
precise_file_ids.discard(None)
1180
# Don't emit file_ids twice
1181
precise_file_ids.difference_update(changed_file_ids)
1182
if not precise_file_ids:
1184
# If the there was something at a given output path in source, we
1185
# have to include the entry from source in the delta, or we would
1186
# be putting this entry into a used path.
1188
for parent_id in precise_file_ids:
1190
paths.append(self.target.id2path(parent_id))
1191
except errors.NoSuchId:
1192
# This id has been dragged in from the source by delta
1193
# expansion and isn't present in target at all: we don't
1194
# need to check for path collisions on it.
1197
old_id = self.source.path2id(path)
1198
precise_file_ids.add(old_id)
1199
precise_file_ids.discard(None)
1200
current_ids = precise_file_ids
1201
precise_file_ids = set()
1202
# We have to emit all of precise_file_ids that have been altered.
1203
# We may have to output the children of some of those ids if any
1204
# directories have stopped being directories.
1205
for file_id in current_ids:
1207
if discarded_changes:
1208
result = discarded_changes.get(file_id)
1213
old_entry = self._get_entry(self.source, file_id)
1214
new_entry = self._get_entry(self.target, file_id)
1215
result, changes = self._changes_from_entries(
1216
old_entry, new_entry)
1219
# Get this parents parent to examine.
1220
new_parent_id = result[4][1]
1221
precise_file_ids.add(new_parent_id)
1223
if (result[6][0] == 'directory' and
1224
result[6][1] != 'directory'):
1225
# This stopped being a directory, the old children have
1227
if old_entry is None:
1228
# Reusing a discarded change.
1229
old_entry = self._get_entry(self.source, file_id)
1230
for child in old_entry.children.values():
1231
precise_file_ids.add(child.file_id)
1232
changed_file_ids.add(result[0])
1236
class MultiWalker(object):
1237
"""Walk multiple trees simultaneously, getting combined results."""
1239
# Note: This could be written to not assume you can do out-of-order
1240
# lookups. Instead any nodes that don't match in all trees could be
1241
# marked as 'deferred', and then returned in the final cleanup loop.
1242
# For now, I think it is "nicer" to return things as close to the
1243
# "master_tree" order as we can.
1245
def __init__(self, master_tree, other_trees):
1246
"""Create a new MultiWalker.
1248
All trees being walked must implement "iter_entries_by_dir()", such
1249
that they yield (path, object) tuples, where that object will have a
1250
'.file_id' member, that can be used to check equality.
1252
:param master_tree: All trees will be 'slaved' to the master_tree such
1253
that nodes in master_tree will be used as 'first-pass' sync points.
1254
Any nodes that aren't in master_tree will be merged in a second
1256
:param other_trees: A list of other trees to walk simultaneously.
1258
self._master_tree = master_tree
1259
self._other_trees = other_trees
1261
# Keep track of any nodes that were properly processed just out of
1262
# order, that way we don't return them at the end, we don't have to
1263
# track *all* processed file_ids, just the out-of-order ones
1264
self._out_of_order_processed = set()
1267
def _step_one(iterator):
1268
"""Step an iter_entries_by_dir iterator.
1270
:return: (has_more, path, ie)
1271
If has_more is False, path and ie will be None.
1274
path, ie = iterator.next()
1275
except StopIteration:
1276
return False, None, None
1278
return True, path, ie
1281
def _cmp_path_by_dirblock(path1, path2):
1282
"""Compare two paths based on what directory they are in.
1284
This generates a sort order, such that all children of a directory are
1285
sorted together, and grandchildren are in the same order as the
1286
children appear. But all grandchildren come after all children.
1288
:param path1: first path
1289
:param path2: the second path
1290
:return: negative number if ``path1`` comes first,
1291
0 if paths are equal
1292
and a positive number if ``path2`` sorts first
1294
# Shortcut this special case
1297
# This is stolen from _dirstate_helpers_py.py, only switching it to
1298
# Unicode objects. Consider using encode_utf8() and then using the
1299
# optimized versions, or maybe writing optimized unicode versions.
1300
if not isinstance(path1, unicode):
1301
raise TypeError("'path1' must be a unicode string, not %s: %r"
1302
% (type(path1), path1))
1303
if not isinstance(path2, unicode):
1304
raise TypeError("'path2' must be a unicode string, not %s: %r"
1305
% (type(path2), path2))
1306
return cmp(MultiWalker._path_to_key(path1),
1307
MultiWalker._path_to_key(path2))
1310
def _path_to_key(path):
1311
dirname, basename = osutils.split(path)
1312
return (dirname.split(u'/'), basename)
1314
def _lookup_by_file_id(self, extra_entries, other_tree, file_id):
1315
"""Lookup an inventory entry by file_id.
1317
This is called when an entry is missing in the normal order.
1318
Generally this is because a file was either renamed, or it was
1319
deleted/added. If the entry was found in the inventory and not in
1320
extra_entries, it will be added to self._out_of_order_processed
1322
:param extra_entries: A dictionary of {file_id: (path, ie)}. This
1323
should be filled with entries that were found before they were
1324
used. If file_id is present, it will be removed from the
1326
:param other_tree: The Tree to search, in case we didn't find the entry
1328
:param file_id: The file_id to look for
1329
:return: (path, ie) if found or (None, None) if not present.
1331
if file_id in extra_entries:
1332
return extra_entries.pop(file_id)
1333
# TODO: Is id2path better as the first call, or is
1334
# inventory[file_id] better as a first check?
1336
cur_path = other_tree.id2path(file_id)
1337
except errors.NoSuchId:
1339
if cur_path is None:
1342
self._out_of_order_processed.add(file_id)
1343
cur_ie = other_tree.inventory[file_id]
1344
return (cur_path, cur_ie)
1347
"""Match up the values in the different trees."""
1348
for result in self._walk_master_tree():
1350
self._finish_others()
1351
for result in self._walk_others():
1354
def _walk_master_tree(self):
1355
"""First pass, walk all trees in lock-step.
1357
When we are done, all nodes in the master_tree will have been
1358
processed. _other_walkers, _other_entries, and _others_extra will be
1359
set on 'self' for future processing.
1361
# This iterator has the most "inlining" done, because it tends to touch
1362
# every file in the tree, while the others only hit nodes that don't
1364
master_iterator = self._master_tree.iter_entries_by_dir()
1366
other_walkers = [other.iter_entries_by_dir()
1367
for other in self._other_trees]
1368
other_entries = [self._step_one(walker) for walker in other_walkers]
1369
# Track extra nodes in the other trees
1370
others_extra = [{} for i in xrange(len(self._other_trees))]
1372
master_has_more = True
1373
step_one = self._step_one
1374
lookup_by_file_id = self._lookup_by_file_id
1375
out_of_order_processed = self._out_of_order_processed
1377
while master_has_more:
1378
(master_has_more, path, master_ie) = step_one(master_iterator)
1379
if not master_has_more:
1382
file_id = master_ie.file_id
1384
other_values_append = other_values.append
1385
next_other_entries = []
1386
next_other_entries_append = next_other_entries.append
1387
for idx, (other_has_more, other_path, other_ie) in enumerate(other_entries):
1388
if not other_has_more:
1389
other_values_append(lookup_by_file_id(
1390
others_extra[idx], self._other_trees[idx], file_id))
1391
next_other_entries_append((False, None, None))
1392
elif file_id == other_ie.file_id:
1393
# This is the critical code path, as most of the entries
1394
# should match between most trees.
1395
other_values_append((other_path, other_ie))
1396
next_other_entries_append(step_one(other_walkers[idx]))
1398
# This walker did not match, step it until it either
1399
# matches, or we know we are past the current walker.
1400
other_walker = other_walkers[idx]
1401
other_extra = others_extra[idx]
1402
while (other_has_more and
1403
self._cmp_path_by_dirblock(other_path, path) < 0):
1404
other_file_id = other_ie.file_id
1405
if other_file_id not in out_of_order_processed:
1406
other_extra[other_file_id] = (other_path, other_ie)
1407
other_has_more, other_path, other_ie = \
1408
step_one(other_walker)
1409
if other_has_more and other_ie.file_id == file_id:
1410
# We ended up walking to this point, match and step
1412
other_values_append((other_path, other_ie))
1413
other_has_more, other_path, other_ie = \
1414
step_one(other_walker)
1416
# This record isn't in the normal order, see if it
1418
other_values_append(lookup_by_file_id(
1419
other_extra, self._other_trees[idx], file_id))
1420
next_other_entries_append((other_has_more, other_path,
1422
other_entries = next_other_entries
1424
# We've matched all the walkers, yield this datapoint
1425
yield path, file_id, master_ie, other_values
1426
self._other_walkers = other_walkers
1427
self._other_entries = other_entries
1428
self._others_extra = others_extra
1430
def _finish_others(self):
1431
"""Finish walking the other iterators, so we get all entries."""
1432
for idx, info in enumerate(self._other_entries):
1433
other_extra = self._others_extra[idx]
1434
(other_has_more, other_path, other_ie) = info
1435
while other_has_more:
1436
other_file_id = other_ie.file_id
1437
if other_file_id not in self._out_of_order_processed:
1438
other_extra[other_file_id] = (other_path, other_ie)
1439
other_has_more, other_path, other_ie = \
1440
self._step_one(self._other_walkers[idx])
1441
del self._other_entries
1443
def _walk_others(self):
1444
"""Finish up by walking all the 'deferred' nodes."""
1445
# TODO: One alternative would be to grab all possible unprocessed
1446
# file_ids, and then sort by path, and then yield them. That
1447
# might ensure better ordering, in case a caller strictly
1448
# requires parents before children.
1449
for idx, other_extra in enumerate(self._others_extra):
1450
others = sorted(other_extra.itervalues(),
1451
key=lambda x: self._path_to_key(x[0]))
1452
for other_path, other_ie in others:
1453
file_id = other_ie.file_id
1454
# We don't need to check out_of_order_processed here, because
1455
# the lookup_by_file_id will be removing anything processed
1456
# from the extras cache
1457
other_extra.pop(file_id)
1458
other_values = [(None, None) for i in xrange(idx)]
1459
other_values.append((other_path, other_ie))
1460
for alt_idx, alt_extra in enumerate(self._others_extra[idx+1:]):
1461
alt_idx = alt_idx + idx + 1
1462
alt_extra = self._others_extra[alt_idx]
1463
alt_tree = self._other_trees[alt_idx]
1464
other_values.append(self._lookup_by_file_id(
1465
alt_extra, alt_tree, file_id))
1466
yield other_path, file_id, None, other_values
added
removed
bzrlib/tree.py
