/brz/remove-bazaar

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