bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
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 |
||
|
2592.3.24
by Robert Collins
Knit1 disk layout specified. |
17 |
from bzrlib.lazy_import import lazy_import |
18 |
lazy_import(globals(), """ |
|
19 |
from bzrlib import (
|
|
|
2592.3.112
by Robert Collins
Various fixups found dogfooding. |
20 |
debug,
|
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
21 |
)
|
|
2592.3.26
by Robert Collins
Start of proper bunch-of-index based repository logic. Can branch bzr.dev with it... if you are patient. |
22 |
from bzrlib.store import revision
|
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
23 |
from bzrlib.store.revision.knit import KnitRevisionStore
|
|
2592.3.24
by Robert Collins
Knit1 disk layout specified. |
24 |
""") |
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
25 |
from bzrlib import ( |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
26 |
bzrdir, |
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
27 |
deprecated_graph, |
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
28 |
errors, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
29 |
knit, |
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
30 |
lockable_files, |
31 |
lockdir, |
|
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
32 |
osutils, |
|
3099.3.3
by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map() |
33 |
symbol_versioning, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
34 |
transactions, |
|
2241.1.8
by Martin Pool
Set the repository's serializer in the places it's needed, not in the base class |
35 |
xml5, |
|
2996.2.1
by Aaron Bentley
Add KnitRepositoryFormat4 |
36 |
xml6, |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
37 |
xml7, |
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
38 |
)
|
39 |
||
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
40 |
from bzrlib.decorators import needs_read_lock, needs_write_lock |
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
41 |
from bzrlib.repository import ( |
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
42 |
CommitBuilder, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
43 |
MetaDirRepository, |
44 |
MetaDirRepositoryFormat, |
|
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
45 |
RepositoryFormat, |
46 |
RootCommitBuilder, |
|
47 |
)
|
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
48 |
import bzrlib.revision as _mod_revision |
49 |
from bzrlib.store.versioned import VersionedFileStore |
|
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
50 |
from bzrlib.trace import mutter, mutter_callsite |
|
2535.3.53
by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead. |
51 |
from bzrlib.util import bencode |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
52 |
|
53 |
||
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
54 |
class _KnitParentsProvider(object): |
55 |
||
56 |
def __init__(self, knit): |
|
57 |
self._knit = knit |
|
58 |
||
|
2490.2.28
by Aaron Bentley
Fix handling of null revision |
59 |
def __repr__(self): |
60 |
return 'KnitParentsProvider(%r)' % self._knit |
|
61 |
||
|
3099.3.3
by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map() |
62 |
@symbol_versioning.deprecated_method(symbol_versioning.one_one) |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
63 |
def get_parents(self, revision_ids): |
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
64 |
"""See graph._StackedParentsProvider.get_parents""" |
65 |
parent_map = self.get_parent_map(revision_ids) |
|
66 |
return [parent_map.get(r, None) for r in revision_ids] |
|
67 |
||
68 |
def get_parent_map(self, keys): |
|
69 |
"""See graph._StackedParentsProvider.get_parent_map""" |
|
70 |
parent_map = {} |
|
71 |
for revision_id in keys: |
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
72 |
if revision_id == _mod_revision.NULL_REVISION: |
|
3146.1.2
by Aaron Bentley
ParentsProviders now provide tuples of parents, never lists |
73 |
parent_map[revision_id] = () |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
74 |
else: |
75 |
try: |
|
|
3146.1.2
by Aaron Bentley
ParentsProviders now provide tuples of parents, never lists |
76 |
parents = tuple( |
77 |
self._knit.get_parents_with_ghosts(revision_id)) |
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
78 |
except errors.RevisionNotPresent: |
|
3146.1.1
by Aaron Bentley
Fix bad ghost handling in KnitParentsProvider |
79 |
continue
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
80 |
else: |
81 |
if len(parents) == 0: |
|
|
3146.1.2
by Aaron Bentley
ParentsProviders now provide tuples of parents, never lists |
82 |
parents = (_mod_revision.NULL_REVISION,) |
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
83 |
parent_map[revision_id] = parents |
84 |
return parent_map |
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
85 |
|
86 |
||
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
87 |
class KnitRepository(MetaDirRepository): |
88 |
"""Knit format repository.""" |
|
89 |
||
|
2889.1.2
by Robert Collins
Review feedback. |
90 |
# These attributes are inherited from the Repository base class. Setting
|
91 |
# them to None ensures that if the constructor is changed to not initialize
|
|
92 |
# them, or a subclass fails to call the constructor, that an error will
|
|
93 |
# occur rather than the system working but generating incorrect data.
|
|
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
94 |
_commit_builder_class = None |
95 |
_serializer = None |
|
96 |
||
97 |
def __init__(self, _format, a_bzrdir, control_files, _revision_store, |
|
98 |
control_store, text_store, _commit_builder_class, _serializer): |
|
99 |
MetaDirRepository.__init__(self, _format, a_bzrdir, control_files, |
|
100 |
_revision_store, control_store, text_store) |
|
101 |
self._commit_builder_class = _commit_builder_class |
|
102 |
self._serializer = _serializer |
|
|
2745.6.16
by Aaron Bentley
Update from review |
103 |
self._reconcile_fixes_text_parents = True |
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
104 |
control_store.get_scope = self.get_transaction |
105 |
text_store.get_scope = self.get_transaction |
|
106 |
_revision_store.get_scope = self.get_transaction |
|
|
2241.1.8
by Martin Pool
Set the repository's serializer in the places it's needed, not in the base class |
107 |
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
108 |
def _warn_if_deprecated(self): |
109 |
# This class isn't deprecated
|
|
110 |
pass
|
|
111 |
||
|
2805.6.7
by Robert Collins
Review feedback. |
112 |
def _inventory_add_lines(self, inv_vf, revid, parents, lines, check_content): |
|
2817.2.1
by Robert Collins
* Inventory serialisation no longer double-sha's the content. |
113 |
return inv_vf.add_lines_with_ghosts(revid, parents, lines, |
114 |
check_content=check_content)[0] |
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
115 |
|
116 |
@needs_read_lock
|
|
117 |
def _all_revision_ids(self): |
|
118 |
"""See Repository.all_revision_ids().""" |
|
119 |
# Knits get the revision graph from the index of the revision knit, so
|
|
120 |
# it's always possible even if they're on an unlistable transport.
|
|
121 |
return self._revision_store.all_revision_ids(self.get_transaction()) |
|
122 |
||
123 |
def fileid_involved_between_revs(self, from_revid, to_revid): |
|
124 |
"""Find file_id(s) which are involved in the changes between revisions. |
|
125 |
||
126 |
This determines the set of revisions which are involved, and then
|
|
127 |
finds all file ids affected by those revisions.
|
|
128 |
"""
|
|
129 |
vf = self._get_revision_vf() |
|
130 |
from_set = set(vf.get_ancestry(from_revid)) |
|
131 |
to_set = set(vf.get_ancestry(to_revid)) |
|
132 |
changed = to_set.difference(from_set) |
|
133 |
return self._fileid_involved_by_set(changed) |
|
134 |
||
135 |
def fileid_involved(self, last_revid=None): |
|
136 |
"""Find all file_ids modified in the ancestry of last_revid. |
|
137 |
||
138 |
:param last_revid: If None, last_revision() will be used.
|
|
139 |
"""
|
|
140 |
if not last_revid: |
|
141 |
changed = set(self.all_revision_ids()) |
|
142 |
else: |
|
143 |
changed = set(self.get_ancestry(last_revid)) |
|
144 |
if None in changed: |
|
145 |
changed.remove(None) |
|
146 |
return self._fileid_involved_by_set(changed) |
|
147 |
||
148 |
@needs_read_lock
|
|
|
2530.1.1
by Aaron Bentley
Make topological sorting optional for get_ancestry |
149 |
def get_ancestry(self, revision_id, topo_sorted=True): |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
150 |
"""Return a list of revision-ids integrated by a revision. |
151 |
|
|
|
2490.2.32
by Aaron Bentley
Merge of not-sorting-ancestry branch |
152 |
This is topologically sorted, unless 'topo_sorted' is specified as
|
153 |
False.
|
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
154 |
"""
|
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
155 |
if _mod_revision.is_null(revision_id): |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
156 |
return [None] |
157 |
vf = self._get_revision_vf() |
|
158 |
try: |
|
|
2530.1.1
by Aaron Bentley
Make topological sorting optional for get_ancestry |
159 |
return [None] + vf.get_ancestry(revision_id, topo_sorted) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
160 |
except errors.RevisionNotPresent: |
161 |
raise errors.NoSuchRevision(self, revision_id) |
|
162 |
||
|
3184.1.9
by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of |
163 |
@symbol_versioning.deprecated_method(symbol_versioning.one_two) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
164 |
@needs_read_lock
|
|
2535.3.12
by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository. |
165 |
def get_data_stream(self, revision_ids): |
|
3184.1.9
by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of |
166 |
"""See Repository.get_data_stream. |
167 |
|
|
168 |
Deprecated in 1.2 for get_data_stream_for_search.
|
|
169 |
"""
|
|
170 |
search_result = self.revision_ids_to_search_result(set(revision_ids)) |
|
171 |
return self.get_data_stream_for_search(search_result) |
|
172 |
||
173 |
@needs_read_lock
|
|
174 |
def get_data_stream_for_search(self, search): |
|
175 |
"""See Repository.get_data_stream_for_search.""" |
|
176 |
item_keys = self.item_keys_introduced_by(search.get_keys()) |
|
|
2535.3.62
by Andrew Bennetts
Cosmetic changes. |
177 |
for knit_kind, file_id, versions in item_keys: |
|
2535.3.50
by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings. |
178 |
name = (knit_kind,) |
|
2535.3.12
by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository. |
179 |
if knit_kind == 'file': |
|
2535.3.50
by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings. |
180 |
name = ('file', file_id) |
|
2535.3.27
by Andrew Bennetts
Merge from bzr.dev. |
181 |
knit = self.weave_store.get_weave_or_empty( |
|
2535.3.12
by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository. |
182 |
file_id, self.get_transaction()) |
183 |
elif knit_kind == 'inventory': |
|
184 |
knit = self.get_inventory_weave() |
|
185 |
elif knit_kind == 'revisions': |
|
|
2535.3.28
by Andrew Bennetts
Use self._revision_store.get_revision_file rather that self.control_store.get_weave('revisions', ...) |
186 |
knit = self._revision_store.get_revision_file( |
187 |
self.get_transaction()) |
|
|
2535.3.25
by Andrew Bennetts
Fetch signatures too. |
188 |
elif knit_kind == 'signatures': |
189 |
knit = self._revision_store.get_signature_file( |
|
190 |
self.get_transaction()) |
|
|
2535.3.12
by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository. |
191 |
else: |
192 |
raise AssertionError('Unknown knit kind %r' % (knit_kind,)) |
|
|
2535.3.53
by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead. |
193 |
yield name, _get_stream_as_bytes(knit, versions) |
|
2535.3.12
by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository. |
194 |
|
195 |
@needs_read_lock
|
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
196 |
def get_revision(self, revision_id): |
197 |
"""Return the Revision object for a named revision""" |
|
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
198 |
revision_id = osutils.safe_revision_id(revision_id) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
199 |
return self.get_revision_reconcile(revision_id) |
200 |
||
|
3287.6.1
by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method. |
201 |
@symbol_versioning.deprecated_method(symbol_versioning.one_four) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
202 |
@needs_read_lock
|
203 |
def get_revision_graph(self, revision_id=None): |
|
204 |
"""Return a dictionary containing the revision graph. |
|
205 |
||
206 |
:param revision_id: The revision_id to get a graph from. If None, then
|
|
207 |
the entire revision graph is returned. This is a deprecated mode of
|
|
208 |
operation and will be removed in the future.
|
|
209 |
:return: a dictionary of revision_id->revision_parents_list.
|
|
210 |
"""
|
|
|
2592.3.111
by Robert Collins
Make the temporary back for autopacking vs pack to pack fetching distinguishable. |
211 |
if 'evil' in debug.debug_flags: |
|
2592.3.112
by Robert Collins
Various fixups found dogfooding. |
212 |
mutter_callsite(3, |
|
2592.3.111
by Robert Collins
Make the temporary back for autopacking vs pack to pack fetching distinguishable. |
213 |
"get_revision_graph scales with size of history.") |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
214 |
# special case NULL_REVISION
|
215 |
if revision_id == _mod_revision.NULL_REVISION: |
|
216 |
return {} |
|
217 |
a_weave = self._get_revision_vf() |
|
218 |
if revision_id is None: |
|
219 |
return a_weave.get_graph() |
|
|
2592.3.43
by Robert Collins
A knit iter_parents API. |
220 |
if revision_id not in a_weave: |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
221 |
raise errors.NoSuchRevision(self, revision_id) |
222 |
else: |
|
223 |
# add what can be reached from revision_id
|
|
|
2652.1.1
by John Arbash Meinel
Avoid set.difference_update(other) because it is slow when other is big. |
224 |
return a_weave.get_graph([revision_id]) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
225 |
|
226 |
@needs_read_lock
|
|
|
3228.4.11
by John Arbash Meinel
Deprecations abound. |
227 |
@symbol_versioning.deprecated_method(symbol_versioning.one_three) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
228 |
def get_revision_graph_with_ghosts(self, revision_ids=None): |
229 |
"""Return a graph of the revisions with ghosts marked as applicable. |
|
230 |
||
231 |
:param revision_ids: an iterable of revisions to graph or None for all.
|
|
232 |
:return: a Graph object with the graph reachable from revision_ids.
|
|
233 |
"""
|
|
|
2592.3.112
by Robert Collins
Various fixups found dogfooding. |
234 |
if 'evil' in debug.debug_flags: |
235 |
mutter_callsite(3, |
|
236 |
"get_revision_graph_with_ghosts scales with size of history.") |
|
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
237 |
result = deprecated_graph.Graph() |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
238 |
vf = self._get_revision_vf() |
239 |
versions = set(vf.versions()) |
|
240 |
if not revision_ids: |
|
241 |
pending = set(self.all_revision_ids()) |
|
242 |
required = set([]) |
|
243 |
else: |
|
|
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
244 |
pending = set(revision_ids) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
245 |
# special case NULL_REVISION
|
246 |
if _mod_revision.NULL_REVISION in pending: |
|
247 |
pending.remove(_mod_revision.NULL_REVISION) |
|
248 |
required = set(pending) |
|
249 |
done = set([]) |
|
250 |
while len(pending): |
|
251 |
revision_id = pending.pop() |
|
252 |
if not revision_id in versions: |
|
253 |
if revision_id in required: |
|
254 |
raise errors.NoSuchRevision(self, revision_id) |
|
255 |
# a ghost
|
|
256 |
result.add_ghost(revision_id) |
|
257 |
# mark it as done so we don't try for it again.
|
|
258 |
done.add(revision_id) |
|
259 |
continue
|
|
260 |
parent_ids = vf.get_parents_with_ghosts(revision_id) |
|
261 |
for parent_id in parent_ids: |
|
262 |
# is this queued or done ?
|
|
263 |
if (parent_id not in pending and |
|
264 |
parent_id not in done): |
|
265 |
# no, queue it.
|
|
266 |
pending.add(parent_id) |
|
267 |
result.add_node(revision_id, parent_ids) |
|
268 |
done.add(revision_id) |
|
269 |
return result |
|
270 |
||
271 |
def _get_revision_vf(self): |
|
272 |
""":return: a versioned file containing the revisions.""" |
|
273 |
vf = self._revision_store.get_revision_file(self.get_transaction()) |
|
274 |
return vf |
|
275 |
||
|
3172.3.1
by Robert Collins
Repository has a new method ``has_revisions`` which signals the presence |
276 |
def has_revisions(self, revision_ids): |
277 |
"""See Repository.has_revisions().""" |
|
278 |
result = set() |
|
279 |
transaction = self.get_transaction() |
|
280 |
for revision_id in revision_ids: |
|
281 |
if self._revision_store.has_revision_id(revision_id, transaction): |
|
282 |
result.add(revision_id) |
|
283 |
return result |
|
284 |
||
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
285 |
@needs_write_lock
|
286 |
def reconcile(self, other=None, thorough=False): |
|
287 |
"""Reconcile this repository.""" |
|
288 |
from bzrlib.reconcile import KnitReconciler |
|
289 |
reconciler = KnitReconciler(self, thorough=thorough) |
|
290 |
reconciler.reconcile() |
|
291 |
return reconciler |
|
292 |
||
293 |
def revision_parents(self, revision_id): |
|
294 |
return self._get_revision_vf().get_parents(revision_id) |
|
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
295 |
|
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
296 |
def _make_parents_provider(self): |
297 |
return _KnitParentsProvider(self._get_revision_vf()) |
|
298 |
||
|
2819.2.1
by Andrew Bennetts
Implement KnitRepository._find_inconsistent_revision_parents. |
299 |
def _find_inconsistent_revision_parents(self): |
300 |
"""Find revisions with different parent lists in the revision object |
|
301 |
and in the index graph.
|
|
|
2819.2.2
by Andrew Bennetts
Implement _check_for_inconsistent_revision_parents. |
302 |
|
303 |
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
|
|
304 |
parents-in-revision).
|
|
|
2819.2.1
by Andrew Bennetts
Implement KnitRepository._find_inconsistent_revision_parents. |
305 |
"""
|
|
2592.3.214
by Robert Collins
Merge bzr.dev. |
306 |
assert self.is_locked() |
|
2819.2.1
by Andrew Bennetts
Implement KnitRepository._find_inconsistent_revision_parents. |
307 |
vf = self._get_revision_vf() |
|
2592.3.214
by Robert Collins
Merge bzr.dev. |
308 |
for index_version in vf.versions(): |
309 |
parents_according_to_index = tuple(vf.get_parents_with_ghosts( |
|
310 |
index_version)) |
|
311 |
revision = self.get_revision(index_version) |
|
312 |
parents_according_to_revision = tuple(revision.parent_ids) |
|
|
2819.2.1
by Andrew Bennetts
Implement KnitRepository._find_inconsistent_revision_parents. |
313 |
if parents_according_to_index != parents_according_to_revision: |
314 |
yield (index_version, parents_according_to_index, |
|
315 |
parents_according_to_revision) |
|
316 |
||
|
2819.2.2
by Andrew Bennetts
Implement _check_for_inconsistent_revision_parents. |
317 |
def _check_for_inconsistent_revision_parents(self): |
318 |
inconsistencies = list(self._find_inconsistent_revision_parents()) |
|
319 |
if inconsistencies: |
|
320 |
raise errors.BzrCheckError( |
|
321 |
"Revision knit has inconsistent parents.") |
|
322 |
||
|
2819.2.4
by Andrew Bennetts
Add a 'revision_graph_can_have_wrong_parents' method to repository. |
323 |
def revision_graph_can_have_wrong_parents(self): |
324 |
# The revision.kndx could potentially claim a revision has a different
|
|
325 |
# parent to the revision text.
|
|
326 |
return True |
|
327 |
||
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
328 |
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
329 |
class RepositoryFormatKnit(MetaDirRepositoryFormat): |
330 |
"""Bzr repository knit format (generalized). |
|
331 |
||
332 |
This repository format has:
|
|
333 |
- knits for file texts and inventory
|
|
334 |
- hash subdirectory based stores.
|
|
335 |
- knits for revisions and signatures
|
|
336 |
- TextStores for revisions and signatures.
|
|
337 |
- a format marker of its own
|
|
338 |
- an optional 'shared-storage' flag
|
|
339 |
- an optional 'no-working-trees' flag
|
|
340 |
- a LockDir lock
|
|
341 |
"""
|
|
342 |
||
|
2857.2.2
by Robert Collins
Review feedback. |
343 |
# Set this attribute in derived classes to control the repository class
|
344 |
# created by open and initialize.
|
|
345 |
repository_class = None |
|
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
346 |
# Set this attribute in derived classes to control the
|
347 |
# _commit_builder_class that the repository objects will have passed to
|
|
348 |
# their constructor.
|
|
349 |
_commit_builder_class = None |
|
350 |
# Set this attribute in derived clases to control the _serializer that the
|
|
351 |
# repository objects will have passed to their constructor.
|
|
352 |
_serializer = xml5.serializer_v5 |
|
|
2949.1.2
by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph. |
353 |
# Knit based repositories handle ghosts reasonably well.
|
354 |
supports_ghosts = True |
|
|
3221.3.1
by Robert Collins
* Repository formats have a new supported-feature attribute |
355 |
# External lookups are not supported in this format.
|
356 |
supports_external_lookups = False |
|
|
2857.2.2
by Robert Collins
Review feedback. |
357 |
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
358 |
def _get_control_store(self, repo_transport, control_files): |
359 |
"""Return the control store for this repository.""" |
|
360 |
return VersionedFileStore( |
|
361 |
repo_transport, |
|
362 |
prefixed=False, |
|
363 |
file_mode=control_files._file_mode, |
|
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
364 |
versionedfile_class=knit.make_file_knit, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
365 |
versionedfile_kwargs={'factory':knit.KnitPlainFactory()}, |
366 |
)
|
|
367 |
||
368 |
def _get_revision_store(self, repo_transport, control_files): |
|
369 |
"""See RepositoryFormat._get_revision_store().""" |
|
370 |
versioned_file_store = VersionedFileStore( |
|
371 |
repo_transport, |
|
372 |
file_mode=control_files._file_mode, |
|
373 |
prefixed=False, |
|
374 |
precious=True, |
|
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
375 |
versionedfile_class=knit.make_file_knit, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
376 |
versionedfile_kwargs={'delta':False, |
377 |
'factory':knit.KnitPlainFactory(), |
|
378 |
},
|
|
379 |
escaped=True, |
|
380 |
)
|
|
381 |
return KnitRevisionStore(versioned_file_store) |
|
382 |
||
383 |
def _get_text_store(self, transport, control_files): |
|
384 |
"""See RepositoryFormat._get_text_store().""" |
|
385 |
return self._get_versioned_file_store('knits', |
|
386 |
transport, |
|
387 |
control_files, |
|
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
388 |
versionedfile_class=knit.make_file_knit, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
389 |
versionedfile_kwargs={ |
390 |
'create_parent_dir':True, |
|
391 |
'delay_create':True, |
|
392 |
'dir_mode':control_files._dir_mode, |
|
393 |
},
|
|
394 |
escaped=True) |
|
395 |
||
396 |
def initialize(self, a_bzrdir, shared=False): |
|
397 |
"""Create a knit format 1 repository. |
|
398 |
||
399 |
:param a_bzrdir: bzrdir to contain the new repository; must already
|
|
400 |
be initialized.
|
|
401 |
:param shared: If true the repository will be initialized as a shared
|
|
402 |
repository.
|
|
403 |
"""
|
|
404 |
mutter('creating repository in %s.', a_bzrdir.transport.base) |
|
|
2592.3.60
by Robert Collins
Nuke per-fileid indices for a single unified index. |
405 |
dirs = ['knits'] |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
406 |
files = [] |
407 |
utf8_files = [('format', self.get_format_string())] |
|
408 |
||
409 |
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared) |
|
410 |
repo_transport = a_bzrdir.get_repository_transport(None) |
|
411 |
control_files = lockable_files.LockableFiles(repo_transport, |
|
412 |
'lock', lockdir.LockDir) |
|
413 |
control_store = self._get_control_store(repo_transport, control_files) |
|
414 |
transaction = transactions.WriteTransaction() |
|
415 |
# trigger a write of the inventory store.
|
|
416 |
control_store.get_weave_or_empty('inventory', transaction) |
|
417 |
_revision_store = self._get_revision_store(repo_transport, control_files) |
|
418 |
# the revision id here is irrelevant: it will not be stored, and cannot
|
|
419 |
# already exist.
|
|
420 |
_revision_store.has_revision_id('A', transaction) |
|
421 |
_revision_store.get_signature_file(transaction) |
|
422 |
return self.open(a_bzrdir=a_bzrdir, _found=True) |
|
423 |
||
424 |
def open(self, a_bzrdir, _found=False, _override_transport=None): |
|
425 |
"""See RepositoryFormat.open(). |
|
426 |
|
|
427 |
:param _override_transport: INTERNAL USE ONLY. Allows opening the
|
|
428 |
repository at a slightly different url
|
|
429 |
than normal. I.e. during 'upgrade'.
|
|
430 |
"""
|
|
431 |
if not _found: |
|
432 |
format = RepositoryFormat.find_format(a_bzrdir) |
|
433 |
assert format.__class__ == self.__class__ |
|
434 |
if _override_transport is not None: |
|
435 |
repo_transport = _override_transport |
|
436 |
else: |
|
437 |
repo_transport = a_bzrdir.get_repository_transport(None) |
|
438 |
control_files = lockable_files.LockableFiles(repo_transport, |
|
439 |
'lock', lockdir.LockDir) |
|
440 |
text_store = self._get_text_store(repo_transport, control_files) |
|
441 |
control_store = self._get_control_store(repo_transport, control_files) |
|
442 |
_revision_store = self._get_revision_store(repo_transport, control_files) |
|
|
2592.3.22
by Robert Collins
Add new experimental repository formats. |
443 |
return self.repository_class(_format=self, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
444 |
a_bzrdir=a_bzrdir, |
445 |
control_files=control_files, |
|
446 |
_revision_store=_revision_store, |
|
447 |
control_store=control_store, |
|
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
448 |
text_store=text_store, |
449 |
_commit_builder_class=self._commit_builder_class, |
|
450 |
_serializer=self._serializer) |
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
451 |
|
452 |
||
453 |
class RepositoryFormatKnit1(RepositoryFormatKnit): |
|
454 |
"""Bzr repository knit format 1. |
|
455 |
||
456 |
This repository format has:
|
|
457 |
- knits for file texts and inventory
|
|
458 |
- hash subdirectory based stores.
|
|
459 |
- knits for revisions and signatures
|
|
460 |
- TextStores for revisions and signatures.
|
|
461 |
- a format marker of its own
|
|
462 |
- an optional 'shared-storage' flag
|
|
463 |
- an optional 'no-working-trees' flag
|
|
464 |
- a LockDir lock
|
|
465 |
||
466 |
This format was introduced in bzr 0.8.
|
|
467 |
"""
|
|
|
2241.1.11
by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format |
468 |
|
|
2592.3.22
by Robert Collins
Add new experimental repository formats. |
469 |
repository_class = KnitRepository |
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
470 |
_commit_builder_class = CommitBuilder |
471 |
_serializer = xml5.serializer_v5 |
|
|
2592.3.22
by Robert Collins
Add new experimental repository formats. |
472 |
|
|
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
473 |
def __ne__(self, other): |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
474 |
return self.__class__ is not other.__class__ |
475 |
||
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
476 |
def get_format_string(self): |
477 |
"""See RepositoryFormat.get_format_string().""" |
|
478 |
return "Bazaar-NG Knit Repository Format 1" |
|
479 |
||
480 |
def get_format_description(self): |
|
481 |
"""See RepositoryFormat.get_format_description().""" |
|
482 |
return "Knit repository format 1" |
|
483 |
||
484 |
def check_conversion_target(self, target_format): |
|
485 |
pass
|
|
486 |
||
487 |
||
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
488 |
class RepositoryFormatKnit3(RepositoryFormatKnit): |
|
2996.2.5
by Aaron Bentley
Correct docstring |
489 |
"""Bzr repository knit format 3. |
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
490 |
|
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
491 |
This repository format has:
|
492 |
- knits for file texts and inventory
|
|
493 |
- hash subdirectory based stores.
|
|
494 |
- knits for revisions and signatures
|
|
495 |
- TextStores for revisions and signatures.
|
|
496 |
- a format marker of its own
|
|
497 |
- an optional 'shared-storage' flag
|
|
498 |
- an optional 'no-working-trees' flag
|
|
499 |
- a LockDir lock
|
|
500 |
- support for recording full info about the tree root
|
|
501 |
- support for recording tree-references
|
|
502 |
"""
|
|
503 |
||
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
504 |
repository_class = KnitRepository |
505 |
_commit_builder_class = RootCommitBuilder |
|
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
506 |
rich_root_data = True |
|
2323.5.16
by Martin Pool
rename support_tree_reference to supports_ |
507 |
supports_tree_reference = True |
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
508 |
_serializer = xml7.serializer_v7 |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
509 |
|
510 |
def _get_matching_bzrdir(self): |
|
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
511 |
return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree') |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
512 |
|
513 |
def _ignore_setting_bzrdir(self, format): |
|
514 |
pass
|
|
515 |
||
516 |
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir) |
|
517 |
||
518 |
def check_conversion_target(self, target_format): |
|
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
519 |
if not target_format.rich_root_data: |
520 |
raise errors.BadConversionTarget( |
|
521 |
'Does not support rich root data.', target_format) |
|
|
2323.5.16
by Martin Pool
rename support_tree_reference to supports_ |
522 |
if not getattr(target_format, 'supports_tree_reference', False): |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
523 |
raise errors.BadConversionTarget( |
524 |
'Does not support nested trees', target_format) |
|
525 |
||
526 |
def get_format_string(self): |
|
527 |
"""See RepositoryFormat.get_format_string().""" |
|
|
2255.2.230
by Robert Collins
Update tree format signatures to mention introducing bzr version. |
528 |
return "Bazaar Knit Repository Format 3 (bzr 0.15)\n" |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
529 |
|
530 |
def get_format_description(self): |
|
531 |
"""See RepositoryFormat.get_format_description().""" |
|
532 |
return "Knit repository format 3" |
|
533 |
||
|
2535.3.53
by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead. |
534 |
|
|
2996.2.1
by Aaron Bentley
Add KnitRepositoryFormat4 |
535 |
class RepositoryFormatKnit4(RepositoryFormatKnit): |
536 |
"""Bzr repository knit format 4. |
|
537 |
||
538 |
This repository format has everything in format 3, except for
|
|
539 |
tree-references:
|
|
540 |
- knits for file texts and inventory
|
|
541 |
- hash subdirectory based stores.
|
|
542 |
- knits for revisions and signatures
|
|
543 |
- TextStores for revisions and signatures.
|
|
544 |
- a format marker of its own
|
|
545 |
- an optional 'shared-storage' flag
|
|
546 |
- an optional 'no-working-trees' flag
|
|
547 |
- a LockDir lock
|
|
548 |
- support for recording full info about the tree root
|
|
549 |
"""
|
|
550 |
||
551 |
repository_class = KnitRepository |
|
552 |
_commit_builder_class = RootCommitBuilder |
|
553 |
rich_root_data = True |
|
554 |
supports_tree_reference = False |
|
555 |
_serializer = xml6.serializer_v6 |
|
556 |
||
557 |
def _get_matching_bzrdir(self): |
|
558 |
return bzrdir.format_registry.make_bzrdir('rich-root') |
|
559 |
||
560 |
def _ignore_setting_bzrdir(self, format): |
|
561 |
pass
|
|
562 |
||
563 |
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir) |
|
564 |
||
565 |
def check_conversion_target(self, target_format): |
|
566 |
if not target_format.rich_root_data: |
|
567 |
raise errors.BadConversionTarget( |
|
568 |
'Does not support rich root data.', target_format) |
|
569 |
||
570 |
def get_format_string(self): |
|
571 |
"""See RepositoryFormat.get_format_string().""" |
|
572 |
return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n' |
|
573 |
||
574 |
def get_format_description(self): |
|
575 |
"""See RepositoryFormat.get_format_description().""" |
|
576 |
return "Knit repository format 4" |
|
577 |
||
578 |
||
|
2535.3.53
by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead. |
579 |
def _get_stream_as_bytes(knit, required_versions): |
580 |
"""Generate a serialised data stream. |
|
581 |
||
582 |
The format is a bencoding of a list. The first element of the list is a
|
|
583 |
string of the format signature, then each subsequent element is a list
|
|
584 |
corresponding to a record. Those lists contain:
|
|
585 |
||
586 |
* a version id
|
|
587 |
* a list of options
|
|
588 |
* a list of parents
|
|
589 |
* the bytes
|
|
590 |
||
591 |
:returns: a bencoded list.
|
|
592 |
"""
|
|
593 |
knit_stream = knit.get_data_stream(required_versions) |
|
594 |
format_signature, data_list, callable = knit_stream |
|
595 |
data = [] |
|
596 |
data.append(format_signature) |
|
597 |
for version, options, length, parents in data_list: |
|
598 |
data.append([version, options, parents, callable(length)]) |
|
599 |
return bencode.bencode(data) |