/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2005-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
17
"""Tree classes, representing directory at point in time.
18
"""
19
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
20
from __future__ import absolute_import
21
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
22
import os
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
23
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
24
from .lazy_import import lazy_import
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
25
lazy_import(globals(), """
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
26
import collections
800 by Martin Pool
Merge John's import-speedup branch:
27
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
28
from breezy import (
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
29
    conflicts as _mod_conflicts,
3368.2.30 by Ian Clatworthy
add -Dfilters support
30
    debug,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
31
    delta,
3368.2.16 by Ian Clatworthy
add real implementation of Tree.get_filter_stack
32
    filters,
1551.15.46 by Aaron Bentley
Move plan merge to tree
33
    revision as _mod_revision,
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
34
    rules,
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
35
    trace,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
36
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
37
from breezy.i18n import gettext
5745.3.1 by Jelmer Vernooij
Use lazy imports in bzrlib.tree.
38
""")
39
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
40
from . import (
41
    errors,
6754.8.3 by Jelmer Vernooij
Use context manager in decorators.
42
    lock,
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
43
    osutils,
44
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
45
from .inter import InterObject
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
46
from .sixish import (
47
    viewvalues,
48
    )
1 by mbp at sourcefrog
import from baz patch-364
49
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
50
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
51
class FileTimestampUnavailable(errors.BzrError):
52
53
    _fmt = "The filestamp for %(path)s is not available."
54
55
    internal_error = True
56
57
    def __init__(self, path):
58
        self.path = path
59
60
6846.6.1 by Jelmer Vernooij
Move Tree{Link,File,Directory,Entry} to breezy.tree.
61
class TreeEntry(object):
62
    """An entry that implements the minimum interface used by commands.
63
    """
64
65
    def __eq__(self, other):
6857 by Jelmer Vernooij
Merge lp:~jelmer/brz/move-ie.
66
        # yes, this is ugly, TODO: best practice __eq__ style.
6846.6.1 by Jelmer Vernooij
Move Tree{Link,File,Directory,Entry} to breezy.tree.
67
        return (isinstance(other, TreeEntry)
68
                and other.__class__ == self.__class__)
69
70
    def kind_character(self):
71
        return "???"
72
73
74
class TreeDirectory(TreeEntry):
75
    """See TreeEntry. This is a directory in a working tree."""
76
77
    def kind_character(self):
78
        return "/"
79
80
81
class TreeFile(TreeEntry):
82
    """See TreeEntry. This is a regular file in a working tree."""
83
84
    def kind_character(self):
85
        return ''
86
87
88
class TreeLink(TreeEntry):
89
    """See TreeEntry. This is a symlink in a working tree."""
90
91
    def kind_character(self):
92
        return ''
93
94
6926.2.1 by Jelmer Vernooij
Some tree reference fixes.
95
class TreeReference(TreeEntry):
96
    """See TreeEntry. This is a reference to a nested tree in a working tree."""
97
98
    def kind_character(self):
99
        return '/'
100
101
558 by Martin Pool
- All top-level classes inherit from object
102
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
103
    """Abstract file tree.
104
105
    There are several subclasses:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
106
1 by mbp at sourcefrog
import from baz patch-364
107
    * `WorkingTree` exists as files on disk editable by the user.
108
109
    * `RevisionTree` is a tree as recorded at some point in the past.
110
111
    Trees can be compared, etc, regardless of whether they are working
112
    trees or versioned trees.
113
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
114
6883.5.17 by Jelmer Vernooij
Add Tree.supports_rename_tracking().
115
    def supports_rename_tracking(self):
116
        """Whether this tree supports rename tracking.
117
118
        This defaults to True, but some implementations may want to override
119
        it.
120
        """
121
        return True
122
6110.6.1 by Jelmer Vernooij
Add Tree.has_versioned_directories.
123
    def has_versioned_directories(self):
124
        """Whether this tree can contain explicitly versioned directories.
125
126
        This defaults to True, but some implementations may want to override
127
        it.
128
        """
129
        return True
130
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
131
    def changes_from(self, other, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
132
        extra_trees=None, require_versioned=False, include_root=False,
133
        want_unversioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
134
        """Return a TreeDelta of the changes from other to this tree.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
135
136
        :param other: A tree to compare with.
137
        :param specific_files: An optional list of file paths to restrict the
138
            comparison to. When mapping filenames to ids, all matches in all
139
            trees (including optional extra_trees) are used, and all children of
140
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
141
        :param want_unchanged: An optional boolean requesting the inclusion of
142
            unchanged entries in the result.
143
        :param extra_trees: An optional list of additional trees to use when
144
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
145
        :param require_versioned: An optional boolean (defaults to False). When
146
            supplied and True all the 'specific_files' must be versioned, or
147
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
148
        :param want_unversioned: Scan for unversioned paths.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
149
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
150
        The comparison will be performed by an InterTree object looked up on
1852.8.4 by Robert Collins
Hook InterTree into Tree.
151
        self and other.
152
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
153
        # Martin observes that Tree.changes_from returns a TreeDelta and this
154
        # may confuse people, because the class name of the returned object is
155
        # a synonym of the object referenced in the method name.
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
156
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
157
            want_unchanged=want_unchanged,
158
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
159
            extra_trees=extra_trees,
160
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
161
            include_root=include_root,
162
            want_unversioned=want_unversioned,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
163
            )
2012.1.1 by Aaron Bentley
Implement change iterator
164
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
165
    def iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
166
                     specific_files=None, pb=None, extra_trees=None,
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
167
                     require_versioned=True, want_unversioned=False):
4988.10.6 by John Arbash Meinel
Fix bug #304182 by adding a trivial docstring to Tree.iter_changes
168
        """See InterTree.iter_changes"""
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
169
        intertree = InterTree.get(from_tree, self)
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
170
        return intertree.iter_changes(include_unchanged, specific_files, pb,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
171
            extra_trees, require_versioned, want_unversioned=want_unversioned)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
172
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
173
    def conflicts(self):
174
        """Get a list of the conflicts in the tree.
175
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
176
        Each conflict is an instance of breezy.conflicts.Conflict.
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
177
        """
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
178
        return _mod_conflicts.ConflictList()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
179
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
180
    def extras(self):
181
        """For trees that can have unversioned files, return all such paths."""
182
        return []
