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