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