183
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
184
    def get_parent_ids(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
185
        """Get the parent ids for this tree.
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
186
187
        :return: a list of parent ids. [] is returned to indicate
188
        a tree with no parents.
189
        :raises: BzrError if the parents are not known.
190
        """
191
        raise NotImplementedError(self.get_parent_ids)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
192
1 by mbp at sourcefrog
import from baz patch-364
193
    def has_filename(self, filename):
194
        """True if the tree has given filename."""
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
195
        raise NotImplementedError(self.has_filename)
1 by mbp at sourcefrog
import from baz patch-364
196
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
197
    def is_ignored(self, filename):
198
        """Check whether the filename is ignored by this tree.
199
200
        :param filename: The relative filename within the tree.
201
        :return: True if the filename is ignored.
202
        """
203
        return False
204
3146.8.16 by Aaron Bentley
Updates from review
205
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
206
        """Iterate through all file ids, including ids for missing files."""
5837.2.1 by Jelmer Vernooij
Deprecate Tree.__iter__.
207
        raise NotImplementedError(self.all_file_ids)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
208
6825.5.1 by Jelmer Vernooij
Implement Tree.all_versioned_paths.
209
    def all_versioned_paths(self):
210
        """Iterate through all paths, including paths for missing files."""
211
        raise NotImplementedError(self.all_versioned_paths)
212
1 by mbp at sourcefrog
import from baz patch-364
213
    def id2path(self, file_id):
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
214
        """Return the path for a file id.
215
216
        :raises NoSuchId:
217
        """
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
218
        raise NotImplementedError(self.id2path)
1 by mbp at sourcefrog
import from baz patch-364
219
6929.6.1 by Jelmer Vernooij
Remove yield_parents argument to Tree.iter_entries_by_dir.
220
    def iter_entries_by_dir(self, specific_files=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
221
        """Walk the tree in 'by_dir' order.
222
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
223
        This will yield each entry in the tree as a (path, entry) tuple.
224
        The order that they are yielded is:
225
226
        Directories are walked in a depth-first lexicographical order,
227
        however, whenever a directory is reached, all of its direct child
228
        nodes are yielded in  lexicographical order before yielding the
229
        grandchildren.
230
231
        For example, in the tree::
232
233
           a/
234
             b/
235
               c
236
             d/
237
               e
238
           f/
239
             g
240
3363.5.4 by Aaron Bentley
Fix iteration order of iter_entries_by_dir
241
        The yield order (ignoring root) would be::
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
242
3363.2.23 by Aaron Bentley
Fix iter_entries_by_dir ordering
243
          a, f, a/b, a/d, a/b/c, a/d/e, f/g
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
244
        """
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
245
        raise NotImplementedError(self.iter_entries_by_dir)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
246
6844.1.1 by Jelmer Vernooij
Many more foreign branch fixes.
247
    def iter_child_entries(self, path, file_id=None):
6471.1.2 by Jelmer Vernooij
Add Tree.iter_child_entries.
248
        """Iterate over the children of a directory or tree reference.
249
6844.1.1 by Jelmer Vernooij
Many more foreign branch fixes.
250
        :param path: Path of the directory
251
        :param file_id: Optional file id of the directory/tree-reference
6471.1.3 by Jelmer Vernooij
Add Tree.iter_child_entries.
252
        :raise NoSuchId: When the file_id does not exist
253
        :return: Iterator over entries in the directory
6471.1.2 by Jelmer Vernooij
Add Tree.iter_child_entries.
254
        """
255
        raise NotImplementedError(self.iter_child_entries)
256
5793.2.1 by Jelmer Vernooij
Add Tree.list_files stub.
257
    def list_files(self, include_root=False, from_dir=None, recursive=True):
258
        """List all files in this tree.
259
260
        :param include_root: Whether to include the entry for the tree root
261
        :param from_dir: Directory under which to list files
262
        :param recursive: Whether to list files recursively
263
        :return: iterator over tuples of (path, versioned, kind, file_id,
264
            inventory entry)
265
        """
266
        raise NotImplementedError(self.list_files)
267
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
268
    def iter_references(self):
4370.3.2 by Ian Clatworthy
apply jam's review feedback
269
        if self.supports_tree_reference():
270
            for path, entry in self.iter_entries_by_dir():
271
                if entry.kind == 'tree-reference':
272
                    yield path, entry.file_id
2100.3.27 by Aaron Bentley
Enable nested commits
273
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
274
    def kind(self, path, file_id=None):
2255.2.159 by Martin Pool
reference-trees in dirstate pass all tests.
275
        raise NotImplementedError("Tree subclass %s must implement kind"
276
            % self.__class__.__name__)
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
277
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
278
    def stored_kind(self, path, file_id=None):
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
279
        """File kind stored for this file_id.
280
3146.8.15 by Aaron Bentley
Cleanup and docs
281
        May not match kind on disk for working trees.  Always available
282
        for versioned files, even when the file itself is missing.
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
283
        """
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
284
        return self.kind(path, file_id)
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
285
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
286
    def path_content_summary(self, path):
287
        """Get a summary of the information about path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
288
4595.11.2 by Martin Pool
Clarify contract of path_content_summary
289
        All the attributes returned are for the canonical form, not the
290
        convenient form (if content filters are in use.)
291
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
292
        :param path: A relative path within the tree.
293
        :return: A tuple containing kind, size, exec, sha1-or-link.
294
            Kind is always present (see tree.kind()).
4595.11.13 by Martin Pool
Remove get_kind_and_executable_by_path; go back to using plain path_content_summary
295
            size is present if kind is file and the size of the 
296
                canonical form can be cheaply determined, None otherwise.
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
297
            exec is None unless kind is file and the platform supports the 'x'
298
                bit.
299
            sha1-or-link is the link target if kind is symlink, or the sha1 if
300
                it can be obtained without reading the file.
301
        """
302
        raise NotImplementedError(self.path_content_summary)
303
6809.4.1 by Jelmer Vernooij
Swap file_id and path arguments for get_reference_revision and get_nested_tree.
304
    def get_reference_revision(self, path, file_id=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
305
        raise NotImplementedError("Tree subclass %s must implement "
306
                                  "get_reference_revision"
307
            % self.__class__.__name__)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
308
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
309
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
310
        """Return a tuple of kind, executable, stat_value for a file.
311
312
        entry may be None if there is no inventory entry for the file, but
313
        path must always be supplied.
314
315
        kind is None if there is no file present (even if an inventory id is
316
        present).  executable is False for non-file entries.
317
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
318
        raise NotImplementedError(self._comparison_data)
319
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
320
    def get_file(self, path, file_id=None):
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
321
        """Return a file object for the file file_id in the tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
322
2772.2.1 by Ian Clatworthy
(Ian Clatworthy) Quicker initial commit - skip SHAing twice & skip path lookup as we know it
323
        If both file_id and path are defined, it is implementation defined as
324
        to which one is used.
325
        """
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
326
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
327
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
328
    def get_file_with_stat(self, path, file_id=None):
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
329
        """Get a file handle and stat object for file_id.
330
331
        The default implementation returns (self.get_file, None) for backwards
332
        compatibility.
333
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
334
        :param path: The path of the file.
335
        :param file_id: The file id to read, if it is known.
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
336
        :return: A tuple (file_handle, stat_value_or_None). If the tree has
337
            no stat facility, or need for a stat cache feedback during commit,
338
            it may return None for the second element of the tuple.
339
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
340
        return (self.get_file(path, file_id), None)
4354.4.5 by Aaron Bentley
Ensure Tree.get_file_with_stat is provided.
341
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
342
    def get_file_text(self, path, file_id=None):
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
343
        """Return the byte content of a file.
344
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
345
        :param path: The path of the file.
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
346
        :param file_id: The file_id of the file.
6006.3.1 by Martin Pool
Start adding ContentFilterTree
347
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
348
        If both file_id and path are supplied, an implementation may use
349
        either one.
6006.3.1 by Martin Pool
Start adding ContentFilterTree
350
351
        :returns: A single byte string for the whole file.
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
352
        """
6977.2.1 by Jelmer Vernooij
Require that get_file implementations are contect managers, simplify file handling in transform.
353
        with self.get_file(path, file_id) as my_file:
3774.1.1 by Aaron Bentley
Test Tree.get_file_text() and supply default implementation.
354
            return my_file.read()
355
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
356
    def get_file_lines(self, path, file_id=None):
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
357
        """Return the content of a file, as lines.
358
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
359
        :param path: The path of the file.
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
360
        :param file_id: The file_id of the file.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
361
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
362
        If both file_id and path are supplied, an implementation may use
363
        either one.
364
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
365
        return osutils.split_lines(self.get_file_text(path, file_id))
3774.1.2 by Aaron Bentley
Test Tree.get_file_lines, provide a default implementation
366
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
367
    def get_file_verifier(self, path, file_id=None, stat_value=None):
5906.1.2 by Jelmer Vernooij
Add Tree.get_file_verifier.
368
        """Return a verifier for a file.
369
370
        The default implementation returns a sha1.
371
372
        :param file_id: The handle for this file.
373
        :param path: The path that this file can be found at.
374
            These must point to the same object.
375
        :param stat_value: Optional stat value for the object
376
        :return: Tuple with verifier name and verifier data
377
        """
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
378
        return ("SHA1", self.get_file_sha1(path, file_id,
5906.1.2 by Jelmer Vernooij
Add Tree.get_file_verifier.
379
            stat_value=stat_value))
380
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
381
    def get_file_sha1(self, path, file_id=None, stat_value=None):
5777.1.3 by Jelmer Vernooij
Add stub for Tree.get_file_sha1.
382
        """Return the SHA1 file for a file.
383
5906.1.4 by Jelmer Vernooij
Add InterTree.file_contents_match.
384
        :note: callers should use get_file_verifier instead
385
            where possible, as the underlying repository implementation may
386
            have quicker access to a non-sha1 verifier.
387
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
388
        :param path: The path that this file can be found at.
5777.1.3 by Jelmer Vernooij
Add stub for Tree.get_file_sha1.
389
        :param file_id: The handle for this file.
390
            These must point to the same object.
5883.1.2 by Jelmer Vernooij
Support stat_value argument to get_file_sha1
391
        :param stat_value: Optional stat value for the object
5777.1.3 by Jelmer Vernooij
Add stub for Tree.get_file_sha1.
392
        """
393
        raise NotImplementedError(self.get_file_sha1)
394
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
395
    def get_file_mtime(self, path, file_id=None):
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
396
        """Return the modification time for a file.
397
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
398
        :param path: The path that this file can be found at.
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
399
        :param file_id: The handle for this file.
400
            These must point to the same object.
401
        """
402
        raise NotImplementedError(self.get_file_mtime)
403
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
404
    def get_file_size(self, path, file_id=None):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
405
        """Return the size of a file in bytes.
406
407
        This applies only to regular files.  If invoked on directories or
408
        symlinks, it will return None.
409
        :param file_id: The file-id of the file
410
        """
411
        raise NotImplementedError(self.get_file_size)
412
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
413
    def is_executable(self, path, file_id=None):
5777.1.4 by Jelmer Vernooij
Stub for is_executable.
414
        """Check if a file is executable.
415
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
416
        :param path: The path that this file can be found at.
5777.1.4 by Jelmer Vernooij
Stub for is_executable.
417
        :param file_id: The handle for this file.
418
            These must point to the same object.
419
        """
420
        raise NotImplementedError(self.is_executable)
421
2708.1.7 by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes
422
    def iter_files_bytes(self, desired_files):
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
423
        """Iterate through file contents.
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
424
2708.1.10 by Aaron Bentley
Update docstrings
425
        Files will not necessarily be returned in the order they occur in
426
        desired_files.  No specific order is guaranteed.
427
428
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
429
        value supplied by the caller as part of desired_files.  It should
430
        uniquely identify the file version in the caller's context.  (Examples:
431
        an index number or a TreeTransform trans_id.)
432
433
        bytes_iterator is an iterable of bytestrings for the file.  The
434
        kind of iterable and length of the bytestrings are unspecified, but for
435
        this implementation, it is a tuple containing a single bytestring with
436
        the complete text of the file.
437
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
438
        :param desired_files: a list of (path, identifier) pairs
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
439
        """
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
440
        for path, identifier in desired_files:
2708.1.10 by Aaron Bentley
Update docstrings
441
            # We wrap the string in a tuple so that we can return an iterable
442
            # of bytestrings.  (Technically, a bytestring is also an iterable
443
            # of bytestrings, but iterating through each character is not
444
            # performant.)
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
445
            cur_file = (self.get_file_text(path),)
2708.1.6 by Aaron Bentley
Turn extract_files_bytes into an iterator
446
            yield identifier, cur_file
2708.1.1 by Aaron Bentley
Implement Tree.extract_files
447
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
448
    def get_symlink_target(self, path, file_id=None):
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
449
        """Get the target for a given file_id.
450
451
        It is assumed that the caller already knows that file_id is referencing
452
        a symlink.
453
        :param file_id: Handle for the symlink entry.
5858.1.1 by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target.
454
        :param path: The path of the file.
455
        If both file_id and path are supplied, an implementation may use
456
        either one.
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
457
        :return: The path the symlink points to.
458
        """
459
        raise NotImplementedError(self.get_symlink_target)
460
2946.3.2 by John Arbash Meinel
Add tree implementation tests for Tree.get_root_id()
461
    def get_root_id(self):
462
        """Return the file_id for the root of this tree."""
463
        raise NotImplementedError(self.get_root_id)
464
6809.4.2 by Jelmer Vernooij
Swap arguments for annotate_iter.
465
    def annotate_iter(self, path, file_id=None,
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
466
                      default_revision=_mod_revision.CURRENT_REVISION):
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
467
        """Return an iterator of revision_id, line tuples.
1551.9.18 by Aaron Bentley
Updates from review comments
468
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
469
        For working trees (and mutable trees in general), the special
470
        revision_id 'current:' will be used for lines that are new in this
471
        tree, e.g. uncommitted changes.
472
        :param file_id: The file to produce an annotated version from
3224.1.2 by John Arbash Meinel
Updated the base Tree.annotate_iter() since all implemenations take an optional kwarg.
473
        :param default_revision: For lines that don't match a basis, mark them
474
            with this revision id. Not all implementations will make use of
475
            this value.
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
476
        """
477
        raise NotImplementedError(self.annotate_iter)
478
3363.9.1 by Aaron Bentley
Implement plan_merge, refactoring various bits
479
    def _iter_parent_trees(self):
480
        """Iterate through parent trees, defaulting to Tree.revision_tree."""
481
        for revision_id in self.get_parent_ids():
482
            try:
483
                yield self.revision_tree(revision_id)
484
            except errors.NoSuchRevisionInTree:
485
                yield self.repository.revision_tree(revision_id)
486
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
487
    def path2id(self, path):
488
        """Return the id for path in this tree."""
5777.3.1 by Jelmer Vernooij
Split InventoryTree out of Tree.
489
        raise NotImplementedError(self.path2id)
1 by mbp at sourcefrog
import from baz patch-364
490
6852.3.1 by Jelmer Vernooij
add Tree.is_versioned.
491
    def is_versioned(self, path):
492
        """Check whether path is versioned.
493
494
        :param path: Path to check
495
        :return: boolean
496
        """
6856 by Jelmer Vernooij
Merge lp:~jelmer/brz/is-versioned.
497
        return self.path2id(path) is not None
6852.3.1 by Jelmer Vernooij
add Tree.is_versioned.
498
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
499
    def find_related_paths_across_trees(self, paths, trees=[],
500
            require_versioned=True):
501
        """Find related paths in tree corresponding to specified filenames in any
502
        of `lookup_trees`.
503
504
        All matches in all trees will be used, and all children of matched
505
        directories will be used.
506
507
        :param paths: The filenames to find related paths for (if None, returns
508
            None)
509
        :param trees: The trees to find file_ids within
510
        :param require_versioned: if true, all specified filenames must occur in
511
            at least one tree.
512
        :return: a set of paths for the specified filenames and their children
513
            in `tree`
514
        """
6885.5.4 by Jelmer Vernooij
Move paths2ids to InventoryTree.
515
        raise NotImplementedError(self.find_related_paths_across_trees)
3363.12.2 by Aaron Bentley
Implement tree.iter_children to instead of adjusting InventoryEntry handling
516
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
517
    def lock_read(self):
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
518
        """Lock this tree for multiple read only operations.
6468.3.1 by Jelmer Vernooij
Use iter_children in a couple more places.
519
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
520
        :return: A breezy.lock.LogicalLockResult.
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
521
        """
6754.8.3 by Jelmer Vernooij
Use context manager in decorators.
522
        return lock.LogicalLockResult(self.unlock)
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
523
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
524
    def revision_tree(self, revision_id):
525
        """Obtain a revision tree for the revision revision_id.
526
527
        The intention of this method is to allow access to possibly cached
528
        tree data. Implementors of this method should raise NoSuchRevision if
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
529
        the tree is not locally available, even if they could obtain the
530
        tree via a repository or some other means. Callers are responsible
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
531
        for finding the ultimate source for a revision tree.
532
533
        :param revision_id: The revision_id of the requested tree.
534
        :return: A Tree.
535
        :raises: NoSuchRevision if the tree cannot be obtained.
536
        """
537
        raise errors.NoSuchRevisionInTree(self, revision_id)
538
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
539
    def unknowns(self):
540
        """What files are present in this tree and unknown.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
541
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
542
        :return: an iterator over the unknown files.
543
        """
544
        return iter([])
545
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
546
    def unlock(self):
547
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
548
549
    def filter_unversioned_files(self, paths):
2255.7.62 by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
550
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
551
552
        :return: set of paths.
553
        """
6974.1.1 by Jelmer Vernooij
Provide a sensible default implementaton of Tree.filter_unversioned_files.
554
        # NB: we specifically *don't* call self.has_filename, because for
555
        # WorkingTrees that can indicate files that exist on disk but that
556
        # are not versioned.
6974.1.2 by Jelmer Vernooij
Avoid unnecessary parentheses.
557
        return set(p for p in paths if not self.is_versioned(p))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
558
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
559
    def walkdirs(self, prefix=""):
560
        """Walk the contents of this tree from path down.
561
562
        This yields all the data about the contents of a directory at a time.
563
        After each directory has been yielded, if the caller has mutated the
564
        list to exclude some directories, they are then not descended into.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
565
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
566
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
567
        ((directory-relpath, directory-path-from-root, directory-fileid),
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
568
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id,
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
569
          versioned_kind), ...]),
570
         - directory-relpath is the containing dirs relpath from prefix
571
         - directory-path-from-root is the containing dirs path from /
572
         - directory-fileid is the id of the directory if it is versioned.
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
573
         - relpath is the relative path within the subtree being walked.
574
         - basename is the basename
575
         - kind is the kind of the file now. If unknonwn then the file is not
576
           present within the tree - but it may be recorded as versioned. See
577
           versioned_kind.
578
         - lstat is the stat data *if* the file was statted.
579
         - path_from_tree_root is the path from the root of the tree.
2818.2.1 by Ian Clatworthy
minor tree & dirstate code cleanups
580
         - file_id is the file_id if the entry is versioned.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
581
         - versioned_kind is the kind of the file as last recorded in the
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
582
           versioning system. If 'unknown' the file is not versioned.
583
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
584
585
        :param prefix: Start walking from prefix within the tree rather than
586
        at the root. This allows one to walk a subtree but get paths that are
587
        relative to a tree rooted higher up.
588
        :return: an iterator over the directory data.
589
        """
590
        raise NotImplementedError(self.walkdirs)
591
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
592
    def supports_content_filtering(self):
593
        return False
594
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
595
    def _content_filter_stack(self, path=None):
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
596
        """The stack of content filters for a path if filtering is supported.
3368.2.47 by Ian Clatworthy
merge bzr.dev r4042
597
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
598
        Readers will be applied in first-to-last order.
599
        Writers will be applied in last-to-first order.
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
600
        Either the path or the file-id needs to be provided.
601
602
        :param path: path relative to the root of the tree
603
            or None if unknown
604
        :return: the list of filters - [] if there are none
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
605
        """
3368.2.16 by Ian Clatworthy
add real implementation of Tree.get_filter_stack
606
        filter_pref_names = filters._get_registered_names()
607
        if len(filter_pref_names) == 0:
608
            return []
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
609
        prefs = next(self.iter_search_rules([path], filter_pref_names))
3368.2.30 by Ian Clatworthy
add -Dfilters support
610
        stk = filters._get_filter_stack_for(prefs)
611
        if 'filters' in debug.debug_flags:
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
612
            trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path, prefs, stk))
