1669.2.1
by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files |
1 |
# Copyright (C) 2005, 2006 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 |
||
30 |
||
1732.1.23
by John Arbash Meinel
Switch iter_entries from being a recursive function and using pathjoin |
31 |
import collections |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
32 |
import os.path |
33 |
import re |
|
34 |
import sys |
|
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
35 |
import tarfile |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
36 |
import types |
1
by mbp at sourcefrog
import from baz patch-364 |
37 |
|
800
by Martin Pool
Merge John's import-speedup branch: |
38 |
import bzrlib |
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
39 |
from bzrlib.osutils import (pumpfile, quotefn, splitpath, joinpath, |
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 \ |
40 |
pathjoin, sha_strings) |
1558.15.2
by Aaron Bentley
Implemented binary file handling for diff |
41 |
from bzrlib.errors import (NotVersionedError, InvalidEntryName, |
42 |
BzrError, BzrCheckError, BinaryFile) |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
43 |
from bzrlib.trace import mutter |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
44 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
45 |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
46 |
class InventoryEntry(object): |
1
by mbp at sourcefrog
import from baz patch-364 |
47 |
"""Description of a versioned file.
|
48 |
||
49 |
An InventoryEntry has the following fields, which are also
|
|
50 |
present in the XML inventory-entry element:
|
|
51 |
||
1197
by Martin Pool
doc |
52 |
file_id
|
53 |
||
54 |
name
|
|
55 |
(within the parent directory)
|
|
56 |
||
57 |
parent_id
|
|
58 |
file_id of the parent directory, or ROOT_ID
|
|
59 |
||
1092.2.21
by Robert Collins
convert name_version to revision in inventory entries |
60 |
revision
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
61 |
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 |
62 |
introduced.
|
1197
by Martin Pool
doc |
63 |
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
64 |
executable
|
65 |
Indicates that this file should be executable on systems
|
|
66 |
that support it.
|
|
67 |
||
1197
by Martin Pool
doc |
68 |
text_sha1
|
69 |
sha-1 of the text of the file
|
|
70 |
|
|
71 |
text_size
|
|
72 |
size in bytes of the text of the file
|
|
73 |
|
|
74 |
(reading a version 4 tree created a text_id field.)
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
75 |
|
76 |
>>> i = Inventory()
|
|
77 |
>>> i.path2id('')
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
78 |
'TREE_ROOT'
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
79 |
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
80 |
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
81 |
>>> 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. |
82 |
InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
|
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 \ |
83 |
>>> shouldbe = {0: 'src', 1: pathjoin('src','hello.c')}
|
1185.16.151
by Martin Pool
[patch] win32 fix for InventoryEntry doctest (Alexander, patch 21) |
84 |
>>> for ix, j in enumerate(i.iter_entries()):
|
85 |
... print (j[0] == shouldbe[ix], j[1])
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
86 |
...
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
87 |
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
|
88 |
(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 |
89 |
>>> i.add(InventoryFile('2323', 'bye.c', '123'))
|
1
by mbp at sourcefrog
import from baz patch-364 |
90 |
Traceback (most recent call last):
|
91 |
...
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
92 |
BzrError: inventory already contains entry with id {2323}
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
93 |
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
94 |
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 |
95 |
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
96 |
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
97 |
>>> i.path2id('src/wibble')
|
98 |
'2325'
|
|
99 |
>>> '2325' in i
|
|
100 |
True
|
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
101 |
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
102 |
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
103 |
>>> i['2326']
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
104 |
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. |
105 |
>>> 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 \ |
106 |
... print path
|
1185.1.40
by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch. |
107 |
... assert i.path2id(path)
|
1
by mbp at sourcefrog
import from baz patch-364 |
108 |
...
|
109 |
src
|
|
110 |
src/bye.c
|
|
111 |
src/hello.c
|
|
112 |
src/wibble
|
|
113 |
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 \ |
114 |
>>> i.id2path('2326')
|
1
by mbp at sourcefrog
import from baz patch-364 |
115 |
'src/wibble/wibble.c'
|
116 |
"""
|
|
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
117 |
|
118 |
# Constants returned by describe_change()
|
|
119 |
#
|
|
120 |
# TODO: These should probably move to some kind of FileChangeDescription
|
|
121 |
# class; that's like what's inside a TreeDelta but we want to be able to
|
|
122 |
# generate them just for one file at a time.
|
|
123 |
RENAMED = 'renamed' |
|
124 |
MODIFIED_AND_RENAMED = 'modified and renamed' |
|
1197
by Martin Pool
doc |
125 |
|
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
126 |
__slots__ = [] |
1185
by Martin Pool
- add xml round-trip test for revisions |
127 |
|
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
128 |
def detect_changes(self, old_entry): |
129 |
"""Return a (text_modified, meta_modified) from this to old_entry.
|
|
130 |
|
|
131 |
_read_tree_state must have been called on self and old_entry prior to
|
|
132 |
calling detect_changes.
|
|
133 |
"""
|
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
134 |
return False, False |
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
135 |
|
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
136 |
def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
137 |
output_to, reverse=False): |
|
138 |
"""Perform a diff from this to to_entry.
|
|
139 |
||
140 |
text_diff will be used for textual difference calculation.
|
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
141 |
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 |
142 |
"""
|
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
143 |
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 |
144 |
if to_entry: |
145 |
# cannot diff from one kind to another - you must do a removal
|
|
146 |
# and an addif they do not match.
|
|
147 |
assert self.kind == to_entry.kind |
|
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
148 |
to_entry._read_tree_state(to_tree.id2path(to_entry.file_id), |
149 |
to_tree) |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
150 |
self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree, |
151 |
output_to, reverse) |
|
152 |
||
153 |
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
|
154 |
output_to, reverse=False): |
|
155 |
"""Perform a diff between two entries of the same kind."""
|
|
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
156 |
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
157 |
def find_previous_heads(self, previous_inventories, |
158 |
versioned_file_store, |
|
159 |
transaction, |
|
160 |
entry_vf=None): |
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
161 |
"""Return the revisions and entries that directly precede this.
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
162 |
|
163 |
Returned as a map from revision to inventory entry.
|
|
164 |
||
165 |
This is a map containing the file revisions in all parents
|
|
166 |
for which the file exists, and its revision is not a parent of
|
|
167 |
any other. If the file is new, the set will be empty.
|
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
168 |
|
169 |
:param versioned_file_store: A store where ancestry data on this
|
|
170 |
file id can be queried.
|
|
171 |
:param transaction: The transaction that queries to the versioned
|
|
172 |
file store should be completed under.
|
|
173 |
:param entry_vf: The entry versioned file, if its already available.
|
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
174 |
"""
|
1411
by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges. |
175 |
def get_ancestors(weave, entry): |
1563.2.18
by Robert Collins
get knit repositories really using knits for text storage. |
176 |
return set(weave.get_ancestry(entry.revision)) |
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
177 |
# revision:ie mapping for each ie found in previous_inventories.
|
178 |
candidates = {} |
|
179 |
# revision:ie mapping with one revision for each head.
|
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
180 |
heads = {} |
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
181 |
# revision: ancestor list for each head
|
1411
by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges. |
182 |
head_ancestors = {} |
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
183 |
# identify candidate head revision ids.
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
184 |
for inv in previous_inventories: |
185 |
if self.file_id in inv: |
|
186 |
ie = inv[self.file_id] |
|
187 |
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. |
188 |
if ie.revision in candidates: |
189 |
# same revision value in two different inventories:
|
|
190 |
# correct possible inconsistencies:
|
|
191 |
# * there was a bug in revision updates with 'x' bit
|
|
192 |
# support.
|
|
1185.1.51
by Robert Collins
merge in reweave support |
193 |
try: |
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
194 |
if candidates[ie.revision].executable != ie.executable: |
195 |
candidates[ie.revision].executable = False |
|
1185.1.51
by Robert Collins
merge in reweave support |
196 |
ie.executable = False |
197 |
except AttributeError: |
|
198 |
pass
|
|
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
199 |
# must now be the same.
|
200 |
assert candidates[ie.revision] == ie |
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
201 |
else: |
1596.2.20
by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit. |
202 |
# add this revision as a candidate.
|
203 |
candidates[ie.revision] = ie |
|
204 |
||
205 |
# common case optimisation
|
|
206 |
if len(candidates) == 1: |
|
207 |
# if there is only one candidate revision found
|
|
208 |
# then we can opening the versioned file to access ancestry:
|
|
209 |
# there cannot be any ancestors to eliminate when there is
|
|
210 |
# only one revision available.
|
|
211 |
heads[ie.revision] = ie |
|
212 |
return heads |
|
213 |
||
214 |
# eliminate ancestors amongst the available candidates:
|
|
215 |
# heads are those that are not an ancestor of any other candidate
|
|
216 |
# - this provides convergence at a per-file level.
|
|
217 |
for ie in candidates.values(): |
|
218 |
# may be an ancestor of a known head:
|
|
219 |
already_present = 0 != len( |
|
220 |
[head for head in heads |
|
221 |
if ie.revision in head_ancestors[head]]) |
|
222 |
if already_present: |
|
223 |
# an ancestor of an analyzed candidate.
|
|
224 |
continue
|
|
225 |
# not an ancestor of a known head:
|
|
226 |
# load the versioned file for this file id if needed
|
|
227 |
if entry_vf is None: |
|
228 |
entry_vf = versioned_file_store.get_weave_or_empty( |
|
229 |
self.file_id, transaction) |
|
230 |
ancestors = get_ancestors(entry_vf, ie) |
|
231 |
# may knock something else out:
|
|
232 |
check_heads = list(heads.keys()) |
|
233 |
for head in check_heads: |
|
234 |
if head in ancestors: |
|
235 |
# this previously discovered 'head' is not
|
|
236 |
# really a head - its an ancestor of the newly
|
|
237 |
# found head,
|
|
238 |
heads.pop(head) |
|
239 |
head_ancestors[ie.revision] = ancestors |
|
240 |
heads[ie.revision] = ie |
|
1409
by Robert Collins
unify previous inventory entry parent logic in preparation for fixing the revision-thrashing bug |
241 |
return heads |
242 |
||
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
243 |
def get_tar_item(self, root, dp, now, tree): |
1399.1.7
by Robert Collins
implement symlink exporting to tarballs |
244 |
"""Get a tarfile item and a file stream for its content."""
|
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 \ |
245 |
item = tarfile.TarInfo(pathjoin(root, dp)) |
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
246 |
# TODO: would be cool to actually set it to the timestamp of the
|
247 |
# revision it was last changed
|
|
248 |
item.mtime = now |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
249 |
fileobj = self._put_in_tar(item, tree) |
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
250 |
return item, fileobj |
251 |
||
1399.1.5
by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py |
252 |
def has_text(self): |
253 |
"""Return true if the object this entry represents has textual data.
|
|
254 |
||
255 |
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 |
256 |
|
257 |
Also note that all entries get weave files created for them.
|
|
258 |
This attribute is primarily used when upgrading from old trees that
|
|
259 |
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 |
260 |
"""
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
261 |
return False |
1399.1.5
by Robert Collins
move checking whether an entry stores text into inventory.py from fetch,py |
262 |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
263 |
def __init__(self, file_id, name, parent_id, text_id=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
264 |
"""Create an InventoryEntry
|
265 |
|
|
266 |
The filename must be a single component, relative to the
|
|
267 |
parent directory; it cannot be a whole path or relative name.
|
|
268 |
||
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
269 |
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
|
1
by mbp at sourcefrog
import from baz patch-364 |
270 |
>>> e.name
|
271 |
'hello.c'
|
|
272 |
>>> e.file_id
|
|
273 |
'123'
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
274 |
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
|
1
by mbp at sourcefrog
import from baz patch-364 |
275 |
Traceback (most recent call last):
|
1185.16.63
by Martin Pool
- more error conversion |
276 |
InvalidEntryName: Invalid entry name: src/hello.c
|
1
by mbp at sourcefrog
import from baz patch-364 |
277 |
"""
|
1183
by Martin Pool
- implement version 5 xml storage, and tests |
278 |
assert isinstance(name, basestring), name |
376
by Martin Pool
- fix slow invariant check when reading in InventoryEntry objects |
279 |
if '/' in name or '\\' in name: |
1185.16.63
by Martin Pool
- more error conversion |
280 |
raise InvalidEntryName(name=name) |
1398
by Robert Collins
integrate in Gustavos x-bit patch |
281 |
self.executable = False |
1092.2.21
by Robert Collins
convert name_version to revision in inventory entries |
282 |
self.revision = None |
955
by Martin Pool
- use __slots__ on InventoryEntry; rather faster |
283 |
self.text_sha1 = None |
284 |
self.text_size = None |
|
1
by mbp at sourcefrog
import from baz patch-364 |
285 |
self.file_id = file_id |
286 |
self.name = name |
|
287 |
self.text_id = text_id |
|
288 |
self.parent_id = parent_id |
|
1092.2.6
by Robert Collins
symlink support updated to work |
289 |
self.symlink_target = None |
237
by mbp at sourcefrog
- Better assertions in InventoryEntry constructor |
290 |
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
291 |
def kind_character(self): |
292 |
"""Return a short kind indicator useful for appending to names."""
|
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
293 |
raise BzrError('unknown kind %r' % self.kind) |
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
294 |
|
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
295 |
known_kinds = ('file', 'directory', 'symlink', 'root_directory') |
1
by mbp at sourcefrog
import from baz patch-364 |
296 |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
297 |
def _put_in_tar(self, item, tree): |
298 |
"""populate item for stashing in a tar, and return the content stream.
|
|
299 |
||
300 |
If no content is available, return None.
|
|
301 |
"""
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
302 |
raise BzrError("don't know how to export {%s} of kind %r" % |
303 |
(self.file_id, self.kind)) |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
304 |
|
1399.1.6
by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support |
305 |
def put_on_disk(self, dest, dp, tree): |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
306 |
"""Create a representation of self on disk in the prefix dest.
|
307 |
|
|
308 |
This is a template method - implement _put_on_disk in subclasses.
|
|
309 |
"""
|
|
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 \ |
310 |
fullpath = pathjoin(dest, dp) |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
311 |
self._put_on_disk(fullpath, tree) |
1185.31.4
by John Arbash Meinel
Fixing mutter() calls to not have to do string processing. |
312 |
mutter(" export {%s} kind %s to %s", self.file_id, |
313 |
self.kind, fullpath) |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
314 |
|
315 |
def _put_on_disk(self, fullpath, tree): |
|
316 |
"""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 |
317 |
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 |
318 |
|
156
by mbp at sourcefrog
new "directories" command |
319 |
def sorted_children(self): |
1757.2.13
by Robert Collins
Tweak InventoryEntry.sorted_children to be simpler. |
320 |
return sorted(self.children.items()) |
156
by mbp at sourcefrog
new "directories" command |
321 |
|
1399.1.1
by Robert Collins
move checks for versionability of file kinds into InventoryEntry |
322 |
@staticmethod
|
323 |
def versionable_kind(kind): |
|
324 |
return kind in ('file', 'directory', 'symlink') |
|
325 |
||
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
326 |
def check(self, checker, rev_id, inv, tree): |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
327 |
"""Check this inventory entry is intact.
|
328 |
||
329 |
This is a template method, override _check for kind specific
|
|
330 |
tests.
|
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
331 |
|
332 |
:param checker: Check object providing context for the checks;
|
|
333 |
can be used to find out what parts of the repository have already
|
|
334 |
been checked.
|
|
335 |
:param rev_id: Revision id from which this InventoryEntry was loaded.
|
|
336 |
Not necessarily the last-changed revision for this file.
|
|
337 |
:param inv: Inventory from which the entry was loaded.
|
|
338 |
:param tree: RevisionTree for this entry.
|
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
339 |
"""
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
340 |
if self.parent_id is not None: |
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
341 |
if not inv.has_id(self.parent_id): |
342 |
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}' |
|
343 |
% (self.parent_id, rev_id)) |
|
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
344 |
self._check(checker, rev_id, tree) |
345 |
||
346 |
def _check(self, checker, rev_id, tree): |
|
347 |
"""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 |
348 |
raise BzrCheckError('unknown entry kind %r in revision {%s}' % |
349 |
(self.kind, rev_id)) |
|
1092.2.20
by Robert Collins
symlink and weaves, whaddya know |
350 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
351 |
def copy(self): |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
352 |
"""Clone this inventory entry."""
|
353 |
raise NotImplementedError |
|
1
by mbp at sourcefrog
import from baz patch-364 |
354 |
|
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
355 |
@staticmethod
|
356 |
def describe_change(old_entry, new_entry): |
|
357 |
"""Describe the change between old_entry and this.
|
|
358 |
|
|
359 |
This smells of being an InterInventoryEntry situation, but as its
|
|
360 |
the first one, we're making it a static method for now.
|
|
361 |
||
362 |
An entry with a different parent, or different name is considered
|
|
363 |
to be renamed. Reparenting is an internal detail.
|
|
364 |
Note that renaming the parent does not trigger a rename for the
|
|
365 |
child entry itself.
|
|
1669.2.1
by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files |
366 |
"""
|
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
367 |
# TODO: Perhaps return an object rather than just a string
|
368 |
if old_entry is new_entry: |
|
369 |
# also the case of both being None
|
|
370 |
return 'unchanged' |
|
371 |
elif old_entry is None: |
|
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
372 |
return 'added' |
1668.1.5
by Martin Pool
[broken] fix up display of files changed by a commit |
373 |
elif new_entry is None: |
374 |
return 'removed' |
|
375 |
text_modified, meta_modified = new_entry.detect_changes(old_entry) |
|
376 |
if text_modified or meta_modified: |
|
377 |
modified = True |
|
378 |
else: |
|
379 |
modified = False |
|
380 |
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
|
|
381 |
if old_entry.parent_id != new_entry.parent_id: |
|
382 |
renamed = True |
|
383 |
elif old_entry.name != new_entry.name: |
|
384 |
renamed = True |
|
385 |
else: |
|
386 |
renamed = False |
|
387 |
if renamed and not modified: |
|
388 |
return InventoryEntry.RENAMED |
|
389 |
if modified and not renamed: |
|
390 |
return 'modified' |
|
391 |
if modified and renamed: |
|
392 |
return InventoryEntry.MODIFIED_AND_RENAMED |
|
393 |
return 'unchanged' |
|
1
by mbp at sourcefrog
import from baz patch-364 |
394 |
|
395 |
def __repr__(self): |
|
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
396 |
return ("%s(%r, %r, parent_id=%r, revision=%r)" |
1
by mbp at sourcefrog
import from baz patch-364 |
397 |
% (self.__class__.__name__, |
398 |
self.file_id, |
|
399 |
self.name, |
|
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
400 |
self.parent_id, |
401 |
self.revision)) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
402 |
|
1411
by Robert Collins
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges. |
403 |
def snapshot(self, revision, path, previous_entries, |
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
404 |
work_tree, commit_builder): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
405 |
"""Make a snapshot of this entry which may or may not have changed.
|
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
406 |
|
407 |
This means that all its fields are populated, that it has its
|
|
408 |
text stored in the text store or weave.
|
|
409 |
"""
|
|
410 |
mutter('new parents of %s are %r', path, previous_entries) |
|
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
411 |
self._read_tree_state(path, work_tree) |
1740.3.2
by Jelmer Vernooij
Move storing file texts to commit builder. |
412 |
# TODO: Where should we determine whether to reuse a
|
413 |
# previous revision id or create a new revision? 20060606
|
|
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
414 |
if len(previous_entries) == 1: |
415 |
# cannot be unchanged unless there is only one parent file rev.
|
|
416 |
parent_ie = previous_entries.values()[0] |
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
417 |
if self._unchanged(parent_ie): |
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
418 |
mutter("found unchanged entry") |
419 |
self.revision = parent_ie.revision |
|
420 |
return "unchanged" |
|
1669.2.1
by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files |
421 |
return self._snapshot_into_revision(revision, previous_entries, |
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
422 |
work_tree, commit_builder) |
1669.2.1
by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files |
423 |
|
424 |
def _snapshot_into_revision(self, revision, previous_entries, work_tree, |
|
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
425 |
commit_builder): |
1669.2.1
by Martin Pool
verbose commit now specifically identifies modified/renamed/reparented files |
426 |
"""Record this revision unconditionally into a store.
|
427 |
||
428 |
The entry's last-changed revision property (`revision`) is updated to
|
|
429 |
that of the new revision.
|
|
430 |
|
|
431 |
:param revision: id of the new revision that is being recorded.
|
|
432 |
||
433 |
:returns: String description of the commit (e.g. "merged", "modified"), etc.
|
|
434 |
"""
|
|
435 |
mutter('new revision {%s} for {%s}', revision, self.file_id) |
|
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
436 |
self.revision = revision |
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
437 |
self._snapshot_text(previous_entries, work_tree, commit_builder) |
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
438 |
|
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
439 |
def _snapshot_text(self, file_parents, work_tree, commit_builder): |
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
440 |
"""Record the 'text' of this entry, whatever form that takes.
|
441 |
|
|
442 |
This default implementation simply adds an empty text.
|
|
443 |
"""
|
|
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
444 |
raise NotImplementedError(self._snapshot_text) |
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
445 |
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
446 |
def __eq__(self, other): |
1
by mbp at sourcefrog
import from baz patch-364 |
447 |
if not isinstance(other, InventoryEntry): |
448 |
return NotImplemented |
|
449 |
||
1398
by Robert Collins
integrate in Gustavos x-bit patch |
450 |
return ((self.file_id == other.file_id) |
451 |
and (self.name == other.name) |
|
452 |
and (other.symlink_target == self.symlink_target) |
|
453 |
and (self.text_sha1 == other.text_sha1) |
|
454 |
and (self.text_size == other.text_size) |
|
455 |
and (self.text_id == other.text_id) |
|
456 |
and (self.parent_id == other.parent_id) |
|
457 |
and (self.kind == other.kind) |
|
458 |
and (self.revision == other.revision) |
|
459 |
and (self.executable == other.executable) |
|
460 |
)
|
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
461 |
|
462 |
def __ne__(self, other): |
|
463 |
return not (self == other) |
|
464 |
||
465 |
def __hash__(self): |
|
466 |
raise ValueError('not hashable') |
|
1
by mbp at sourcefrog
import from baz patch-364 |
467 |
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
468 |
def _unchanged(self, previous_ie): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
469 |
"""Has this entry changed relative to previous_ie.
|
470 |
||
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
471 |
This method should be overridden in child classes.
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
472 |
"""
|
1092.2.22
by Robert Collins
text_version and name_version unification looking reasonable |
473 |
compatible = True |
474 |
# different inv parent
|
|
475 |
if previous_ie.parent_id != self.parent_id: |
|
476 |
compatible = False |
|
477 |
# renamed
|
|
478 |
elif previous_ie.name != self.name: |
|
479 |
compatible = False |
|
480 |
return compatible |
|
481 |
||
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
482 |
def _read_tree_state(self, path, work_tree): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
483 |
"""Populate fields in the inventory entry from the given tree.
|
484 |
|
|
485 |
Note that this should be modified to be a noop on virtual trees
|
|
486 |
as all entries created there are prepopulated.
|
|
487 |
"""
|
|
1185.16.5
by Martin Pool
doc |
488 |
# TODO: Rather than running this manually, we should check the
|
489 |
# working sha1 and other expensive properties when they're
|
|
490 |
# first requested, or preload them if they're already known
|
|
491 |
pass # nothing to do by default |
|
1092.2.23
by Robert Collins
move inventory entry centric snapshot taking logic to inventory.py |
492 |
|
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
493 |
def _forget_tree_state(self): |
494 |
pass
|
|
495 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
496 |
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
497 |
class RootEntry(InventoryEntry): |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
498 |
|
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
499 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
500 |
'text_id', 'parent_id', 'children', 'executable', |
|
501 |
'revision', 'symlink_target'] |
|
502 |
||
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
503 |
def _check(self, checker, rev_id, tree): |
504 |
"""See InventoryEntry._check"""
|
|
505 |
||
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
506 |
def __init__(self, file_id): |
507 |
self.file_id = file_id |
|
508 |
self.children = {} |
|
509 |
self.kind = 'root_directory' |
|
510 |
self.parent_id = None |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
511 |
self.name = u'' |
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
512 |
self.revision = None |
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
513 |
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
514 |
def __eq__(self, other): |
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
515 |
if not isinstance(other, RootEntry): |
516 |
return NotImplemented |
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
517 |
|
518 |
return (self.file_id == other.file_id) \ |
|
519 |
and (self.children == other.children) |
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
520 |
|
521 |
||
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
522 |
class InventoryDirectory(InventoryEntry): |
523 |
"""A directory in an inventory."""
|
|
524 |
||
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
525 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
526 |
'text_id', 'parent_id', 'children', 'executable', |
|
527 |
'revision', 'symlink_target'] |
|
528 |
||
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
529 |
def _check(self, checker, rev_id, tree): |
530 |
"""See InventoryEntry._check"""
|
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
531 |
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 |
532 |
raise BzrCheckError('directory {%s} has text in revision {%s}' |
533 |
% (self.file_id, rev_id)) |
|
534 |
||
535 |
def copy(self): |
|
536 |
other = InventoryDirectory(self.file_id, self.name, self.parent_id) |
|
537 |
other.revision = self.revision |
|
538 |
# note that children are *not* copied; they're pulled across when
|
|
539 |
# others are added
|
|
540 |
return other |
|
541 |
||
542 |
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 |
543 |
super(InventoryDirectory, self).__init__(file_id, name, parent_id) |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
544 |
self.children = {} |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
545 |
self.kind = 'directory' |
1399.1.8
by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class |
546 |
|
547 |
def kind_character(self): |
|
548 |
"""See InventoryEntry.kind_character."""
|
|
549 |
return '/' |
|
550 |
||
551 |
def _put_in_tar(self, item, tree): |
|
552 |
"""See InventoryEntry._put_in_tar."""
|
|
553 |
item.type = tarfile.DIRTYPE |
|
554 |
fileobj = None |
|
555 |
item.name += '/' |
|
556 |
item.size = 0 |
|
557 |
item.mode = 0755 |
|
558 |
return fileobj |
|
559 |
||
560 |
def _put_on_disk(self, fullpath, tree): |
|
561 |
"""See InventoryEntry._put_on_disk."""
|
|
562 |
os.mkdir(fullpath) |
|
563 |
||
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
564 |
def _snapshot_text(self, file_parents, work_tree, commit_builder): |
565 |
"""See InventoryEntry._snapshot_text."""
|
|
566 |
commit_builder.modified_directory(self.file_id, file_parents) |
|
567 |
||
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
568 |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
569 |
class InventoryFile(InventoryEntry): |
570 |
"""A file in an inventory."""
|
|
571 |
||
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
572 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
573 |
'text_id', 'parent_id', 'children', 'executable', |
|
574 |
'revision', 'symlink_target'] |
|
575 |
||
1616.1.5
by Martin Pool
Cleanup and document some check code |
576 |
def _check(self, checker, tree_revision_id, tree): |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
577 |
"""See InventoryEntry._check"""
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
578 |
t = (self.file_id, self.revision) |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
579 |
if t in checker.checked_texts: |
1616.1.5
by Martin Pool
Cleanup and document some check code |
580 |
prev_sha = checker.checked_texts[t] |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
581 |
if prev_sha != self.text_sha1: |
582 |
raise BzrCheckError('mismatched sha1 on {%s} in {%s}' % |
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
583 |
(self.file_id, tree_revision_id)) |
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
584 |
else: |
585 |
checker.repeated_text_cnt += 1 |
|
586 |
return
|
|
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
587 |
|
588 |
if self.file_id not in checker.checked_weaves: |
|
589 |
mutter('check weave {%s}', self.file_id) |
|
590 |
w = tree.get_weave(self.file_id) |
|
591 |
# Not passing a progress bar, because it creates a new
|
|
592 |
# progress, which overwrites the current progress,
|
|
593 |
# and doesn't look nice
|
|
594 |
w.check() |
|
595 |
checker.checked_weaves[self.file_id] = True |
|
596 |
else: |
|
1563.2.14
by Robert Collins
Prepare weave store to delegate copy details to the versioned file. |
597 |
w = tree.get_weave(self.file_id) |
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
598 |
|
1616.1.5
by Martin Pool
Cleanup and document some check code |
599 |
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'. |
600 |
checker.checked_text_cnt += 1 |
1185.50.28
by John Arbash Meinel
Lots of updates for 'bzr check' |
601 |
# We can't check the length, because Weave doesn't store that
|
602 |
# information, and the whole point of looking at the weave's
|
|
603 |
# sha1sum is that we don't have to extract the text.
|
|
604 |
if self.text_sha1 != w.get_sha1(self.revision): |
|
605 |
raise BzrCheckError('text {%s} version {%s} wrong sha1' |
|
606 |
% (self.file_id, self.revision)) |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
607 |
checker.checked_texts[t] = self.text_sha1 |
608 |
||
609 |
def copy(self): |
|
610 |
other = InventoryFile(self.file_id, self.name, self.parent_id) |
|
611 |
other.executable = self.executable |
|
612 |
other.text_id = self.text_id |
|
613 |
other.text_sha1 = self.text_sha1 |
|
614 |
other.text_size = self.text_size |
|
615 |
other.revision = self.revision |
|
616 |
return other |
|
617 |
||
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
618 |
def detect_changes(self, old_entry): |
619 |
"""See InventoryEntry.detect_changes."""
|
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
620 |
assert self.text_sha1 is not None |
621 |
assert old_entry.text_sha1 is not None |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
622 |
text_modified = (self.text_sha1 != old_entry.text_sha1) |
623 |
meta_modified = (self.executable != old_entry.executable) |
|
624 |
return text_modified, meta_modified |
|
625 |
||
626 |
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
|
627 |
output_to, reverse=False): |
|
628 |
"""See InventoryEntry._diff."""
|
|
1558.15.2
by Aaron Bentley
Implemented binary file handling for diff |
629 |
try: |
630 |
from_text = tree.get_file(self.file_id).readlines() |
|
631 |
if to_entry: |
|
632 |
to_text = to_tree.get_file(to_entry.file_id).readlines() |
|
633 |
else: |
|
634 |
to_text = [] |
|
635 |
if not reverse: |
|
636 |
text_diff(from_label, from_text, |
|
637 |
to_label, to_text, output_to) |
|
638 |
else: |
|
639 |
text_diff(to_label, to_text, |
|
640 |
from_label, from_text, output_to) |
|
641 |
except BinaryFile: |
|
1558.15.11
by Aaron Bentley
Apply merge review suggestions |
642 |
if reverse: |
643 |
label_pair = (to_label, from_label) |
|
644 |
else: |
|
645 |
label_pair = (from_label, to_label) |
|
646 |
print >> output_to, "Binary files %s and %s differ" % label_pair |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
647 |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
648 |
def has_text(self): |
649 |
"""See InventoryEntry.has_text."""
|
|
650 |
return True |
|
651 |
||
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
652 |
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 |
653 |
super(InventoryFile, self).__init__(file_id, name, parent_id) |
654 |
self.kind = 'file' |
|
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
655 |
|
656 |
def kind_character(self): |
|
657 |
"""See InventoryEntry.kind_character."""
|
|
658 |
return '' |
|
659 |
||
660 |
def _put_in_tar(self, item, tree): |
|
661 |
"""See InventoryEntry._put_in_tar."""
|
|
662 |
item.type = tarfile.REGTYPE |
|
663 |
fileobj = tree.get_file(self.file_id) |
|
664 |
item.size = self.text_size |
|
665 |
if tree.is_executable(self.file_id): |
|
666 |
item.mode = 0755 |
|
667 |
else: |
|
668 |
item.mode = 0644 |
|
669 |
return fileobj |
|
670 |
||
671 |
def _put_on_disk(self, fullpath, tree): |
|
672 |
"""See InventoryEntry._put_on_disk."""
|
|
673 |
pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb')) |
|
674 |
if tree.is_executable(self.file_id): |
|
675 |
os.chmod(fullpath, 0755) |
|
676 |
||
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
677 |
def _read_tree_state(self, path, work_tree): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
678 |
"""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 |
679 |
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. |
680 |
# FIXME: 20050930 probe for the text size when getting sha1
|
681 |
# in _read_tree_state
|
|
1732.1.19
by John Arbash Meinel
If you have the path, use it rather than looking it up again |
682 |
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 |
683 |
|
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
684 |
def __repr__(self): |
685 |
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)" |
|
686 |
% (self.__class__.__name__, |
|
687 |
self.file_id, |
|
688 |
self.name, |
|
689 |
self.parent_id, |
|
690 |
self.text_sha1, |
|
691 |
self.text_size)) |
|
692 |
||
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
693 |
def _forget_tree_state(self): |
694 |
self.text_sha1 = None |
|
695 |
||
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
696 |
def _snapshot_text(self, file_parents, work_tree, commit_builder): |
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
697 |
"""See InventoryEntry._snapshot_text."""
|
1740.3.2
by Jelmer Vernooij
Move storing file texts to commit builder. |
698 |
def get_content_byte_lines(): |
699 |
return work_tree.get_file(self.file_id).readlines() |
|
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
700 |
self.text_sha1, self.text_size = commit_builder.modified_file_text( |
1740.3.2
by Jelmer Vernooij
Move storing file texts to commit builder. |
701 |
self.file_id, file_parents, get_content_byte_lines, self.text_sha1, self.text_size) |
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
702 |
|
703 |
def _unchanged(self, previous_ie): |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
704 |
"""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 |
705 |
compatible = super(InventoryFile, self)._unchanged(previous_ie) |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
706 |
if self.text_sha1 != previous_ie.text_sha1: |
707 |
compatible = False |
|
708 |
else: |
|
709 |
# FIXME: 20050930 probe for the text size when getting sha1
|
|
710 |
# in _read_tree_state
|
|
711 |
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 |
712 |
if self.executable != previous_ie.executable: |
713 |
compatible = False |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
714 |
return compatible |
715 |
||
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
716 |
|
717 |
class InventoryLink(InventoryEntry): |
|
718 |
"""A file in an inventory."""
|
|
719 |
||
1757.2.10
by Robert Collins
Give all inventory entries __slots__ that are useful with the current codebase. |
720 |
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind', |
721 |
'text_id', 'parent_id', 'children', 'executable', |
|
722 |
'revision', 'symlink_target'] |
|
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
723 |
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
724 |
def _check(self, checker, rev_id, tree): |
725 |
"""See InventoryEntry._check"""
|
|
1757.2.11
by Robert Collins
Correct bzr diff | less= None clauses in inventory.py to be is not None. |
726 |
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 |
727 |
raise BzrCheckError('symlink {%s} has text in revision {%s}' |
728 |
% (self.file_id, rev_id)) |
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
729 |
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 |
730 |
raise BzrCheckError('symlink {%s} has no target in revision {%s}' |
731 |
% (self.file_id, rev_id)) |
|
732 |
||
733 |
def copy(self): |
|
734 |
other = InventoryLink(self.file_id, self.name, self.parent_id) |
|
735 |
other.symlink_target = self.symlink_target |
|
736 |
other.revision = self.revision |
|
737 |
return other |
|
738 |
||
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
739 |
def detect_changes(self, old_entry): |
740 |
"""See InventoryEntry.detect_changes."""
|
|
741 |
# FIXME: which _modified field should we use ? RBC 20051003
|
|
742 |
text_modified = (self.symlink_target != old_entry.symlink_target) |
|
743 |
if text_modified: |
|
744 |
mutter(" symlink target changed") |
|
745 |
meta_modified = False |
|
746 |
return text_modified, meta_modified |
|
747 |
||
748 |
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree, |
|
749 |
output_to, reverse=False): |
|
750 |
"""See InventoryEntry._diff."""
|
|
751 |
from_text = self.symlink_target |
|
752 |
if to_entry is not None: |
|
753 |
to_text = to_entry.symlink_target |
|
754 |
if reverse: |
|
755 |
temp = from_text |
|
756 |
from_text = to_text |
|
757 |
to_text = temp |
|
758 |
print >>output_to, '=== target changed %r => %r' % (from_text, to_text) |
|
759 |
else: |
|
760 |
if not reverse: |
|
761 |
print >>output_to, '=== target was %r' % self.symlink_target |
|
762 |
else: |
|
763 |
print >>output_to, '=== target is %r' % self.symlink_target |
|
764 |
||
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
765 |
def __init__(self, file_id, name, parent_id): |
766 |
super(InventoryLink, self).__init__(file_id, name, parent_id) |
|
767 |
self.kind = 'symlink' |
|
768 |
||
769 |
def kind_character(self): |
|
770 |
"""See InventoryEntry.kind_character."""
|
|
771 |
return '' |
|
772 |
||
773 |
def _put_in_tar(self, item, tree): |
|
774 |
"""See InventoryEntry._put_in_tar."""
|
|
1185.33.3
by Martin Pool
[merge] jelmer |
775 |
item.type = tarfile.SYMTYPE |
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
776 |
fileobj = None |
777 |
item.size = 0 |
|
778 |
item.mode = 0755 |
|
779 |
item.linkname = self.symlink_target |
|
780 |
return fileobj |
|
781 |
||
782 |
def _put_on_disk(self, fullpath, tree): |
|
783 |
"""See InventoryEntry._put_on_disk."""
|
|
784 |
try: |
|
785 |
os.symlink(self.symlink_target, fullpath) |
|
786 |
except OSError,e: |
|
787 |
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 |
788 |
|
1185.12.33
by Aaron Bentley
Fixed symlink reverting |
789 |
def _read_tree_state(self, path, work_tree): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
790 |
"""See InventoryEntry._read_tree_state."""
|
791 |
self.symlink_target = work_tree.get_symlink_target(self.file_id) |
|
792 |
||
1534.7.175
by Aaron Bentley
Ensured revert writes a normal inventory |
793 |
def _forget_tree_state(self): |
794 |
self.symlink_target = None |
|
795 |
||
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
796 |
def _unchanged(self, previous_ie): |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
797 |
"""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 |
798 |
compatible = super(InventoryLink, self)._unchanged(previous_ie) |
1399.1.11
by Robert Collins
finish off nearly all of the kind separations |
799 |
if self.symlink_target != previous_ie.symlink_target: |
800 |
compatible = False |
|
801 |
return compatible |
|
802 |
||
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
803 |
def _snapshot_text(self, file_parents, work_tree, commit_builder): |
804 |
"""See InventoryEntry._snapshot_text."""
|
|
805 |
commit_builder.modified_link( |
|
806 |
self.file_id, file_parents, self.symlink_target) |
|
807 |
||
1399.1.9
by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile |
808 |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
809 |
class Inventory(object): |
1
by mbp at sourcefrog
import from baz patch-364 |
810 |
"""Inventory of versioned files in a tree.
|
811 |
||
240
by mbp at sourcefrog
doc |
812 |
This describes which file_id is present at each point in the tree,
|
813 |
and possibly the SHA-1 or other information about the file.
|
|
814 |
Entries can be looked up either by path or by file_id.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
815 |
|
816 |
The inventory represents a typical unix file tree, with
|
|
817 |
directories containing files and subdirectories. We never store
|
|
818 |
the full path to a file, because renaming a directory implicitly
|
|
819 |
moves all of its contents. This class internally maintains a
|
|
820 |
lookup tree that allows the children under a directory to be
|
|
821 |
returned quickly.
|
|
822 |
||
823 |
InventoryEntry objects must not be modified after they are
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
824 |
inserted, other than through the Inventory API.
|
1
by mbp at sourcefrog
import from baz patch-364 |
825 |
|
826 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
827 |
>>> 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. |
828 |
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
829 |
>>> inv['123-123'].name
|
830 |
'hello.c'
|
|
831 |
||
832 |
May be treated as an iterator or set to look up file ids:
|
|
833 |
|
|
834 |
>>> bool(inv.path2id('hello.c'))
|
|
835 |
True
|
|
836 |
>>> '123-123' in inv
|
|
837 |
True
|
|
838 |
||
839 |
May also look up by name:
|
|
840 |
||
841 |
>>> [x[0] for x in inv.iter_entries()]
|
|
1732.1.23
by John Arbash Meinel
Switch iter_entries from being a recursive function and using pathjoin |
842 |
[u'hello.c']
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
843 |
>>> 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 |
844 |
>>> 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. |
845 |
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 |
846 |
"""
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
847 |
def __init__(self, root_id=ROOT_ID, revision_id=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
848 |
"""Create or read an inventory.
|
849 |
||
850 |
If a working directory is specified, the inventory is read
|
|
851 |
from there. If the file is specified, read from that. If not,
|
|
852 |
the inventory is created empty.
|
|
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
853 |
|
854 |
The inventory is created with a default root directory, with
|
|
855 |
an id of None.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
856 |
"""
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
857 |
# We are letting Branch.create() create a unique inventory
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
858 |
# root id. Rather than generating a random one here.
|
859 |
#if root_id is None:
|
|
860 |
# root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
|
|
861 |
self.root = RootEntry(root_id) |
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
862 |
# FIXME: this isn't ever used, changing it to self.revision may break
|
863 |
# things. TODO make everything use self.revision_id
|
|
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
864 |
self.revision_id = revision_id |
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
865 |
self._byid = {self.root.file_id: self.root} |
1
by mbp at sourcefrog
import from baz patch-364 |
866 |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
867 |
def copy(self): |
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
868 |
# TODO: jam 20051218 Should copy also copy the revision_id?
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
869 |
other = Inventory(self.root.file_id) |
1206
by Martin Pool
- fix bug in Inventory.copy() |
870 |
# copy recursively so we know directories will be added before
|
871 |
# their children. There are more efficient ways than this...
|
|
872 |
for path, entry in self.iter_entries(): |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
873 |
if entry == self.root: |
874 |
continue
|
|
875 |
other.add(entry.copy()) |
|
876 |
return other |
|
877 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
878 |
def __iter__(self): |
879 |
return iter(self._byid) |
|
880 |
||
881 |
def __len__(self): |
|
882 |
"""Returns number of entries."""
|
|
883 |
return len(self._byid) |
|
884 |
||
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
885 |
def iter_entries(self, from_dir=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
886 |
"""Return (path, entry) pairs, in order by name."""
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
887 |
if from_dir is None: |
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
888 |
assert self.root |
889 |
from_dir = self.root |
|
890 |
elif isinstance(from_dir, basestring): |
|
891 |
from_dir = self._byid[from_dir] |
|
892 |
||
1732.1.24
by John Arbash Meinel
iter_entries time drops to 1/6th time |
893 |
# unrolling the recursive called changed the time from
|
894 |
# 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 |
895 |
children = from_dir.children.items() |
896 |
children.sort() |
|
897 |
children = collections.deque(children) |
|
898 |
stack = [(u'', children)] |
|
899 |
while stack: |
|
900 |
from_dir_relpath, children = stack[-1] |
|
901 |
||
902 |
while children: |
|
903 |
name, ie = children.popleft() |
|
904 |
||
905 |
# we know that from_dir_relpath never ends in a slash
|
|
906 |
# and 'f' doesn't begin with one, we can do a string op, rather
|
|
907 |
# than the checks of pathjoin(), though this means that all paths
|
|
908 |
# start with a slash
|
|
909 |
path = from_dir_relpath + '/' + name |
|
910 |
||
911 |
yield path[1:], ie |
|
912 |
||
913 |
if ie.kind != 'directory': |
|
914 |
continue
|
|
915 |
||
916 |
# But do this child first
|
|
917 |
new_children = ie.children.items() |
|
918 |
new_children.sort() |
|
919 |
new_children = collections.deque(new_children) |
|
920 |
stack.append((path, new_children)) |
|
921 |
# Break out of inner loop, so that we start outer loop with child
|
|
922 |
break
|
|
923 |
else: |
|
924 |
# 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. |
925 |
stack.pop() |
555
by Martin Pool
- New Inventory.entries() method |
926 |
|
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
927 |
def iter_entries_by_dir(self, from_dir=None): |
928 |
"""Iterate over the entries in a directory first order.
|
|
929 |
||
930 |
This returns all entries for a directory before returning
|
|
931 |
the entries for children of a directory. This is not
|
|
932 |
lexicographically sorted order, and is a hybrid between
|
|
933 |
depth-first and breadth-first.
|
|
934 |
||
935 |
:return: This yields (path, entry) pairs
|
|
936 |
"""
|
|
1755.1.1
by Robert Collins
(jam, robertc, ab)Merge new iter_entries_by_dirs routine which matches the order walkdirs provides. |
937 |
# TODO? Perhaps this should return the from_dir so that the root is
|
938 |
# yielded? or maybe an option?
|
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
939 |
if from_dir is None: |
1711.2.36
by John Arbash Meinel
Add an iter_entries_by_dir which returns directory children before their children. |
940 |
assert self.root |
941 |
from_dir = self.root |
|
942 |
elif isinstance(from_dir, basestring): |
|
943 |
from_dir = self._byid[from_dir] |
|
944 |
||
945 |
stack = [(u'', from_dir)] |
|
946 |
while stack: |
|
947 |
cur_relpath, cur_dir = stack.pop() |
|
948 |
||
949 |
child_dirs = [] |
|
950 |
for child_name, child_ie in sorted(cur_dir.children.iteritems()): |
|
951 |
||
952 |
child_relpath = cur_relpath + child_name |
|
953 |
||
954 |
yield child_relpath, child_ie |
|
955 |
||
956 |
if child_ie.kind == 'directory': |
|
957 |
child_dirs.append((child_relpath+'/', child_ie)) |
|
958 |
stack.extend(reversed(child_dirs)) |
|
959 |
||
555
by Martin Pool
- New Inventory.entries() method |
960 |
def entries(self): |
961 |
"""Return list of (path, ie) for all entries except the root.
|
|
962 |
||
963 |
This may be faster than iter_entries.
|
|
964 |
"""
|
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
965 |
accum = [] |
966 |
def descend(dir_ie, dir_path): |
|
556
by Martin Pool
- fix up Inventory.entries() |
967 |
kids = dir_ie.children.items() |
555
by Martin Pool
- New Inventory.entries() method |
968 |
kids.sort() |
969 |
for name, ie in kids: |
|
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 \ |
970 |
child_path = pathjoin(dir_path, name) |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
971 |
accum.append((child_path, ie)) |
555
by Martin Pool
- New Inventory.entries() method |
972 |
if ie.kind == 'directory': |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
973 |
descend(ie, child_path) |
555
by Martin Pool
- New Inventory.entries() method |
974 |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
975 |
descend(self.root, u'') |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
976 |
return accum |
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
977 |
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
978 |
def directories(self): |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
979 |
"""Return (path, entry) pairs for all directories, including the root.
|
1
by mbp at sourcefrog
import from baz patch-364 |
980 |
"""
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
981 |
accum = [] |
982 |
def descend(parent_ie, parent_path): |
|
983 |
accum.append((parent_path, parent_ie)) |
|
156
by mbp at sourcefrog
new "directories" command |
984 |
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
985 |
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory'] |
986 |
kids.sort() |
|
156
by mbp at sourcefrog
new "directories" command |
987 |
|
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
988 |
for name, child_ie in kids: |
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 \ |
989 |
child_path = pathjoin(parent_path, name) |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
990 |
descend(child_ie, child_path) |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
991 |
descend(self.root, u'') |
557
by Martin Pool
- Refactor/cleanup Inventory.entries() |
992 |
return accum |
1
by mbp at sourcefrog
import from baz patch-364 |
993 |
|
994 |
def __contains__(self, file_id): |
|
995 |
"""True if this entry contains a file with given id.
|
|
996 |
||
997 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
998 |
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
999 |
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1000 |
>>> '123' in inv
|
1001 |
True
|
|
1002 |
>>> '456' in inv
|
|
1003 |
False
|
|
1004 |
"""
|
|
1005 |
return file_id in self._byid |
|
1006 |
||
1007 |
def __getitem__(self, file_id): |
|
1008 |
"""Return the entry for given file_id.
|
|
1009 |
||
1010 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1011 |
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1012 |
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1013 |
>>> inv['123123'].name
|
1014 |
'hello.c'
|
|
1015 |
"""
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1016 |
try: |
1017 |
return self._byid[file_id] |
|
1018 |
except KeyError: |
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
1019 |
if file_id is None: |
380
by Martin Pool
- Slight optimization for Inventory.__getitem__ |
1020 |
raise BzrError("can't look up file_id None") |
1021 |
else: |
|
1022 |
raise BzrError("file_id {%s} not in inventory" % file_id) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1023 |
|
460
by Martin Pool
- new testing command compare-trees |
1024 |
def get_file_kind(self, file_id): |
1025 |
return self._byid[file_id].kind |
|
1026 |
||
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1027 |
def get_child(self, parent_id, filename): |
1732.1.18
by John Arbash Meinel
50ms is probably not worth it |
1028 |
return self[parent_id].children.get(filename) |
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1029 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1030 |
def add(self, entry): |
1031 |
"""Add entry to inventory.
|
|
1032 |
||
1033 |
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 |
1034 |
which calls this.
|
1035 |
||
1036 |
Returns the new entry object.
|
|
1037 |
"""
|
|
139
by mbp at sourcefrog
simplified/faster Inventory.add |
1038 |
if entry.file_id in self._byid: |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1039 |
raise BzrError("inventory already contains entry with id {%s}" % entry.file_id) |
1
by mbp at sourcefrog
import from baz patch-364 |
1040 |
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
1041 |
if entry.parent_id == ROOT_ID or entry.parent_id is None: |
1042 |
entry.parent_id = self.root.file_id |
|
1043 |
||
155
by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only) |
1044 |
try: |
1045 |
parent = self._byid[entry.parent_id] |
|
1046 |
except KeyError: |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1047 |
raise BzrError("parent_id {%s} not in inventory" % entry.parent_id) |
139
by mbp at sourcefrog
simplified/faster Inventory.add |
1048 |
|
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
1049 |
if entry.name in parent.children: |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1050 |
raise BzrError("%s is already versioned" % |
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 \ |
1051 |
pathjoin(self.id2path(parent.file_id), entry.name)) |
1
by mbp at sourcefrog
import from baz patch-364 |
1052 |
|
1053 |
self._byid[entry.file_id] = entry |
|
139
by mbp at sourcefrog
simplified/faster Inventory.add |
1054 |
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 |
1055 |
return entry |
1
by mbp at sourcefrog
import from baz patch-364 |
1056 |
|
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) |
1057 |
def add_path(self, relpath, kind, file_id=None, parent_id=None): |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1058 |
"""Add entry from a path.
|
1059 |
||
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
1060 |
The immediate parent must already be versioned.
|
1061 |
||
1062 |
Returns the new entry object."""
|
|
1015
by Martin Pool
- fix circular imports |
1063 |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1064 |
parts = bzrlib.osutils.splitpath(relpath) |
1065 |
||
1534.7.69
by Aaron Bentley
Got real root moves working |
1066 |
if len(parts) == 0: |
1713.1.6
by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'. |
1067 |
if file_id is None: |
1068 |
file_id = bzrlib.workingtree.gen_root_id() |
|
1534.7.69
by Aaron Bentley
Got real root moves working |
1069 |
self.root = RootEntry(file_id) |
1070 |
self._byid = {self.root.file_id: self.root} |
|
1071 |
return
|
|
1072 |
else: |
|
1073 |
parent_path = parts[:-1] |
|
1074 |
parent_id = self.path2id(parent_path) |
|
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
1075 |
if parent_id is None: |
1534.7.69
by Aaron Bentley
Got real root moves working |
1076 |
raise 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) |
1077 |
ie = make_entry(kind, parts[-1], parent_id, file_id) |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1078 |
return self.add(ie) |
1079 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1080 |
def __delitem__(self, file_id): |
1081 |
"""Remove entry by id.
|
|
1082 |
||
1083 |
>>> inv = Inventory()
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1084 |
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1085 |
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1086 |
>>> '123' in inv
|
1087 |
True
|
|
1088 |
>>> del inv['123']
|
|
1089 |
>>> '123' in inv
|
|
1090 |
False
|
|
1091 |
"""
|
|
1092 |
ie = self[file_id] |
|
1093 |
||
1534.7.69
by Aaron Bentley
Got real root moves working |
1094 |
assert ie.parent_id is None or \ |
1095 |
self[ie.parent_id].children[ie.name] == ie |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1096 |
|
1097 |
del self._byid[file_id] |
|
1534.7.69
by Aaron Bentley
Got real root moves working |
1098 |
if ie.parent_id is not None: |
1099 |
del self[ie.parent_id].children[ie.name] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1100 |
|
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
1101 |
def __eq__(self, other): |
1
by mbp at sourcefrog
import from baz patch-364 |
1102 |
"""Compare two sets by comparing their contents.
|
1103 |
||
1104 |
>>> i1 = Inventory()
|
|
1105 |
>>> i2 = Inventory()
|
|
1106 |
>>> i1 == i2
|
|
1107 |
True
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1108 |
>>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1109 |
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1110 |
>>> i1 == i2
|
1111 |
False
|
|
1399.1.10
by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now |
1112 |
>>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
|
1733.1.6
by Jelmer Vernooij
Fix a couple of minor issues after review by Martin. |
1113 |
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1114 |
>>> i1 == i2
|
1115 |
True
|
|
1116 |
"""
|
|
1117 |
if not isinstance(other, Inventory): |
|
1118 |
return NotImplemented |
|
1119 |
||
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
1120 |
return self._byid == other._byid |
1121 |
||
1122 |
def __ne__(self, other): |
|
1249
by Martin Pool
- improvements to weave commit [broken] |
1123 |
return not self.__eq__(other) |
544
by Martin Pool
- Define __eq__ and __ne__ for Inventory and InventoryEntry objects, |
1124 |
|
1125 |
def __hash__(self): |
|
1126 |
raise ValueError('not hashable') |
|
1127 |
||
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1128 |
def _iter_file_id_parents(self, file_id): |
1129 |
"""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. |
1130 |
while file_id is not None: |
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1131 |
try: |
1132 |
ie = self._byid[file_id] |
|
1133 |
except KeyError: |
|
1134 |
raise BzrError("file_id {%s} not found in inventory" % file_id) |
|
1135 |
yield ie |
|
1136 |
file_id = ie.parent_id |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1137 |
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1138 |
def get_idpath(self, file_id): |
1139 |
"""Return a list of file_ids for the path to an entry.
|
|
1140 |
||
1141 |
The list contains one element for each directory followed by
|
|
1142 |
the id of the file itself. So the length of the returned list
|
|
1143 |
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 |
1144 |
root directory as depth 1.
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1145 |
"""
|
1146 |
p = [] |
|
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1147 |
for parent in self._iter_file_id_parents(file_id): |
1148 |
p.insert(0, parent.file_id) |
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1149 |
return p |
1150 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1151 |
def id2path(self, file_id): |
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1152 |
"""Return as a string the path to file_id.
|
1393.1.32
by Martin Pool
- add docstring demonstrating use of Inventory.id2path |
1153 |
|
1154 |
>>> i = Inventory()
|
|
1155 |
>>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
|
|
1156 |
>>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
|
|
1185.31.34
by John Arbash Meinel
Removing instances of os.sep |
1157 |
>>> print i.id2path('foo-id')
|
1393.1.32
by Martin Pool
- add docstring demonstrating use of Inventory.id2path |
1158 |
src/foo.c
|
1159 |
"""
|
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1160 |
# get all names, skipping root
|
1596.2.19
by Robert Collins
Shave 20% off id2path. |
1161 |
return '/'.join(reversed( |
1162 |
[parent.name for parent in |
|
1163 |
self._iter_file_id_parents(file_id)][:-1])) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1164 |
|
1165 |
def path2id(self, name): |
|
1166 |
"""Walk down through directories to return entry of last component.
|
|
1167 |
||
1168 |
names may be either a list of path components, or a single
|
|
1169 |
string, in which case it is automatically split.
|
|
1170 |
||
1171 |
This returns the entry of the last component in the path,
|
|
1172 |
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 |
1173 |
|
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) |
1174 |
Returns None IFF the path is not found.
|
1
by mbp at sourcefrog
import from baz patch-364 |
1175 |
"""
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1176 |
if isinstance(name, types.StringTypes): |
1177 |
name = splitpath(name) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1178 |
|
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) |
1179 |
# mutter("lookup path %r" % name)
|
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1180 |
|
1181 |
parent = self.root |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1182 |
for f in name: |
1
by mbp at sourcefrog
import from baz patch-364 |
1183 |
try: |
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1184 |
cie = parent.children[f] |
1
by mbp at sourcefrog
import from baz patch-364 |
1185 |
assert cie.name == f |
178
by mbp at sourcefrog
- Use a non-null file_id for the branch root directory. At the moment |
1186 |
assert cie.parent_id == parent.file_id |
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1187 |
parent = cie |
1
by mbp at sourcefrog
import from baz patch-364 |
1188 |
except KeyError: |
1189 |
# or raise an error?
|
|
1190 |
return None |
|
1191 |
||
138
by mbp at sourcefrog
remove parallel tree from inventory; |
1192 |
return parent.file_id |
1
by mbp at sourcefrog
import from baz patch-364 |
1193 |
|
1194 |
def has_filename(self, names): |
|
1195 |
return bool(self.path2id(names)) |
|
1196 |
||
1197 |
def has_id(self, file_id): |
|
1198 |
return self._byid.has_key(file_id) |
|
1199 |
||
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 |
1200 |
def rename(self, file_id, new_parent_id, new_name): |
1201 |
"""Move a file within the inventory.
|
|
1202 |
||
1203 |
This can change either the name, or the parent, or both.
|
|
1204 |
||
1205 |
This does not move the working file."""
|
|
1206 |
if not is_valid_name(new_name): |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1207 |
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 |
1208 |
|
1209 |
new_parent = self._byid[new_parent_id] |
|
1210 |
if new_name in new_parent.children: |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1211 |
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 |
1212 |
|
172
by mbp at sourcefrog
- clearer check against attempts to introduce directory loops in the inventory |
1213 |
new_parent_idpath = self.get_idpath(new_parent_id) |
1214 |
if file_id in new_parent_idpath: |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
1215 |
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 |
1216 |
% (self.id2path(file_id), self.id2path(new_parent_id))) |
1217 |
||
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 |
1218 |
file_ie = self._byid[file_id] |
1219 |
old_parent = self._byid[file_ie.parent_id] |
|
1220 |
||
1221 |
# TODO: Don't leave things messed up if this fails
|
|
1222 |
||
1223 |
del old_parent.children[file_ie.name] |
|
1224 |
new_parent.children[new_name] = file_ie |
|
1225 |
||
1226 |
file_ie.name = new_name |
|
1227 |
file_ie.parent_id = new_parent_id |
|
1228 |
||
1229 |
||
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) |
1230 |
def make_entry(kind, name, parent_id, file_id=None): |
1231 |
"""Create an inventory entry.
|
|
1232 |
||
1233 |
:param kind: the type of inventory entry to create.
|
|
1234 |
:param name: the basename of the entry.
|
|
1235 |
:param parent_id: the parent_id of the entry.
|
|
1236 |
:param file_id: the file_id to use. if None, one will be created.
|
|
1237 |
"""
|
|
1238 |
if file_id is None: |
|
1239 |
file_id = bzrlib.workingtree.gen_file_id(name) |
|
1240 |
if kind == 'directory': |
|
1241 |
return InventoryDirectory(file_id, name, parent_id) |
|
1242 |
elif kind == 'file': |
|
1243 |
return InventoryFile(file_id, name, parent_id) |
|
1244 |
elif kind == 'symlink': |
|
1245 |
return InventoryLink(file_id, name, parent_id) |
|
1246 |
else: |
|
1247 |
raise BzrError("unknown kind %r" % kind) |
|
1248 |
||
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 |
1249 |
|
1250 |
||
1077
by Martin Pool
- avoid compiling REs at module load time |
1251 |
_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 |
1252 |
|
1253 |
def is_valid_name(name): |
|
1077
by Martin Pool
- avoid compiling REs at module load time |
1254 |
global _NAME_RE |
1753.1.4
by Robert Collins
Fixup '== None' usage in inventory.py. |
1255 |
if _NAME_RE is None: |
1077
by Martin Pool
- avoid compiling REs at module load time |
1256 |
_NAME_RE = re.compile(r'^[^/\\]+$') |
1257 |
||
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 |
1258 |
return bool(_NAME_RE.match(name)) |