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