3368.2.30 by Ian Clatworthy
add -Dfilters support
613
        return stk
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
614
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
615
    def _content_filter_stack_provider(self):
616
        """A function that returns a stack of ContentFilters.
617
618
        The function takes a path (relative to the top of the tree) and a
619
        file-id as parameters.
620
621
        :return: None if content filtering is not supported by this tree.
622
        """
623
        if self.supports_content_filtering():
624
            return lambda path, file_id: \
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
625
                    self._content_filter_stack(path)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
626
        else:
627
            return None
628
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
629
    def iter_search_rules(self, path_names, pref_names=None,
4324.4.1 by Marius Kruger
Make it possible to blackboxtest rules
630
        _default_searcher=None):
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
631
        """Find the preferences for filenames in a tree.
632
633
        :param path_names: an iterable of paths to find attributes for.
634
          Paths are given relative to the root of the tree.
635
        :param pref_names: the list of preferences to lookup - None for all
636
        :param _default_searcher: private parameter to assist testing - don't use
637
        :return: an iterator of tuple sequences, one per path-name.
638
          See _RulesSearcher.get_items for details on the tuple sequence.
639
        """
4324.4.1 by Marius Kruger
Make it possible to blackboxtest rules
640
        if _default_searcher is None:
641
            _default_searcher = rules._per_user_searcher
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
642
        searcher = self._get_rules_searcher(_default_searcher)
