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