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