643
        if searcher is not None:
3398.1.34 by Ian Clatworthy
changed API design as requested by jam during review
644
            if pref_names is not None:
645
                for path in path_names:
646
                    yield searcher.get_selected_items(path, pref_names)
647
            else:
648
                for path in path_names:
649
                    yield searcher.get_items(path)
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
650
651
    def _get_rules_searcher(self, default_searcher):
652
        """Get the RulesSearcher for this tree given the default one."""
653
        searcher = default_searcher
654
        return searcher
655
6968.2.7 by Jelmer Vernooij
Add breezy.archive.
656
    def archive(self, format, name, root='', subdir=None,
657
                force_mtime=None):
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
658
        """Create an archive of this tree.
659
660
        :param name: target file name
661
        :param format: Format name (e.g. 'tar')
662
        :param root: Root directory name (or None)
663
        :param subdir: Subdirectory to export (or None)
6968.2.7 by Jelmer Vernooij
Add breezy.archive.
664
        :param per_file_timestamps: Whether to set the timestamp
665
            for each file to the last changed time.
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
666
        :return: Iterator over archive chunks
667
        """
6968.2.10 by Jelmer Vernooij
Review comments.
668
        from .archive import create_archive
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
669
        with self.lock_read():
6968.2.7 by Jelmer Vernooij
Add breezy.archive.
670
            return create_archive(format, self, name, root,
671
                    subdir, force_mtime=force_mtime)
6968.2.1 by Jelmer Vernooij
Add Tree.archive, which streams an archived version of a tree.
672
6929.3.3 by Jelmer Vernooij
Add Tree.versionable_kind.
673
    @classmethod
674
    def versionable_kind(cls, kind):
675
        """Check if this tree support versioning a specific file kind."""
676
        return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
677
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
678
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
679
class InterTree(InterObject):
680
    """This class represents operations taking place between two Trees.
681
682
    Its instances have methods like 'compare' and contain references to the
683
    source and target trees these operations are to be carried out on.
684
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
685
    Clients of breezy should not need to use InterTree directly, rather they
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
686
    should use the convenience methods on Tree such as 'Tree.compare()' which
687
    will pass through to InterTree as appropriate.
688
    """
689
4585.1.18 by Jelmer Vernooij
Add note saying that InterTree will not be tested if the from and to formats are not set.
690
    # Formats that will be used to test this InterTree. If both are
691
    # None, this InterTree will not be tested (e.g. because a complex
692
    # setup is required)
693
    _matching_from_tree_format = None
694
    _matching_to_tree_format = None
695
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
696
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
697
5837.1.2 by Jelmer Vernooij
Register defaults as first optimiser for existing Inter objects.
698
    @classmethod
699
    def is_compatible(kls, source, target):
700
        # The default implementation is naive and uses the public API, so
701
        # it works for all trees.
702
        return True
703
6883.1.1 by Jelmer Vernooij
Avoid file id lookups.
704
    def _changes_from_entries(self, source_entry, target_entry, source_path,
705
                              target_path):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
