4597.9.8
by Vincent Ladeuil
Merge bzr.dev into cleanup |
1 |
# Copyright (C) 2007-2010 Canonical Ltd
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
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
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
16 |
|
2592.3.24
by Robert Collins
Knit1 disk layout specified. |
17 |
from bzrlib.lazy_import import lazy_import |
18 |
lazy_import(globals(), """ |
|
5852.1.8
by Jelmer Vernooij
Simplify revision limiting. |
19 |
import itertools
|
20 |
||
2592.3.24
by Robert Collins
Knit1 disk layout specified. |
21 |
from bzrlib import (
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
22 |
bzrdir,
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
23 |
errors,
|
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
24 |
knit as _mod_knit,
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
25 |
lockable_files,
|
26 |
lockdir,
|
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
27 |
osutils,
|
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
28 |
revision as _mod_revision,
|
5184.1.1
by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk. |
29 |
trace,
|
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
30 |
transactions,
|
31 |
versionedfile,
|
|
32 |
xml5,
|
|
33 |
xml6,
|
|
34 |
xml7,
|
|
35 |
)
|
|
36 |
""") |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
37 |
from bzrlib.decorators import needs_read_lock, needs_write_lock |
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
38 |
from bzrlib.repository import ( |
5537.2.1
by Jelmer Vernooij
Move InterWeaveRepo and InterKnitRepo to related repository files. |
39 |
InterRepository, |
5199.1.1
by Andrew Bennetts
Allow repositories to support refresh_data during a write group. |
40 |
IsInWriteGroupError, |
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
41 |
RepositoryFormat, |
42 |
)
|
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
43 |
from bzrlib.vf_repository import ( |
5815.4.19
by Jelmer Vernooij
Fix test failures. |
44 |
InterSameDataRepository, |
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
45 |
MetaDirVersionedFileRepository, |
5815.4.5
by Jelmer Vernooij
Use MetaDirVersionedFileRepositoryFormat (a Soyuz worthy name). |
46 |
MetaDirVersionedFileRepositoryFormat, |
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
47 |
VersionedFileCommitBuilder, |
48 |
VersionedFileRootCommitBuilder, |
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
49 |
)
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
50 |
from bzrlib import symbol_versioning |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
51 |
|
52 |
||
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
53 |
class _KnitParentsProvider(object): |
54 |
||
55 |
def __init__(self, knit): |
|
56 |
self._knit = knit |
|
57 |
||
2490.2.28
by Aaron Bentley
Fix handling of null revision |
58 |
def __repr__(self): |
59 |
return 'KnitParentsProvider(%r)' % self._knit |
|
60 |
||
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
61 |
def get_parent_map(self, keys): |
4379.3.3
by Gary van der Merwe
Rename and add doc string for StackedParentsProvider. |
62 |
"""See graph.StackedParentsProvider.get_parent_map"""
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
63 |
parent_map = {} |
64 |
for revision_id in keys: |
|
3373.5.2
by John Arbash Meinel
Add repository_implementation tests for get_parent_map |
65 |
if revision_id is None: |
66 |
raise ValueError('get_parent_map(None) is not valid') |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
67 |
if revision_id == _mod_revision.NULL_REVISION: |
3146.1.2
by Aaron Bentley
ParentsProviders now provide tuples of parents, never lists |
68 |
parent_map[revision_id] = () |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
69 |
else: |
70 |
try: |
|
3146.1.2
by Aaron Bentley
ParentsProviders now provide tuples of parents, never lists |
71 |
parents = tuple( |
72 |
self._knit.get_parents_with_ghosts(revision_id)) |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
73 |
except errors.RevisionNotPresent: |
3146.1.1
by Aaron Bentley
Fix bad ghost handling in KnitParentsProvider |
74 |
continue
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
75 |
else: |
76 |
if len(parents) == 0: |
|
3146.1.2
by Aaron Bentley
ParentsProviders now provide tuples of parents, never lists |
77 |
parents = (_mod_revision.NULL_REVISION,) |
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
78 |
parent_map[revision_id] = parents |
79 |
return parent_map |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
80 |
|
81 |
||
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
82 |
class _KnitsParentsProvider(object): |
83 |
||
84 |
def __init__(self, knit, prefix=()): |
|
85 |
"""Create a parent provider for string keys mapped to tuple keys."""
|
|
86 |
self._knit = knit |
|
87 |
self._prefix = prefix |
|
88 |
||
89 |
def __repr__(self): |
|
90 |
return 'KnitsParentsProvider(%r)' % self._knit |
|
91 |
||
92 |
def get_parent_map(self, keys): |
|
4379.3.3
by Gary van der Merwe
Rename and add doc string for StackedParentsProvider. |
93 |
"""See graph.StackedParentsProvider.get_parent_map"""
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
94 |
parent_map = self._knit.get_parent_map( |
95 |
[self._prefix + (key,) for key in keys]) |
|
96 |
result = {} |
|
97 |
for key, parents in parent_map.items(): |
|
98 |
revid = key[-1] |
|
99 |
if len(parents) == 0: |
|
100 |
parents = (_mod_revision.NULL_REVISION,) |
|
101 |
else: |
|
102 |
parents = tuple(parent[-1] for parent in parents) |
|
103 |
result[revid] = parents |
|
104 |
for revision_id in keys: |
|
105 |
if revision_id == _mod_revision.NULL_REVISION: |
|
106 |
result[revision_id] = () |
|
107 |
return result |
|
108 |
||
109 |
||
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
110 |
class KnitRepository(MetaDirVersionedFileRepository): |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
111 |
"""Knit format repository."""
|
112 |
||
2889.1.2
by Robert Collins
Review feedback. |
113 |
# These attributes are inherited from the Repository base class. Setting
|
114 |
# them to None ensures that if the constructor is changed to not initialize
|
|
115 |
# them, or a subclass fails to call the constructor, that an error will
|
|
116 |
# 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 |
117 |
_commit_builder_class = None |
118 |
_serializer = None |
|
119 |
||
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
120 |
def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class, |
121 |
_serializer): |
|
5815.4.1
by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository. |
122 |
super(KnitRepository, self).__init__(_format, a_bzrdir, control_files) |
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
123 |
self._commit_builder_class = _commit_builder_class |
124 |
self._serializer = _serializer |
|
2745.6.16
by Aaron Bentley
Update from review |
125 |
self._reconcile_fixes_text_parents = True |
3830.3.6
by Martin Pool
Document _fetch_uses_delta and make it a class attribute |
126 |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
127 |
@needs_read_lock
|
128 |
def _all_revision_ids(self): |
|
129 |
"""See Repository.all_revision_ids()."""
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
130 |
return [key[0] for key in self.revisions.keys()] |
131 |
||
132 |
def _activate_new_inventory(self): |
|
133 |
"""Put a replacement inventory.new into use as inventories."""
|
|
134 |
# Copy the content across
|
|
135 |
t = self._transport |
|
136 |
t.copy('inventory.new.kndx', 'inventory.kndx') |
|
137 |
try: |
|
138 |
t.copy('inventory.new.knit', 'inventory.knit') |
|
139 |
except errors.NoSuchFile: |
|
140 |
# empty inventories knit
|
|
141 |
t.delete('inventory.knit') |
|
142 |
# delete the temp inventory
|
|
143 |
t.delete('inventory.new.kndx') |
|
144 |
try: |
|
145 |
t.delete('inventory.new.knit') |
|
146 |
except errors.NoSuchFile: |
|
147 |
# empty inventories knit
|
|
148 |
pass
|
|
149 |
# Force index reload (sanity check)
|
|
150 |
self.inventories._index._reset_cache() |
|
151 |
self.inventories.keys() |
|
152 |
||
153 |
def _backup_inventory(self): |
|
154 |
t = self._transport |
|
155 |
t.copy('inventory.kndx', 'inventory.backup.kndx') |
|
156 |
t.copy('inventory.knit', 'inventory.backup.knit') |
|
157 |
||
158 |
def _move_file_id(self, from_id, to_id): |
|
159 |
t = self._transport.clone('knits') |
|
160 |
from_rel_url = self.texts._index._mapper.map((from_id, None)) |
|
161 |
to_rel_url = self.texts._index._mapper.map((to_id, None)) |
|
162 |
# We expect both files to always exist in this case.
|
|
163 |
for suffix in ('.knit', '.kndx'): |
|
164 |
t.rename(from_rel_url + suffix, to_rel_url + suffix) |
|
165 |
||
166 |
def _remove_file_id(self, file_id): |
|
167 |
t = self._transport.clone('knits') |
|
168 |
rel_url = self.texts._index._mapper.map((file_id, None)) |
|
169 |
for suffix in ('.kndx', '.knit'): |
|
170 |
try: |
|
171 |
t.delete(rel_url + suffix) |
|
172 |
except errors.NoSuchFile: |
|
173 |
pass
|
|
174 |
||
175 |
def _temp_inventories(self): |
|
176 |
result = self._format._get_inventories(self._transport, self, |
|
177 |
'inventory.new') |
|
178 |
# Reconciling when the output has no revisions would result in no
|
|
179 |
# writes - but we want to ensure there is an inventory for
|
|
180 |
# compatibility with older clients that don't lazy-load.
|
|
181 |
result.get_parent_map([('A',)]) |
|
182 |
return result |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
183 |
|
184 |
@needs_read_lock
|
|
185 |
def get_revision(self, revision_id): |
|
186 |
"""Return the Revision object for a named revision"""
|
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
187 |
revision_id = osutils.safe_revision_id(revision_id) |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
188 |
return self.get_revision_reconcile(revision_id) |
189 |
||
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
190 |
def _refresh_data(self): |
191 |
if not self.is_locked(): |
|
192 |
return
|
|
5199.1.1
by Andrew Bennetts
Allow repositories to support refresh_data during a write group. |
193 |
if self.is_in_write_group(): |
194 |
raise IsInWriteGroupError(self) |
|
4145.1.2
by Robert Collins
Add a refresh_data method on Repository allowing cleaner handling of insertions into RemoteRepository objects with _real_repository instances. |
195 |
# Create a new transaction to force all knits to see the scope change.
|
196 |
# This is safe because we're outside a write group.
|
|
197 |
self.control_files._finish_transaction() |
|
198 |
if self.is_write_locked(): |
|
199 |
self.control_files._set_write_transaction() |
|
200 |
else: |
|
201 |
self.control_files._set_read_transaction() |
|
202 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
203 |
@needs_write_lock
|
204 |
def reconcile(self, other=None, thorough=False): |
|
205 |
"""Reconcile this repository."""
|
|
206 |
from bzrlib.reconcile import KnitReconciler |
|
207 |
reconciler = KnitReconciler(self, thorough=thorough) |
|
208 |
reconciler.reconcile() |
|
209 |
return reconciler |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
210 |
|
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
211 |
def _make_parents_provider(self): |
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
212 |
return _KnitsParentsProvider(self.revisions) |
2490.2.13
by Aaron Bentley
Update distinct -> lowest, refactor, add ParentsProvider concept |
213 |
|
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
214 |
|
5815.4.5
by Jelmer Vernooij
Use MetaDirVersionedFileRepositoryFormat (a Soyuz worthy name). |
215 |
class RepositoryFormatKnit(MetaDirVersionedFileRepositoryFormat): |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
216 |
"""Bzr repository knit format (generalized).
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
217 |
|
218 |
This repository format has:
|
|
219 |
- knits for file texts and inventory
|
|
220 |
- hash subdirectory based stores.
|
|
221 |
- knits for revisions and signatures
|
|
222 |
- TextStores for revisions and signatures.
|
|
223 |
- a format marker of its own
|
|
224 |
- an optional 'shared-storage' flag
|
|
225 |
- an optional 'no-working-trees' flag
|
|
226 |
- a LockDir lock
|
|
227 |
"""
|
|
228 |
||
2857.2.2
by Robert Collins
Review feedback. |
229 |
# Set this attribute in derived classes to control the repository class
|
230 |
# created by open and initialize.
|
|
231 |
repository_class = None |
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
232 |
# Set this attribute in derived classes to control the
|
233 |
# _commit_builder_class that the repository objects will have passed to
|
|
234 |
# their constructor.
|
|
235 |
_commit_builder_class = None |
|
236 |
# Set this attribute in derived clases to control the _serializer that the
|
|
237 |
# repository objects will have passed to their constructor.
|
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
238 |
@property
|
239 |
def _serializer(self): |
|
240 |
return xml5.serializer_v5 |
|
2949.1.2
by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph. |
241 |
# Knit based repositories handle ghosts reasonably well.
|
242 |
supports_ghosts = True |
|
3221.3.1
by Robert Collins
* Repository formats have a new supported-feature attribute |
243 |
# External lookups are not supported in this format.
|
244 |
supports_external_lookups = False |
|
4246.2.1
by Ian Clatworthy
supports_chks flag on repo formats & log tuning |
245 |
# No CHK support.
|
246 |
supports_chks = False |
|
4053.1.4
by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat. |
247 |
_fetch_order = 'topological' |
248 |
_fetch_uses_deltas = True |
|
4183.5.1
by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation. |
249 |
fast_deltas = False |
5684.2.1
by Jelmer Vernooij
Add bzrlib.tests.per_repository_vf. |
250 |
supports_funky_characters = True |
5766.1.1
by Jelmer Vernooij
Make revision-graph-can-have-wrong-parents a repository format attribute rather than a repository method. |
251 |
# The revision.kndx could potentially claim a revision has a different
|
252 |
# parent to the revision text.
|
|
253 |
revision_graph_can_have_wrong_parents = True |
|
2857.2.2
by Robert Collins
Review feedback. |
254 |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
255 |
def _get_inventories(self, repo_transport, repo, name='inventory'): |
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
256 |
mapper = versionedfile.ConstantMapper(name) |
257 |
index = _mod_knit._KndxIndex(repo_transport, mapper, |
|
258 |
repo.get_transaction, repo.is_write_locked, repo.is_locked) |
|
259 |
access = _mod_knit._KnitKeyAccess(repo_transport, mapper) |
|
260 |
return _mod_knit.KnitVersionedFiles(index, access, annotated=False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
261 |
|
262 |
def _get_revisions(self, repo_transport, repo): |
|
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
263 |
mapper = versionedfile.ConstantMapper('revisions') |
264 |
index = _mod_knit._KndxIndex(repo_transport, mapper, |
|
265 |
repo.get_transaction, repo.is_write_locked, repo.is_locked) |
|
266 |
access = _mod_knit._KnitKeyAccess(repo_transport, mapper) |
|
267 |
return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=0, |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
268 |
annotated=False) |
269 |
||
270 |
def _get_signatures(self, repo_transport, repo): |
|
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
271 |
mapper = versionedfile.ConstantMapper('signatures') |
272 |
index = _mod_knit._KndxIndex(repo_transport, mapper, |
|
273 |
repo.get_transaction, repo.is_write_locked, repo.is_locked) |
|
274 |
access = _mod_knit._KnitKeyAccess(repo_transport, mapper) |
|
275 |
return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=0, |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
276 |
annotated=False) |
277 |
||
278 |
def _get_texts(self, repo_transport, repo): |
|
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
279 |
mapper = versionedfile.HashEscapedPrefixMapper() |
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
280 |
base_transport = repo_transport.clone('knits') |
3224.5.26
by Andrew Bennetts
More minor import tidying suggested by pyflakes. |
281 |
index = _mod_knit._KndxIndex(base_transport, mapper, |
282 |
repo.get_transaction, repo.is_write_locked, repo.is_locked) |
|
283 |
access = _mod_knit._KnitKeyAccess(base_transport, mapper) |
|
284 |
return _mod_knit.KnitVersionedFiles(index, access, max_delta_chain=200, |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
285 |
annotated=True) |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
286 |
|
287 |
def initialize(self, a_bzrdir, shared=False): |
|
288 |
"""Create a knit format 1 repository.
|
|
289 |
||
290 |
:param a_bzrdir: bzrdir to contain the new repository; must already
|
|
291 |
be initialized.
|
|
292 |
:param shared: If true the repository will be initialized as a shared
|
|
293 |
repository.
|
|
294 |
"""
|
|
5184.1.1
by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk. |
295 |
trace.mutter('creating repository in %s.', a_bzrdir.transport.base) |
2592.3.60
by Robert Collins
Nuke per-fileid indices for a single unified index. |
296 |
dirs = ['knits'] |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
297 |
files = [] |
298 |
utf8_files = [('format', self.get_format_string())] |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
299 |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
300 |
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared) |
301 |
repo_transport = a_bzrdir.get_repository_transport(None) |
|
302 |
control_files = lockable_files.LockableFiles(repo_transport, |
|
303 |
'lock', lockdir.LockDir) |
|
304 |
transaction = transactions.WriteTransaction() |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
305 |
result = self.open(a_bzrdir=a_bzrdir, _found=True) |
306 |
result.lock_write() |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
307 |
# the revision id here is irrelevant: it will not be stored, and cannot
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
308 |
# already exist, we do this to create files on disk for older clients.
|
309 |
result.inventories.get_parent_map([('A',)]) |
|
310 |
result.revisions.get_parent_map([('A',)]) |
|
311 |
result.signatures.get_parent_map([('A',)]) |
|
312 |
result.unlock() |
|
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
313 |
self._run_post_repo_init_hooks(result, a_bzrdir, shared) |
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
314 |
return result |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
315 |
|
316 |
def open(self, a_bzrdir, _found=False, _override_transport=None): |
|
317 |
"""See RepositoryFormat.open().
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
318 |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
319 |
:param _override_transport: INTERNAL USE ONLY. Allows opening the
|
320 |
repository at a slightly different url
|
|
321 |
than normal. I.e. during 'upgrade'.
|
|
322 |
"""
|
|
323 |
if not _found: |
|
324 |
format = RepositoryFormat.find_format(a_bzrdir) |
|
325 |
if _override_transport is not None: |
|
326 |
repo_transport = _override_transport |
|
327 |
else: |
|
328 |
repo_transport = a_bzrdir.get_repository_transport(None) |
|
329 |
control_files = lockable_files.LockableFiles(repo_transport, |
|
330 |
'lock', lockdir.LockDir) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
331 |
repo = self.repository_class(_format=self, |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
332 |
a_bzrdir=a_bzrdir, |
333 |
control_files=control_files, |
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
334 |
_commit_builder_class=self._commit_builder_class, |
335 |
_serializer=self._serializer) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
336 |
repo.revisions = self._get_revisions(repo_transport, repo) |
337 |
repo.signatures = self._get_signatures(repo_transport, repo) |
|
338 |
repo.inventories = self._get_inventories(repo_transport, repo) |
|
339 |
repo.texts = self._get_texts(repo_transport, repo) |
|
4246.2.1
by Ian Clatworthy
supports_chks flag on repo formats & log tuning |
340 |
repo.chk_bytes = None |
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
341 |
repo._transport = repo_transport |
342 |
return repo |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
343 |
|
344 |
||
345 |
class RepositoryFormatKnit1(RepositoryFormatKnit): |
|
346 |
"""Bzr repository knit format 1.
|
|
347 |
||
348 |
This repository format has:
|
|
349 |
- knits for file texts and inventory
|
|
350 |
- hash subdirectory based stores.
|
|
351 |
- knits for revisions and signatures
|
|
352 |
- TextStores for revisions and signatures.
|
|
353 |
- a format marker of its own
|
|
354 |
- an optional 'shared-storage' flag
|
|
355 |
- an optional 'no-working-trees' flag
|
|
356 |
- a LockDir lock
|
|
357 |
||
358 |
This format was introduced in bzr 0.8.
|
|
359 |
"""
|
|
2241.1.11
by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format |
360 |
|
2592.3.22
by Robert Collins
Add new experimental repository formats. |
361 |
repository_class = KnitRepository |
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
362 |
_commit_builder_class = VersionedFileCommitBuilder |
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
363 |
@property
|
364 |
def _serializer(self): |
|
365 |
return xml5.serializer_v5 |
|
2592.3.22
by Robert Collins
Add new experimental repository formats. |
366 |
|
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
367 |
def __ne__(self, other): |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
368 |
return self.__class__ is not other.__class__ |
369 |
||
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
370 |
def get_format_string(self): |
371 |
"""See RepositoryFormat.get_format_string()."""
|
|
372 |
return "Bazaar-NG Knit Repository Format 1" |
|
373 |
||
374 |
def get_format_description(self): |
|
375 |
"""See RepositoryFormat.get_format_description()."""
|
|
376 |
return "Knit repository format 1" |
|
377 |
||
378 |
||
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
379 |
class RepositoryFormatKnit3(RepositoryFormatKnit): |
2996.2.5
by Aaron Bentley
Correct docstring |
380 |
"""Bzr repository knit format 3.
|
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
381 |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
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 |
- support for recording full info about the tree root
|
|
392 |
- support for recording tree-references
|
|
393 |
"""
|
|
394 |
||
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
395 |
repository_class = KnitRepository |
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
396 |
_commit_builder_class = VersionedFileRootCommitBuilder |
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
397 |
rich_root_data = True |
4988.9.1
by Jelmer Vernooij
Add experimental flag to RepositoryFormat. |
398 |
experimental = True |
2323.5.16
by Martin Pool
rename support_tree_reference to supports_ |
399 |
supports_tree_reference = True |
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
400 |
@property
|
401 |
def _serializer(self): |
|
402 |
return xml7.serializer_v7 |
|
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
403 |
|
404 |
def _get_matching_bzrdir(self): |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
405 |
return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree') |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
406 |
|
407 |
def _ignore_setting_bzrdir(self, format): |
|
408 |
pass
|
|
409 |
||
410 |
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir) |
|
411 |
||
412 |
def get_format_string(self): |
|
413 |
"""See RepositoryFormat.get_format_string()."""
|
|
2255.2.230
by Robert Collins
Update tree format signatures to mention introducing bzr version. |
414 |
return "Bazaar Knit Repository Format 3 (bzr 0.15)\n" |
2100.3.31
by Aaron Bentley
Merged bzr.dev (17 tests failing) |
415 |
|
416 |
def get_format_description(self): |
|
417 |
"""See RepositoryFormat.get_format_description()."""
|
|
418 |
return "Knit repository format 3" |
|
419 |
||
2535.3.53
by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead. |
420 |
|
2996.2.1
by Aaron Bentley
Add KnitRepositoryFormat4 |
421 |
class RepositoryFormatKnit4(RepositoryFormatKnit): |
422 |
"""Bzr repository knit format 4.
|
|
423 |
||
424 |
This repository format has everything in format 3, except for
|
|
425 |
tree-references:
|
|
426 |
- knits for file texts and inventory
|
|
427 |
- hash subdirectory based stores.
|
|
428 |
- knits for revisions and signatures
|
|
429 |
- TextStores for revisions and signatures.
|
|
430 |
- a format marker of its own
|
|
431 |
- an optional 'shared-storage' flag
|
|
432 |
- an optional 'no-working-trees' flag
|
|
433 |
- a LockDir lock
|
|
434 |
- support for recording full info about the tree root
|
|
435 |
"""
|
|
436 |
||
437 |
repository_class = KnitRepository |
|
5815.4.2
by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder. |
438 |
_commit_builder_class = VersionedFileRootCommitBuilder |
2996.2.1
by Aaron Bentley
Add KnitRepositoryFormat4 |
439 |
rich_root_data = True |
440 |
supports_tree_reference = False |
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
441 |
@property
|
442 |
def _serializer(self): |
|
443 |
return xml6.serializer_v6 |
|
2996.2.1
by Aaron Bentley
Add KnitRepositoryFormat4 |
444 |
|
445 |
def _get_matching_bzrdir(self): |
|
446 |
return bzrdir.format_registry.make_bzrdir('rich-root') |
|
447 |
||
448 |
def _ignore_setting_bzrdir(self, format): |
|
449 |
pass
|
|
450 |
||
451 |
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir) |
|
452 |
||
453 |
def get_format_string(self): |
|
454 |
"""See RepositoryFormat.get_format_string()."""
|
|
455 |
return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n' |
|
456 |
||
457 |
def get_format_description(self): |
|
458 |
"""See RepositoryFormat.get_format_description()."""
|
|
459 |
return "Knit repository format 4" |
|
5537.2.1
by Jelmer Vernooij
Move InterWeaveRepo and InterKnitRepo to related repository files. |
460 |
|
461 |
||
462 |
class InterKnitRepo(InterSameDataRepository): |
|
463 |
"""Optimised code paths between Knit based repositories."""
|
|
464 |
||
465 |
@classmethod
|
|
466 |
def _get_repo_format_to_test(self): |
|
467 |
return RepositoryFormatKnit1() |
|
468 |
||
469 |
@staticmethod
|
|
470 |
def is_compatible(source, target): |
|
471 |
"""Be compatible with known Knit formats.
|
|
472 |
||
473 |
We don't test for the stores being of specific types because that
|
|
474 |
could lead to confusing results, and there is no need to be
|
|
475 |
overly general.
|
|
476 |
"""
|
|
477 |
try: |
|
478 |
are_knits = (isinstance(source._format, RepositoryFormatKnit) and |
|
479 |
isinstance(target._format, RepositoryFormatKnit)) |
|
480 |
except AttributeError: |
|
481 |
return False |
|
482 |
return are_knits and InterRepository._same_model(source, target) |
|
483 |
||
484 |
@needs_read_lock
|
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
485 |
def search_missing_revision_ids(self, |
486 |
revision_id=symbol_versioning.DEPRECATED_PARAMETER, |
|
5852.1.6
by Jelmer Vernooij
Add extra test for Repository.search_missing_revision_ids. |
487 |
find_ghosts=True, revision_ids=None, if_present_ids=None, |
488 |
limit=None): |
|
5536.2.6
by Andrew Bennetts
Fix docstring typo. |
489 |
"""See InterRepository.search_missing_revision_ids()."""
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
490 |
if symbol_versioning.deprecated_passed(revision_id): |
491 |
symbol_versioning.warn( |
|
492 |
'search_missing_revision_ids(revision_id=...) was '
|
|
5536.3.3
by Andrew Bennetts
Merge lp:bzr. |
493 |
'deprecated in 2.4. Use revision_ids=[...] instead.', |
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
494 |
DeprecationWarning, stacklevel=2) |
495 |
if revision_ids is not None: |
|
496 |
raise AssertionError( |
|
497 |
'revision_ids is mutually exclusive with revision_id') |
|
498 |
if revision_id is not None: |
|
499 |
revision_ids = [revision_id] |
|
500 |
del revision_id |
|
5535.3.32
by Andrew Bennetts
Implement if_present_ids behaviour in all implementations and code paths of searching_missing_revision_ids |
501 |
source_ids_set = self._present_source_revisions_for( |
502 |
revision_ids, if_present_ids) |
|
5537.2.1
by Jelmer Vernooij
Move InterWeaveRepo and InterKnitRepo to related repository files. |
503 |
# source_ids is the worst possible case we may need to pull.
|
504 |
# now we want to filter source_ids against what we actually
|
|
505 |
# have in target, but don't try to check for existence where we know
|
|
506 |
# we do not have a revision as that would be pointless.
|
|
507 |
target_ids = set(self.target.all_revision_ids()) |
|
508 |
possibly_present_revisions = target_ids.intersection(source_ids_set) |
|
509 |
actually_present_revisions = set( |
|
510 |
self.target._eliminate_revisions_not_present(possibly_present_revisions)) |
|
511 |
required_revisions = source_ids_set.difference(actually_present_revisions) |
|
5539.2.10
by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids. |
512 |
if revision_ids is not None: |
5537.2.1
by Jelmer Vernooij
Move InterWeaveRepo and InterKnitRepo to related repository files. |
513 |
# we used get_ancestry to determine source_ids then we are assured all
|
514 |
# revisions referenced are present as they are installed in topological order.
|
|
515 |
# and the tip revision was validated by get_ancestry.
|
|
516 |
result_set = required_revisions |
|
517 |
else: |
|
518 |
# if we just grabbed the possibly available ids, then
|
|
519 |
# we only have an estimate of whats available and need to validate
|
|
520 |
# that against the revision records.
|
|
521 |
result_set = set( |
|
522 |
self.source._eliminate_revisions_not_present(required_revisions)) |
|
5852.1.6
by Jelmer Vernooij
Add extra test for Repository.search_missing_revision_ids. |
523 |
if limit is not None: |
5852.1.8
by Jelmer Vernooij
Simplify revision limiting. |
524 |
topo_ordered = self.source.get_graph().iter_topo_order(result_set) |
525 |
result_set = set(itertools.islice(topo_ordered, limit)) |
|
5537.2.1
by Jelmer Vernooij
Move InterWeaveRepo and InterKnitRepo to related repository files. |
526 |
return self.source.revision_ids_to_search_result(result_set) |
527 |
||
528 |
||
529 |
InterRepository.register_optimiser(InterKnitRepo) |