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