706
        """Generate a iter_changes tuple between source_entry and target_entry.
707
708
        :param source_entry: An inventory entry from self.source, or None.
709
        :param target_entry: An inventory entry from self.target, or None.
6883.1.1 by Jelmer Vernooij
Avoid file id lookups.
710
        :param source_path: The path of source_entry.
711
        :param target_path: The path of target_entry.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
712
        :return: A tuple, item 0 of which is an iter_changes result tuple, and
713
            item 1 is True if there are any changes in the result tuple.
714
        """
715
        if source_entry is None:
716
            if target_entry is None:
717
                return None
718
            file_id = target_entry.file_id
719
        else:
720
            file_id = source_entry.file_id
721
        if source_entry is not None:
722
            source_versioned = True
723
            source_name = source_entry.name
724
            source_parent = source_entry.parent_id
725
            source_kind, source_executable, source_stat = \
726
                self.source._comparison_data(source_entry, source_path)
727
        else:
728
            source_versioned = False
729
            source_name = None
730
            source_parent = None
731
            source_kind = None
732
            source_executable = None
733
        if target_entry is not None:
734
            target_versioned = True
735
            target_name = target_entry.name
736
            target_parent = target_entry.parent_id
737
            target_kind, target_executable, target_stat = \
738
                self.target._comparison_data(target_entry, target_path)
739
        else:
740
            target_versioned = False
741
            target_name = None
742
            target_parent = None
743
            target_kind = None
744
            target_executable = None
745
        versioned = (source_versioned, target_versioned)
746
        kind = (source_kind, target_kind)
747
        changed_content = False
748
        if source_kind != target_kind:
749
            changed_content = True
750
        elif source_kind == 'file':
6883.7.1 by Jelmer Vernooij
Swap order of arguments to Tree.file_content_matches.
751
            if not self.file_content_matches(
6883.1.2 by Jelmer Vernooij
Fix order.
752
                    source_path, target_path,
753
                    file_id, file_id, source_stat, target_stat):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
754
                changed_content = True
755
        elif source_kind == 'symlink':
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
756
            if (self.source.get_symlink_target(source_path, file_id) !=
757
                self.target.get_symlink_target(target_path, file_id)):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
758
                changed_content = True
6405.2.12 by Jelmer Vernooij
Fix tests.
759
        elif source_kind == 'tree-reference':
6809.4.1 by Jelmer Vernooij
Swap file_id and path arguments for get_reference_revision and get_nested_tree.
760
            if (self.source.get_reference_revision(source_path, file_id)
761
                != self.target.get_reference_revision(target_path, file_id)):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
762
                    changed_content = True
763
        parent = (source_parent, target_parent)
764
        name = (source_name, target_name)
765
        executable = (source_executable, target_executable)
766
        if (changed_content is not False or versioned[0] != versioned[1]
767
            or parent[0] != parent[1] or name[0] != name[1] or
768
            executable[0] != executable[1]):
769
            changes = True
770
        else:
771
            changes = False
772
        return (file_id, (source_path, target_path), changed_content,
773
                versioned, parent, name, kind, executable), changes
774
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
775
    def compare(self, want_unchanged=False, specific_files=None,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
776
        extra_trees=None, require_versioned=False, include_root=False,
777
        want_unversioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
778
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
779
780
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
781
        :param specific_files: An optional list of file paths to restrict the
782
            comparison to. When mapping filenames to ids, all matches in all
783
            trees (including optional extra_trees) are used, and all children of
784
            matched directories are included.
785
        :param want_unchanged: An optional boolean requesting the inclusion of
786
            unchanged entries in the result.
787
        :param extra_trees: An optional list of additional trees to use when
788
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
789
        :param require_versioned: An optional boolean (defaults to False). When
790
            supplied and True all the 'specific_files' must be versioned, or
791
            a PathsNotVersionedError will be thrown.
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
792
        :param want_unversioned: Scan for unversioned paths.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
793
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
794
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
795
        if extra_trees is not None:
796
            trees = trees + tuple(extra_trees)
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
797
        with self.lock_read():
798
            return delta._compare_trees(self.source, self.target, want_unchanged,
799
                specific_files, include_root, extra_trees=extra_trees,
800
                require_versioned=require_versioned,
801
                want_unversioned=want_unversioned)
2012.1.1 by Aaron Bentley
Implement change iterator
802
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
803
    def iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
804
                      specific_files=None, pb=None, extra_trees=[],
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
805
                      require_versioned=True, want_unversioned=False):
2012.1.1 by Aaron Bentley
Implement change iterator
806
        """Generate an iterator of changes between trees.
807
808
        A tuple is returned:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
809
        (file_id, (path_in_source, path_in_target),
810
         changed_content, versioned, parent, name, kind,
2012.1.1 by Aaron Bentley
Implement change iterator
811
         executable)
812
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
813
        Changed_content is True if the file's content has changed.  This
814
        includes changes to its kind, and to a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
815
2012.1.15 by Aaron Bentley
Minor tweaks
816
        versioned, parent, name, kind, executable are tuples of (from, to).
817
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
818
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
819
        Iteration is done in parent-to-child order, relative to the target
820
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
821
822
        There is no guarantee that all paths are in sorted order: the
823
        requirement to expand the search due to renames may result in children
824
        that should be found early being found late in the search, after
825
        lexically later results have been returned.
826
        :param require_versioned: Raise errors.PathsNotVersionedError if a
827
            path in the specific_files list is not versioned in one of
828
            source, target or extra_trees.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
829
        :param specific_files: An optional list of file paths to restrict the
830
            comparison to. When mapping filenames to ids, all matches in all
831
            trees (including optional extra_trees) are used, and all children
832
            of matched directories are included. The parents in the target tree
833
            of the specific files up to and including the root of the tree are
834
            always evaluated for changes too.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
835
        :param want_unversioned: Should unversioned files be returned in the
836
            output. An unversioned file is defined as one with (False, False)
837
            for the versioned pair.
2012.1.1 by Aaron Bentley
Implement change iterator
838
        """
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
839
        if not extra_trees:
840
             extra_trees = []
6885.5.8 by Jelmer Vernooij
Remove interesting_ids support from merge.
841
        else:
842
             extra_trees = list(extra_trees)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
843
        # The ids of items we need to examine to insure delta consistency.
844
        precise_file_ids = set()
845
        changed_file_ids = []
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
846
        if specific_files == []:
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
847
            target_specific_files = []
848
            source_specific_files = []
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
849
        else:
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
850
            target_specific_files = self.target.find_related_paths_across_trees(
851
                    specific_files, [self.source] + extra_trees,
852
                    require_versioned=require_versioned)
853
            source_specific_files = self.source.find_related_paths_across_trees(
854
                    specific_files, [self.target] + extra_trees,
855
                    require_versioned=require_versioned)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
856
        if specific_files is not None:
857
            # reparented or added entries must have their parents included
858
            # so that valid deltas can be created. The seen_parents set
859
            # tracks the parents that we need to have.
860
            # The seen_dirs set tracks directory entries we've yielded.
861
            # After outputting version object in to_entries we set difference
862
            # the two seen sets and start checking parents.
863
            seen_parents = set()
864
            seen_dirs = set()
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
865
        if want_unversioned:
2748.3.1 by Aaron Bentley
Start supporting [] for empty list
866
            all_unversioned = sorted([(p.split('/'), p) for p in
867
                                     self.target.extras()
868
                if specific_files is None or
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
869
                    osutils.is_inside_any(specific_files, p)])
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
870
            all_unversioned = collections.deque(all_unversioned)
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
871
        else:
5745.3.4 by Jelmer Vernooij
Merge bzr.dev.
872
            all_unversioned = collections.deque()
2012.1.1 by Aaron Bentley
Implement change iterator
873
        to_paths = {}
3363.14.2 by Aaron Bentley
Get iter_changes running to completion
874
        from_entries_by_dir = list(self.source.iter_entries_by_dir(
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
875
            specific_files=source_specific_files))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
