2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
1448
by Robert Collins
revert symlinks correctly |
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.
|
|
1448
by Robert Collins
revert symlinks correctly |
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.
|
|
1448
by Robert Collins
revert symlinks correctly |
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
17 |
# FIXME: This refactoring of the workingtree code doesn't seem to keep
|
18 |
# the WorkingTree's copy of the inventory in sync with the branch. The
|
|
19 |
# branch modifies its working inventory when it does a commit to make
|
|
20 |
# missing files permanently removed.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
21 |
|
1197
by Martin Pool
doc |
22 |
# TODO: Maybe also keep the full path of the entry, and the children?
|
23 |
# But those depend on its position within a particular inventory, and
|
|
24 |
# it would be nice not to need to hold the backpointer here.
|
|
25 |
||
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
26 |
# This should really be an id randomly assigned when the tree is
|
27 |
# created, but it's not for now.
|
|
28 |
ROOT_ID = "TREE_ROOT" |
|
29 |
||
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
30 |
import os |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
31 |
import re |
32 |
import sys |
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
33 |
|
34 |
from bzrlib.lazy_import import lazy_import |
|
35 |
lazy_import(globals(), """ |
|
36 |
import collections
|
|
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
37 |
import tarfile
|
1
by mbp at sourcefrog
import from baz patch-364 |
38 |
|
800
by Martin Pool
Merge John's import-speedup branch: |
39 |
import bzrlib
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
40 |
from bzrlib import (
|
41 |
errors,
|
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
42 |
generate_ids,
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
43 |
osutils,
|
44 |
symbol_versioning,
|
|
2094.3.5
by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used |
45 |
workingtree,
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
46 |
)
|
47 |
""") |
|
48 |
||
49 |
from bzrlib.errors import ( |
|
50 |
BzrCheckError, |
|
51 |
BzrError, |
|
52 |
)
|
|
3123.1.3
by John Arbash Meinel
find_previous_heads was deprecated in 0.91, not 0.93 |
53 |
from bzrlib.symbol_versioning import deprecated_method |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
54 |
from bzrlib.trace import mutter |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
55 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
56 |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
57 |
class InventoryEntry(object): |
1
by mbp at sourcefrog
import from baz patch-364 |
58 |
"""Description of a versioned file.
|
59 |
||
60 |
An InventoryEntry has the following fields, which are also
|
|
61 |
present in the XML inventory-entry element:
|
|
62 |
||
1197
by Martin Pool
doc |
63 |
file_id
|
64 |
||
65 |
name
|
|
66 |
(within the parent directory)
|
|
67 |
||
68 |
parent_id
|
|
69 |
file_id of the parent directory, or ROOT_ID
|
|
70 |
||
1092.2.21
by Robert Collins
convert name_version to revision in inventory entries |
71 |
revision
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
72 |
the revision_id in which this variation of this file was
|
1092.2.22
by Robert Collins
text_version and name_version unification looking reasonable |
73 |
introduced.
|
1197
by Martin Pool
doc |
74 |
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
75 |
executable
|
76 |
Indicates that this file should be executable on systems
|
|
77 |
that support it.
|
|
78 |
||
1197
by Martin Pool
doc |
79 |
text_sha1
|
80 |
sha-1 of the text of the file
|
|
81 |
|
|
82 |
text_size
|
|
83 |
size in bytes of the text of the file
|
|
84 |
|
|
85 |
(reading a version 4 tree created a text_id field.)
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
86 |
|
87 |
>>> i = Inventory()
|
|
88 |
>>> i.path2id('')
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
89 |
'TREE_ROOT'
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
90 |
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
91 |
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
92 |
>>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
93 |
InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
|
1996.3.13
by John Arbash Meinel
Fix the inventory doc tests |
94 |
>>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
|
1185.16.151
by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21) |
95 |
>>> for ix, j in enumerate(i.iter_entries()):
|
96 |
... print (j[0] == shouldbe[ix], j[1])
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
97 |
...
|
2294.1.8
by John Arbash Meinel
Fix one doc test in Inventory which expected a plain str |
98 |
(True, InventoryDirectory('TREE_ROOT', u'', parent_id=None, revision=None))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
99 |
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
|
100 |
(True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None))
|
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
101 |
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
102 |
InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
103 |
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
104 |
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
105 |
>>> i.path2id('src/wibble')
|
106 |
'2325'
|
|
107 |
>>> '2325' in i
|
|
108 |
True
|
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
109 |
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
110 |
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
111 |
>>> i['2326']
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
112 |
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
|
1185.1.40
by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch. |
113 |
>>> for path, entry in i.iter_entries():
|
1185.31.32
by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ |
114 |
... print path
|
1185.1.40
by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch. |
115 |
... assert i.path2id(path)
|
1
by mbp at sourcefrog
import from baz patch-364 |
116 |
...
|
1852.6.6
by Robert Collins
Finish updating iter_entries change to make all tests pass. |
117 |
<BLANKLINE>
|
1
by mbp at sourcefrog
import from baz patch-364 |
118 |
src
|
119 |
src/bye.c
|
|
120 |
src/hello.c
|
|
121 |
src/wibble
|
|
122 |
src/wibble/wibble.c
|
|
1185.31.32
by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ |
123 |
>>> i.id2path('2326')
|
1
by mbp at sourcefrog
import from baz patch-364 |
124 |
'src/wibble/wibble.c'
|
125 |
"""
|
|
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
126 |
|
127 |
# Constants returned by describe_change()
|
|
128 |
#
|
|
129 |
# TODO: These should probably move to some kind of FileChangeDescription
|
|
130 |
# class; that's like what's inside a TreeDelta but we want to be able to
|
|
131 |
# generate them just for one file at a time.
|
|
132 |
RENAMED = 'renamed' |
|
133 |
MODIFIED_AND_RENAMED = 'modified and renamed' |
|
1197
by Martin Pool
doc |
134 |
|
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
135 |
__slots__ = [] |
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
136 |
|
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
137 |
def detect_changes(self, old_entry): |
138 |
"""Return a (text_modified, meta_modified) from this to old_entry.
|
|
139 |
|
|
140 |
_read_tree_state must have been called on self and old_entry prior to
|
|
141 |
calling detect_changes.
|
|
142 |
"""
|
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
143 |
return False, False |
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
144 |
|
3123.1.1
by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation. |
145 |
@deprecated_method(symbol_versioning.one_zero) |
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
146 |
def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
147 |
output_to, reverse=False): |
|
148 |
"""Perform a diff from this to to_entry.
|
|
149 |
||
150 |
text_diff will be used for textual difference calculation.
|
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
151 |
This is a template method, override _diff in child classes.
|
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
152 |
"""
|
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
153 |
self._read_tree_state(tree.id2path(self.file_id), tree) |
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
154 |
if to_entry: |
155 |
# cannot diff from one kind to another - you must do a removal
|
|
156 |
# and an addif they do not match.
|
|
157 |
assert self.kind == to_entry.kind |
|
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
158 |
to_entry._read_tree_state(to_tree.id2path(to_entry.file_id), |
159 |
to_tree) |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
160 |
self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree, |
161 |
output_to, reverse) |
|
162 |
||
163 |
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
|
164 |
output_to, reverse=False): |
|
165 |
"""Perform a diff between two entries of the same kind."""
|
|
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
166 |
|
167 |
def parent_candidates(self, previous_inventories): |
|
168 |
"""Find possible per-file graph parents.
|
|
169 |
||
170 |
This is currently defined by:
|
|
171 |
- Select the last changed revision in the parent inventory.
|
|
172 |
- Do deal with a short lived bug in bzr 0.8's development two entries
|
|
173 |
that have the same last changed but different 'x' bit settings are
|
|
174 |
changed in-place.
|
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
175 |
"""
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
176 |
# revision:ie mapping for each ie found in previous_inventories.
|
177 |
candidates = {} |
|
178 |
# identify candidate head revision ids.
|
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
179 |
for inv in previous_inventories: |
180 |
if self.file_id in inv: |
|
181 |
ie = inv[self.file_id] |
|
182 |
assert ie.file_id == self.file_id |
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
183 |
if ie.revision in candidates: |
184 |
# same revision value in two different inventories:
|
|
185 |
# correct possible inconsistencies:
|
|
186 |
# * there was a bug in revision updates with 'x' bit
|
|
187 |
# support.
|
|
1185.1.51
by Robert Collins
merge in reweave support |
188 |
try: |
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
189 |
if candidates[ie.revision].executable != ie.executable: |
190 |
candidates[ie.revision].executable = False |
|
1185.1.51
by Robert Collins
merge in reweave support |
191 |
ie.executable = False |
192 |
except AttributeError: |
|
193 |
pass
|
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
194 |
# must now be the same.
|
195 |
assert candidates[ie.revision] == ie |
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
196 |
else: |
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
197 |
# add this revision as a candidate.
|
198 |
candidates[ie.revision] = ie |
|
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
199 |
return candidates |
200 |
||
3123.1.3
by John Arbash Meinel
find_previous_heads was deprecated in 0.91, not 0.93 |
201 |
@deprecated_method(symbol_versioning.zero_ninetyone) |
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
202 |
def find_previous_heads(self, previous_inventories, |
203 |
versioned_file_store, |
|
204 |
transaction, |
|
205 |
entry_vf=None): |
|
206 |
"""Return the revisions and entries that directly precede this.
|
|
207 |
||
208 |
Returned as a map from revision to inventory entry.
|
|
209 |
||
210 |
This is a map containing the file revisions in all parents
|
|
211 |
for which the file exists, and its revision is not a parent of
|
|
212 |
any other. If the file is new, the set will be empty.
|
|
213 |
||
214 |
:param versioned_file_store: A store where ancestry data on this
|
|
215 |
file id can be queried.
|
|
216 |
:param transaction: The transaction that queries to the versioned
|
|
217 |
file store should be completed under.
|
|
218 |
:param entry_vf: The entry versioned file, if its already available.
|
|
219 |
"""
|
|
220 |
candidates = self.parent_candidates(previous_inventories) |
|
221 |
||
222 |
# revision:ie mapping with one revision for each head.
|
|
223 |
heads = {} |
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
224 |
# common case optimisation
|
225 |
if len(candidates) == 1: |
|
226 |
# if there is only one candidate revision found
|
|
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
227 |
# then we can avoid opening the versioned file to access ancestry:
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
228 |
# there cannot be any ancestors to eliminate when there is
|
229 |
# only one revision available.
|
|
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
230 |
return candidates |
231 |
||
232 |
# --- what follows is now encapsulated in repository.get_graph.heads(),
|
|
233 |
# but that is not accessible from here as we have no repository
|
|
234 |
# pointer. Note that the repository.get_graph.heads() call can return
|
|
235 |
# different results *at the moment* because of the kind-changing check
|
|
236 |
# we have in parent_candidates().
|
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
237 |
|
238 |
# eliminate ancestors amongst the available candidates:
|
|
239 |
# heads are those that are not an ancestor of any other candidate
|
|
240 |
# - this provides convergence at a per-file level.
|
|
2776.3.1
by Robert Collins
* Deprecated method ``find_previous_heads`` on |
241 |
def get_ancestors(weave, entry): |
242 |
return set(weave.get_ancestry(entry.revision, topo_sorted=False)) |
|
243 |
# revision: ancestor list for each head
|
|
244 |
head_ancestors = {} |
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
245 |
for ie in candidates.values(): |
246 |
# may be an ancestor of a known head:
|
|
247 |
already_present = 0 != len( |
|
248 |
[head for head in heads |
|
249 |
if ie.revision in head_ancestors[head]]) |
|
250 |
if already_present: |
|
251 |
# an ancestor of an analyzed candidate.
|
|
252 |
continue
|
|
253 |
# not an ancestor of a known head:
|
|
254 |
# load the versioned file for this file id if needed
|
|
255 |
if entry_vf is None: |
|
256 |
entry_vf = versioned_file_store.get_weave_or_empty( |
|
257 |
self.file_id, transaction) |
|
258 |
ancestors = get_ancestors(entry_vf, ie) |
|
259 |
# may knock something else out:
|
|
260 |
check_heads = list(heads.keys()) |
|
261 |
for head in check_heads: |
|
262 |
if head in ancestors: |
|
263 |
# this previously discovered 'head' is not
|
|
264 |
# really a head - its an ancestor of the newly
|
|
265 |
# found head,
|
|
266 |
heads.pop(head) |
|
267 |
head_ancestors[ie.revision] = ancestors |
|
268 |
heads[ie.revision] = ie |
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
269 |
return heads |
270 |
||
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
271 |
def get_tar_item(self, root, dp, now, tree): |
1399.1.7
by Robert Collins
implement symlink exporting to tarballs |
272 |
"""Get a tarfile item and a file stream for its content."""
|
1996.3.20
by John Arbash Meinel
[merge] bzr.dev 2063 |
273 |
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8')) |
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
274 |
# TODO: would be cool to actually set it to the timestamp of the
|
275 |
# revision it was last changed
|
|
276 |
item.mtime = now |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
277 |
fileobj = self._put_in_tar(item, tree) |
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
278 |
return item, fileobj |
279 |
||
1399.1.5
by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py |
280 |
def has_text(self): |
281 |
"""Return true if the object this entry represents has textual data.
|
|
282 |
||
283 |
Note that textual data includes binary content.
|
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
284 |
|
285 |
Also note that all entries get weave files created for them.
|
|
286 |
This attribute is primarily used when upgrading from old trees that
|
|
287 |
did not have the weave index for all inventory entries.
|
|
1399.1.5
by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py |
288 |
"""
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
289 |
return False |
1399.1.5
by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py |
290 |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
291 |
def __init__(self, file_id, name, parent_id, text_id=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
292 |
"""Create an InventoryEntry
|
293 |
|
|
294 |
The filename must be a single component, relative to the
|
|
295 |
parent directory; it cannot be a whole path or relative name.
|
|
296 |
||
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
297 |
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
|
1
by mbp at sourcefrog
import from baz patch-364 |
298 |
>>> e.name
|
299 |
'hello.c'
|
|
300 |
>>> e.file_id
|
|
301 |
'123'
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
302 |
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
|
1
by mbp at sourcefrog
import from baz patch-364 |
303 |
Traceback (most recent call last):
|
1185.16.63
by Martin Pool
- more error conversion |
304 |
InvalidEntryName: Invalid entry name: src/hello.c
|
1
by mbp at sourcefrog
import from baz patch-364 |
305 |
"""
|
1183
by Martin Pool
- implement version 5 xml storage, and tests |
306 |
assert isinstance(name, basestring), name |
376
by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects |
307 |
if '/' in name or '\\' in name: |
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
308 |
raise errors.InvalidEntryName(name=name) |
1398
by Robert Collins
integrate in Gustavos x-bit patch |
309 |
self.executable = False |
1092.2.21
by Robert Collins
convert name_version to revision in inventory entries |
310 |
self.revision = None |
955
by Martin Pool
- use __slots__ on InventoryEntry; rather faster |
311 |
self.text_sha1 = None |
312 |
self.text_size = None |
|
1
by mbp at sourcefrog
import from baz patch-364 |
313 |
self.file_id = file_id |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
314 |
assert isinstance(file_id, (str, None.__class__)), \ |
315 |
'bad type %r for %r' % (type(file_id), file_id) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
316 |
self.name = name |
317 |
self.text_id = text_id |
|
318 |
self.parent_id = parent_id |
|
1092.2.6
by Robert Collins
symlink support updated to work |
319 |
self.symlink_target = None |
2255.2.220
by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors. |
320 |
self.reference_revision = None |
237
by mbp at sourcefrog
- Better assertions in InventoryEntry constructor |
321 |
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
322 |
def kind_character(self): |
323 |
"""Return a short kind indicator useful for appending to names."""
|
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
324 |
raise BzrError('unknown kind %r' % self.kind) |
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
325 |
|
1731.1.2
by Aaron Bentley
Removed all remaining uses of root_directory |
326 |
known_kinds = ('file', 'directory', 'symlink') |
1
by mbp at sourcefrog
import from baz patch-364 |
327 |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
328 |
def _put_in_tar(self, item, tree): |
329 |
"""populate item for stashing in a tar, and return the content stream.
|
|
330 |
||
331 |
If no content is available, return None.
|
|
332 |
"""
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
333 |
raise BzrError("don't know how to export {%s} of kind %r" % |
334 |
(self.file_id, self.kind)) |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
335 |
|
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
336 |
def put_on_disk(self, dest, dp, tree): |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
337 |
"""Create a representation of self on disk in the prefix dest.
|
338 |
|
|
339 |
This is a template method - implement _put_on_disk in subclasses.
|
|
340 |
"""
|
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
341 |
fullpath = osutils.pathjoin(dest, dp) |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
342 |
self._put_on_disk(fullpath, tree) |
1711.2.101
by John Arbash Meinel
Clean up some unnecessary mutter() calls |
343 |
# mutter(" export {%s} kind %s to %s", self.file_id,
|
344 |
# self.kind, fullpath)
|
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
345 |
|
346 |
def _put_on_disk(self, fullpath, tree): |
|
347 |
"""Put this entry onto disk at fullpath, from tree tree."""
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
348 |
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind)) |
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
349 |
|
156
by mbp at sourcefrog
new "directories" command |
350 |
def sorted_children(self): |
1757.2.13
by Robert Collins
Tweak InventoryEntry.sorted_children to be simpler. |
351 |
return sorted(self.children.items()) |
156
by mbp at sourcefrog
new "directories" command |
352 |
|
1399.1.1
by Robert Collins
move checks for versionability of file kinds into InventoryEntry |
353 |
@staticmethod
|
354 |
def versionable_kind(kind): |
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
355 |
return (kind in ('file', 'directory', 'symlink', 'tree-reference')) |
1399.1.1
by Robert Collins
move checks for versionability of file kinds into InventoryEntry |
356 |
|
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
357 |
def check(self, checker, rev_id, inv, tree): |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
358 |
"""Check this inventory entry is intact.
|
359 |
||
360 |
This is a template method, override _check for kind specific
|
|
361 |
tests.
|
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
362 |
|
363 |
:param checker: Check object providing context for the checks;
|
|
364 |
can be used to find out what parts of the repository have already
|
|
365 |
been checked.
|
|
366 |
:param rev_id: Revision id from which this InventoryEntry was loaded.
|
|
367 |
Not necessarily the last-changed revision for this file.
|
|
368 |
:param inv: Inventory from which the entry was loaded.
|
|
369 |
:param tree: RevisionTree for this entry.
|
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
370 |
"""
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
371 |
if self.parent_id is not None: |
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
372 |
if not inv.has_id(self.parent_id): |
373 |
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}' |
|
374 |
% (self.parent_id, rev_id)) |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
375 |
self._check(checker, rev_id, tree) |
376 |
||
377 |
def _check(self, checker, rev_id, tree): |
|
378 |
"""Check this inventory entry for kind specific errors."""
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
379 |
raise BzrCheckError('unknown entry kind %r in revision {%s}' % |
380 |
(self.kind, rev_id)) |
|
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
381 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
382 |
def copy(self): |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
383 |
"""Clone this inventory entry."""
|
384 |
raise NotImplementedError |
|
1
by mbp at sourcefrog
import from baz patch-364 |
385 |
|
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
386 |
@staticmethod
|
387 |
def describe_change(old_entry, new_entry): |
|
388 |
"""Describe the change between old_entry and this.
|
|
389 |
|
|
390 |
This smells of being an InterInventoryEntry situation, but as its
|
|
391 |
the first one, we're making it a static method for now.
|
|
392 |
||
393 |
An entry with a different parent, or different name is considered
|
|
394 |
to be renamed. Reparenting is an internal detail.
|
|
395 |
Note that renaming the parent does not trigger a rename for the
|
|
396 |
child entry itself.
|
|
1669.2.1
by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files |
397 |
"""
|
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
398 |
# TODO: Perhaps return an object rather than just a string
|
399 |
if old_entry is new_entry: |
|
400 |
# also the case of both being None
|
|
401 |
return 'unchanged' |
|
402 |
elif old_entry is None: |
|
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
403 |
return 'added' |
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
404 |
elif new_entry is None: |
405 |
return 'removed' |
|
1959.4.1
by Aaron Bentley
Correctly handle all file kind changes |
406 |
if old_entry.kind != new_entry.kind: |
407 |
return 'modified' |
|
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
408 |
text_modified, meta_modified = new_entry.detect_changes(old_entry) |
409 |
if text_modified or meta_modified: |
|
410 |
modified = True |
|
411 |
else: |
|
412 |
modified = False |
|
413 |
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
|
|
414 |
if old_entry.parent_id != new_entry.parent_id: |
|
415 |
renamed = True |
|
416 |
elif old_entry.name != new_entry.name: |
|
417 |
renamed = True |
|
418 |
else: |
|
419 |
renamed = False |
|
420 |
if renamed and not modified: |
|
421 |
return InventoryEntry.RENAMED |
|
422 |
if modified and not renamed: |
|
423 |
return 'modified' |
|
424 |
if modified and renamed: |
|
425 |
return InventoryEntry.MODIFIED_AND_RENAMED |
|
426 |
return 'unchanged' |
|
1
by mbp at sourcefrog
import from baz patch-364 |
427 |
|
428 |
def __repr__(self): |
|
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
429 |
return ("%s(%r, %r, parent_id=%r, revision=%r)" |
1
by mbp at sourcefrog
import from baz patch-364 |
430 |
% (self.__class__.__name__, |
431 |
self.file_id, |
|
432 |
self.name, |
|
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
433 |
self.parent_id, |
434 |
self.revision)) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
435 |
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
436 |
def __eq__(self, other): |
1
by mbp at sourcefrog
import from baz patch-364 |
437 |
if not isinstance(other, InventoryEntry): |
438 |
return NotImplemented |
|
439 |
||
1398
by Robert Collins
integrate in Gustavos x-bit patch |
440 |
return ((self.file_id == other.file_id) |
441 |
and (self.name == other.name) |
|
442 |
and (other.symlink_target == self.symlink_target) |
|
443 |
and (self.text_sha1 == other.text_sha1) |
|
444 |
and (self.text_size == other.text_size) |
|
445 |
and (self.text_id == other.text_id) |
|
446 |
and (self.parent_id == other.parent_id) |
|
447 |
and (self.kind == other.kind) |
|
448 |
and (self.revision == other.revision) |
|
449 |
and (self.executable == other.executable) |
|
2255.2.220
by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors. |
450 |
and (self.reference_revision == other.reference_revision) |
1398
by Robert Collins
integrate in Gustavos x-bit patch |
451 |
)
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
452 |
|
453 |
def __ne__(self, other): |
|
454 |
return not (self == other) |
|
455 |
||
456 |
def __hash__(self): |
|
457 |
raise ValueError('not hashable') |
|
1
by mbp at sourcefrog
import from baz patch-364 |
458 |
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
459 |
def _unchanged(self, previous_ie): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
460 |
"""Has this entry changed relative to previous_ie.
|
461 |
||
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
462 |
This method should be overridden in child classes.
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
463 |
"""
|
1092.2.22
by Robert Collins
text_version and name_version unification looking reasonable |
464 |
compatible = True |
465 |
# different inv parent
|
|
466 |
if previous_ie.parent_id != self.parent_id: |
|
467 |
compatible = False |
|
468 |
# renamed
|
|
469 |
elif previous_ie.name != self.name: |
|
470 |
compatible = False |
|
2374.2.2
by John Arbash Meinel
Fix the small bug that ie.snapshot() didn't think about kind changes. |
471 |
elif previous_ie.kind != self.kind: |
472 |
compatible = False |
|
1092.2.22
by Robert Collins
text_version and name_version unification looking reasonable |
473 |
return compatible |
474 |
||
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
475 |
def _read_tree_state(self, path, work_tree): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
476 |
"""Populate fields in the inventory entry from the given tree.
|
477 |
|
|
478 |
Note that this should be modified to be a noop on virtual trees
|
|
479 |
as all entries created there are prepopulated.
|
|
480 |
"""
|
|
1185.16.5
by Martin Pool
doc |
481 |
# TODO: Rather than running this manually, we should check the
|
482 |
# working sha1 and other expensive properties when they're
|
|
483 |
# first requested, or preload them if they're already known
|
|
484 |
pass # nothing to do by default |
|
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
485 |
|
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
486 |
def _forget_tree_state(self): |
487 |
pass
|
|
488 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
489 |
|
1907.1.4
by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind |
490 |
class RootEntry(InventoryEntry): |
491 |
||
492 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
|
2255.2.220
by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors. |
493 |
'text_id', 'parent_id', 'children', 'executable', |
494 |
'revision', 'symlink_target', 'reference_revision'] |
|
1907.1.4
by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind |
495 |
|
496 |
def _check(self, checker, rev_id, tree): |
|
497 |
"""See InventoryEntry._check"""
|
|
498 |
||
499 |
def __init__(self, file_id): |
|
500 |
self.file_id = file_id |
|
501 |
self.children = {} |
|
502 |
self.kind = 'directory' |
|
503 |
self.parent_id = None |
|
504 |
self.name = u'' |
|
505 |
self.revision = None |
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
506 |
symbol_versioning.warn('RootEntry is deprecated as of bzr 0.10.' |
507 |
' Please use InventoryDirectory instead.', |
|
508 |
DeprecationWarning, stacklevel=2) |
|
1907.1.4
by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind |
509 |
|
510 |
def __eq__(self, other): |
|
511 |
if not isinstance(other, RootEntry): |
|
512 |
return NotImplemented |
|
513 |
||
514 |
return (self.file_id == other.file_id) \ |
|
515 |
and (self.children == other.children) |
|
516 |
||
517 |
||
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
518 |
class InventoryDirectory(InventoryEntry): |
519 |
"""A directory in an inventory."""
|
|
520 |
||
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
521 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
2255.2.220
by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors. |
522 |
'text_id', 'parent_id', 'children', 'executable', |
523 |
'revision', 'symlink_target', 'reference_revision'] |
|
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
524 |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
525 |
def _check(self, checker, rev_id, tree): |
526 |
"""See InventoryEntry._check"""
|
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
527 |
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None: |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
528 |
raise BzrCheckError('directory {%s} has text in revision {%s}' |
529 |
% (self.file_id, rev_id)) |
|
530 |
||
531 |
def copy(self): |
|
532 |
other = InventoryDirectory(self.file_id, self.name, self.parent_id) |
|
533 |
other.revision = self.revision |
|
534 |
# note that children are *not* copied; they're pulled across when
|
|
535 |
# others are added
|
|
536 |
return other |
|
537 |
||
538 |
def __init__(self, file_id, name, parent_id): |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
539 |
super(InventoryDirectory, self).__init__(file_id, name, parent_id) |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
540 |
self.children = {} |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
541 |
self.kind = 'directory' |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
542 |
|
543 |
def kind_character(self): |
|
544 |
"""See InventoryEntry.kind_character."""
|
|
545 |
return '/' |
|
546 |
||
547 |
def _put_in_tar(self, item, tree): |
|
548 |
"""See InventoryEntry._put_in_tar."""
|
|
549 |
item.type = tarfile.DIRTYPE |
|
550 |
fileobj = None |
|
551 |
item.name += '/' |
|
552 |
item.size = 0 |
|
553 |
item.mode = 0755 |
|
554 |
return fileobj |
|
555 |
||
556 |
def _put_on_disk(self, fullpath, tree): |
|
557 |
"""See InventoryEntry._put_on_disk."""
|
|
558 |
os.mkdir(fullpath) |
|
559 |
||
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
560 |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
561 |
class InventoryFile(InventoryEntry): |
562 |
"""A file in an inventory."""
|
|
563 |
||
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
564 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
2255.2.220
by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors. |
565 |
'text_id', 'parent_id', 'children', 'executable', |
566 |
'revision', 'symlink_target', 'reference_revision'] |
|
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
567 |
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
568 |
def _check(self, checker, tree_revision_id, tree): |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
569 |
"""See InventoryEntry._check"""
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
570 |
t = (self.file_id, self.revision) |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
571 |
if t in checker.checked_texts: |
1616.1.5
by Martin Pool
Cleanup and document some check code |
572 |
prev_sha = checker.checked_texts[t] |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
573 |
if prev_sha != self.text_sha1: |
2745.6.41
by Andrew Bennetts
Test repo.check against all_scenarios. |
574 |
raise BzrCheckError( |
575 |
'mismatched sha1 on {%s} in {%s} (%s != %s) %r' % |
|
576 |
(self.file_id, tree_revision_id, prev_sha, self.text_sha1, |
|
577 |
t)) |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
578 |
else: |
579 |
checker.repeated_text_cnt += 1 |
|
580 |
return
|
|
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
581 |
|
582 |
if self.file_id not in checker.checked_weaves: |
|
583 |
mutter('check weave {%s}', self.file_id) |
|
1551.15.50
by Aaron Bentley
Deprecate RevisionTree.get_weave |
584 |
w = tree._get_weave(self.file_id) |
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
585 |
# Not passing a progress bar, because it creates a new
|
586 |
# progress, which overwrites the current progress,
|
|
587 |
# and doesn't look nice
|
|
588 |
w.check() |
|
589 |
checker.checked_weaves[self.file_id] = True |
|
590 |
else: |
|
1551.15.50
by Aaron Bentley
Deprecate RevisionTree.get_weave |
591 |
w = tree._get_weave(self.file_id) |
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
592 |
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
593 |
mutter('check version {%s} of {%s}', tree_revision_id, self.file_id) |
1616.1.7
by Martin Pool
New developer commands 'weave-list' and 'weave-join'. |
594 |
checker.checked_text_cnt += 1 |
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
595 |
# We can't check the length, because Weave doesn't store that
|
596 |
# information, and the whole point of looking at the weave's
|
|
597 |
# sha1sum is that we don't have to extract the text.
|
|
3316.2.9
by Robert Collins
* ``VersionedFile.get_sha1`` is deprecated, please use |
598 |
if self.text_sha1 != w.get_sha1s([self.revision])[0]: |
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
599 |
raise BzrCheckError('text {%s} version {%s} wrong sha1' |
600 |
% (self.file_id, self.revision)) |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
601 |
checker.checked_texts[t] = self.text_sha1 |
602 |
||
603 |
def copy(self): |
|
604 |
other = InventoryFile(self.file_id, self.name, self.parent_id) |
|
605 |
other.executable = self.executable |
|
606 |
other.text_id = self.text_id |
|
607 |
other.text_sha1 = self.text_sha1 |
|
608 |
other.text_size = self.text_size |
|
609 |
other.revision = self.revision |
|
610 |
return other |
|
611 |
||
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
612 |
def detect_changes(self, old_entry): |
613 |
"""See InventoryEntry.detect_changes."""
|
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
614 |
assert self.text_sha1 is not None |
615 |
assert old_entry.text_sha1 is not None |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
616 |
text_modified = (self.text_sha1 != old_entry.text_sha1) |
617 |
meta_modified = (self.executable != old_entry.executable) |
|
618 |
return text_modified, meta_modified |
|
619 |
||
620 |
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
|
621 |
output_to, reverse=False): |
|
622 |
"""See InventoryEntry._diff."""
|
|
3009.2.22
by Aaron Bentley
Update names & docstring |
623 |
from bzrlib.diff import DiffText |
3009.2.5
by Aaron Bentley
Factor symlink and file diffing into differ |
624 |
from_file_id = self.file_id |
625 |
if to_entry: |
|
626 |
to_file_id = to_entry.file_id |
|
627 |
else: |
|
628 |
to_file_id = None |
|
629 |
if reverse: |
|
630 |
to_file_id, from_file_id = from_file_id, to_file_id |
|
631 |
tree, to_tree = to_tree, tree |
|
632 |
from_label, to_label = to_label, from_label |
|
3009.2.22
by Aaron Bentley
Update names & docstring |
633 |
differ = DiffText(tree, to_tree, output_to, 'utf-8', '', '', |
634 |
text_diff) |
|
3009.2.5
by Aaron Bentley
Factor symlink and file diffing into differ |
635 |
return differ.diff_text(from_file_id, to_file_id, from_label, to_label) |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
636 |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
637 |
def has_text(self): |
638 |
"""See InventoryEntry.has_text."""
|
|
639 |
return True |
|
640 |
||
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
641 |
def __init__(self, file_id, name, parent_id): |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
642 |
super(InventoryFile, self).__init__(file_id, name, parent_id) |
643 |
self.kind = 'file' |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
644 |
|
645 |
def kind_character(self): |
|
646 |
"""See InventoryEntry.kind_character."""
|
|
647 |
return '' |
|
648 |
||
649 |
def _put_in_tar(self, item, tree): |
|
650 |
"""See InventoryEntry._put_in_tar."""
|
|
651 |
item.type = tarfile.REGTYPE |
|
652 |
fileobj = tree.get_file(self.file_id) |
|
653 |
item.size = self.text_size |
|
654 |
if tree.is_executable(self.file_id): |
|
655 |
item.mode = 0755 |
|
656 |
else: |
|
657 |
item.mode = 0644 |
|
658 |
return fileobj |
|
659 |
||
660 |
def _put_on_disk(self, fullpath, tree): |
|
661 |
"""See InventoryEntry._put_on_disk."""
|
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
662 |
osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb')) |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
663 |
if tree.is_executable(self.file_id): |
664 |
os.chmod(fullpath, 0755) |
|
665 |
||
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
666 |
def _read_tree_state(self, path, work_tree): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
667 |
"""See InventoryEntry._read_tree_state."""
|
1732.1.19
by John Arbash Meinel
If you have the path, use it rather than looking it up again |
668 |
self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path) |
1740.3.2
by Jelmer Vernooij
Move storing file texts to commit builder. |
669 |
# FIXME: 20050930 probe for the text size when getting sha1
|
670 |
# in _read_tree_state
|
|
1732.1.19
by John Arbash Meinel
If you have the path, use it rather than looking it up again |
671 |
self.executable = work_tree.is_executable(self.file_id, path=path) |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
672 |
|
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
673 |
def __repr__(self): |
674 |
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)" |
|
675 |
% (self.__class__.__name__, |
|
676 |
self.file_id, |
|
677 |
self.name, |
|
678 |
self.parent_id, |
|
679 |
self.text_sha1, |
|
680 |
self.text_size)) |
|
681 |
||
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
682 |
def _forget_tree_state(self): |
683 |
self.text_sha1 = None |
|
684 |
||
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
685 |
def _unchanged(self, previous_ie): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
686 |
"""See InventoryEntry._unchanged."""
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
687 |
compatible = super(InventoryFile, self)._unchanged(previous_ie) |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
688 |
if self.text_sha1 != previous_ie.text_sha1: |
689 |
compatible = False |
|
690 |
else: |
|
691 |
# FIXME: 20050930 probe for the text size when getting sha1
|
|
692 |
# in _read_tree_state
|
|
693 |
self.text_size = previous_ie.text_size |
|
1185.1.52
by Robert Collins
fix detection of changes in inventory entries when the x bit is toggled |
694 |
if self.executable != previous_ie.executable: |
695 |
compatible = False |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
696 |
return compatible |
697 |
||
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
698 |
|
699 |
class InventoryLink(InventoryEntry): |
|
700 |
"""A file in an inventory."""
|
|
701 |
||
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
702 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
2255.2.220
by Robert Collins
Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors. |
703 |
'text_id', 'parent_id', 'children', 'executable', |
704 |
'revision', 'symlink_target', 'reference_revision'] |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
705 |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
706 |
def _check(self, checker, rev_id, tree): |
707 |
"""See InventoryEntry._check"""
|
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
708 |
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None: |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
709 |
raise BzrCheckError('symlink {%s} has text in revision {%s}' |
710 |
% (self.file_id, rev_id)) |
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
711 |
if self.symlink_target is None: |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
712 |
raise BzrCheckError('symlink {%s} has no target in revision {%s}' |
713 |
% (self.file_id, rev_id)) |
|
714 |
||
715 |
def copy(self): |
|
716 |
other = InventoryLink(self.file_id, self.name, self.parent_id) |
|
717 |
other.symlink_target = self.symlink_target |
|
718 |
other.revision = self.revision |
|
719 |
return other |
|
720 |
||
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
721 |
def detect_changes(self, old_entry): |
722 |
"""See InventoryEntry.detect_changes."""
|
|
723 |
# FIXME: which _modified field should we use ? RBC 20051003
|
|
724 |
text_modified = (self.symlink_target != old_entry.symlink_target) |
|
725 |
if text_modified: |
|
726 |
mutter(" symlink target changed") |
|
727 |
meta_modified = False |
|
728 |
return text_modified, meta_modified |
|
729 |
||
730 |
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
|
731 |
output_to, reverse=False): |
|
732 |
"""See InventoryEntry._diff."""
|
|
3009.2.22
by Aaron Bentley
Update names & docstring |
733 |
from bzrlib.diff import DiffSymlink |
3009.2.5
by Aaron Bentley
Factor symlink and file diffing into differ |
734 |
old_target = self.symlink_target |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
735 |
if to_entry is not None: |
3009.2.5
by Aaron Bentley
Factor symlink and file diffing into differ |
736 |
new_target = to_entry.symlink_target |
737 |
else: |
|
738 |
new_target = None |
|
739 |
if not reverse: |
|
740 |
old_tree = tree |
|
741 |
new_tree = to_tree |
|
742 |
else: |
|
743 |
old_tree = to_tree |
|
744 |
new_tree = tree |
|
745 |
new_target, old_target = old_target, new_target |
|
3009.2.22
by Aaron Bentley
Update names & docstring |
746 |
differ = DiffSymlink(old_tree, new_tree, output_to) |
3009.2.5
by Aaron Bentley
Factor symlink and file diffing into differ |
747 |
return differ.diff_symlink(old_target, new_target) |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
748 |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
749 |
def __init__(self, file_id, name, parent_id): |
750 |
super(InventoryLink, self).__init__(file_id, name, parent_id) |
|
751 |
self.kind = 'symlink' |
|
752 |
||
753 |
def kind_character(self): |
|
754 |
"""See InventoryEntry.kind_character."""
|
|
755 |
return '' |
|
756 |
||
757 |
def _put_in_tar(self, item, tree): |
|
758 |
"""See InventoryEntry._put_in_tar."""
|
|
1185.33.3
by Martin Pool
[merge] jelmer |
759 |
item.type = tarfile.SYMTYPE |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
760 |
fileobj = None |
761 |
item.size = 0 |
|
762 |
item.mode = 0755 |
|
763 |
item.linkname = self.symlink_target |
|
764 |
return fileobj |
|
765 |
||
766 |
def _put_on_disk(self, fullpath, tree): |
|
767 |
"""See InventoryEntry._put_on_disk."""
|
|
768 |
try: |
|
769 |
os.symlink(self.symlink_target, fullpath) |
|
770 |
except OSError,e: |
|
771 |
raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e)) |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
772 |
|
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
773 |
def _read_tree_state(self, path, work_tree): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
774 |
"""See InventoryEntry._read_tree_state."""
|
775 |
self.symlink_target = work_tree.get_symlink_target(self.file_id) |
|
776 |
||
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
777 |
def _forget_tree_state(self): |
778 |
self.symlink_target = None |
|
779 |
||
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
780 |
def _unchanged(self, previous_ie): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
781 |
"""See InventoryEntry._unchanged."""
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
782 |
compatible = super(InventoryLink, self)._unchanged(previous_ie) |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
783 |
if self.symlink_target != previous_ie.symlink_target: |
784 |
compatible = False |
|
785 |
return compatible |
|
786 |
||
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
787 |
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
788 |
class TreeReference(InventoryEntry): |
789 |
||
790 |
kind = 'tree-reference' |
|
791 |
||
2255.6.8
by Aaron Bentley
Merge refactoring of add_reference |
792 |
def __init__(self, file_id, name, parent_id, revision=None, |
793 |
reference_revision=None): |
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
794 |
InventoryEntry.__init__(self, file_id, name, parent_id) |
795 |
self.revision = revision |
|
796 |
self.reference_revision = reference_revision |
|
797 |
||
2100.3.18
by Aaron Bentley
Get commit working for tree references |
798 |
def copy(self): |
799 |
return TreeReference(self.file_id, self.name, self.parent_id, |
|
800 |
self.revision, self.reference_revision) |
|
801 |
||
2100.3.19
by Aaron Bentley
Ensure commit preserves reference revision |
802 |
def _read_tree_state(self, path, work_tree): |
803 |
"""Populate fields in the inventory entry from the given tree.
|
|
804 |
"""
|
|
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. |
805 |
self.reference_revision = work_tree.get_reference_revision( |
806 |
self.file_id, path) |
|
2100.3.19
by Aaron Bentley
Ensure commit preserves reference revision |
807 |
|
808 |
def _forget_tree_state(self): |
|
809 |
self.reference_revision = None |
|
810 |
||
2825.5.2
by Robert Collins
Review feedback, and fix pointless commits with nested trees to raise PointlessCommit appropriately. |
811 |
def _unchanged(self, previous_ie): |
812 |
"""See InventoryEntry._unchanged."""
|
|
813 |
compatible = super(TreeReference, self)._unchanged(previous_ie) |
|
814 |
if self.reference_revision != previous_ie.reference_revision: |
|
815 |
compatible = False |
|
816 |
return compatible |
|
817 |
||
2100.3.19
by Aaron Bentley
Ensure commit preserves reference revision |
818 |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
819 |
class Inventory(object): |
1
by mbp at sourcefrog
import from baz patch-364 |
820 |
"""Inventory of versioned files in a tree.
|
821 |
||
240
by mbp at sourcefrog
doc |
822 |
This describes which file_id is present at each point in the tree,
|
823 |
and possibly the SHA-1 or other information about the file.
|
|
824 |
Entries can be looked up either by path or by file_id.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
825 |
|
826 |
The inventory represents a typical unix file tree, with
|
|
827 |
directories containing files and subdirectories. We never store
|
|
828 |
the full path to a file, because renaming a directory implicitly
|
|
829 |
moves all of its contents. This class internally maintains a
|
|
830 |
lookup tree that allows the children under a directory to be
|
|
831 |
returned quickly.
|
|
832 |
||
833 |
InventoryEntry objects must not be modified after they are
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
834 |
inserted, other than through the Inventory API.
|
1
by mbp at sourcefrog
import from baz patch-364 |
835 |
|
836 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
837 |
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
838 |
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
839 |
>>> inv['123-123'].name
|
840 |
'hello.c'
|
|
841 |
||
842 |
May be treated as an iterator or set to look up file ids:
|
|
843 |
|
|
844 |
>>> bool(inv.path2id('hello.c'))
|
|
845 |
True
|
|
846 |
>>> '123-123' in inv
|
|
847 |
True
|
|
848 |
||
849 |
May also look up by name:
|
|
850 |
||
851 |
>>> [x[0] for x in inv.iter_entries()]
|
|
1852.6.6
by Robert Collins
Finish updating iter_entries change to make all tests pass. |
852 |
['', u'hello.c']
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
853 |
>>> inv = Inventory('TREE_ROOT-12345678-12345678')
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
854 |
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
855 |
Traceback (most recent call last):
|
856 |
BzrError: parent_id {TREE_ROOT} not in inventory
|
|
857 |
>>> inv.add(InventoryFile('123-123', 'hello.c', 'TREE_ROOT-12345678-12345678'))
|
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
858 |
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
859 |
"""
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
860 |
def __init__(self, root_id=ROOT_ID, revision_id=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
861 |
"""Create or read an inventory.
|
862 |
||
863 |
If a working directory is specified, the inventory is read
|
|
864 |
from there. If the file is specified, read from that. If not,
|
|
865 |
the inventory is created empty.
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
866 |
|
867 |
The inventory is created with a default root directory, with
|
|
868 |
an id of None.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
869 |
"""
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
870 |
if root_id is not None: |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
871 |
assert root_id.__class__ == str |
2294.1.5
by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths, |
872 |
self._set_root(InventoryDirectory(root_id, u'', None)) |
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
873 |
else: |
874 |
self.root = None |
|
875 |
self._byid = {} |
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
876 |
self.revision_id = revision_id |
1910.2.3
by Aaron Bentley
All tests pass |
877 |
|
2865.1.1
by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit. |
878 |
def __repr__(self): |
879 |
return "<Inventory object at %x, contents=%r>" % (id(self), self._byid) |
|
880 |
||
881 |
def apply_delta(self, delta): |
|
882 |
"""Apply a delta to this inventory.
|
|
883 |
||
884 |
:param delta: A list of changes to apply. After all the changes are
|
|
885 |
applied the final inventory must be internally consistent, but it
|
|
886 |
is ok to supply changes which, if only half-applied would have an
|
|
887 |
invalid result - such as supplying two changes which rename two
|
|
888 |
files, 'A' and 'B' with each other : [('A', 'B', 'A-id', a_entry),
|
|
889 |
('B', 'A', 'B-id', b_entry)].
|
|
890 |
||
891 |
Each change is a tuple, of the form (old_path, new_path, file_id,
|
|
892 |
new_entry).
|
|
893 |
|
|
894 |
When new_path is None, the change indicates the removal of an entry
|
|
895 |
from the inventory and new_entry will be ignored (using None is
|
|
896 |
appropriate). If new_path is not None, then new_entry must be an
|
|
897 |
InventoryEntry instance, which will be incorporated into the
|
|
898 |
inventory (and replace any existing entry with the same file id).
|
|
899 |
|
|
900 |
When old_path is None, the change indicates the addition of
|
|
901 |
a new entry to the inventory.
|
|
902 |
|
|
903 |
When neither new_path nor old_path are None, the change is a
|
|
904 |
modification to an entry, such as a rename, reparent, kind change
|
|
905 |
etc.
|
|
906 |
||
907 |
The children attribute of new_entry is ignored. This is because
|
|
2865.1.3
by Robert Collins
Review feedback. |
908 |
this method preserves children automatically across alterations to
|
909 |
the parent of the children, and cases where the parent id of a
|
|
910 |
child is changing require the child to be passed in as a separate
|
|
911 |
change regardless. E.g. in the recursive deletion of a directory -
|
|
912 |
the directory's children must be included in the delta, or the
|
|
913 |
final inventory will be invalid.
|
|
2865.1.1
by Robert Collins
Create new mutable tree method update_to_one_parent_via_delta for eventual use by commit. |
914 |
"""
|
915 |
children = {} |
|
916 |
# Remove all affected items which were in the original inventory,
|
|
917 |
# starting with the longest paths, thus ensuring parents are examined
|
|
918 |
# after their children, which means that everything we examine has no
|
|
919 |
# modified children remaining by the time we examine it.
|
|
920 |
for old_path, file_id in sorted(((op, f) for op, np, f, e in delta |
|
921 |
if op is not None), reverse=True): |
|
922 |
if file_id not in self: |
|
923 |
# adds come later
|
|
924 |
continue
|
|
925 |
# Preserve unaltered children of file_id for later reinsertion.
|
|
926 |
children[file_id] = getattr(self[file_id], 'children', {}) |
|
927 |
# Remove file_id and the unaltered children. If file_id is not
|
|
928 |
# being deleted it will be reinserted back later.
|
|
929 |
self.remove_recursive_id(file_id) |
|
930 |
# Insert all affected which should be in the new inventory, reattaching
|
|
931 |
# their children if they had any. This is done from shortest path to
|
|
932 |
# longest, ensuring that items which were modified and whose parents in
|
|
933 |
# the resulting inventory were also modified, are inserted after their
|
|
934 |
# parents.
|
|
935 |
for new_path, new_entry in sorted((np, e) for op, np, f, e in |
|
936 |
delta if np is not None): |
|
937 |
if new_entry.kind == 'directory': |
|
938 |
new_entry.children = children.get(new_entry.file_id, {}) |
|
939 |
self.add(new_entry) |
|
940 |
||
1910.2.3
by Aaron Bentley
All tests pass |
941 |
def _set_root(self, ie): |
942 |
self.root = ie |
|
1907.1.2
by Aaron Bentley
More removal of unique-root stuff |
943 |
self._byid = {self.root.file_id: self.root} |
1
by mbp at sourcefrog
import from baz patch-364 |
944 |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
945 |
def copy(self): |
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
946 |
# TODO: jam 20051218 Should copy also copy the revision_id?
|
1852.6.3
by Robert Collins
Make iter(Tree) consistent for all tree types. |
947 |
entries = self.iter_entries() |
2938.2.1
by Jelmer Vernooij
Handle empty inventories in Inventory.copy(). |
948 |
if self.root is None: |
949 |
return Inventory(root_id=None) |
|
1852.6.3
by Robert Collins
Make iter(Tree) consistent for all tree types. |
950 |
other = Inventory(entries.next()[1].file_id) |
1206
by Martin Pool
- fix bug in Inventory.copy() |
951 |
# copy recursively so we know directories will be added before
|
952 |
# their children. There are more efficient ways than this...
|
|
2935.2.1
by Jelmer Vernooij
Fix Inventory.copy() and add a test for it. |
953 |
for path, entry in entries: |
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
954 |
other.add(entry.copy()) |
955 |
return other |
|
956 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
957 |
def __iter__(self): |
958 |
return iter(self._byid) |
|
959 |
||
960 |
def __len__(self): |
|
961 |
"""Returns number of entries."""
|
|
962 |
return len(self._byid) |
|
963 |
||
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
964 |
def iter_entries(self, from_dir=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
965 |
"""Return (path, entry) pairs, in order by name."""
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
966 |
if from_dir is None: |
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
967 |
if self.root is None: |
968 |
return
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
969 |
from_dir = self.root |
1852.6.3
by Robert Collins
Make iter(Tree) consistent for all tree types. |
970 |
yield '', self.root |
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
971 |
elif isinstance(from_dir, basestring): |
972 |
from_dir = self._byid[from_dir] |
|
973 |
||
1732.1.24
by John Arbash Meinel
iter_entries time drops to 1/6th time |
974 |
# unrolling the recursive called changed the time from
|
975 |
# 440ms/663ms (inline/total) to 116ms/116ms
|
|
1732.1.23
by John Arbash Meinel
Switch iter_entries from being a recursive function and using pathjoin |
976 |
children = from_dir.children.items() |
977 |
children.sort() |
|
978 |
children = collections.deque(children) |
|
979 |
stack = [(u'', children)] |
|
980 |
while stack: |
|
981 |
from_dir_relpath, children = stack[-1] |
|
982 |
||
983 |
while children: |
|
984 |
name, ie = children.popleft() |
|
985 |
||
986 |
# we know that from_dir_relpath never ends in a slash
|
|
987 |
# and 'f' doesn't begin with one, we can do a string op, rather
|
|
988 |
# than the checks of pathjoin(), though this means that all paths
|
|
989 |
# start with a slash
|
|
990 |
path = from_dir_relpath + '/' + name |
|
991 |
||
992 |
yield path[1:], ie |
|
993 |
||
994 |
if ie.kind != 'directory': |
|
995 |
continue
|
|
996 |
||
997 |
# But do this child first
|
|
998 |
new_children = ie.children.items() |
|
999 |
new_children.sort() |
|
1000 |
new_children = collections.deque(new_children) |
|
1001 |
stack.append((path, new_children)) |
|
1002 |
# Break out of inner loop, so that we start outer loop with child
|
|
1003 |
break
|
|
1004 |
else: |
|
1005 |
# if we finished all children, pop it off the stack
|
|
1732.1.25
by John Arbash Meinel
Fix list_files test, we don't need to check if children are empty if we fall off the loop. |
1006 |
stack.pop() |
555
by Martin Pool
- New Inventory.entries() method |
1007 |
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
1008 |
def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None, |
1009 |
yield_parents=False): |
|
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
1010 |
"""Iterate over the entries in a directory first order.
|
1011 |
||
1012 |
This returns all entries for a directory before returning
|
|
1013 |
the entries for children of a directory. This is not
|
|
1014 |
lexicographically sorted order, and is a hybrid between
|
|
1015 |
depth-first and breadth-first.
|
|
1016 |
||
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
1017 |
:param yield_parents: If True, yield the parents from the root leading
|
1018 |
down to specific_file_ids that have been requested. This has no
|
|
1019 |
impact if specific_file_ids is None.
|
|
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
1020 |
:return: This yields (path, entry) pairs
|
1021 |
"""
|
|
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
1022 |
if specific_file_ids and not isinstance(specific_file_ids, set): |
1023 |
specific_file_ids = set(specific_file_ids) |
|
1755.1.1
by Robert Collins
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides. |
1024 |
# TODO? Perhaps this should return the from_dir so that the root is
|
1025 |
# yielded? or maybe an option?
|
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
1026 |
if from_dir is None: |
1731.1.47
by Aaron Bentley
Merge bzr.dev |
1027 |
if self.root is None: |
1028 |
return
|
|
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1029 |
# Optimize a common case
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
1030 |
if (not yield_parents and specific_file_ids is not None and |
1031 |
len(specific_file_ids) == 1): |
|
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1032 |
file_id = list(specific_file_ids)[0] |
1033 |
if file_id in self: |
|
1034 |
yield self.id2path(file_id), self[file_id] |
|
1035 |
return
|
|
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
1036 |
from_dir = self.root |
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
1037 |
if (specific_file_ids is None or yield_parents or |
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1038 |
self.root.file_id in specific_file_ids): |
2294.1.5
by John Arbash Meinel
Fix Inventory.iter_entries_by_dir to return Unicode paths, |
1039 |
yield u'', self.root |
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
1040 |
elif isinstance(from_dir, basestring): |
1041 |
from_dir = self._byid[from_dir] |
|
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1042 |
|
1043 |
if specific_file_ids is not None: |
|
2309.4.2
by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks. |
1044 |
# TODO: jam 20070302 This could really be done as a loop rather
|
1045 |
# than a bunch of recursive calls.
|
|
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1046 |
parents = set() |
2309.4.2
by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks. |
1047 |
byid = self._byid |
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1048 |
def add_ancestors(file_id): |
2309.4.2
by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks. |
1049 |
if file_id not in byid: |
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1050 |
return
|
2309.4.2
by John Arbash Meinel
Change iter_entries_by_dir to avoid extra file id safety checks. |
1051 |
parent_id = byid[file_id].parent_id |
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1052 |
if parent_id is None: |
1053 |
return
|
|
1054 |
if parent_id not in parents: |
|
1055 |
parents.add(parent_id) |
|
1056 |
add_ancestors(parent_id) |
|
1057 |
for file_id in specific_file_ids: |
|
1058 |
add_ancestors(file_id) |
|
1059 |
else: |
|
1060 |
parents = None |
|
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
1061 |
|
1062 |
stack = [(u'', from_dir)] |
|
1063 |
while stack: |
|
1064 |
cur_relpath, cur_dir = stack.pop() |
|
1065 |
||
1066 |
child_dirs = [] |
|
1067 |
for child_name, child_ie in sorted(cur_dir.children.iteritems()): |
|
1068 |
||
1069 |
child_relpath = cur_relpath + child_name |
|
1070 |
||
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1071 |
if (specific_file_ids is None or |
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
1072 |
child_ie.file_id in specific_file_ids or |
1073 |
(yield_parents and child_ie.file_id in parents)): |
|
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1074 |
yield child_relpath, child_ie |
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
1075 |
|
1076 |
if child_ie.kind == 'directory': |
|
1551.9.29
by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids |
1077 |
if parents is None or child_ie.file_id in parents: |
1078 |
child_dirs.append((child_relpath+'/', child_ie)) |
|
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
1079 |
stack.extend(reversed(child_dirs)) |
1080 |
||
2568.2.4
by Robert Collins
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now |
1081 |
def make_entry(self, kind, name, parent_id, file_id=None): |
1082 |
"""Simple thunk to bzrlib.inventory.make_entry."""
|
|
1083 |
return make_entry(kind, name, parent_id, file_id) |
|
1084 |
||
555
by Martin Pool
- New Inventory.entries() method |
1085 |
def entries(self): |
1086 |
"""Return list of (path, ie) for all entries except the root.
|
|
1087 |
||
1088 |
This may be faster than iter_entries.
|
|
1089 |
"""
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1090 |
accum = [] |
1091 |
def descend(dir_ie, dir_path): |
|
556
by Martin Pool
- fix up Inventory.entries() |
1092 |
kids = dir_ie.children.items() |
555
by Martin Pool
- New Inventory.entries() method |
1093 |
kids.sort() |
1094 |
for name, ie in kids: |
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
1095 |
child_path = osutils.pathjoin(dir_path, name) |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1096 |
accum.append((child_path, ie)) |
555
by Martin Pool
- New Inventory.entries() method |
1097 |
if ie.kind == 'directory': |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1098 |
descend(ie, child_path) |
555
by Martin Pool
- New Inventory.entries() method |
1099 |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1100 |
descend(self.root, u'') |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1101 |
return accum |
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
1102 |
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1103 |
def directories(self): |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1104 |
"""Return (path, entry) pairs for all directories, including the root.
|
1
by mbp at sourcefrog
import from baz patch-364 |
1105 |
"""
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1106 |
accum = [] |
1107 |
def descend(parent_ie, parent_path): |
|
1108 |
accum.append((parent_path, parent_ie)) |
|
156
by mbp at sourcefrog
new "directories" command |
1109 |
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1110 |
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory'] |
1111 |
kids.sort() |
|
156
by mbp at sourcefrog
new "directories" command |
1112 |
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1113 |
for name, child_ie in kids: |
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
1114 |
child_path = osutils.pathjoin(parent_path, name) |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1115 |
descend(child_ie, child_path) |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1116 |
descend(self.root, u'') |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
1117 |
return accum |
1
by mbp at sourcefrog
import from baz patch-364 |
1118 |
|
1119 |
def __contains__(self, file_id): |
|
1120 |
"""True if this entry contains a file with given id.
|
|
1121 |
||
1122 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1123 |
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1124 |
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1125 |
>>> '123' in inv
|
1126 |
True
|
|
1127 |
>>> '456' in inv
|
|
1128 |
False
|
|
1129 |
"""
|
|
1711.9.11
by John Arbash Meinel
change return foo in bar to return (foo in bar) |
1130 |
return (file_id in self._byid) |
1
by mbp at sourcefrog
import from baz patch-364 |
1131 |
|
1132 |
def __getitem__(self, file_id): |
|
1133 |
"""Return the entry for given file_id.
|
|
1134 |
||
1135 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1136 |
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1137 |
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1138 |
>>> inv['123123'].name
|
1139 |
'hello.c'
|
|
1140 |
"""
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1141 |
try: |
1142 |
return self._byid[file_id] |
|
1143 |
except KeyError: |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1144 |
# really we're passing an inventory, not a tree...
|
1145 |
raise errors.NoSuchId(self, file_id) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1146 |
|
460
by Martin Pool
- new testing command compare-trees |
1147 |
def get_file_kind(self, file_id): |
1148 |
return self._byid[file_id].kind |
|
1149 |
||
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1150 |
def get_child(self, parent_id, filename): |
1732.1.18
by John Arbash Meinel
50ms is probably not worth it |
1151 |
return self[parent_id].children.get(filename) |
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1152 |
|
2100.3.6
by Aaron Bentley
Make add recursive for children of added entries |
1153 |
def _add_child(self, entry): |
1154 |
"""Add an entry to the inventory, without adding it to its parent"""
|
|
1155 |
if entry.file_id in self._byid: |
|
1156 |
raise BzrError("inventory already contains entry with id {%s}" % |
|
1157 |
entry.file_id) |
|
1158 |
self._byid[entry.file_id] = entry |
|
1159 |
for child in getattr(entry, 'children', {}).itervalues(): |
|
1160 |
self._add_child(child) |
|
1161 |
return entry |
|
1162 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1163 |
def add(self, entry): |
1164 |
"""Add entry to inventory.
|
|
1165 |
||
1166 |
To add a file to a branch ready to be committed, use Branch.add,
|
|
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
1167 |
which calls this.
|
1168 |
||
1169 |
Returns the new entry object.
|
|
1170 |
"""
|
|
139
by mbp at sourcefrog
simplified/faster Inventory.add |
1171 |
if entry.file_id in self._byid: |
2255.7.16
by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId. |
1172 |
raise errors.DuplicateFileId(entry.file_id, |
1173 |
self._byid[entry.file_id]) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1174 |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1175 |
if entry.parent_id is None: |
1910.2.3
by Aaron Bentley
All tests pass |
1176 |
assert self.root is None and len(self._byid) == 0 |
2100.3.6
by Aaron Bentley
Make add recursive for children of added entries |
1177 |
self.root = entry |
1178 |
else: |
|
1179 |
try: |
|
1180 |
parent = self._byid[entry.parent_id] |
|
1181 |
except KeyError: |
|
1182 |
raise BzrError("parent_id {%s} not in inventory" % |
|
1183 |
entry.parent_id) |
|
1184 |
||
1185 |
if entry.name in parent.children: |
|
1186 |
raise BzrError("%s is already versioned" % |
|
1187 |
osutils.pathjoin(self.id2path(parent.file_id), |
|
1551.13.12
by Aaron Bentley
Fix encoding of 'already versioned' error |
1188 |
entry.name).encode('utf-8')) |
2100.3.6
by Aaron Bentley
Make add recursive for children of added entries |
1189 |
parent.children[entry.name] = entry |
1190 |
return self._add_child(entry) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1191 |
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
1192 |
def add_path(self, relpath, kind, file_id=None, parent_id=None): |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1193 |
"""Add entry from a path.
|
1194 |
||
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
1195 |
The immediate parent must already be versioned.
|
1196 |
||
1197 |
Returns the new entry object."""
|
|
1015
by Martin Pool
- fix circular imports |
1198 |
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
1199 |
parts = osutils.splitpath(relpath) |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1200 |
|
1534.7.69
by Aaron Bentley
Got real root moves working |
1201 |
if len(parts) == 0: |
1713.1.6
by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'. |
1202 |
if file_id is None: |
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
1203 |
file_id = generate_ids.gen_root_id() |
1731.1.1
by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty |
1204 |
self.root = InventoryDirectory(file_id, '', None) |
1534.7.69
by Aaron Bentley
Got real root moves working |
1205 |
self._byid = {self.root.file_id: self.root} |
2178.2.2
by Jelmer Vernooij
Make add_path() return inventory entry for root just like it does for other entries. |
1206 |
return self.root |
1534.7.69
by Aaron Bentley
Got real root moves working |
1207 |
else: |
1208 |
parent_path = parts[:-1] |
|
1209 |
parent_id = self.path2id(parent_path) |
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
1210 |
if parent_id is None: |
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
1211 |
raise errors.NotVersionedError(path=parent_path) |
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
1212 |
ie = make_entry(kind, parts[-1], parent_id, file_id) |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1213 |
return self.add(ie) |
1214 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1215 |
def __delitem__(self, file_id): |
1216 |
"""Remove entry by id.
|
|
1217 |
||
1218 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1219 |
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1220 |
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1221 |
>>> '123' in inv
|
1222 |
True
|
|
1223 |
>>> del inv['123']
|
|
1224 |
>>> '123' in inv
|
|
1225 |
False
|
|
1226 |
"""
|
|
1227 |
ie = self[file_id] |
|
1228 |
||
1534.7.69
by Aaron Bentley
Got real root moves working |
1229 |
assert ie.parent_id is None or \ |
1230 |
self[ie.parent_id].children[ie.name] == ie |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1231 |
|
1232 |
del self._byid[file_id] |
|
1534.7.69
by Aaron Bentley
Got real root moves working |
1233 |
if ie.parent_id is not None: |
1234 |
del self[ie.parent_id].children[ie.name] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1235 |
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
1236 |
def __eq__(self, other): |
1
by mbp at sourcefrog
import from baz patch-364 |
1237 |
"""Compare two sets by comparing their contents.
|
1238 |
||
1239 |
>>> i1 = Inventory()
|
|
1240 |
>>> i2 = Inventory()
|
|
1241 |
>>> i1 == i2
|
|
1242 |
True
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1243 |
>>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1244 |
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1245 |
>>> i1 == i2
|
1246 |
False
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1247 |
>>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1248 |
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1249 |
>>> i1 == i2
|
1250 |
True
|
|
1251 |
"""
|
|
1252 |
if not isinstance(other, Inventory): |
|
1253 |
return NotImplemented |
|
1254 |
||
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
1255 |
return self._byid == other._byid |
1256 |
||
1257 |
def __ne__(self, other): |
|
1249
by Martin Pool
- improvements to weave commit [broken] |
1258 |
return not self.__eq__(other) |
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
1259 |
|
1260 |
def __hash__(self): |
|
1261 |
raise ValueError('not hashable') |
|
1262 |
||
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1263 |
def _iter_file_id_parents(self, file_id): |
1264 |
"""Yield the parents of file_id up to the root."""
|
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
1265 |
while file_id is not None: |
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1266 |
try: |
1267 |
ie = self._byid[file_id] |
|
1268 |
except KeyError: |
|
2255.11.5
by Martin Pool
Tree.id2path should raise NoSuchId, not return None. |
1269 |
raise errors.NoSuchId(tree=None, file_id=file_id) |
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1270 |
yield ie |
1271 |
file_id = ie.parent_id |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1272 |
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1273 |
def get_idpath(self, file_id): |
1274 |
"""Return a list of file_ids for the path to an entry.
|
|
1275 |
||
1276 |
The list contains one element for each directory followed by
|
|
1277 |
the id of the file itself. So the length of the returned list
|
|
1278 |
is equal to the depth of the file in the tree, counting the
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1279 |
root directory as depth 1.
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1280 |
"""
|
1281 |
p = [] |
|
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1282 |
for parent in self._iter_file_id_parents(file_id): |
1283 |
p.insert(0, parent.file_id) |
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1284 |
return p |
1285 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1286 |
def id2path(self, file_id): |
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1287 |
"""Return as a string the path to file_id.
|
1393.1.32
by Martin Pool
- add docstring demonstrating use of Inventory.id2path |
1288 |
|
1289 |
>>> i = Inventory()
|
|
1290 |
>>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
|
|
1291 |
>>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
|
|
1185.31.34
by John Arbash Meinel
Removing instances of os.sep |
1292 |
>>> print i.id2path('foo-id')
|
1393.1.32
by Martin Pool
- add docstring demonstrating use of Inventory.id2path |
1293 |
src/foo.c
|
1294 |
"""
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1295 |
# get all names, skipping root
|
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1296 |
return '/'.join(reversed( |
1297 |
[parent.name for parent in |
|
1298 |
self._iter_file_id_parents(file_id)][:-1])) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1299 |
|
1300 |
def path2id(self, name): |
|
1301 |
"""Walk down through directories to return entry of last component.
|
|
1302 |
||
1303 |
names may be either a list of path components, or a single
|
|
1304 |
string, in which case it is automatically split.
|
|
1305 |
||
1306 |
This returns the entry of the last component in the path,
|
|
1307 |
which may be either a file or a directory.
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1308 |
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
1309 |
Returns None IFF the path is not found.
|
1
by mbp at sourcefrog
import from baz patch-364 |
1310 |
"""
|
1996.3.10
by John Arbash Meinel
lazy_import inventory.py, avoids importing tarfile |
1311 |
if isinstance(name, basestring): |
1312 |
name = osutils.splitpath(name) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1313 |
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
1314 |
# mutter("lookup path %r" % name)
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1315 |
|
1316 |
parent = self.root |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1317 |
if parent is None: |
1318 |
return None |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1319 |
for f in name: |
1
by mbp at sourcefrog
import from baz patch-364 |
1320 |
try: |
2091.3.1
by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id |
1321 |
children = getattr(parent, 'children', None) |
2091.3.3
by Aaron Bentley
Test 'is None' not '== None' |
1322 |
if children is None: |
2091.3.1
by Aaron Bentley
When 'directory' path element isn't a directory, return None from path2id |
1323 |
return None |
1324 |
cie = children[f] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1325 |
assert cie.name == f |
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1326 |
assert cie.parent_id == parent.file_id |
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1327 |
parent = cie |
1
by mbp at sourcefrog
import from baz patch-364 |
1328 |
except KeyError: |
1329 |
# or raise an error?
|
|
1330 |
return None |
|
1331 |
||
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1332 |
return parent.file_id |
1
by mbp at sourcefrog
import from baz patch-364 |
1333 |
|
1334 |
def has_filename(self, names): |
|
1335 |
return bool(self.path2id(names)) |
|
1336 |
||
1337 |
def has_id(self, file_id): |
|
1711.9.11
by John Arbash Meinel
change return foo in bar to return (foo in bar) |
1338 |
return (file_id in self._byid) |
1
by mbp at sourcefrog
import from baz patch-364 |
1339 |
|
1988.2.6
by Robert Collins
Review feedback. |
1340 |
def remove_recursive_id(self, file_id): |
1341 |
"""Remove file_id, and children, from the inventory.
|
|
1342 |
|
|
1343 |
:param file_id: A file_id to remove.
|
|
1344 |
"""
|
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1345 |
to_find_delete = [self._byid[file_id]] |
1346 |
to_delete = [] |
|
1988.2.6
by Robert Collins
Review feedback. |
1347 |
while to_find_delete: |
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1348 |
ie = to_find_delete.pop() |
1349 |
to_delete.append(ie.file_id) |
|
1350 |
if ie.kind == 'directory': |
|
1351 |
to_find_delete.extend(ie.children.values()) |
|
1352 |
for file_id in reversed(to_delete): |
|
1988.2.4
by Robert Collins
Bugfix the unversion implementation - it had a faulty inventory.remove included in it, which the initial test was not rigourous enough to detect. |
1353 |
ie = self[file_id] |
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1354 |
del self._byid[file_id] |
1731.2.16
by Aaron Bentley
Get extract working for standalone trees |
1355 |
if ie.parent_id is not None: |
1356 |
del self[ie.parent_id].children[ie.name] |
|
2376.2.3
by Aaron Bentley
Fix root replacement for apply_inventory_delta |
1357 |
else: |
1358 |
self.root = None |
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1359 |
|
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1360 |
def rename(self, file_id, new_parent_id, new_name): |
1361 |
"""Move a file within the inventory.
|
|
1362 |
||
1363 |
This can change either the name, or the parent, or both.
|
|
1364 |
||
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
1365 |
This does not move the working file.
|
1366 |
"""
|
|
2825.6.1
by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the |
1367 |
new_name = ensure_normalized_name(new_name) |
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1368 |
if not is_valid_name(new_name): |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1369 |
raise BzrError("not an acceptable filename: %r" % new_name) |
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1370 |
|
1371 |
new_parent = self._byid[new_parent_id] |
|
1372 |
if new_name in new_parent.children: |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1373 |
raise BzrError("%r already exists in %r" % (new_name, self.id2path(new_parent_id))) |
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1374 |
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1375 |
new_parent_idpath = self.get_idpath(new_parent_id) |
1376 |
if file_id in new_parent_idpath: |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1377 |
raise BzrError("cannot move directory %r into a subdirectory of itself, %r" |
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1378 |
% (self.id2path(file_id), self.id2path(new_parent_id))) |
1379 |
||
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1380 |
file_ie = self._byid[file_id] |
1381 |
old_parent = self._byid[file_ie.parent_id] |
|
1382 |
||
1383 |
# TODO: Don't leave things messed up if this fails
|
|
1384 |
||
1385 |
del old_parent.children[file_ie.name] |
|
1386 |
new_parent.children[new_name] = file_ie |
|
1387 |
||
1388 |
file_ie.name = new_name |
|
1389 |
file_ie.parent_id = new_parent_id |
|
1390 |
||
1731.1.1
by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty |
1391 |
def is_root(self, file_id): |
1392 |
return self.root is not None and file_id == self.root.file_id |
|
1393 |
||
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1394 |
|
2255.2.74
by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries. |
1395 |
entry_factory = { |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1396 |
'directory': InventoryDirectory, |
1397 |
'file': InventoryFile, |
|
1398 |
'symlink': InventoryLink, |
|
2255.6.8
by Aaron Bentley
Merge refactoring of add_reference |
1399 |
'tree-reference': TreeReference |
2255.2.74
by Robert Collins
Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries. |
1400 |
}
|
1401 |
||
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
1402 |
def make_entry(kind, name, parent_id, file_id=None): |
1403 |
"""Create an inventory entry.
|
|
1404 |
||
1405 |
:param kind: the type of inventory entry to create.
|
|
1406 |
:param name: the basename of the entry.
|
|
1407 |
:param parent_id: the parent_id of the entry.
|
|
1408 |
:param file_id: the file_id to use. if None, one will be created.
|
|
1409 |
"""
|
|
1410 |
if file_id is None: |
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
1411 |
file_id = generate_ids.gen_file_id(name) |
2825.6.1
by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the |
1412 |
name = ensure_normalized_name(name) |
1413 |
try: |
|
1414 |
factory = entry_factory[kind] |
|
1415 |
except KeyError: |
|
1416 |
raise BzrError("unknown kind %r" % kind) |
|
1417 |
return factory(file_id, name, parent_id) |
|
1418 |
||
1419 |
||
1420 |
def ensure_normalized_name(name): |
|
1421 |
"""Normalize name.
|
|
1422 |
||
1423 |
:raises InvalidNormalization: When name is not normalized, and cannot be
|
|
1424 |
accessed on this platform by the normalized path.
|
|
3201.1.1
by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC |
1425 |
:return: The NFC normalised version of name.
|
2825.6.1
by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the |
1426 |
"""
|
2255.2.54
by Robert Collins
Add in non-normalized filename sanity check to dirstate add(). |
1427 |
#------- This has been copied to bzrlib.dirstate.DirState.add, please
|
1428 |
# keep them synchronised.
|
|
2255.2.58
by Robert Collins
Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used. |
1429 |
# we dont import normalized_filename directly because we want to be
|
1430 |
# able to change the implementation at runtime for tests.
|
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
1431 |
norm_name, can_access = osutils.normalized_filename(name) |
1432 |
if norm_name != name: |
|
1433 |
if can_access: |
|
2825.6.1
by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the |
1434 |
return norm_name |
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
1435 |
else: |
1436 |
# TODO: jam 20060701 This would probably be more useful
|
|
1437 |
# if the error was raised with the full path
|
|
1438 |
raise errors.InvalidNormalization(name) |
|
2825.6.1
by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the |
1439 |
return name |
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
1440 |
|
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1441 |
|
1077
by Martin Pool
- avoid compiling REs at module load time |
1442 |
_NAME_RE = None |
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1443 |
|
1444 |
def is_valid_name(name): |
|
1077
by Martin Pool
- avoid compiling REs at module load time |
1445 |
global _NAME_RE |
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
1446 |
if _NAME_RE is None: |
1077
by Martin Pool
- avoid compiling REs at module load time |
1447 |
_NAME_RE = re.compile(r'^[^/\\]+$') |
1448 |
||
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1449 |
return bool(_NAME_RE.match(name)) |