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 |
||
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
17 |
from bzrlib.lazy_import import lazy_import |
18 |
lazy_import(globals(), """ |
|
19 |
from bzrlib import (
|
|
20 |
debug,
|
|
21 |
)
|
|
22 |
from bzrlib.store import revision
|
|
23 |
from bzrlib.store.revision.knit import KnitRevisionStore
|
|
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, |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
33 |
transactions, |
2241.1.8
by Martin Pool
Set the repository's serializer in the places it's needed, not in the base class |
34 |
xml5, |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
35 |
xml7, |
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
36 |
)
|
37 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
38 |
from bzrlib.decorators import needs_read_lock, needs_write_lock |
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
39 |
from bzrlib.repository import ( |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
40 |
MetaDirRepository, |
41 |
MetaDirRepositoryFormat, |
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
42 |
RepositoryFormat, |
43 |
RootCommitBuilder, |
|
44 |
)
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
45 |
import bzrlib.revision as _mod_revision |
46 |
from bzrlib.store.versioned import VersionedFileStore |
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
47 |
from bzrlib.trace import mutter, mutter_callsite |
2670.3.5
by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead. |
48 |
from bzrlib.util import bencode |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
49 |
|
50 |
||
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
51 |
class _KnitParentsProvider(object): |
52 |
||
53 |
def __init__(self, knit): |
|
54 |
self._knit = knit |
|
55 |
||
2490.2.28
by Aaron Bentley
Fix handling of null revision |
56 |
def __repr__(self): |
57 |
return 'KnitParentsProvider(%r)' % self._knit |
|
58 |
||
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
59 |
def get_parents(self, revision_ids): |
60 |
parents_list = [] |
|
61 |
for revision_id in revision_ids: |
|
62 |
if revision_id == _mod_revision.NULL_REVISION: |
|
63 |
parents = [] |
|
64 |
else: |
|
65 |
try: |
|
66 |
parents = self._knit.get_parents_with_ghosts(revision_id) |
|
67 |
except errors.RevisionNotPresent: |
|
68 |
parents = None |
|
69 |
else: |
|
70 |
if len(parents) == 0: |
|
71 |
parents = [_mod_revision.NULL_REVISION] |
|
72 |
parents_list.append(parents) |
|
73 |
return parents_list |
|
74 |
||
75 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
76 |
class KnitRepository(MetaDirRepository): |
77 |
"""Knit format repository.""" |
|
78 |
||
2241.1.8
by Martin Pool
Set the repository's serializer in the places it's needed, not in the base class |
79 |
_serializer = xml5.serializer_v5 |
80 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
81 |
def _warn_if_deprecated(self): |
82 |
# This class isn't deprecated
|
|
83 |
pass
|
|
84 |
||
2805.6.7
by Robert Collins
Review feedback. |
85 |
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. |
86 |
return inv_vf.add_lines_with_ghosts(revid, parents, lines, |
87 |
check_content=check_content)[0] |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
88 |
|
89 |
@needs_read_lock
|
|
90 |
def _all_revision_ids(self): |
|
91 |
"""See Repository.all_revision_ids().""" |
|
92 |
# Knits get the revision graph from the index of the revision knit, so
|
|
93 |
# it's always possible even if they're on an unlistable transport.
|
|
94 |
return self._revision_store.all_revision_ids(self.get_transaction()) |
|
95 |
||
96 |
def fileid_involved_between_revs(self, from_revid, to_revid): |
|
97 |
"""Find file_id(s) which are involved in the changes between revisions. |
|
98 |
||
99 |
This determines the set of revisions which are involved, and then
|
|
100 |
finds all file ids affected by those revisions.
|
|
101 |
"""
|
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
102 |
from_revid = osutils.safe_revision_id(from_revid) |
103 |
to_revid = osutils.safe_revision_id(to_revid) |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
104 |
vf = self._get_revision_vf() |
105 |
from_set = set(vf.get_ancestry(from_revid)) |
|
106 |
to_set = set(vf.get_ancestry(to_revid)) |
|
107 |
changed = to_set.difference(from_set) |
|
108 |
return self._fileid_involved_by_set(changed) |
|
109 |
||
110 |
def fileid_involved(self, last_revid=None): |
|
111 |
"""Find all file_ids modified in the ancestry of last_revid. |
|
112 |
||
113 |
:param last_revid: If None, last_revision() will be used.
|
|
114 |
"""
|
|
115 |
if not last_revid: |
|
116 |
changed = set(self.all_revision_ids()) |
|
117 |
else: |
|
118 |
changed = set(self.get_ancestry(last_revid)) |
|
119 |
if None in changed: |
|
120 |
changed.remove(None) |
|
121 |
return self._fileid_involved_by_set(changed) |
|
122 |
||
123 |
@needs_read_lock
|
|
2530.1.1
by Aaron Bentley
Make topological sorting optional for get_ancestry |
124 |
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 |
125 |
"""Return a list of revision-ids integrated by a revision. |
126 |
|
|
2490.2.32
by Aaron Bentley
Merge of not-sorting-ancestry branch |
127 |
This is topologically sorted, unless 'topo_sorted' is specified as
|
128 |
False.
|
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
129 |
"""
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
130 |
if _mod_revision.is_null(revision_id): |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
131 |
return [None] |
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
132 |
revision_id = osutils.safe_revision_id(revision_id) |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
133 |
vf = self._get_revision_vf() |
134 |
try: |
|
2530.1.1
by Aaron Bentley
Make topological sorting optional for get_ancestry |
135 |
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 |
136 |
except errors.RevisionNotPresent: |
137 |
raise errors.NoSuchRevision(self, revision_id) |
|
138 |
||
139 |
@needs_read_lock
|
|
140 |
def get_revision_graph(self, revision_id=None): |
|
141 |
"""Return a dictionary containing the revision graph. |
|
142 |
||
143 |
:param revision_id: The revision_id to get a graph from. If None, then
|
|
144 |
the entire revision graph is returned. This is a deprecated mode of
|
|
145 |
operation and will be removed in the future.
|
|
146 |
:return: a dictionary of revision_id->revision_parents_list.
|
|
147 |
"""
|
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
148 |
if 'evil' in debug.debug_flags: |
149 |
mutter_callsite(3, |
|
150 |
"get_revision_graph scales with size of history.") |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
151 |
# special case NULL_REVISION
|
152 |
if revision_id == _mod_revision.NULL_REVISION: |
|
153 |
return {} |
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
154 |
revision_id = osutils.safe_revision_id(revision_id) |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
155 |
a_weave = self._get_revision_vf() |
156 |
if revision_id is None: |
|
157 |
return a_weave.get_graph() |
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
158 |
if revision_id not in a_weave: |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
159 |
raise errors.NoSuchRevision(self, revision_id) |
160 |
else: |
|
161 |
# 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. |
162 |
return a_weave.get_graph([revision_id]) |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
163 |
|
164 |
@needs_read_lock
|
|
165 |
def get_revision_graph_with_ghosts(self, revision_ids=None): |
|
166 |
"""Return a graph of the revisions with ghosts marked as applicable. |
|
167 |
||
168 |
:param revision_ids: an iterable of revisions to graph or None for all.
|
|
169 |
:return: a Graph object with the graph reachable from revision_ids.
|
|
170 |
"""
|
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
171 |
if 'evil' in debug.debug_flags: |
172 |
mutter_callsite(3, |
|
173 |
"get_revision_graph_with_ghosts scales with size of history.") |
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
174 |
result = deprecated_graph.Graph() |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
175 |
vf = self._get_revision_vf() |
176 |
versions = set(vf.versions()) |
|
177 |
if not revision_ids: |
|
178 |
pending = set(self.all_revision_ids()) |
|
179 |
required = set([]) |
|
180 |
else: |
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
181 |
pending = set(osutils.safe_revision_id(r) for r in revision_ids) |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
182 |
# special case NULL_REVISION
|
183 |
if _mod_revision.NULL_REVISION in pending: |
|
184 |
pending.remove(_mod_revision.NULL_REVISION) |
|
185 |
required = set(pending) |
|
186 |
done = set([]) |
|
187 |
while len(pending): |
|
188 |
revision_id = pending.pop() |
|
189 |
if not revision_id in versions: |
|
190 |
if revision_id in required: |
|
191 |
raise errors.NoSuchRevision(self, revision_id) |
|
192 |
# a ghost
|
|
193 |
result.add_ghost(revision_id) |
|
194 |
# mark it as done so we don't try for it again.
|
|
195 |
done.add(revision_id) |
|
196 |
continue
|
|
197 |
parent_ids = vf.get_parents_with_ghosts(revision_id) |
|
198 |
for parent_id in parent_ids: |
|
199 |
# is this queued or done ?
|
|
200 |
if (parent_id not in pending and |
|
201 |
parent_id not in done): |
|
202 |
# no, queue it.
|
|
203 |
pending.add(parent_id) |
|
204 |
result.add_node(revision_id, parent_ids) |
|
205 |
done.add(revision_id) |
|
206 |
return result |
|
207 |
||
208 |
def _get_revision_vf(self): |
|
209 |
""":return: a versioned file containing the revisions.""" |
|
210 |
vf = self._revision_store.get_revision_file(self.get_transaction()) |
|
211 |
return vf |
|
212 |
||
2230.3.54
by Aaron Bentley
Move reverse history iteration to repository |
213 |
def _get_history_vf(self): |
214 |
"""Get a versionedfile whose history graph reflects all revisions. |
|
215 |
||
216 |
For knit repositories, this is the revision knit.
|
|
217 |
"""
|
|
218 |
return self._get_revision_vf() |
|
219 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
220 |
@needs_write_lock
|
221 |
def reconcile(self, other=None, thorough=False): |
|
222 |
"""Reconcile this repository.""" |
|
223 |
from bzrlib.reconcile import KnitReconciler |
|
224 |
reconciler = KnitReconciler(self, thorough=thorough) |
|
225 |
reconciler.reconcile() |
|
226 |
return reconciler |
|
227 |
||
228 |
def revision_parents(self, revision_id): |
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
229 |
revision_id = osutils.safe_revision_id(revision_id) |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
230 |
return self._get_revision_vf().get_parents(revision_id) |
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
231 |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
232 |
def _make_parents_provider(self): |
233 |
return _KnitParentsProvider(self._get_revision_vf()) |
|
234 |
||
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
235 |
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
236 |
class KnitRepository3(KnitRepository): |
237 |
||
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
238 |
# knit3 repositories need a RootCommitBuilder
|
2818.3.1
by Robert Collins
Change CommitBuilder factory delegation to allow simple declaration. |
239 |
_commit_builder_class = RootCommitBuilder |
240 |
||
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
241 |
def __init__(self, _format, a_bzrdir, control_files, _revision_store, |
242 |
control_store, text_store): |
|
243 |
KnitRepository.__init__(self, _format, a_bzrdir, control_files, |
|
244 |
_revision_store, control_store, text_store) |
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
245 |
self._serializer = xml7.serializer_v7 |
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
246 |
|
247 |
def deserialise_inventory(self, revision_id, xml): |
|
248 |
"""Transform the xml into an inventory object. |
|
249 |
||
250 |
:param revision_id: The expected revision id of the inventory.
|
|
251 |
:param xml: A serialised inventory.
|
|
252 |
"""
|
|
253 |
result = self._serializer.read_inventory_from_string(xml) |
|
254 |
assert result.root.revision is not None |
|
255 |
return result |
|
256 |
||
257 |
def serialise_inventory(self, inv): |
|
258 |
"""Transform the inventory object into XML text. |
|
259 |
||
260 |
:param revision_id: The expected revision id of the inventory.
|
|
261 |
:param xml: A serialised inventory.
|
|
262 |
"""
|
|
263 |
assert inv.revision_id is not None |
|
264 |
assert inv.root.revision is not None |
|
265 |
return KnitRepository.serialise_inventory(self, inv) |
|
266 |
||
267 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
268 |
class RepositoryFormatKnit(MetaDirRepositoryFormat): |
269 |
"""Bzr repository knit format (generalized). |
|
270 |
||
271 |
This repository format has:
|
|
272 |
- knits for file texts and inventory
|
|
273 |
- hash subdirectory based stores.
|
|
274 |
- knits for revisions and signatures
|
|
275 |
- TextStores for revisions and signatures.
|
|
276 |
- a format marker of its own
|
|
277 |
- an optional 'shared-storage' flag
|
|
278 |
- an optional 'no-working-trees' flag
|
|
279 |
- a LockDir lock
|
|
280 |
"""
|
|
281 |
||
2857.2.2
by Robert Collins
Review feedback. |
282 |
# Set this attribute in derived classes to control the repository class
|
283 |
# created by open and initialize.
|
|
284 |
repository_class = None |
|
285 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
286 |
def _get_control_store(self, repo_transport, control_files): |
287 |
"""Return the control store for this repository.""" |
|
288 |
return VersionedFileStore( |
|
289 |
repo_transport, |
|
290 |
prefixed=False, |
|
291 |
file_mode=control_files._file_mode, |
|
292 |
versionedfile_class=knit.KnitVersionedFile, |
|
293 |
versionedfile_kwargs={'factory':knit.KnitPlainFactory()}, |
|
294 |
)
|
|
295 |
||
296 |
def _get_revision_store(self, repo_transport, control_files): |
|
297 |
"""See RepositoryFormat._get_revision_store().""" |
|
298 |
versioned_file_store = VersionedFileStore( |
|
299 |
repo_transport, |
|
300 |
file_mode=control_files._file_mode, |
|
301 |
prefixed=False, |
|
302 |
precious=True, |
|
303 |
versionedfile_class=knit.KnitVersionedFile, |
|
304 |
versionedfile_kwargs={'delta':False, |
|
305 |
'factory':knit.KnitPlainFactory(), |
|
306 |
},
|
|
307 |
escaped=True, |
|
308 |
)
|
|
309 |
return KnitRevisionStore(versioned_file_store) |
|
310 |
||
311 |
def _get_text_store(self, transport, control_files): |
|
312 |
"""See RepositoryFormat._get_text_store().""" |
|
313 |
return self._get_versioned_file_store('knits', |
|
314 |
transport, |
|
315 |
control_files, |
|
316 |
versionedfile_class=knit.KnitVersionedFile, |
|
317 |
versionedfile_kwargs={ |
|
318 |
'create_parent_dir':True, |
|
319 |
'delay_create':True, |
|
320 |
'dir_mode':control_files._dir_mode, |
|
321 |
},
|
|
322 |
escaped=True) |
|
323 |
||
324 |
def initialize(self, a_bzrdir, shared=False): |
|
325 |
"""Create a knit format 1 repository. |
|
326 |
||
327 |
:param a_bzrdir: bzrdir to contain the new repository; must already
|
|
328 |
be initialized.
|
|
329 |
:param shared: If true the repository will be initialized as a shared
|
|
330 |
repository.
|
|
331 |
"""
|
|
332 |
mutter('creating repository in %s.', a_bzrdir.transport.base) |
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
333 |
dirs = ['knits'] |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
334 |
files = [] |
335 |
utf8_files = [('format', self.get_format_string())] |
|
336 |
||
337 |
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared) |
|
338 |
repo_transport = a_bzrdir.get_repository_transport(None) |
|
339 |
control_files = lockable_files.LockableFiles(repo_transport, |
|
340 |
'lock', lockdir.LockDir) |
|
341 |
control_store = self._get_control_store(repo_transport, control_files) |
|
342 |
transaction = transactions.WriteTransaction() |
|
343 |
# trigger a write of the inventory store.
|
|
344 |
control_store.get_weave_or_empty('inventory', transaction) |
|
345 |
_revision_store = self._get_revision_store(repo_transport, control_files) |
|
346 |
# the revision id here is irrelevant: it will not be stored, and cannot
|
|
347 |
# already exist.
|
|
348 |
_revision_store.has_revision_id('A', transaction) |
|
349 |
_revision_store.get_signature_file(transaction) |
|
350 |
return self.open(a_bzrdir=a_bzrdir, _found=True) |
|
351 |
||
352 |
def open(self, a_bzrdir, _found=False, _override_transport=None): |
|
353 |
"""See RepositoryFormat.open(). |
|
354 |
|
|
355 |
:param _override_transport: INTERNAL USE ONLY. Allows opening the
|
|
356 |
repository at a slightly different url
|
|
357 |
than normal. I.e. during 'upgrade'.
|
|
358 |
"""
|
|
359 |
if not _found: |
|
360 |
format = RepositoryFormat.find_format(a_bzrdir) |
|
361 |
assert format.__class__ == self.__class__ |
|
362 |
if _override_transport is not None: |
|
363 |
repo_transport = _override_transport |
|
364 |
else: |
|
365 |
repo_transport = a_bzrdir.get_repository_transport(None) |
|
366 |
control_files = lockable_files.LockableFiles(repo_transport, |
|
367 |
'lock', lockdir.LockDir) |
|
368 |
text_store = self._get_text_store(repo_transport, control_files) |
|
369 |
control_store = self._get_control_store(repo_transport, control_files) |
|
370 |
_revision_store = self._get_revision_store(repo_transport, control_files) |
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
371 |
return self.repository_class(_format=self, |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
372 |
a_bzrdir=a_bzrdir, |
373 |
control_files=control_files, |
|
374 |
_revision_store=_revision_store, |
|
375 |
control_store=control_store, |
|
376 |
text_store=text_store) |
|
377 |
||
378 |
||
379 |
class RepositoryFormatKnit1(RepositoryFormatKnit): |
|
380 |
"""Bzr repository knit format 1. |
|
381 |
||
382 |
This repository format has:
|
|
383 |
- knits for file texts and inventory
|
|
384 |
- hash subdirectory based stores.
|
|
385 |
- knits for revisions and signatures
|
|
386 |
- TextStores for revisions and signatures.
|
|
387 |
- a format marker of its own
|
|
388 |
- an optional 'shared-storage' flag
|
|
389 |
- an optional 'no-working-trees' flag
|
|
390 |
- a LockDir lock
|
|
391 |
||
392 |
This format was introduced in bzr 0.8.
|
|
393 |
"""
|
|
2241.1.11
by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format |
394 |
|
2857.2.1
by Robert Collins
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins) |
395 |
repository_class = KnitRepository |
396 |
||
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
397 |
def __ne__(self, other): |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
398 |
return self.__class__ is not other.__class__ |
399 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
400 |
def get_format_string(self): |
401 |
"""See RepositoryFormat.get_format_string().""" |
|
402 |
return "Bazaar-NG Knit Repository Format 1" |
|
403 |
||
404 |
def get_format_description(self): |
|
405 |
"""See RepositoryFormat.get_format_description().""" |
|
406 |
return "Knit repository format 1" |
|
407 |
||
408 |
def check_conversion_target(self, target_format): |
|
409 |
pass
|
|
410 |
||
411 |
||
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
412 |
class RepositoryFormatKnit3(RepositoryFormatKnit): |
413 |
"""Bzr repository knit format 2. |
|
414 |
||
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
415 |
This repository format has:
|
416 |
- knits for file texts and inventory
|
|
417 |
- hash subdirectory based stores.
|
|
418 |
- knits for revisions and signatures
|
|
419 |
- TextStores for revisions and signatures.
|
|
420 |
- a format marker of its own
|
|
421 |
- an optional 'shared-storage' flag
|
|
422 |
- an optional 'no-working-trees' flag
|
|
423 |
- a LockDir lock
|
|
424 |
- support for recording full info about the tree root
|
|
425 |
- support for recording tree-references
|
|
426 |
"""
|
|
427 |
||
428 |
repository_class = KnitRepository3 |
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
429 |
rich_root_data = True |
2323.5.16
by Martin Pool
rename support_tree_reference to supports_ |
430 |
supports_tree_reference = True |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
431 |
|
432 |
def _get_matching_bzrdir(self): |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
433 |
return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree') |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
434 |
|
435 |
def _ignore_setting_bzrdir(self, format): |
|
436 |
pass
|
|
437 |
||
438 |
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir) |
|
439 |
||
440 |
def check_conversion_target(self, target_format): |
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
441 |
if not target_format.rich_root_data: |
442 |
raise errors.BadConversionTarget( |
|
443 |
'Does not support rich root data.', target_format) |
|
2323.5.16
by Martin Pool
rename support_tree_reference to supports_ |
444 |
if not getattr(target_format, 'supports_tree_reference', False): |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
445 |
raise errors.BadConversionTarget( |
446 |
'Does not support nested trees', target_format) |
|
447 |
||
448 |
def get_format_string(self): |
|
449 |
"""See RepositoryFormat.get_format_string().""" |
|
2255.2.230
by Robert Collins
Update tree format signatures to mention introducing bzr version. |
450 |
return "Bazaar Knit Repository Format 3 (bzr 0.15)\n" |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
451 |
|
452 |
def get_format_description(self): |
|
453 |
"""See RepositoryFormat.get_format_description().""" |
|
454 |
return "Knit repository format 3" |
|
455 |
||
2670.3.5
by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead. |
456 |
|
457 |
def _get_stream_as_bytes(knit, required_versions): |
|
458 |
"""Generate a serialised data stream. |
|
459 |
||
460 |
The format is a bencoding of a list. The first element of the list is a
|
|
461 |
string of the format signature, then each subsequent element is a list
|
|
462 |
corresponding to a record. Those lists contain:
|
|
463 |
||
464 |
* a version id
|
|
465 |
* a list of options
|
|
466 |
* a list of parents
|
|
467 |
* the bytes
|
|
468 |
||
469 |
:returns: a bencoded list.
|
|
470 |
"""
|
|
471 |
knit_stream = knit.get_data_stream(required_versions) |
|
472 |
format_signature, data_list, callable = knit_stream |
|
473 |
data = [] |
|
474 |
data.append(format_signature) |
|
475 |
for version, options, length, parents in data_list: |
|
476 |
data.append([version, options, parents, callable(length)]) |
|
477 |
return bencode.bencode(data) |