876
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
3363.14.2 by Aaron Bentley
Get iter_changes running to completion
877
        to_entries_by_dir = list(self.target.iter_entries_by_dir(
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
878
            specific_files=target_specific_files))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
879
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
880
        entry_count = 0
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
881
        # the unversioned path lookup only occurs on real trees - where there
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
882
        # can be extras. So the fake_entry is solely used to look up
883
        # executable it values when execute is not supported.
6929.3.2 by Jelmer Vernooij
Remove use of inventory in breezy.tree.
884
        fake_entry = TreeFile()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
885
        for target_path, target_entry in to_entries_by_dir:
886
            while (all_unversioned and
887
                all_unversioned[0][0] < target_path.split('/')):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
888
                unversioned_path = all_unversioned.popleft()
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
889
                target_kind, target_executable, target_stat = \
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
890
                    self.target._comparison_data(fake_entry, unversioned_path[1])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
891
                yield (None, (None, unversioned_path[1]), True, (False, False),
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
892
                    (None, None),
893
                    (None, unversioned_path[0][-1]),
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
894
                    (None, target_kind),
895
                    (None, target_executable))
896
            source_path, source_entry = from_data.get(target_entry.file_id,
897
                (None, None))
898
            result, changes = self._changes_from_entries(source_entry,
899
                target_entry, source_path=source_path, target_path=target_path)
900
            to_paths[result[0]] = result[1][1]
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
901
            entry_count += 1
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
902
            if result[3][0]:
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
903
                entry_count += 1
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
904
            if pb is not None:
905
                pb.update('comparing files', entry_count, num_entries)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
906
            if changes or include_unchanged:
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
907
                if specific_files is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
908
                    new_parent_id = result[4][1]
909
                    precise_file_ids.add(new_parent_id)
910
                    changed_file_ids.append(result[0])
911
                yield result
912
            # Ensure correct behaviour for reparented/added specific files.
913
            if specific_files is not None:
914
                # Record output dirs
915
                if result[6][1] == 'directory':
916
                    seen_dirs.add(result[0])
917
                # Record parents of reparented/added entries.
918
                versioned = result[3]
919
                parents = result[4]
920
                if not versioned[0] or parents[0] != parents[1]:
921
                    seen_parents.add(parents[1])
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
922
        while all_unversioned:
923
            # yield any trailing unversioned paths
924
            unversioned_path = all_unversioned.popleft()
925
            to_kind, to_executable, to_stat = \
926
                self.target._comparison_data(fake_entry, unversioned_path[1])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
927
            yield (None, (None, unversioned_path[1]), True, (False, False),
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
928
                (None, None),
929
                (None, unversioned_path[0][-1]),
930
                (None, to_kind),
931
                (None, to_executable))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
932
        # Yield all remaining source paths
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
933
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
934
            file_id = from_entry.file_id
935
            if file_id in to_paths:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
936
                # already returned
2012.1.1 by Aaron Bentley
Implement change iterator
937
                continue
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
938
            to_path = find_previous_path(self.source, self.target, path)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
939
            entry_count += 1
940
            if pb is not None:
941
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
942
            versioned = (True, False)
943
            parent = (from_entry.parent_id, None)
944
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
945
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
946
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
947
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
948
            executable = (from_executable, None)
3619.4.1 by Robert Collins
Improve tests for the behaviour of Tree.iter_changes for missing paths that are only present in one tree, and fix found bugs. (Robert Collins)
949
            changed_content = from_kind is not None
2012.1.1 by Aaron Bentley
Implement change iterator
950
            # the parent's path is necessarily known at this point.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
951
            changed_file_ids.append(file_id)
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
952
            yield(file_id, (path, to_path), changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
953
                  name, kind, executable)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
954
        changed_file_ids = set(changed_file_ids)
6885.5.3 by Jelmer Vernooij
Add a Tree.find_related_paths_across_trees.
955
        if specific_files is not None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
956
            for result in self._handle_precise_ids(precise_file_ids,
957
                changed_file_ids):
958
                yield result
959
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
960
    def _get_entry(self, tree, path):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
961
        """Get an inventory entry from a tree, with missing entries as None.
962
963
        If the tree raises NotImplementedError on accessing .inventory, then
964
        this is worked around using iter_entries_by_dir on just the file id
965
        desired.
966
967
        :param tree: The tree to lookup the entry in.
968
        :param file_id: The file_id to lookup.
969
        """
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
970
        # No inventory available.
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
971
        try:
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
972
            iterator = tree.iter_entries_by_dir(specific_files=[path])
973
            return iterator.next()[1]
974
        except StopIteration:
975
            return None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
976
977
    def _handle_precise_ids(self, precise_file_ids, changed_file_ids,
978
        discarded_changes=None):
979
        """Fill out a partial iter_changes to be consistent.
980
981
        :param precise_file_ids: The file ids of parents that were seen during
982
            the iter_changes.
983
        :param changed_file_ids: The file ids of already emitted items.
984
        :param discarded_changes: An optional dict of precalculated
985
            iter_changes items which the partial iter_changes had not output
986
            but had calculated.
987
        :return: A generator of iter_changes items to output.
988
        """
989
        # process parents of things that had changed under the users
990
        # requested paths to prevent incorrect paths or parent ids which
991
        # aren't in the tree.
992
        while precise_file_ids:
993
            precise_file_ids.discard(None)
994
            # Don't emit file_ids twice
995
            precise_file_ids.difference_update(changed_file_ids)
996
            if not precise_file_ids:
997
                break
998
            # If the there was something at a given output path in source, we
999
            # have to include the entry from source in the delta, or we would
1000
            # be putting this entry into a used path.
1001
            paths = []
1002
            for parent_id in precise_file_ids:
1003
                try:
1004
                    paths.append(self.target.id2path(parent_id))
1005
                except errors.NoSuchId:
1006
                    # This id has been dragged in from the source by delta
1007
                    # expansion and isn't present in target at all: we don't
1008
                    # need to check for path collisions on it.
1009
                    pass
1010
            for path in paths:
1011
                old_id = self.source.path2id(path)
1012
                precise_file_ids.add(old_id)
1013
            precise_file_ids.discard(None)
1014
            current_ids = precise_file_ids
1015
            precise_file_ids = set()
1016
            # We have to emit all of precise_file_ids that have been altered.
1017
            # We may have to output the children of some of those ids if any
1018
            # directories have stopped being directories.
1019
            for file_id in current_ids:
1020
                # Examine file_id
1021
                if discarded_changes:
1022
                    result = discarded_changes.get(file_id)
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1023
                    source_entry = None
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1024
                else:
1025
                    result = None
1026
                if result is None:
6883.1.4 by Jelmer Vernooij
Fix tests.
1027
                    try:
1028
                        source_path = self.source.id2path(file_id)
1029
                    except errors.NoSuchId:
1030
                        source_path = None
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1031
                        source_entry = None
1032
                    else:
1033
                        source_entry = self._get_entry(self.source, source_path)
6883.1.4 by Jelmer Vernooij
Fix tests.
1034
                    try:
1035
                        target_path = self.target.id2path(file_id)
1036
                    except errors.NoSuchId:
1037
                        target_path = None
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1038
                        target_entry = None
1039
                    else:
1040
                        target_entry = self._get_entry(self.target, target_path)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1041
                    result, changes = self._changes_from_entries(
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1042
                        source_entry, target_entry, source_path, target_path)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1043
                else:
1044
                    changes = True
4570.2.5 by Robert Collins
Review feedback, including finding a bug with changes at the root.
1045
                # Get this parents parent to examine.
1046
                new_parent_id = result[4][1]
1047
                precise_file_ids.add(new_parent_id)
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1048
                if changes:
1049
                    if (result[6][0] == 'directory' and
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1050
                            result[6][1] != 'directory'):
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1051
                        # This stopped being a directory, the old children have
1052
                        # to be included.
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1053
                        if source_entry is None:
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1054
                            # Reusing a discarded change.
