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