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