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