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