6885.6.5 by Jelmer Vernooij
Avoid more uses of specific_file_ids.
1055
                            source_entry = self._get_entry(self.source, result[1][0])
6471.1.7 by Jelmer Vernooij
merge bzr.dev.
1056
                        precise_file_ids.update(
6883.3.3 by Jelmer Vernooij
Fix replacements.
1057
                                child.file_id
1058
                                for child in self.source.iter_child_entries(result[1][0]))
4570.2.3 by Robert Collins
Change the way iter_changes treats specific files to prevent InconsistentDeltas.
1059
                    changed_file_ids.add(result[0])
1060
                    yield result
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1061
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1062
    def file_content_matches(
6883.1.3 by Jelmer Vernooij
Add test, make file_id optional.
1063
            self, source_path, target_path,
1064
            source_file_id=None, target_file_id=None,
6883.1.2 by Jelmer Vernooij
Fix order.
1065
            source_stat=None, target_stat=None):
5906.1.8 by Jelmer Vernooij
Tests.
1066
        """Check if two files are the same in the source and target trees.
1067
1068
        This only checks that the contents of the files are the same,
1069
        it does not touch anything else.
1070
6883.7.1 by Jelmer Vernooij
Swap order of arguments to Tree.file_content_matches.
1071
        :param source_path: Path of the file in the source tree
1072
        :param target_path: Path of the file in the target tree
6883.1.3 by Jelmer Vernooij
Add test, make file_id optional.
1073
        :param source_file_id: Optional file id of the file in the source tree
1074
        :param target_file_id: Optional file id of the file in the target tree
5906.1.8 by Jelmer Vernooij
Tests.
1075
        :param source_stat: Optional stat value of the file in the source tree
1076
        :param target_stat: Optional stat value of the file in the target tree
1077
        :return: Boolean indicating whether the files have the same contents
1078
        """
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1079
        with self.lock_read():
1080
            source_verifier_kind, source_verifier_data = (
1081
                    self.source.get_file_verifier(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1082
                        source_path, source_file_id, source_stat))
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1083
            target_verifier_kind, target_verifier_data = (
1084
                self.target.get_file_verifier(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1085
                    target_path, target_file_id, target_stat))
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1086
            if source_verifier_kind == target_verifier_kind:
1087
                return (source_verifier_data == target_verifier_data)
1088
            # Fall back to SHA1 for now
1089
            if source_verifier_kind != "SHA1":
1090
                source_sha1 = self.source.get_file_sha1(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1091
                        source_path, source_file_id, source_stat)
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1092
            else:
1093
                source_sha1 = source_verifier_data
1094
            if target_verifier_kind != "SHA1":
1095
                target_sha1 = self.target.get_file_sha1(
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1096
                        target_path, target_file_id, target_stat)
6754.8.16 by Jelmer Vernooij
Get rid of all uses of needs_read_lock
1097
            else:
1098
                target_sha1 = target_verifier_data
1099
            return (source_sha1 == target_sha1)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1100
5837.1.2 by Jelmer Vernooij
Register defaults as first optimiser for existing Inter objects.
1101
InterTree.register_optimiser(InterTree)
1102
1103
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1104
class MultiWalker(object):
1105
    """Walk multiple trees simultaneously, getting combined results."""
1106
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1107
    # Note: This could be written to not assume you can do out-of-order
1108
    #       lookups. Instead any nodes that don't match in all trees could be
1109
    #       marked as 'deferred', and then returned in the final cleanup loop.
1110
    #       For now, I think it is "nicer" to return things as close to the
1111
    #       "master_tree" order as we can.
1112
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1113
    def __init__(self, master_tree, other_trees):
1114
        """Create a new MultiWalker.
1115
1116
        All trees being walked must implement "iter_entries_by_dir()", such
1117
        that they yield (path, object) tuples, where that object will have a
1118
        '.file_id' member, that can be used to check equality.
1119
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
1120
        :param master_tree: All trees will be 'slaved' to the master_tree such
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1121
            that nodes in master_tree will be used as 'first-pass' sync points.
1122
            Any nodes that aren't in master_tree will be merged in a second
1123
            pass.
1124
        :param other_trees: A list of other trees to walk simultaneously.
1125
        """
1126
        self._master_tree = master_tree
1127
        self._other_trees = other_trees
1128
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1129
        # Keep track of any nodes that were properly processed just out of
1130
        # order, that way we don't return them at the end, we don't have to
1131
        # track *all* processed file_ids, just the out-of-order ones
1132
        self._out_of_order_processed = set()
1133
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1134
    @staticmethod
1135
    def _step_one(iterator):
1136
        """Step an iter_entries_by_dir iterator.
1137
1138
        :return: (has_more, path, ie)
1139
            If has_more is False, path and ie will be None.
1140
        """
1141
        try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1142
            path, ie = next(iterator)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1143
        except StopIteration:
1144
            return False, None, None
1145
        else:
1146
            return True, path, ie
1147
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1148
    @staticmethod
1149
    def _cmp_path_by_dirblock(path1, path2):
1150
        """Compare two paths based on what directory they are in.
1151
1152
        This generates a sort order, such that all children of a directory are
1153
        sorted together, and grandchildren are in the same order as the
1154
        children appear. But all grandchildren come after all children.
1155
1156
        :param path1: first path
1157
        :param path2: the second path
1158
        :return: negative number if ``path1`` comes first,
1159
            0 if paths are equal
1160
            and a positive number if ``path2`` sorts first
1161
        """
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1162
        # Shortcut this special case
1163
        if path1 == path2:
1164
            return 0
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1165
        # This is stolen from _dirstate_helpers_py.py, only switching it to
1166
        # Unicode objects. Consider using encode_utf8() and then using the
1167
        # optimized versions, or maybe writing optimized unicode versions.
1168
        if not isinstance(path1, unicode):
1169
            raise TypeError("'path1' must be a unicode string, not %s: %r"
1170
                            % (type(path1), path1))
1171
        if not isinstance(path2, unicode):
1172
            raise TypeError("'path2' must be a unicode string, not %s: %r"
1173
                            % (type(path2), path2))
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1174
        return cmp(MultiWalker._path_to_key(path1),
1175
                   MultiWalker._path_to_key(path2))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1176
1177
    @staticmethod
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1178
    def _path_to_key(path):
3514.3.11 by John Arbash Meinel
Cleanups suggested by Ian
1179
        dirname, basename = osutils.split(path)
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1180
        return (dirname.split(u'/'), basename)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1181
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1182
    def _lookup_by_file_id(self, extra_entries, other_tree, file_id):
1183
        """Lookup an inventory entry by file_id.
1184
1185
        This is called when an entry is missing in the normal order.
1186
        Generally this is because a file was either renamed, or it was
1187
        deleted/added. If the entry was found in the inventory and not in
1188
        extra_entries, it will be added to self._out_of_order_processed
1189
1190
        :param extra_entries: A dictionary of {file_id: (path, ie)}.  This
1191
            should be filled with entries that were found before they were
1192
            used. If file_id is present, it will be removed from the
1193
            dictionary.
1194
        :param other_tree: The Tree to search, in case we didn't find the entry
1195
            yet.
1196
        :param file_id: The file_id to look for
1197
        :return: (path, ie) if found or (None, None) if not present.
1198
        """
1199
        if file_id in extra_entries:
1200
            return extra_entries.pop(file_id)
1201
        # TODO: Is id2path better as the first call, or is
1202
        #       inventory[file_id] better as a first check?
1203
        try:
1204
            cur_path = other_tree.id2path(file_id)
1205
        except errors.NoSuchId:
1206
            cur_path = None
1207
        if cur_path is None:
1208
            return (None, None)
1209
        else:
1210
            self._out_of_order_processed.add(file_id)
6915.4.2 by Jelmer Vernooij
Remove __getitem__ and __iter__ from Inventory.
1211
            cur_ie = other_tree.root_inventory.get_entry(file_id)
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1212
            return (cur_path, cur_ie)
