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