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