bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1 |
# (C) 2005 Canonical Ltd
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
2 |
|
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.
|
|
7 |
||
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.
|
|
12 |
||
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 |
||
17 |
||
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
18 |
# This should really be an id randomly assigned when the tree is
|
19 |
# created, but it's not for now.
|
|
20 |
ROOT_ID = "TREE_ROOT" |
|
21 |
||
22 |
||
|
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 |
23 |
import sys, os.path, types, re |
|
1
by mbp at sourcefrog
import from baz patch-364 |
24 |
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
25 |
import bzrlib |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
26 |
from bzrlib.errors import BzrError, BzrCheckError |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
27 |
|
28 |
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath |
|
29 |
from bzrlib.trace import mutter |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
30 |
from bzrlib.errors import NotVersionedError |
31 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
32 |
|
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
33 |
class InventoryEntry(object): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
34 |
"""Description of a versioned file. |
35 |
||
36 |
An InventoryEntry has the following fields, which are also
|
|
37 |
present in the XML inventory-entry element:
|
|
38 |
||
39 |
* *file_id*
|
|
40 |
* *name*: (only the basename within the directory, must not
|
|
41 |
contain slashes)
|
|
42 |
* *kind*: "directory" or "file"
|
|
43 |
* *directory_id*: (if absent/null means the branch root directory)
|
|
44 |
* *text_sha1*: only for files
|
|
45 |
* *text_size*: in bytes, only for files
|
|
46 |
* *text_id*: identifier for the text version, only for files
|
|
47 |
||
48 |
InventoryEntries can also exist inside a WorkingTree
|
|
49 |
inventory, in which case they are not yet bound to a
|
|
50 |
particular revision of the file. In that case the text_sha1,
|
|
51 |
text_size and text_id are absent.
|
|
52 |
||
53 |
||
54 |
>>> i = Inventory()
|
|
55 |
>>> i.path2id('')
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
56 |
'TREE_ROOT'
|
57 |
>>> i.add(InventoryEntry('123', 'src', 'directory', ROOT_ID))
|
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
58 |
InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT')
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
59 |
>>> i.add(InventoryEntry('2323', 'hello.c', 'file', parent_id='123'))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
60 |
InventoryEntry('2323', 'hello.c', kind='file', parent_id='123')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
61 |
>>> for j in i.iter_entries():
|
62 |
... print j
|
|
63 |
...
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
64 |
('src', InventoryEntry('123', 'src', kind='directory', parent_id='TREE_ROOT'))
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
65 |
('src/hello.c', InventoryEntry('2323', 'hello.c', kind='file', parent_id='123'))
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
66 |
>>> i.add(InventoryEntry('2323', 'bye.c', 'file', '123'))
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
67 |
Traceback (most recent call last):
|
68 |
...
|
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
69 |
BzrError: inventory already contains entry with id {2323}
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
70 |
>>> i.add(InventoryEntry('2324', 'bye.c', 'file', '123'))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
71 |
InventoryEntry('2324', 'bye.c', kind='file', parent_id='123')
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
72 |
>>> i.add(InventoryEntry('2325', 'wibble', 'directory', '123'))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
73 |
InventoryEntry('2325', 'wibble', kind='directory', parent_id='123')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
74 |
>>> i.path2id('src/wibble')
|
75 |
'2325'
|
|
76 |
>>> '2325' in i
|
|
77 |
True
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
78 |
>>> i.add(InventoryEntry('2326', 'wibble.c', 'file', '2325'))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
79 |
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
80 |
>>> i['2326']
|
81 |
InventoryEntry('2326', 'wibble.c', kind='file', parent_id='2325')
|
|
82 |
>>> for j in i.iter_entries():
|
|
83 |
... print j[0]
|
|
84 |
... assert i.path2id(j[0])
|
|
85 |
...
|
|
86 |
src
|
|
87 |
src/bye.c
|
|
88 |
src/hello.c
|
|
89 |
src/wibble
|
|
90 |
src/wibble/wibble.c
|
|
91 |
>>> i.id2path('2326')
|
|
92 |
'src/wibble/wibble.c'
|
|
93 |
||
|
254
by Martin Pool
- Doc cleanups from Magnus Therning |
94 |
TODO: Maybe also keep the full path of the entry, and the children?
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
95 |
But those depend on its position within a particular inventory, and
|
96 |
it would be nice not to need to hold the backpointer here.
|
|
97 |
"""
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
98 |
|
99 |
# TODO: split InventoryEntry into subclasses for files,
|
|
100 |
# directories, etc etc.
|
|
|
376
by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects |
101 |
|
|
955
by Martin Pool
- use __slots__ on InventoryEntry; rather faster |
102 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
|
1183
by Martin Pool
- implement version 5 xml storage, and tests |
103 |
'text_id', 'parent_id', 'children', |
104 |
'text_version', 'entry_version', ] |
|
|
955
by Martin Pool
- use __slots__ on InventoryEntry; rather faster |
105 |
|
|
1185
by Martin Pool
- add xml round-trip test for revisions |
106 |
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
107 |
def __init__(self, file_id, name, kind, parent_id, text_id=None): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
108 |
"""Create an InventoryEntry |
109 |
|
|
110 |
The filename must be a single component, relative to the
|
|
111 |
parent directory; it cannot be a whole path or relative name.
|
|
112 |
||
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
113 |
>>> e = InventoryEntry('123', 'hello.c', 'file', ROOT_ID)
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
114 |
>>> e.name
|
115 |
'hello.c'
|
|
116 |
>>> e.file_id
|
|
117 |
'123'
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
118 |
>>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
119 |
Traceback (most recent call last):
|
|
395
by Martin Pool
- fix error raised from invalid InventoryEntry name |
120 |
BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
121 |
"""
|
|
1183
by Martin Pool
- implement version 5 xml storage, and tests |
122 |
assert isinstance(name, basestring), name |
|
376
by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects |
123 |
if '/' in name or '\\' in name: |
124 |
raise BzrCheckError('InventoryEntry name %r is invalid' % name) |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
125 |
|
|
1185
by Martin Pool
- add xml round-trip test for revisions |
126 |
self.text_version = None |
127 |
self.entry_version = None |
|
|
955
by Martin Pool
- use __slots__ on InventoryEntry; rather faster |
128 |
self.text_sha1 = None |
129 |
self.text_size = None |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
130 |
self.file_id = file_id |
131 |
self.name = name |
|
132 |
self.kind = kind |
|
133 |
self.text_id = text_id |
|
134 |
self.parent_id = parent_id |
|
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
135 |
if kind == 'directory': |
136 |
self.children = {} |
|
|
237
by mbp at sourcefrog
- Better assertions in InventoryEntry constructor |
137 |
elif kind == 'file': |
138 |
pass
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
139 |
else: |
|
237
by mbp at sourcefrog
- Better assertions in InventoryEntry constructor |
140 |
raise BzrError("unhandled entry kind %r" % kind) |
141 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
142 |
|
143 |
||
|
156
by mbp at sourcefrog
new "directories" command |
144 |
def sorted_children(self): |
145 |
l = self.children.items() |
|
146 |
l.sort() |
|
147 |
return l |
|
148 |
||
149 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
150 |
def copy(self): |
151 |
other = InventoryEntry(self.file_id, self.name, self.kind, |
|
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
152 |
self.parent_id) |
153 |
other.text_id = self.text_id |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
154 |
other.text_sha1 = self.text_sha1 |
155 |
other.text_size = self.text_size |
|
|
490
by Martin Pool
doc |
156 |
# note that children are *not* copied; they're pulled across when
|
157 |
# others are added
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
158 |
return other |
159 |
||
160 |
||
161 |
def __repr__(self): |
|
162 |
return ("%s(%r, %r, kind=%r, parent_id=%r)" |
|
163 |
% (self.__class__.__name__, |
|
164 |
self.file_id, |
|
165 |
self.name, |
|
166 |
self.kind, |
|
167 |
self.parent_id)) |
|
168 |
||
169 |
||
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
170 |
def __eq__(self, other): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
171 |
if not isinstance(other, InventoryEntry): |
172 |
return NotImplemented |
|
173 |
||
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
174 |
return (self.file_id == other.file_id) \ |
175 |
and (self.name == other.name) \ |
|
176 |
and (self.text_sha1 == other.text_sha1) \ |
|
177 |
and (self.text_size == other.text_size) \ |
|
178 |
and (self.text_id == other.text_id) \ |
|
179 |
and (self.parent_id == other.parent_id) \ |
|
|
1185
by Martin Pool
- add xml round-trip test for revisions |
180 |
and (self.kind == other.kind) \ |
181 |
and (self.text_version == other.text_version) \ |
|
182 |
and (self.entry_version == other.entry_version) |
|
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
183 |
|
184 |
||
185 |
def __ne__(self, other): |
|
186 |
return not (self == other) |
|
187 |
||
188 |
def __hash__(self): |
|
189 |
raise ValueError('not hashable') |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
190 |
|
191 |
||
192 |
||
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
193 |
class RootEntry(InventoryEntry): |
194 |
def __init__(self, file_id): |
|
195 |
self.file_id = file_id |
|
196 |
self.children = {} |
|
197 |
self.kind = 'root_directory' |
|
198 |
self.parent_id = None |
|
|
156
by mbp at sourcefrog
new "directories" command |
199 |
self.name = '' |
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
200 |
|
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
201 |
def __eq__(self, other): |
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
202 |
if not isinstance(other, RootEntry): |
203 |
return NotImplemented |
|
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
204 |
|
205 |
return (self.file_id == other.file_id) \ |
|
206 |
and (self.children == other.children) |
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
207 |
|
208 |
||
209 |
||
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
210 |
class Inventory(object): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
211 |
"""Inventory of versioned files in a tree. |
212 |
||
|
240
by mbp at sourcefrog
doc |
213 |
This describes which file_id is present at each point in the tree,
|
214 |
and possibly the SHA-1 or other information about the file.
|
|
215 |
Entries can be looked up either by path or by file_id.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
216 |
|
217 |
The inventory represents a typical unix file tree, with
|
|
218 |
directories containing files and subdirectories. We never store
|
|
219 |
the full path to a file, because renaming a directory implicitly
|
|
220 |
moves all of its contents. This class internally maintains a
|
|
221 |
lookup tree that allows the children under a directory to be
|
|
222 |
returned quickly.
|
|
223 |
||
224 |
InventoryEntry objects must not be modified after they are
|
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
225 |
inserted, other than through the Inventory API.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
226 |
|
227 |
>>> inv = Inventory()
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
228 |
>>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
229 |
InventoryEntry('123-123', 'hello.c', kind='file', parent_id='TREE_ROOT')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
230 |
>>> inv['123-123'].name
|
231 |
'hello.c'
|
|
232 |
||
233 |
May be treated as an iterator or set to look up file ids:
|
|
234 |
|
|
235 |
>>> bool(inv.path2id('hello.c'))
|
|
236 |
True
|
|
237 |
>>> '123-123' in inv
|
|
238 |
True
|
|
239 |
||
240 |
May also look up by name:
|
|
241 |
||
242 |
>>> [x[0] for x in inv.iter_entries()]
|
|
243 |
['hello.c']
|
|
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
244 |
>>> inv = Inventory('TREE_ROOT-12345678-12345678')
|
245 |
>>> inv.add(InventoryEntry('123-123', 'hello.c', 'file', ROOT_ID))
|
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
246 |
InventoryEntry('123-123', 'hello.c', kind='file', parent_id='TREE_ROOT-12345678-12345678')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
247 |
"""
|
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
248 |
def __init__(self, root_id=ROOT_ID): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
249 |
"""Create or read an inventory. |
250 |
||
251 |
If a working directory is specified, the inventory is read
|
|
252 |
from there. If the file is specified, read from that. If not,
|
|
253 |
the inventory is created empty.
|
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
254 |
|
255 |
The inventory is created with a default root directory, with
|
|
256 |
an id of None.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
257 |
"""
|
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
258 |
# We are letting Branch(init=True) create a unique inventory
|
259 |
# root id. Rather than generating a random one here.
|
|
260 |
#if root_id is None:
|
|
261 |
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
|
|
262 |
self.root = RootEntry(root_id) |
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
263 |
self._byid = {self.root.file_id: self.root} |
|
1
by mbp at sourcefrog
import from baz patch-364 |
264 |
|
265 |
||
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
266 |
def copy(self): |
267 |
other = Inventory(self.root.file_id) |
|
268 |
for entry in self._byid.itervalues(): |
|
269 |
if entry == self.root: |
|
270 |
continue
|
|
271 |
other.add(entry.copy()) |
|
272 |
return other |
|
273 |
||
274 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
275 |
def __iter__(self): |
276 |
return iter(self._byid) |
|
277 |
||
278 |
||
279 |
def __len__(self): |
|
280 |
"""Returns number of entries.""" |
|
281 |
return len(self._byid) |
|
282 |
||
283 |
||
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
284 |
def iter_entries(self, from_dir=None): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
285 |
"""Return (path, entry) pairs, in order by name.""" |
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
286 |
if from_dir == None: |
287 |
assert self.root |
|
288 |
from_dir = self.root |
|
289 |
elif isinstance(from_dir, basestring): |
|
290 |
from_dir = self._byid[from_dir] |
|
291 |
||
292 |
kids = from_dir.children.items() |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
293 |
kids.sort() |
294 |
for name, ie in kids: |
|
295 |
yield name, ie |
|
296 |
if ie.kind == 'directory': |
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
297 |
for cn, cie in self.iter_entries(from_dir=ie.file_id): |
|
271
by Martin Pool
- Windows path fixes |
298 |
yield os.path.join(name, cn), cie |
|
555
by Martin Pool
- New Inventory.entries() method |
299 |
|
300 |
||
301 |
def entries(self): |
|
302 |
"""Return list of (path, ie) for all entries except the root. |
|
303 |
||
304 |
This may be faster than iter_entries.
|
|
305 |
"""
|
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
306 |
accum = [] |
307 |
def descend(dir_ie, dir_path): |
|
|
556
by Martin Pool
- fix up Inventory.entries() |
308 |
kids = dir_ie.children.items() |
|
555
by Martin Pool
- New Inventory.entries() method |
309 |
kids.sort() |
310 |
for name, ie in kids: |
|
311 |
child_path = os.path.join(dir_path, name) |
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
312 |
accum.append((child_path, ie)) |
|
555
by Martin Pool
- New Inventory.entries() method |
313 |
if ie.kind == 'directory': |
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
314 |
descend(ie, child_path) |
|
555
by Martin Pool
- New Inventory.entries() method |
315 |
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
316 |
descend(self.root, '') |
317 |
return accum |
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
318 |
|
319 |
||
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
320 |
def directories(self): |
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
321 |
"""Return (path, entry) pairs for all directories, including the root. |
|
1
by mbp at sourcefrog
import from baz patch-364 |
322 |
"""
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
323 |
accum = [] |
324 |
def descend(parent_ie, parent_path): |
|
325 |
accum.append((parent_path, parent_ie)) |
|
|
156
by mbp at sourcefrog
new "directories" command |
326 |
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
327 |
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory'] |
328 |
kids.sort() |
|
|
156
by mbp at sourcefrog
new "directories" command |
329 |
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
330 |
for name, child_ie in kids: |
331 |
child_path = os.path.join(parent_path, name) |
|
332 |
descend(child_ie, child_path) |
|
333 |
descend(self.root, '') |
|
334 |
return accum |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
335 |
|
336 |
||
337 |
||
338 |
def __contains__(self, file_id): |
|
339 |
"""True if this entry contains a file with given id. |
|
340 |
||
341 |
>>> inv = Inventory()
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
342 |
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
343 |
InventoryEntry('123', 'foo.c', kind='file', parent_id='TREE_ROOT')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
344 |
>>> '123' in inv
|
345 |
True
|
|
346 |
>>> '456' in inv
|
|
347 |
False
|
|
348 |
"""
|
|
349 |
return file_id in self._byid |
|
350 |
||
351 |
||
352 |
def __getitem__(self, file_id): |
|
353 |
"""Return the entry for given file_id. |
|
354 |
||
355 |
>>> inv = Inventory()
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
356 |
>>> inv.add(InventoryEntry('123123', 'hello.c', 'file', ROOT_ID))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
357 |
InventoryEntry('123123', 'hello.c', kind='file', parent_id='TREE_ROOT')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
358 |
>>> inv['123123'].name
|
359 |
'hello.c'
|
|
360 |
"""
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
361 |
try: |
362 |
return self._byid[file_id] |
|
363 |
except KeyError: |
|
|
380
by Martin Pool
- Slight optimization for Inventory.__getitem__ |
364 |
if file_id == None: |
365 |
raise BzrError("can't look up file_id None") |
|
366 |
else: |
|
367 |
raise BzrError("file_id {%s} not in inventory" % file_id) |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
368 |
|
369 |
||
|
460
by Martin Pool
- new testing command compare-trees |
370 |
def get_file_kind(self, file_id): |
371 |
return self._byid[file_id].kind |
|
372 |
||
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
373 |
def get_child(self, parent_id, filename): |
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
374 |
return self[parent_id].children.get(filename) |
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
375 |
|
376 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
377 |
def add(self, entry): |
378 |
"""Add entry to inventory. |
|
379 |
||
380 |
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 |
381 |
which calls this.
|
382 |
||
383 |
Returns the new entry object.
|
|
384 |
"""
|
|
|
139
by mbp at sourcefrog
simplified/faster Inventory.add |
385 |
if entry.file_id in self._byid: |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
386 |
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
387 |
|
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
388 |
if entry.parent_id == ROOT_ID or entry.parent_id is None: |
389 |
entry.parent_id = self.root.file_id |
|
390 |
||
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
391 |
try: |
392 |
parent = self._byid[entry.parent_id] |
|
393 |
except KeyError: |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
394 |
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id) |
|
139
by mbp at sourcefrog
simplified/faster Inventory.add |
395 |
|
396 |
if parent.children.has_key(entry.name): |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
397 |
raise BzrError("%s is already versioned" % |
|
140
by mbp at sourcefrog
fix error message for repeated add |
398 |
appendpath(self.id2path(parent.file_id), entry.name)) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
399 |
|
400 |
self._byid[entry.file_id] = entry |
|
|
139
by mbp at sourcefrog
simplified/faster Inventory.add |
401 |
parent.children[entry.name] = entry |
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
402 |
return entry |
|
1
by mbp at sourcefrog
import from baz patch-364 |
403 |
|
404 |
||
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
405 |
def add_path(self, relpath, kind, file_id=None): |
406 |
"""Add entry from a path. |
|
407 |
||
|
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
408 |
The immediate parent must already be versioned.
|
409 |
||
410 |
Returns the new entry object."""
|
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
411 |
from bzrlib.branch import gen_file_id |
|
1015
by Martin Pool
- fix circular imports |
412 |
|
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
413 |
parts = bzrlib.osutils.splitpath(relpath) |
414 |
if len(parts) == 0: |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
415 |
raise BzrError("cannot re-add root of inventory") |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
416 |
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
417 |
if file_id == None: |
|
800
by Martin Pool
Merge John's import-speedup branch: |
418 |
file_id = gen_file_id(relpath) |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
419 |
|
|
753
by Martin Pool
- new exception NotVersionedError |
420 |
parent_path = parts[:-1] |
421 |
parent_id = self.path2id(parent_path) |
|
422 |
if parent_id == None: |
|
423 |
raise NotVersionedError(parent_path) |
|
424 |
||
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
425 |
ie = InventoryEntry(file_id, parts[-1], |
426 |
kind=kind, parent_id=parent_id) |
|
427 |
return self.add(ie) |
|
428 |
||
429 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
430 |
def __delitem__(self, file_id): |
431 |
"""Remove entry by id. |
|
432 |
||
433 |
>>> inv = Inventory()
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
434 |
>>> inv.add(InventoryEntry('123', 'foo.c', 'file', ROOT_ID))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
435 |
InventoryEntry('123', 'foo.c', kind='file', parent_id='TREE_ROOT')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
436 |
>>> '123' in inv
|
437 |
True
|
|
438 |
>>> del inv['123']
|
|
439 |
>>> '123' in inv
|
|
440 |
False
|
|
441 |
"""
|
|
442 |
ie = self[file_id] |
|
443 |
||
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
444 |
assert self[ie.parent_id].children[ie.name] == ie |
|
1
by mbp at sourcefrog
import from baz patch-364 |
445 |
|
446 |
# TODO: Test deleting all children; maybe hoist to a separate
|
|
447 |
# deltree method?
|
|
448 |
if ie.kind == 'directory': |
|
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
449 |
for cie in ie.children.values(): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
450 |
del self[cie.file_id] |
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
451 |
del ie.children |
|
1
by mbp at sourcefrog
import from baz patch-364 |
452 |
|
453 |
del self._byid[file_id] |
|
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
454 |
del self[ie.parent_id].children[ie.name] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
455 |
|
456 |
||
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
457 |
def __eq__(self, other): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
458 |
"""Compare two sets by comparing their contents. |
459 |
||
460 |
>>> i1 = Inventory()
|
|
461 |
>>> i2 = Inventory()
|
|
462 |
>>> i1 == i2
|
|
463 |
True
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
464 |
>>> i1.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
465 |
InventoryEntry('123', 'foo', kind='file', parent_id='TREE_ROOT')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
466 |
>>> i1 == i2
|
467 |
False
|
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
468 |
>>> i2.add(InventoryEntry('123', 'foo', 'file', ROOT_ID))
|
|
1092.1.30
by Robert Collins
change smart_add reporting of added files to callback with the entry, and change the inventory.add signature to return the added entry |
469 |
InventoryEntry('123', 'foo', kind='file', parent_id='TREE_ROOT')
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
470 |
>>> i1 == i2
|
471 |
True
|
|
472 |
"""
|
|
473 |
if not isinstance(other, Inventory): |
|
474 |
return NotImplemented |
|
475 |
||
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
476 |
if len(self._byid) != len(other._byid): |
|
543
by Martin Pool
- More cleanups for set type |
477 |
# shortcut: obviously not the same
|
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
478 |
return False |
479 |
||
480 |
return self._byid == other._byid |
|
481 |
||
482 |
||
483 |
def __ne__(self, other): |
|
484 |
return not (self == other) |
|
485 |
||
486 |
||
487 |
def __hash__(self): |
|
488 |
raise ValueError('not hashable') |
|
489 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
490 |
|
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
491 |
def get_idpath(self, file_id): |
492 |
"""Return a list of file_ids for the path to an entry. |
|
493 |
||
494 |
The list contains one element for each directory followed by
|
|
495 |
the id of the file itself. So the length of the returned list
|
|
496 |
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 |
497 |
root directory as depth 1.
|
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
498 |
"""
|
499 |
p = [] |
|
500 |
while file_id != None: |
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
501 |
try: |
502 |
ie = self._byid[file_id] |
|
503 |
except KeyError: |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
504 |
raise BzrError("file_id {%s} not found in inventory" % file_id) |
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
505 |
p.insert(0, ie.file_id) |
506 |
file_id = ie.parent_id |
|
507 |
return p |
|
508 |
||
509 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
510 |
def id2path(self, file_id): |
511 |
"""Return as a list the path to file_id.""" |
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
512 |
|
513 |
# get all names, skipping root
|
|
|
922
by Martin Pool
- optimization for Inventory.id2path; access byid map directly rather than |
514 |
p = [self._byid[fid].name for fid in self.get_idpath(file_id)[1:]] |
|
271
by Martin Pool
- Windows path fixes |
515 |
return os.sep.join(p) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
516 |
|
517 |
||
518 |
||
519 |
def path2id(self, name): |
|
520 |
"""Walk down through directories to return entry of last component. |
|
521 |
||
522 |
names may be either a list of path components, or a single
|
|
523 |
string, in which case it is automatically split.
|
|
524 |
||
525 |
This returns the entry of the last component in the path,
|
|
526 |
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 |
527 |
|
528 |
Returns None iff the path is not found.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
529 |
"""
|
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
530 |
if isinstance(name, types.StringTypes): |
531 |
name = splitpath(name) |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
532 |
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
533 |
mutter("lookup path %r" % name) |
534 |
||
535 |
parent = self.root |
|
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
536 |
for f in name: |
|
1
by mbp at sourcefrog
import from baz patch-364 |
537 |
try: |
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
538 |
cie = parent.children[f] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
539 |
assert cie.name == f |
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
540 |
assert cie.parent_id == parent.file_id |
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
541 |
parent = cie |
|
1
by mbp at sourcefrog
import from baz patch-364 |
542 |
except KeyError: |
543 |
# or raise an error?
|
|
544 |
return None |
|
545 |
||
|
138
by mbp at sourcefrog
remove parallel tree from inventory; |
546 |
return parent.file_id |
|
1
by mbp at sourcefrog
import from baz patch-364 |
547 |
|
548 |
||
549 |
def has_filename(self, names): |
|
550 |
return bool(self.path2id(names)) |
|
551 |
||
552 |
||
553 |
def has_id(self, file_id): |
|
554 |
return self._byid.has_key(file_id) |
|
555 |
||
556 |
||
|
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 |
557 |
def rename(self, file_id, new_parent_id, new_name): |
558 |
"""Move a file within the inventory. |
|
559 |
||
560 |
This can change either the name, or the parent, or both.
|
|
561 |
||
562 |
This does not move the working file."""
|
|
563 |
if not is_valid_name(new_name): |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
564 |
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 |
565 |
|
566 |
new_parent = self._byid[new_parent_id] |
|
567 |
if new_name in new_parent.children: |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
568 |
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 |
569 |
|
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
570 |
new_parent_idpath = self.get_idpath(new_parent_id) |
571 |
if file_id in new_parent_idpath: |
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
572 |
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 |
573 |
% (self.id2path(file_id), self.id2path(new_parent_id))) |
574 |
||
|
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 |
575 |
file_ie = self._byid[file_id] |
576 |
old_parent = self._byid[file_ie.parent_id] |
|
577 |
||
578 |
# TODO: Don't leave things messed up if this fails
|
|
579 |
||
580 |
del old_parent.children[file_ie.name] |
|
581 |
new_parent.children[new_name] = file_ie |
|
582 |
||
583 |
file_ie.name = new_name |
|
584 |
file_ie.parent_id = new_parent_id |
|
585 |
||
586 |
||
587 |
||
588 |
||
|
1077
by Martin Pool
- avoid compiling REs at module load time |
589 |
_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 |
590 |
|
591 |
def is_valid_name(name): |
|
|
1077
by Martin Pool
- avoid compiling REs at module load time |
592 |
global _NAME_RE |
593 |
if _NAME_RE == None: |
|
594 |
_NAME_RE = re.compile(r'^[^/\\]+$') |
|
595 |
||
|
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 |
596 |
return bool(_NAME_RE.match(name)) |