1213
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1214
    def iter_all(self):
1215
        """Match up the values in the different trees."""
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1216
        for result in self._walk_master_tree():
1217
            yield result
1218
        self._finish_others()
1219
        for result in self._walk_others():
1220
            yield result
1221
1222
    def _walk_master_tree(self):
1223
        """First pass, walk all trees in lock-step.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1224
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1225
        When we are done, all nodes in the master_tree will have been
1226
        processed. _other_walkers, _other_entries, and _others_extra will be
1227
        set on 'self' for future processing.
1228
        """
1229
        # This iterator has the most "inlining" done, because it tends to touch
1230
        # every file in the tree, while the others only hit nodes that don't
1231
        # match.
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1232
        master_iterator = self._master_tree.iter_entries_by_dir()
1233
1234
        other_walkers = [other.iter_entries_by_dir()
1235
                         for other in self._other_trees]
1236
        other_entries = [self._step_one(walker) for walker in other_walkers]
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1237
        # Track extra nodes in the other trees
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1238
        others_extra = [{} for _ in range(len(self._other_trees))]
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1239
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1240
        master_has_more = True
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1241
        step_one = self._step_one
1242
        lookup_by_file_id = self._lookup_by_file_id
1243
        out_of_order_processed = self._out_of_order_processed
1244
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1245
        while master_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1246
            (master_has_more, path, master_ie) = step_one(master_iterator)
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1247
            if not master_has_more:
1248
                break
1249
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1250
            file_id = master_ie.file_id
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1251
            other_values = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1252
            other_values_append = other_values.append
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1253
            next_other_entries = []
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1254
            next_other_entries_append = next_other_entries.append
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1255
            for idx, (other_has_more, other_path, other_ie) in enumerate(other_entries):
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1256
                if not other_has_more:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1257
                    other_values_append(lookup_by_file_id(
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1258
                        others_extra[idx], self._other_trees[idx], file_id))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1259
                    next_other_entries_append((False, None, None))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1260
                elif file_id == other_ie.file_id:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1261
                    # This is the critical code path, as most of the entries
1262
                    # should match between most trees.
1263
                    other_values_append((other_path, other_ie))
1264
                    next_other_entries_append(step_one(other_walkers[idx]))
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1265
                else:
1266
                    # This walker did not match, step it until it either
1267
                    # matches, or we know we are past the current walker.
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1268
                    other_walker = other_walkers[idx]
1269
                    other_extra = others_extra[idx]
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1270
                    while (other_has_more and
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1271
                           self._cmp_path_by_dirblock(other_path, path) < 0):
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1272
                        other_file_id = other_ie.file_id
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1273
                        if other_file_id not in out_of_order_processed:
1274
                            other_extra[other_file_id] = (other_path, other_ie)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1275
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1276
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1277
                    if other_has_more and other_ie.file_id == file_id:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1278
                        # We ended up walking to this point, match and step
1279
                        # again
1280
                        other_values_append((other_path, other_ie))
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1281
                        other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1282
                            step_one(other_walker)
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1283
                    else:
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1284
                        # This record isn't in the normal order, see if it
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1285
                        # exists at all.
1286
                        other_values_append(lookup_by_file_id(
1287
                            other_extra, self._other_trees[idx], file_id))
1288
                    next_other_entries_append((other_has_more, other_path,
3514.3.2 by John Arbash Meinel
Handle the case when a record is missing in base
1289
                                               other_ie))
3514.3.1 by John Arbash Meinel
Start working on a special walker that can iterate several trees at once.
1290
            other_entries = next_other_entries
1291
1292
            # We've matched all the walkers, yield this datapoint
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1293
            yield path, file_id, master_ie, other_values
1294
        self._other_walkers = other_walkers
1295
        self._other_entries = other_entries
1296
        self._others_extra = others_extra
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1297
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1298
    def _finish_others(self):
1299
        """Finish walking the other iterators, so we get all entries."""
1300
        for idx, info in enumerate(self._other_entries):
1301
            other_extra = self._others_extra[idx]
1302
            (other_has_more, other_path, other_ie) = info
3514.3.4 by John Arbash Meinel
Handle more cases when the other tree has extra nodes.
1303
            while other_has_more:
1304
                other_file_id = other_ie.file_id
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1305
                if other_file_id not in self._out_of_order_processed:
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1306
                    other_extra[other_file_id] = (other_path, other_ie)
3514.3.4 by John Arbash Meinel
Handle more cases when the other tree has extra nodes.
1307
                other_has_more, other_path, other_ie = \
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1308
                    self._step_one(self._other_walkers[idx])
1309
        del self._other_entries
1310
1311
    def _walk_others(self):
1312
        """Finish up by walking all the 'deferred' nodes."""
1313
        # TODO: One alternative would be to grab all possible unprocessed
1314
        #       file_ids, and then sort by path, and then yield them. That
1315
        #       might ensure better ordering, in case a caller strictly
1316
        #       requires parents before children.
1317
        for idx, other_extra in enumerate(self._others_extra):
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1318
            others = sorted(viewvalues(other_extra),
3514.3.13 by John Arbash Meinel
One code path was using a tuple, another a plain path
1319
                            key=lambda x: self._path_to_key(x[0]))
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1320
            for other_path, other_ie in others:
1321
                file_id = other_ie.file_id
3514.3.7 by John Arbash Meinel
comment
1322
                # We don't need to check out_of_order_processed here, because
1323
                # the lookup_by_file_id will be removing anything processed
1324
                # from the extras cache
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1325
                other_extra.pop(file_id)
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1326
                other_values = [(None, None)] * idx
3514.3.5 by John Arbash Meinel
Handle some edge cases when we have multiple other trees.
1327
                other_values.append((other_path, other_ie))
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1328
                for alt_idx, alt_extra in enumerate(self._others_extra[idx+1:]):
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1329
                    alt_idx = alt_idx + idx + 1
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1330
                    alt_extra = self._others_extra[alt_idx]
1331
                    alt_tree = self._other_trees[alt_idx]
3514.3.8 by John Arbash Meinel
Start trying to refactor the big function into smaller ones.
1332
                    other_values.append(self._lookup_by_file_id(
3514.3.9 by John Arbash Meinel
Refactor the large function into multiple small ones.
1333
                                            alt_extra, alt_tree, file_id))
3514.3.3 by John Arbash Meinel
Handle when the other tree has extra nodes, and we need to yield them.
1334
                yield other_path, file_id, None, other_values
6883.5.2 by Jelmer Vernooij
Add find_previous_paths call.
1335
1336
1337
def find_previous_paths(from_tree, to_tree, paths):
1338
    """Find previous tree paths.
1339
1340
    :param from_tree: From tree
1341
    :param to_tree: To tree
1342
    :param paths: Iterable over paths to search for
1343
    :return: Dictionary mapping from from_tree paths to paths in to_tree, or
1344
        None if there is no equivalent path.
1345
    """
1346
    ret = {}
1347
    for path in paths:
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1348
        ret[path] = find_previous_path(from_tree, to_tree, path)
6883.5.2 by Jelmer Vernooij
Add find_previous_paths call.
1349
    return ret
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1350
1351
6883.5.11 by Jelmer Vernooij
Fix tests.
1352
def find_previous_path(from_tree, to_tree, path, file_id=None):
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1353
    """Find previous tree path.
1354
1355
    :param from_tree: From tree
1356
    :param to_tree: To tree
1357
    :param path: Path to search for
1358
    :return: path in to_tree, or None if there is no equivalent path.
1359
    """
6883.5.11 by Jelmer Vernooij
Fix tests.
1360
    if file_id is None:
1361
        file_id = from_tree.path2id(path)
6883.5.3 by Jelmer Vernooij
Add find_previous_path.
1362
    if file_id is None:
1363
        raise errors.NoSuchFile(path)
1364
    try:
1365
        return to_tree.id2path(file_id)
1366
    except errors.NoSuchId:
1367
        return None