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