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