/brz/remove-bazaar

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