« back to all changes in this revision
Viewing changes to bzrlib/repository.py
- browse files at revision 1534.11.4
- compare with another revision
- compare with revision 3458
- download diff
- download tarball
- view history from revision 1534.11.4
- Committer: Robert Collins
- Date: 2006-04-28 11:01:38 UTC
- mfrom: (1687 +trunk)
- mto: (1704.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 1706.
- Revision ID: robertc@robertcollins.net-20060428110138-0e69ecb765434f9d
Merge from mainline.
- files added:
- bzrlib/inter.py
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/transport/http
- files removed:
- bzrlib/_changeset.py
- patches
- files renamed:
- bzrlib/store/weave.py => bzrlib/store/versioned/__init__.py
- bzrlib/tests/test_uncommit.py => bzrlib/tests/blackbox/test_uncommit.py
- bzrlib/tests/test_basis_inventory.py => bzrlib/tests/workingtree_implementations/test_basis_inventory.py
- bzrlib/transport/http.py => bzrlib/transport/http/__init__.py
- files modified:
- BRANCH.TODO
added
removed
bzrlib/repository.py
1
# Copyright (C) 2005 Canonical Ltd
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
from copy import deepcopy
18
18
from cStringIO import StringIO
19
19
from unittest import TestSuite
20
import xml.sax.saxutils
21
22
20
23
21
import bzrlib.bzrdir as bzrdir
24
22
from bzrlib.decorators import needs_read_lock, needs_write_lock
25
23
import bzrlib.errors as errors
26
24
from bzrlib.errors import InvalidRevisionId
27
from bzrlib.lockable_files import LockableFiles
25
import bzrlib.gpg as gpg
26
from bzrlib.graph import Graph
27
from bzrlib.inter import InterObject
28
from bzrlib.knit import KnitVersionedFile, KnitPlainFactory
29
from bzrlib.lockable_files import LockableFiles, TransportLock
30
from bzrlib.lockdir import LockDir
28
31
from bzrlib.osutils import safe_unicode
29
32
from bzrlib.revision import NULL_REVISION
30
from bzrlib.store import copy_all
31
from bzrlib.store.weave import WeaveStore
33
from bzrlib.store.versioned import VersionedFileStore, WeaveStore
32
34
from bzrlib.store.text import TextStore
33
35
from bzrlib.symbol_versioning import *
34
from bzrlib.trace import mutter
36
from bzrlib.trace import mutter, note
35
37
from bzrlib.tree import RevisionTree
38
from bzrlib.tsort import topo_sort
36
39
from bzrlib.testament import Testament
37
40
from bzrlib.tree import EmptyTree
41
import bzrlib.ui
42
from bzrlib.weave import WeaveFile
38
43
import bzrlib.xml5
39
44
40
45
50
55
remote) disk.
51
56
"""
52
57
58
@needs_write_lock
59
def add_inventory(self, revid, inv, parents):
60
"""Add the inventory inv to the repository as revid.
61
62
:param parents: The revision ids of the parents that revid
63
is known to have and are in the repository already.
64
65
returns the sha1 of the serialized inventory.
66
"""
67
inv_text = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
68
inv_sha1 = bzrlib.osutils.sha_string(inv_text)
69
inv_vf = self.control_weaves.get_weave('inventory',
70
self.get_transaction())
71
inv_vf.add_lines(revid, parents, bzrlib.osutils.split_lines(inv_text))
72
return inv_sha1
73
74
@needs_write_lock
75
def add_revision(self, rev_id, rev, inv=None, config=None):
76
"""Add rev to the revision store as rev_id.
77
78
:param rev_id: the revision id to use.
79
:param rev: The revision object.
80
:param inv: The inventory for the revision. if None, it will be looked
81
up in the inventory storer
82
:param config: If None no digital signature will be created.
83
If supplied its signature_needed method will be used
84
to determine if a signature should be made.
85
"""
86
if config is not None and config.signature_needed():
87
if inv is None:
88
inv = self.get_inventory(rev_id)
89
plaintext = Testament(rev, inv).as_short_text()
90
self.store_revision_signature(
91
gpg.GPGStrategy(config), plaintext, rev_id)
92
if not rev_id in self.get_inventory_weave():
93
if inv is None:
94
raise errors.WeaveRevisionNotPresent(rev_id,
95
self.get_inventory_weave())
96
else:
97
# yes, this is not suitable for adding with ghosts.
98
self.add_inventory(rev_id, inv, rev.parent_ids)
99
self._revision_store.add_revision(rev, self.get_transaction())
100
53
101
@needs_read_lock
54
102
def _all_possible_ids(self):
55
103
"""Return all the possible revisions that we could find."""
56
return self.get_inventory_weave().names()
104
return self.get_inventory_weave().versions()
57
105
58
106
@needs_read_lock
59
107
def all_revision_ids(self):
63
111
present: for weaves ghosts may lead to a lack of correctness until
64
112
the reweave updates the parents list.
65
113
"""
114
if self._revision_store.text_store.listable():
115
return self._revision_store.all_revision_ids(self.get_transaction())
66
116
result = self._all_possible_ids()
67
117
return self._eliminate_revisions_not_present(result)
68
118
83
133
"""Construct the current default format repository in a_bzrdir."""
84
134
return RepositoryFormat.get_default_format().initialize(a_bzrdir)
85
135
86
def __init__(self, transport, branch_format, _format=None, a_bzrdir=None):
87
object.__init__(self)
88
if transport is not None:
89
warn("Repository.__init__(..., transport=XXX): The transport parameter is "
90
"deprecated and was never in a supported release. Please use "
91
"bzrdir.open_repository() or bzrdir.open_branch().repository.",
92
DeprecationWarning,
93
stacklevel=2)
94
self.control_files = LockableFiles(transport.clone(bzrlib.BZRDIR), 'README')
95
else:
96
# TODO: clone into repository if needed
97
self.control_files = LockableFiles(a_bzrdir.get_repository_transport(None), 'README')
98
99
dir_mode = self.control_files._dir_mode
100
file_mode = self.control_files._file_mode
136
def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
137
"""instantiate a Repository.
138
139
:param _format: The format of the repository on disk.
140
:param a_bzrdir: The BzrDir of the repository.
141
142
In the future we will have a single api for all stores for
143
getting file texts, inventories and revisions, then
144
this construct will accept instances of those things.
145
"""
146
super(Repository, self).__init__()
101
147
self._format = _format
148
# the following are part of the public API for Repository:
102
149
self.bzrdir = a_bzrdir
103
104
def get_weave(name, prefixed=False):
105
if name:
106
name = safe_unicode(name)
107
else:
108
name = ''
109
relpath = self.control_files._escape(name)
110
weave_transport = self.control_files._transport.clone(relpath)
111
ws = WeaveStore(weave_transport, prefixed=prefixed,
112
dir_mode=dir_mode,
113
file_mode=file_mode)
114
if self.control_files._transport.should_cache():
115
ws.enable_cache = True
116
return ws
117
118
119
def get_store(name, compressed=True, prefixed=False):
120
# FIXME: This approach of assuming stores are all entirely compressed
121
# or entirely uncompressed is tidy, but breaks upgrade from
122
# some existing branches where there's a mixture; we probably
123
# still want the option to look for both.
124
if name:
125
name = safe_unicode(name)
126
else:
127
name = ''
128
relpath = self.control_files._escape(name)
129
store = TextStore(self.control_files._transport.clone(relpath),
130
prefixed=prefixed, compressed=compressed,
131
dir_mode=dir_mode,
132
file_mode=file_mode)
133
#if self._transport.should_cache():
134
# cache_path = os.path.join(self.cache_root, name)
135
# os.mkdir(cache_path)
136
# store = bzrlib.store.CachedStore(store, cache_path)
137
return store
138
139
if branch_format is not None:
140
# circular dependencies:
141
from bzrlib.branch import (BzrBranchFormat4,
142
BzrBranchFormat5,
143
BzrBranchFormat6,
144
)
145
if isinstance(branch_format, BzrBranchFormat4):
146
self._format = RepositoryFormat4()
147
elif isinstance(branch_format, BzrBranchFormat5):
148
self._format = RepositoryFormat5()
149
elif isinstance(branch_format, BzrBranchFormat6):
150
self._format = RepositoryFormat6()
151
152
153
if isinstance(self._format, RepositoryFormat4):
154
self.inventory_store = get_store('inventory-store')
155
self.text_store = get_store('text-store')
156
self.revision_store = get_store('revision-store')
157
elif isinstance(self._format, RepositoryFormat5):
158
self.control_weaves = get_weave('')
159
self.weave_store = get_weave('weaves')
160
self.revision_store = get_store('revision-store', compressed=False)
161
elif isinstance(self._format, RepositoryFormat6):
162
self.control_weaves = get_weave('')
163
self.weave_store = get_weave('weaves', prefixed=True)
164
self.revision_store = get_store('revision-store', compressed=False,
165
prefixed=True)
166
elif isinstance(self._format, RepositoryFormat7):
167
self.control_weaves = get_weave('')
168
self.weave_store = get_weave('weaves', prefixed=True)
169
self.revision_store = get_store('revision-store', compressed=False,
170
prefixed=True)
171
self.revision_store.register_suffix('sig')
150
self.control_files = control_files
151
self._revision_store = _revision_store
152
self.text_store = text_store
153
# backwards compatability
154
self.weave_store = text_store
155
# not right yet - should be more semantically clear ?
156
#
157
self.control_store = control_store
158
self.control_weaves = control_store
159
# TODO: make sure to construct the right store classes, etc, depending
160
# on whether escaping is required.
172
161
173
162
def lock_write(self):
174
163
self.control_files.lock_write()
176
165
def lock_read(self):
177
166
self.control_files.lock_read()
178
167
168
def is_locked(self):
169
return self.control_files.is_locked()
170
179
171
@needs_read_lock
180
172
def missing_revision_ids(self, other, revision_id=None):
181
173
"""Return the revision ids that other has that this does not.
184
176
185
177
revision_id: only return revision ids included by revision_id.
186
178
"""
187
if self._compatible_formats(other):
188
# fast path for weave-inventory based stores.
189
# we want all revisions to satisft revision_id in other.
190
# but we dont want to stat every file here and there.
191
# we want then, all revisions other needs to satisfy revision_id
192
# checked, but not those that we have locally.
193
# so the first thing is to get a subset of the revisions to
194
# satisfy revision_id in other, and then eliminate those that
195
# we do already have.
196
# this is slow on high latency connection to self, but as as this
197
# disk format scales terribly for push anyway due to rewriting
198
# inventory.weave, this is considered acceptable.
199
# - RBC 20060209
200
if revision_id is not None:
201
other_ids = other.get_ancestry(revision_id)
202
assert other_ids.pop(0) == None
203
else:
204
other_ids = other._all_possible_ids()
205
other_ids_set = set(other_ids)
206
# other ids is the worst case to pull now.
207
# now we want to filter other_ids against what we actually
208
# have, but dont try to stat what we know we dont.
209
my_ids = set(self._all_possible_ids())
210
possibly_present_revisions = my_ids.intersection(other_ids_set)
211
actually_present_revisions = set(self._eliminate_revisions_not_present(possibly_present_revisions))
212
required_revisions = other_ids_set.difference(actually_present_revisions)
213
required_topo_revisions = [rev_id for rev_id in other_ids if rev_id in required_revisions]
214
if revision_id is not None:
215
# we used get_ancestry to determine other_ids then we are assured all
216
# revisions referenced are present as they are installed in topological order.
217
return required_topo_revisions
218
else:
219
# we only have an estimate of whats available
220
return other._eliminate_revisions_not_present(required_topo_revisions)
221
# slow code path.
222
my_ids = set(self.all_revision_ids())
223
if revision_id is not None:
224
other_ids = other.get_ancestry(revision_id)
225
assert other_ids.pop(0) == None
226
else:
227
other_ids = other.all_revision_ids()
228
result_set = set(other_ids).difference(my_ids)
229
return [rev_id for rev_id in other_ids if rev_id in result_set]
179
return InterRepository.get(other, self).missing_revision_ids(revision_id)
230
180
231
181
@staticmethod
232
182
def open(base):
235
185
For instance, if the repository is at URL/.bzr/repository,
236
186
Repository.open(URL) -> a Repository instance.
237
187
"""
238
control = bzrdir.BzrDir.open(base)
188
control = bzrlib.bzrdir.BzrDir.open(base)
239
189
return control.open_repository()
240
190
241
def _compatible_formats(self, other):
242
"""Return True if the stores in self and other are 'compatible'
243
244
'compatible' means that they are both the same underlying type
245
i.e. both weave stores, or both knits and thus support fast-path
246
operations."""
247
return (isinstance(self._format, (RepositoryFormat5,
248
RepositoryFormat6,
249
RepositoryFormat7)) and
250
isinstance(other._format, (RepositoryFormat5,
251
RepositoryFormat6,
252
RepositoryFormat7)))
253
254
@needs_read_lock
255
191
def copy_content_into(self, destination, revision_id=None, basis=None):
256
"""Make a complete copy of the content in self into destination."""
257
destination.lock_write()
258
try:
259
# optimised paths:
260
# compatible stores
261
if self._compatible_formats(destination):
262
if basis is not None:
263
# copy the basis in, then fetch remaining data.
264
basis.copy_content_into(destination, revision_id)
265
destination.fetch(self, revision_id=revision_id)
266
else:
267
# FIXME do not peek!
268
if self.control_files._transport.listable():
269
destination.control_weaves.copy_multi(self.control_weaves,
270
['inventory'])
271
copy_all(self.weave_store, destination.weave_store)
272
copy_all(self.revision_store, destination.revision_store)
273
else:
274
destination.fetch(self, revision_id=revision_id)
275
# compatible v4 stores
276
elif isinstance(self._format, RepositoryFormat4):
277
if not isinstance(destination._format, RepositoryFormat4):
278
raise BzrError('cannot copy v4 branches to anything other than v4 branches.')
279
store_pairs = ((self.text_store, destination.text_store),
280
(self.inventory_store, destination.inventory_store),
281
(self.revision_store, destination.revision_store))
282
try:
283
for from_store, to_store in store_pairs:
284
copy_all(from_store, to_store)
285
except UnlistableStore:
286
raise UnlistableBranch(from_store)
287
# fallback - 'fetch'
288
else:
289
destination.fetch(self, revision_id=revision_id)
290
finally:
291
destination.unlock()
192
"""Make a complete copy of the content in self into destination.
193
194
This is a destructive operation! Do not use it on existing
195
repositories.
196
"""
197
return InterRepository.get(self, destination).copy_content(revision_id, basis)
292
198
293
@needs_write_lock
294
def fetch(self, source, revision_id=None):
199
def fetch(self, source, revision_id=None, pb=None):
295
200
"""Fetch the content required to construct revision_id from source.
296
201
297
202
If revision_id is None all content is copied.
298
203
"""
299
from bzrlib.fetch import RepoFetcher
300
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
301
source, source._format, self, self._format)
302
RepoFetcher(to_repository=self, from_repository=source, last_revision=revision_id)
204
return InterRepository.get(source, self).fetch(revision_id=revision_id,
205
pb=pb)
303
206
304
207
def unlock(self):
305
208
self.control_files.unlock()
316
219
result = a_bzrdir.create_repository()
317
220
# FIXME RBC 20060209 split out the repository type to avoid this check ?
318
221
elif isinstance(a_bzrdir._format,
319
(bzrdir.BzrDirFormat4,
320
bzrdir.BzrDirFormat5,
321
bzrdir.BzrDirFormat6)):
222
(bzrlib.bzrdir.BzrDirFormat4,
223
bzrlib.bzrdir.BzrDirFormat5,
224
bzrlib.bzrdir.BzrDirFormat6)):
322
225
result = a_bzrdir.open_repository()
323
226
else:
324
result = self._format.initialize(a_bzrdir)
227
result = self._format.initialize(a_bzrdir, shared=self.is_shared())
325
228
self.copy_content_into(result, revision_id, basis)
326
229
return result
327
230
231
@needs_read_lock
328
232
def has_revision(self, revision_id):
329
"""True if this branch has a copy of the revision.
330
331
This does not necessarily imply the revision is merge
332
or on the mainline."""
333
return (revision_id is None
334
or self.revision_store.has_id(revision_id))
233
"""True if this repository has a copy of the revision."""
234
return self._revision_store.has_revision_id(revision_id,
235
self.get_transaction())
335
236
336
237
@needs_read_lock
337
def get_revision_xml_file(self, revision_id):
338
"""Return XML file object for revision object."""
238
def get_revision_reconcile(self, revision_id):
239
"""'reconcile' helper routine that allows access to a revision always.
240
241
This variant of get_revision does not cross check the weave graph
242
against the revision one as get_revision does: but it should only
243
be used by reconcile, or reconcile-alike commands that are correcting
244
or testing the revision graph.
245
"""
339
246
if not revision_id or not isinstance(revision_id, basestring):
340
247
raise InvalidRevisionId(revision_id=revision_id, branch=self)
341
try:
342
return self.revision_store.get(revision_id)
343
except (IndexError, KeyError):
344
raise bzrlib.errors.NoSuchRevision(self, revision_id)
248
return self._revision_store.get_revision(revision_id,
249
self.get_transaction())
345
250
346
251
@needs_read_lock
347
252
def get_revision_xml(self, revision_id):
348
return self.get_revision_xml_file(revision_id).read()
253
rev = self.get_revision(revision_id)
254
rev_tmp = StringIO()
255
# the current serializer..
256
self._revision_store._serializer.write_revision(rev, rev_tmp)
257
rev_tmp.seek(0)
258
return rev_tmp.getvalue()
349
259
350
260
@needs_read_lock
351
261
def get_revision(self, revision_id):
352
262
"""Return the Revision object for a named revision"""
353
xml_file = self.get_revision_xml_file(revision_id)
354
355
try:
356
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
357
except SyntaxError, e:
358
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
359
[revision_id,
360
str(e)])
361
362
assert r.revision_id == revision_id
263
r = self.get_revision_reconcile(revision_id)
264
# weave corruption can lead to absent revision markers that should be
265
# present.
266
# the following test is reasonably cheap (it needs a single weave read)
267
# and the weave is cached in read transactions. In write transactions
268
# it is not cached but typically we only read a small number of
269
# revisions. For knits when they are introduced we will probably want
270
# to ensure that caching write transactions are in use.
271
inv = self.get_inventory_weave()
272
self._check_revision_parents(r, inv)
363
273
return r
364
274
365
@needs_read_lock
366
def get_revision_sha1(self, revision_id):
367
"""Hash the stored value of a revision, and return it."""
368
# In the future, revision entries will be signed. At that
369
# point, it is probably best *not* to include the signature
370
# in the revision hash. Because that lets you re-sign
371
# the revision, (add signatures/remove signatures) and still
372
# have all hash pointers stay consistent.
373
# But for now, just hash the contents.
374
return bzrlib.osutils.sha_file(self.get_revision_xml_file(revision_id))
275
def _check_revision_parents(self, revision, inventory):
276
"""Private to Repository and Fetch.
277
278
This checks the parentage of revision in an inventory weave for
279
consistency and is only applicable to inventory-weave-for-ancestry
280
using repository formats & fetchers.
281
"""
282
weave_parents = inventory.get_parents(revision.revision_id)
283
weave_names = inventory.versions()
284
for parent_id in revision.parent_ids:
285
if parent_id in weave_names:
286
# this parent must not be a ghost.
287
if not parent_id in weave_parents:
288
# but it is a ghost
289
raise errors.CorruptRepository(self)
375
290
376
291
@needs_write_lock
377
292
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
378
self.revision_store.add(StringIO(gpg_strategy.sign(plaintext)),
379
revision_id, "sig")
293
signature = gpg_strategy.sign(plaintext)
294
self._revision_store.add_revision_signature_text(revision_id,
295
signature,
296
self.get_transaction())
380
297
381
298
def fileid_involved_between_revs(self, from_revid, to_revid):
382
299
"""Find file_id(s) which are involved in the changes between revisions.
384
301
This determines the set of revisions which are involved, and then
385
302
finds all file ids affected by those revisions.
386
303
"""
387
# TODO: jam 20060119 This code assumes that w.inclusions will
388
# always be correct. But because of the presence of ghosts
389
# it is possible to be wrong.
390
# One specific example from Robert Collins:
391
# Two branches, with revisions ABC, and AD
392
# C is a ghost merge of D.
393
# Inclusions doesn't recognize D as an ancestor.
394
# If D is ever merged in the future, the weave
395
# won't be fixed, because AD never saw revision C
396
# to cause a conflict which would force a reweave.
397
304
w = self.get_inventory_weave()
398
from_set = set(w.inclusions([w.lookup(from_revid)]))
399
to_set = set(w.inclusions([w.lookup(to_revid)]))
400
included = to_set.difference(from_set)
401
changed = map(w.idx_to_name, included)
305
from_set = set(w.get_ancestry(from_revid))
306
to_set = set(w.get_ancestry(to_revid))
307
changed = to_set.difference(from_set)
402
308
return self._fileid_involved_by_set(changed)
403
309
404
310
def fileid_involved(self, last_revid=None):
408
314
"""
409
315
w = self.get_inventory_weave()
410
316
if not last_revid:
411
changed = set(w._names)
317
changed = set(w.versions())
412
318
else:
413
included = w.inclusions([w.lookup(last_revid)])
414
changed = map(w.idx_to_name, included)
319
changed = set(w.get_ancestry(last_revid))
415
320
return self._fileid_involved_by_set(changed)
416
321
417
322
def fileid_involved_by_set(self, changes):
440
345
"""
441
346
assert isinstance(self._format, (RepositoryFormat5,
442
347
RepositoryFormat6,
443
RepositoryFormat7)), \
348
RepositoryFormat7,
349
RepositoryFormatKnit1)), \
444
350
"fileid_involved only supported for branches which store inventory as unnested xml"
445
351
446
352
w = self.get_inventory_weave()
447
353
file_ids = set()
448
for line in w._weave:
449
450
# it is ugly, but it is due to the weave structure
451
if not isinstance(line, basestring): continue
452
354
355
# this code needs to read every line in every inventory for the
356
# inventories [changes]. Seeing a line twice is ok. Seeing a line
357
# not pesent in one of those inventories is unnecessary and not
358
# harmful because we are filtering by the revision id marker in the
359
# inventory lines to only select file ids altered in one of those
360
# revisions. We dont need to see all lines in the inventory because
361
# only those added in an inventory in rev X can contain a revision=X
362
# line.
363
for line in w.iter_lines_added_or_present_in_versions(changes):
453
364
start = line.find('file_id="')+9
454
365
if start < 9: continue
455
366
end = line.find('"', start)
456
367
assert end>= 0
457
file_id = xml.sax.saxutils.unescape(line[start:end])
368
file_id = _unescape_xml(line[start:end])
458
369
459
370
# check if file_id is already present
460
371
if file_id in file_ids: continue
463
374
if start < 10: continue
464
375
end = line.find('"', start)
465
376
assert end>= 0
466
revision_id = xml.sax.saxutils.unescape(line[start:end])
467
377
revision_id = _unescape_xml(line[start:end])
468
378
if revision_id in changes:
469
379
file_ids.add(file_id)
470
380
return file_ids
486
396
try:
487
397
assert isinstance(revision_id, basestring), type(revision_id)
488
398
iw = self.get_inventory_weave()
489
return iw.get_text(iw.lookup(revision_id))
399
return iw.get_text(revision_id)
490
400
except IndexError:
491
401
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
492
402
497
407
return self.get_revision(revision_id).inventory_sha1
498
408
499
409
@needs_read_lock
410
def get_revision_graph(self, revision_id=None):
411
"""Return a dictionary containing the revision graph.
412
413
:return: a dictionary of revision_id->revision_parents_list.
414
"""
415
weave = self.get_inventory_weave()
416
all_revisions = self._eliminate_revisions_not_present(weave.versions())
417
entire_graph = dict([(node, weave.get_parents(node)) for
418
node in all_revisions])
419
if revision_id is None:
420
return entire_graph
421
elif revision_id not in entire_graph:
422
raise errors.NoSuchRevision(self, revision_id)
423
else:
424
# add what can be reached from revision_id
425
result = {}
426
pending = set([revision_id])
427
while len(pending) > 0:
428
node = pending.pop()
429
result[node] = entire_graph[node]
430
for revision_id in result[node]:
431
if revision_id not in result:
432
pending.add(revision_id)
433
return result
434
435
@needs_read_lock
436
def get_revision_graph_with_ghosts(self, revision_ids=None):
437
"""Return a graph of the revisions with ghosts marked as applicable.
438
439
:param revision_ids: an iterable of revisions to graph or None for all.
440
:return: a Graph object with the graph reachable from revision_ids.
441
"""
442
result = Graph()
443
if not revision_ids:
444
pending = set(self.all_revision_ids())
445
required = set([])
446
else:
447
pending = set(revision_ids)
448
required = set(revision_ids)
449
done = set([])
450
while len(pending):
451
revision_id = pending.pop()
452
try:
453
rev = self.get_revision(revision_id)
454
except errors.NoSuchRevision:
455
if revision_id in required:
456
raise
457
# a ghost
458
result.add_ghost(revision_id)
459
continue
460
for parent_id in rev.parent_ids:
461
# is this queued or done ?
462
if (parent_id not in pending and
463
parent_id not in done):
464
# no, queue it.
465
pending.add(parent_id)
466
result.add_node(revision_id, rev.parent_ids)
467
done.add(revision_id)
468
return result
469
470
@needs_read_lock
500
471
def get_revision_inventory(self, revision_id):
501
472
"""Return inventory of a past revision."""
502
473
# TODO: Unify this with get_inventory()
513
484
return self.get_inventory(revision_id)
514
485
515
486
@needs_read_lock
487
def is_shared(self):
488
"""Return True if this repository is flagged as a shared repository."""
489
raise NotImplementedError(self.is_shared)
490
491
@needs_write_lock
492
def reconcile(self):
493
"""Reconcile this repository."""
494
from bzrlib.reconcile import RepoReconciler
495
reconciler = RepoReconciler(self)
496
reconciler.reconcile()
497
return reconciler
498
499
@needs_read_lock
516
500
def revision_tree(self, revision_id):
517
501
"""Return Tree for a revision on this branch.
518
502
537
521
if not self.has_revision(revision_id):
538
522
raise errors.NoSuchRevision(self, revision_id)
539
523
w = self.get_inventory_weave()
540
return [None] + map(w.idx_to_name,
541
w.inclusions([w.lookup(revision_id)]))
524
candidates = w.get_ancestry(revision_id)
525
return [None] + candidates # self._eliminate_revisions_not_present(candidates)
542
526
543
527
@needs_read_lock
544
528
def print_file(self, file, revision_id):
568
552
def get_transaction(self):
569
553
return self.control_files.get_transaction()
570
554
555
def revision_parents(self, revid):
556
return self.get_inventory_weave().parent_names(revid)
557
558
@needs_write_lock
559
def set_make_working_trees(self, new_value):
560
"""Set the policy flag for making working trees when creating branches.
561
562
This only applies to branches that use this repository.
563
564
The default is 'True'.
565
:param new_value: True to restore the default, False to disable making
566
working trees.
567
"""
568
raise NotImplementedError(self.set_make_working_trees)
569
570
def make_working_trees(self):
571
"""Returns the policy for making working trees on new branches."""
572
raise NotImplementedError(self.make_working_trees)
573
571
574
@needs_write_lock
572
575
def sign_revision(self, revision_id, gpg_strategy):
573
576
plaintext = Testament.from_revision(self, revision_id).as_short_text()
574
577
self.store_revision_signature(gpg_strategy, plaintext, revision_id)
575
578
579
@needs_read_lock
580
def has_signature_for_revision_id(self, revision_id):
581
"""Query for a revision signature for revision_id in the repository."""
582
return self._revision_store.has_signature(revision_id,
583
self.get_transaction())
584
585
@needs_read_lock
586
def get_signature_text(self, revision_id):
587
"""Return the text for a signature."""
588
return self._revision_store.get_signature_text(revision_id,
589
self.get_transaction())
590
591
592
class AllInOneRepository(Repository):
593
"""Legacy support - the repository behaviour for all-in-one branches."""
594
595
def __init__(self, _format, a_bzrdir, _revision_store, control_store, text_store):
596
# we reuse one control files instance.
597
dir_mode = a_bzrdir._control_files._dir_mode
598
file_mode = a_bzrdir._control_files._file_mode
599
600
def get_store(name, compressed=True, prefixed=False):
601
# FIXME: This approach of assuming stores are all entirely compressed
602
# or entirely uncompressed is tidy, but breaks upgrade from
603
# some existing branches where there's a mixture; we probably
604
# still want the option to look for both.
605
relpath = a_bzrdir._control_files._escape(name)
606
store = TextStore(a_bzrdir._control_files._transport.clone(relpath),
607
prefixed=prefixed, compressed=compressed,
608
dir_mode=dir_mode,
609
file_mode=file_mode)
610
#if self._transport.should_cache():
611
# cache_path = os.path.join(self.cache_root, name)
612
# os.mkdir(cache_path)
613
# store = bzrlib.store.CachedStore(store, cache_path)
614
return store
615
616
# not broken out yet because the controlweaves|inventory_store
617
# and text_store | weave_store bits are still different.
618
if isinstance(_format, RepositoryFormat4):
619
# cannot remove these - there is still no consistent api
620
# which allows access to this old info.
621
self.inventory_store = get_store('inventory-store')
622
text_store = get_store('text-store')
623
super(AllInOneRepository, self).__init__(_format, a_bzrdir, a_bzrdir._control_files, _revision_store, control_store, text_store)
624
625
@needs_read_lock
626
def is_shared(self):
627
"""AllInOne repositories cannot be shared."""
628
return False
629
630
@needs_write_lock
631
def set_make_working_trees(self, new_value):
632
"""Set the policy flag for making working trees when creating branches.
633
634
This only applies to branches that use this repository.
635
636
The default is 'True'.
637
:param new_value: True to restore the default, False to disable making
638
working trees.
639
"""
640
raise NotImplementedError(self.set_make_working_trees)
641
642
def make_working_trees(self):
643
"""Returns the policy for making working trees on new branches."""
644
return True
645
646
647
class MetaDirRepository(Repository):
648
"""Repositories in the new meta-dir layout."""
649
650
def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
651
super(MetaDirRepository, self).__init__(_format,
652
a_bzrdir,
653
control_files,
654
_revision_store,
655
control_store,
656
text_store)
657
658
dir_mode = self.control_files._dir_mode
659
file_mode = self.control_files._file_mode
660
661
@needs_read_lock
662
def is_shared(self):
663
"""Return True if this repository is flagged as a shared repository."""
664
return self.control_files._transport.has('shared-storage')
665
666
@needs_write_lock
667
def set_make_working_trees(self, new_value):
668
"""Set the policy flag for making working trees when creating branches.
669
670
This only applies to branches that use this repository.
671
672
The default is 'True'.
673
:param new_value: True to restore the default, False to disable making
674
working trees.
675
"""
676
if new_value:
677
try:
678
self.control_files._transport.delete('no-working-trees')
679
except errors.NoSuchFile:
680
pass
681
else:
682
self.control_files.put_utf8('no-working-trees', '')
683
684
def make_working_trees(self):
685
"""Returns the policy for making working trees on new branches."""
686
return not self.control_files._transport.has('no-working-trees')
687
688
689
class KnitRepository(MetaDirRepository):
690
"""Knit format repository."""
691
692
@needs_read_lock
693
def all_revision_ids(self):
694
"""See Repository.all_revision_ids()."""
695
return self._revision_store.all_revision_ids(self.get_transaction())
696
697
def fileid_involved_between_revs(self, from_revid, to_revid):
698
"""Find file_id(s) which are involved in the changes between revisions.
699
700
This determines the set of revisions which are involved, and then
701
finds all file ids affected by those revisions.
702
"""
703
vf = self._get_revision_vf()
704
from_set = set(vf.get_ancestry(from_revid))
705
to_set = set(vf.get_ancestry(to_revid))
706
changed = to_set.difference(from_set)
707
return self._fileid_involved_by_set(changed)
708
709
def fileid_involved(self, last_revid=None):
710
"""Find all file_ids modified in the ancestry of last_revid.
711
712
:param last_revid: If None, last_revision() will be used.
713
"""
714
if not last_revid:
715
changed = set(self.all_revision_ids())
716
else:
717
changed = set(self.get_ancestry(last_revid))
718
if None in changed:
719
changed.remove(None)
720
return self._fileid_involved_by_set(changed)
721
722
@needs_read_lock
723
def get_ancestry(self, revision_id):
724
"""Return a list of revision-ids integrated by a revision.
725
726
This is topologically sorted.
727
"""
728
if revision_id is None:
729
return [None]
730
vf = self._get_revision_vf()
731
try:
732
return [None] + vf.get_ancestry(revision_id)
733
except errors.RevisionNotPresent:
734
raise errors.NoSuchRevision(self, revision_id)
735
736
@needs_read_lock
737
def get_revision(self, revision_id):
738
"""Return the Revision object for a named revision"""
739
return self.get_revision_reconcile(revision_id)
740
741
@needs_read_lock
742
def get_revision_graph(self, revision_id=None):
743
"""Return a dictionary containing the revision graph.
744
745
:return: a dictionary of revision_id->revision_parents_list.
746
"""
747
weave = self._get_revision_vf()
748
entire_graph = weave.get_graph()
749
if revision_id is None:
750
return weave.get_graph()
751
elif revision_id not in weave:
752
raise errors.NoSuchRevision(self, revision_id)
753
else:
754
# add what can be reached from revision_id
755
result = {}
756
pending = set([revision_id])
757
while len(pending) > 0:
758
node = pending.pop()
759
result[node] = weave.get_parents(node)
760
for revision_id in result[node]:
761
if revision_id not in result:
762
pending.add(revision_id)
763
return result
764
765
@needs_read_lock
766
def get_revision_graph_with_ghosts(self, revision_ids=None):
767
"""Return a graph of the revisions with ghosts marked as applicable.
768
769
:param revision_ids: an iterable of revisions to graph or None for all.
770
:return: a Graph object with the graph reachable from revision_ids.
771
"""
772
result = Graph()
773
vf = self._get_revision_vf()
774
versions = set(vf.versions())
775
if not revision_ids:
776
pending = set(self.all_revision_ids())
777
required = set([])
778
else:
779
pending = set(revision_ids)
780
required = set(revision_ids)
781
done = set([])
782
while len(pending):
783
revision_id = pending.pop()
784
if not revision_id in versions:
785
if revision_id in required:
786
raise errors.NoSuchRevision(self, revision_id)
787
# a ghost
788
result.add_ghost(revision_id)
789
# mark it as done so we dont try for it again.
790
done.add(revision_id)
791
continue
792
parent_ids = vf.get_parents_with_ghosts(revision_id)
793
for parent_id in parent_ids:
794
# is this queued or done ?
795
if (parent_id not in pending and
796
parent_id not in done):
797
# no, queue it.
798
pending.add(parent_id)
799
result.add_node(revision_id, parent_ids)
800
done.add(revision_id)
801
return result
802
803
def _get_revision_vf(self):
804
""":return: a versioned file containing the revisions."""
805
vf = self._revision_store.get_revision_file(self.get_transaction())
806
return vf
807
808
@needs_write_lock
809
def reconcile(self):
810
"""Reconcile this repository."""
811
from bzrlib.reconcile import KnitReconciler
812
reconciler = KnitReconciler(self)
813
reconciler.reconcile()
814
return reconciler
815
816
def revision_parents(self, revid):
817
return self._get_revision_vf().get_parents(rev_id)
576
818
577
819
class RepositoryFormat(object):
578
820
"""A repository format.
616
858
except KeyError:
617
859
raise errors.UnknownFormatError(format_string)
618
860
861
def _get_control_store(self, repo_transport, control_files):
862
"""Return the control store for this repository."""
863
raise NotImplementedError(self._get_control_store)
864
619
865
@classmethod
620
866
def get_default_format(klass):
621
867
"""Return the current default format."""
629
875
"""
630
876
raise NotImplementedError(self.get_format_string)
631
877
632
def initialize(self, a_bzrdir, _internal=False):
633
"""Create a weave repository.
634
635
TODO: when creating split out bzr branch formats, move this to a common
636
base for Format5, Format6. or something like that.
637
"""
638
from bzrlib.weavefile import write_weave_v5
639
from bzrlib.weave import Weave
640
641
if not _internal:
642
# always initialized when the bzrdir is.
643
return Repository(None, branch_format=None, _format=self, a_bzrdir=a_bzrdir)
644
645
# Create an empty weave
646
sio = StringIO()
647
bzrlib.weavefile.write_weave_v5(Weave(), sio)
648
empty_weave = sio.getvalue()
649
650
mutter('creating repository in %s.', a_bzrdir.transport.base)
651
dirs = ['revision-store', 'weaves']
652
lock_file = 'branch-lock'
653
files = [('inventory.weave', StringIO(empty_weave)),
654
]
655
656
# FIXME: RBC 20060125 dont peek under the covers
657
# NB: no need to escape relative paths that are url safe.
658
control_files = LockableFiles(a_bzrdir.transport, 'branch-lock')
659
control_files.lock_write()
660
control_files._transport.mkdir_multi(dirs,
661
mode=control_files._dir_mode)
662
try:
663
for file, content in files:
664
control_files.put(file, content)
665
finally:
666
control_files.unlock()
667
return Repository(None, branch_format=None, _format=self, a_bzrdir=a_bzrdir)
878
def get_format_description(self):
879
"""Return the short desciption for this format."""
880
raise NotImplementedError(self.get_format_description)
881
882
def _get_revision_store(self, repo_transport, control_files):
883
"""Return the revision store object for this a_bzrdir."""
884
raise NotImplementedError(self._get_revision_store)
885
886
def _get_text_rev_store(self,
887
transport,
888
control_files,
889
name,
890
compressed=True,
891
prefixed=False,
892
serializer=None):
893
"""Common logic for getting a revision store for a repository.
894
895
see self._get_revision_store for the subclass-overridable method to
896
get the store for a repository.
897
"""
898
from bzrlib.store.revision.text import TextRevisionStore
899
dir_mode = control_files._dir_mode
900
file_mode = control_files._file_mode
901
text_store =TextStore(transport.clone(name),
902
prefixed=prefixed,
903
compressed=compressed,
904
dir_mode=dir_mode,
905
file_mode=file_mode)
906
_revision_store = TextRevisionStore(text_store, serializer)
907
return _revision_store
908
909
def _get_versioned_file_store(self,
910
name,
911
transport,
912
control_files,
913
prefixed=True,
914
versionedfile_class=WeaveFile,
915
escaped=False):
916
weave_transport = control_files._transport.clone(name)
917
dir_mode = control_files._dir_mode
918
file_mode = control_files._file_mode
919
return VersionedFileStore(weave_transport, prefixed=prefixed,
920
dir_mode=dir_mode,
921
file_mode=file_mode,
922
versionedfile_class=versionedfile_class,
923
escaped=escaped)
924
925
def initialize(self, a_bzrdir, shared=False):
926
"""Initialize a repository of this format in a_bzrdir.
927
928
:param a_bzrdir: The bzrdir to put the new repository in it.
929
:param shared: The repository should be initialized as a sharable one.
930
931
This may raise UninitializableFormat if shared repository are not
932
compatible the a_bzrdir.
933
"""
668
934
669
935
def is_supported(self):
670
936
"""Is this format supported?
680
946
681
947
_found is a private parameter, do not use it.
682
948
"""
683
if not _found:
684
# we are being called directly and must probe.
685
raise NotImplementedError
686
return Repository(None, branch_format=None, _format=self, a_bzrdir=a_bzrdir)
949
raise NotImplementedError(self.open)
687
950
688
951
@classmethod
689
952
def register_format(klass, format):
699
962
del klass._formats[format.get_format_string()]
700
963
701
964
702
class RepositoryFormat4(RepositoryFormat):
965
class PreSplitOutRepositoryFormat(RepositoryFormat):
966
"""Base class for the pre split out repository formats."""
967
968
def initialize(self, a_bzrdir, shared=False, _internal=False):
969
"""Create a weave repository.
970
971
TODO: when creating split out bzr branch formats, move this to a common
972
base for Format5, Format6. or something like that.
973
"""
974
from bzrlib.weavefile import write_weave_v5
975
from bzrlib.weave import Weave
976
977
if shared:
978
raise errors.IncompatibleFormat(self, a_bzrdir._format)
979
980
if not _internal:
981
# always initialized when the bzrdir is.
982
return self.open(a_bzrdir, _found=True)
983
984
# Create an empty weave
985
sio = StringIO()
986
bzrlib.weavefile.write_weave_v5(Weave(), sio)
987
empty_weave = sio.getvalue()
988
989
mutter('creating repository in %s.', a_bzrdir.transport.base)
990
dirs = ['revision-store', 'weaves']
991
files = [('inventory.weave', StringIO(empty_weave)),
992
]
993
994
# FIXME: RBC 20060125 dont peek under the covers
995
# NB: no need to escape relative paths that are url safe.
996
control_files = LockableFiles(a_bzrdir.transport, 'branch-lock',
997
TransportLock)
998
control_files.create_lock()
999
control_files.lock_write()
1000
control_files._transport.mkdir_multi(dirs,
1001
mode=control_files._dir_mode)
1002
try:
1003
for file, content in files:
1004
control_files.put(file, content)
1005
finally:
1006
control_files.unlock()
1007
return self.open(a_bzrdir, _found=True)
1008
1009
def _get_control_store(self, repo_transport, control_files):
1010
"""Return the control store for this repository."""
1011
return self._get_versioned_file_store('',
1012
repo_transport,
1013
control_files,
1014
prefixed=False)
1015
1016
def _get_text_store(self, transport, control_files):
1017
"""Get a store for file texts for this format."""
1018
raise NotImplementedError(self._get_text_store)
1019
1020
def open(self, a_bzrdir, _found=False):
1021
"""See RepositoryFormat.open()."""
1022
if not _found:
1023
# we are being called directly and must probe.
1024
raise NotImplementedError
1025
1026
repo_transport = a_bzrdir.get_repository_transport(None)
1027
control_files = a_bzrdir._control_files
1028
text_store = self._get_text_store(repo_transport, control_files)
1029
control_store = self._get_control_store(repo_transport, control_files)
1030
_revision_store = self._get_revision_store(repo_transport, control_files)
1031
return AllInOneRepository(_format=self,
1032
a_bzrdir=a_bzrdir,
1033
_revision_store=_revision_store,
1034
control_store=control_store,
1035
text_store=text_store)
1036
1037
1038
class RepositoryFormat4(PreSplitOutRepositoryFormat):
703
1039
"""Bzr repository format 4.
704
1040
705
1041
This repository format has:
713
1049
714
1050
def __init__(self):
715
1051
super(RepositoryFormat4, self).__init__()
716
self._matchingbzrdir = bzrdir.BzrDirFormat4()
717
718
def initialize(self, url, _internal=False):
1052
self._matchingbzrdir = bzrlib.bzrdir.BzrDirFormat4()
1053
1054
def get_format_description(self):
1055
"""See RepositoryFormat.get_format_description()."""
1056
return "Repository format 4"
1057
1058
def initialize(self, url, shared=False, _internal=False):
719
1059
"""Format 4 branches cannot be created."""
720
1060
raise errors.UninitializableFormat(self)
721
1061
728
1068
"""
729
1069
return False
730
1070
731
732
class RepositoryFormat5(RepositoryFormat):
1071
def _get_control_store(self, repo_transport, control_files):
1072
"""Format 4 repositories have no formal control store at this point.
1073
1074
This will cause any control-file-needing apis to fail - this is desired.
1075
"""
1076
return None
1077
1078
def _get_revision_store(self, repo_transport, control_files):
1079
"""See RepositoryFormat._get_revision_store()."""
1080
from bzrlib.xml4 import serializer_v4
1081
return self._get_text_rev_store(repo_transport,
1082
control_files,
1083
'revision-store',
1084
serializer=serializer_v4)
1085
1086
def _get_text_store(self, transport, control_files):
1087
"""See RepositoryFormat._get_text_store()."""
1088
1089
1090
class RepositoryFormat5(PreSplitOutRepositoryFormat):
733
1091
"""Bzr control format 5.
734
1092
735
1093
This repository format has:
740
1098
741
1099
def __init__(self):
742
1100
super(RepositoryFormat5, self).__init__()
743
self._matchingbzrdir = bzrdir.BzrDirFormat5()
744
745
746
class RepositoryFormat6(RepositoryFormat):
1101
self._matchingbzrdir = bzrlib.bzrdir.BzrDirFormat5()
1102
1103
def get_format_description(self):
1104
"""See RepositoryFormat.get_format_description()."""
1105
return "Weave repository format 5"
1106
1107
def _get_revision_store(self, repo_transport, control_files):
1108
"""See RepositoryFormat._get_revision_store()."""
1109
"""Return the revision store object for this a_bzrdir."""
1110
return self._get_text_rev_store(repo_transport,
1111
control_files,
1112
'revision-store',
1113
compressed=False)
1114
1115
def _get_text_store(self, transport, control_files):
1116
"""See RepositoryFormat._get_text_store()."""
1117
return self._get_versioned_file_store('weaves', transport, control_files, prefixed=False)
1118
1119
1120
class RepositoryFormat6(PreSplitOutRepositoryFormat):
747
1121
"""Bzr control format 6.
748
1122
749
1123
This repository format has:
754
1128
755
1129
def __init__(self):
756
1130
super(RepositoryFormat6, self).__init__()
757
self._matchingbzrdir = bzrdir.BzrDirFormat6()
758
759
760
class RepositoryFormat7(RepositoryFormat):
761
"""Bzr repository 7.
762
763
This repository format has:
764
- weaves for file texts and inventory
765
- hash subdirectory based stores.
766
- TextStores for revisions and signatures.
767
- a format marker of its own
768
"""
769
770
def get_format_string(self):
771
"""See RepositoryFormat.get_format_string()."""
772
return "Bazaar-NG Repository format 7"
773
774
def initialize(self, a_bzrdir):
775
"""Create a weave repository.
776
"""
777
from bzrlib.weavefile import write_weave_v5
778
from bzrlib.weave import Weave
779
780
# Create an empty weave
781
sio = StringIO()
782
bzrlib.weavefile.write_weave_v5(Weave(), sio)
783
empty_weave = sio.getvalue()
784
785
mutter('creating repository in %s.', a_bzrdir.transport.base)
786
dirs = ['revision-store', 'weaves']
787
files = [('inventory.weave', StringIO(empty_weave)),
788
]
789
utf8_files = [('format', self.get_format_string())]
790
1131
self._matchingbzrdir = bzrlib.bzrdir.BzrDirFormat6()
1132
1133
def get_format_description(self):
1134
"""See RepositoryFormat.get_format_description()."""
1135
return "Weave repository format 6"
1136
1137
def _get_revision_store(self, repo_transport, control_files):
1138
"""See RepositoryFormat._get_revision_store()."""
1139
return self._get_text_rev_store(repo_transport,
1140
control_files,
1141
'revision-store',
1142
compressed=False,
1143
prefixed=True)
1144
1145
def _get_text_store(self, transport, control_files):
1146
"""See RepositoryFormat._get_text_store()."""
1147
return self._get_versioned_file_store('weaves', transport, control_files)
1148
1149
1150
class MetaDirRepositoryFormat(RepositoryFormat):
1151
"""Common base class for the new repositories using the metadir layour."""
1152
1153
def __init__(self):
1154
super(MetaDirRepositoryFormat, self).__init__()
1155
self._matchingbzrdir = bzrlib.bzrdir.BzrDirMetaFormat1()
1156
1157
def _create_control_files(self, a_bzrdir):
1158
"""Create the required files and the initial control_files object."""
791
1159
# FIXME: RBC 20060125 dont peek under the covers
792
1160
# NB: no need to escape relative paths that are url safe.
793
lock_file = 'lock'
794
1161
repository_transport = a_bzrdir.get_repository_transport(self)
795
repository_transport.put(lock_file, StringIO()) # TODO get the file mode from the bzrdir lock files., mode=file_mode)
796
control_files = LockableFiles(repository_transport, 'lock')
1162
control_files = LockableFiles(repository_transport, 'lock', LockDir)
1163
control_files.create_lock()
1164
return control_files
1165
1166
def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared):
1167
"""Upload the initial blank content."""
1168
control_files = self._create_control_files(a_bzrdir)
797
1169
control_files.lock_write()
798
control_files._transport.mkdir_multi(dirs,
799
mode=control_files._dir_mode)
800
1170
try:
1171
control_files._transport.mkdir_multi(dirs,
1172
mode=control_files._dir_mode)
801
1173
for file, content in files:
802
1174
control_files.put(file, content)
803
1175
for file, content in utf8_files:
804
1176
control_files.put_utf8(file, content)
1177
if shared == True:
1178
control_files.put_utf8('shared-storage', '')
805
1179
finally:
806
1180
control_files.unlock()
807
return Repository(None, branch_format=None, _format=self, a_bzrdir=a_bzrdir)
808
809
def __init__(self):
810
super(RepositoryFormat7, self).__init__()
811
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1181
1182
1183
class RepositoryFormat7(MetaDirRepositoryFormat):
1184
"""Bzr repository 7.
1185
1186
This repository format has:
1187
- weaves for file texts and inventory
1188
- hash subdirectory based stores.
1189
- TextStores for revisions and signatures.
1190
- a format marker of its own
1191
- an optional 'shared-storage' flag
1192
- an optional 'no-working-trees' flag
1193
"""
1194
1195
def _get_control_store(self, repo_transport, control_files):
1196
"""Return the control store for this repository."""
1197
return self._get_versioned_file_store('',
1198
repo_transport,
1199
control_files,
1200
prefixed=False)
1201
1202
def get_format_string(self):
1203
"""See RepositoryFormat.get_format_string()."""
1204
return "Bazaar-NG Repository format 7"
1205
1206
def get_format_description(self):
1207
"""See RepositoryFormat.get_format_description()."""
1208
return "Weave repository format 7"
1209
1210
def _get_revision_store(self, repo_transport, control_files):
1211
"""See RepositoryFormat._get_revision_store()."""
1212
return self._get_text_rev_store(repo_transport,
1213
control_files,
1214
'revision-store',
1215
compressed=False,
1216
prefixed=True,
1217
)
1218
1219
def _get_text_store(self, transport, control_files):
1220
"""See RepositoryFormat._get_text_store()."""
1221
return self._get_versioned_file_store('weaves',
1222
transport,
1223
control_files)
1224
1225
def initialize(self, a_bzrdir, shared=False):
1226
"""Create a weave repository.
1227
1228
:param shared: If true the repository will be initialized as a shared
1229
repository.
1230
"""
1231
from bzrlib.weavefile import write_weave_v5
1232
from bzrlib.weave import Weave
1233
1234
# Create an empty weave
1235
sio = StringIO()
1236
bzrlib.weavefile.write_weave_v5(Weave(), sio)
1237
empty_weave = sio.getvalue()
1238
1239
mutter('creating repository in %s.', a_bzrdir.transport.base)
1240
dirs = ['revision-store', 'weaves']
1241
files = [('inventory.weave', StringIO(empty_weave)),
1242
]
1243
utf8_files = [('format', self.get_format_string())]
1244
1245
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
1246
return self.open(a_bzrdir=a_bzrdir, _found=True)
1247
1248
def open(self, a_bzrdir, _found=False, _override_transport=None):
1249
"""See RepositoryFormat.open().
1250
1251
:param _override_transport: INTERNAL USE ONLY. Allows opening the
1252
repository at a slightly different url
1253
than normal. I.e. during 'upgrade'.
1254
"""
1255
if not _found:
1256
format = RepositoryFormat.find_format(a_bzrdir)
1257
assert format.__class__ == self.__class__
1258
if _override_transport is not None:
1259
repo_transport = _override_transport
1260
else:
1261
repo_transport = a_bzrdir.get_repository_transport(None)
1262
control_files = LockableFiles(repo_transport, 'lock', LockDir)
1263
text_store = self._get_text_store(repo_transport, control_files)
1264
control_store = self._get_control_store(repo_transport, control_files)
1265
_revision_store = self._get_revision_store(repo_transport, control_files)
1266
return MetaDirRepository(_format=self,
1267
a_bzrdir=a_bzrdir,
1268
control_files=control_files,
1269
_revision_store=_revision_store,
1270
control_store=control_store,
1271
text_store=text_store)
1272
1273
1274
class RepositoryFormatKnit1(MetaDirRepositoryFormat):
1275
"""Bzr repository knit format 1.
1276
1277
This repository format has:
1278
- knits for file texts and inventory
1279
- hash subdirectory based stores.
1280
- knits for revisions and signatures
1281
- TextStores for revisions and signatures.
1282
- a format marker of its own
1283
- an optional 'shared-storage' flag
1284
- an optional 'no-working-trees' flag
1285
- a LockDir lock
1286
1287
This format was introduced in bzr 0.8.
1288
"""
1289
1290
def _get_control_store(self, repo_transport, control_files):
1291
"""Return the control store for this repository."""
1292
return VersionedFileStore(
1293
repo_transport,
1294
prefixed=False,
1295
file_mode=control_files._file_mode,
1296
versionedfile_class=KnitVersionedFile,
1297
versionedfile_kwargs={'factory':KnitPlainFactory()},
1298
)
1299
1300
def get_format_string(self):
1301
"""See RepositoryFormat.get_format_string()."""
1302
return "Bazaar-NG Knit Repository Format 1"
1303
1304
def get_format_description(self):
1305
"""See RepositoryFormat.get_format_description()."""
1306
return "Knit repository format 1"
1307
1308
def _get_revision_store(self, repo_transport, control_files):
1309
"""See RepositoryFormat._get_revision_store()."""
1310
from bzrlib.store.revision.knit import KnitRevisionStore
1311
versioned_file_store = VersionedFileStore(
1312
repo_transport,
1313
file_mode=control_files._file_mode,
1314
prefixed=False,
1315
precious=True,
1316
versionedfile_class=KnitVersionedFile,
1317
versionedfile_kwargs={'delta':False, 'factory':KnitPlainFactory()},
1318
escaped=True,
1319
)
1320
return KnitRevisionStore(versioned_file_store)
1321
1322
def _get_text_store(self, transport, control_files):
1323
"""See RepositoryFormat._get_text_store()."""
1324
return self._get_versioned_file_store('knits',
1325
transport,
1326
control_files,
1327
versionedfile_class=KnitVersionedFile,
1328
escaped=True)
1329
1330
def initialize(self, a_bzrdir, shared=False):
1331
"""Create a knit format 1 repository.
1332
1333
:param a_bzrdir: bzrdir to contain the new repository; must already
1334
be initialized.
1335
:param shared: If true the repository will be initialized as a shared
1336
repository.
1337
"""
1338
mutter('creating repository in %s.', a_bzrdir.transport.base)
1339
dirs = ['revision-store', 'knits']
1340
files = []
1341
utf8_files = [('format', self.get_format_string())]
1342
1343
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
1344
repo_transport = a_bzrdir.get_repository_transport(None)
1345
control_files = LockableFiles(repo_transport, 'lock', LockDir)
1346
control_store = self._get_control_store(repo_transport, control_files)
1347
transaction = bzrlib.transactions.WriteTransaction()
1348
# trigger a write of the inventory store.
1349
control_store.get_weave_or_empty('inventory', transaction)
1350
_revision_store = self._get_revision_store(repo_transport, control_files)
1351
_revision_store.has_revision_id('A', transaction)
1352
_revision_store.get_signature_file(transaction)
1353
return self.open(a_bzrdir=a_bzrdir, _found=True)
1354
1355
def open(self, a_bzrdir, _found=False, _override_transport=None):
1356
"""See RepositoryFormat.open().
1357
1358
:param _override_transport: INTERNAL USE ONLY. Allows opening the
1359
repository at a slightly different url
1360
than normal. I.e. during 'upgrade'.
1361
"""
1362
if not _found:
1363
format = RepositoryFormat.find_format(a_bzrdir)
1364
assert format.__class__ == self.__class__
1365
if _override_transport is not None:
1366
repo_transport = _override_transport
1367
else:
1368
repo_transport = a_bzrdir.get_repository_transport(None)
1369
control_files = LockableFiles(repo_transport, 'lock', LockDir)
1370
text_store = self._get_text_store(repo_transport, control_files)
1371
control_store = self._get_control_store(repo_transport, control_files)
1372
_revision_store = self._get_revision_store(repo_transport, control_files)
1373
return KnitRepository(_format=self,
1374
a_bzrdir=a_bzrdir,
1375
control_files=control_files,
1376
_revision_store=_revision_store,
1377
control_store=control_store,
1378
text_store=text_store)
812
1379
813
1380
814
1381
# formats which have no format string are not discoverable
815
1382
# and not independently creatable, so are not registered.
816
__default_format = RepositoryFormat7()
817
RepositoryFormat.register_format(__default_format)
818
RepositoryFormat.set_default_format(__default_format)
1383
RepositoryFormat.register_format(RepositoryFormat7())
1384
_default_format = RepositoryFormatKnit1()
1385
RepositoryFormat.register_format(_default_format)
1386
RepositoryFormat.set_default_format(_default_format)
819
1387
_legacy_formats = [RepositoryFormat4(),
820
1388
RepositoryFormat5(),
821
1389
RepositoryFormat6()]
822
1390
823
1391
824
# TODO: jam 20060108 Create a new branch format, and as part of upgrade
825
# make sure that ancestry.weave is deleted (it is never used, but
826
# used to be created)
1392
class InterRepository(InterObject):
1393
"""This class represents operations taking place between two repositories.
1394
1395
Its instances have methods like copy_content and fetch, and contain
1396
references to the source and target repositories these operations can be
1397
carried out on.
1398
1399
Often we will provide convenience methods on 'repository' which carry out
1400
operations with another repository - they will always forward to
1401
InterRepository.get(other).method_name(parameters).
1402
"""
1403
1404
_optimisers = set()
1405
"""The available optimised InterRepository types."""
1406
1407
@needs_write_lock
1408
def copy_content(self, revision_id=None, basis=None):
1409
"""Make a complete copy of the content in self into destination.
1410
1411
This is a destructive operation! Do not use it on existing
1412
repositories.
1413
1414
:param revision_id: Only copy the content needed to construct
1415
revision_id and its parents.
1416
:param basis: Copy the needed data preferentially from basis.
1417
"""
1418
try:
1419
self.target.set_make_working_trees(self.source.make_working_trees())
1420
except NotImplementedError:
1421
pass
1422
# grab the basis available data
1423
if basis is not None:
1424
self.target.fetch(basis, revision_id=revision_id)
1425
# but dont bother fetching if we have the needed data now.
1426
if (revision_id not in (None, NULL_REVISION) and
1427
self.target.has_revision(revision_id)):
1428
return
1429
self.target.fetch(self.source, revision_id=revision_id)
1430
1431
def _double_lock(self, lock_source, lock_target):
1432
"""Take out too locks, rolling back the first if the second throws."""
1433
lock_source()
1434
try:
1435
lock_target()
1436
except Exception:
1437
# we want to ensure that we don't leave source locked by mistake.
1438
# and any error on target should not confuse source.
1439
self.source.unlock()
1440
raise
1441
1442
@needs_write_lock
1443
def fetch(self, revision_id=None, pb=None):
1444
"""Fetch the content required to construct revision_id.
1445
1446
The content is copied from source to target.
1447
1448
:param revision_id: if None all content is copied, if NULL_REVISION no
1449
content is copied.
1450
:param pb: optional progress bar to use for progress reports. If not
1451
provided a default one will be created.
1452
1453
Returns the copied revision count and the failed revisions in a tuple:
1454
(copied, failures).
1455
"""
1456
from bzrlib.fetch import GenericRepoFetcher
1457
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1458
self.source, self.source._format, self.target, self.target._format)
1459
f = GenericRepoFetcher(to_repository=self.target,
1460
from_repository=self.source,
1461
last_revision=revision_id,
1462
pb=pb)
1463
return f.count_copied, f.failed_revisions
1464
1465
def lock_read(self):
1466
"""Take out a logical read lock.
1467
1468
This will lock the source branch and the target branch. The source gets
1469
a read lock and the target a read lock.
1470
"""
1471
self._double_lock(self.source.lock_read, self.target.lock_read)
1472
1473
def lock_write(self):
1474
"""Take out a logical write lock.
1475
1476
This will lock the source branch and the target branch. The source gets
1477
a read lock and the target a write lock.
1478
"""
1479
self._double_lock(self.source.lock_read, self.target.lock_write)
1480
1481
@needs_read_lock
1482
def missing_revision_ids(self, revision_id=None):
1483
"""Return the revision ids that source has that target does not.
1484
1485
These are returned in topological order.
1486
1487
:param revision_id: only return revision ids included by this
1488
revision_id.
1489
"""
1490
# generic, possibly worst case, slow code path.
1491
target_ids = set(self.target.all_revision_ids())
1492
if revision_id is not None:
1493
source_ids = self.source.get_ancestry(revision_id)
1494
assert source_ids.pop(0) == None
1495
else:
1496
source_ids = self.source.all_revision_ids()
1497
result_set = set(source_ids).difference(target_ids)
1498
# this may look like a no-op: its not. It preserves the ordering
1499
# other_ids had while only returning the members from other_ids
1500
# that we've decided we need.
1501
return [rev_id for rev_id in source_ids if rev_id in result_set]
1502
1503
def unlock(self):
1504
"""Release the locks on source and target."""
1505
try:
1506
self.target.unlock()
1507
finally:
1508
self.source.unlock()
1509
1510
1511
class InterWeaveRepo(InterRepository):
1512
"""Optimised code paths between Weave based repositories."""
1513
1514
_matching_repo_format = RepositoryFormat7()
1515
"""Repository format for testing with."""
1516
1517
@staticmethod
1518
def is_compatible(source, target):
1519
"""Be compatible with known Weave formats.
1520
1521
We dont test for the stores being of specific types becase that
1522
could lead to confusing results, and there is no need to be
1523
overly general.
1524
"""
1525
try:
1526
return (isinstance(source._format, (RepositoryFormat5,
1527
RepositoryFormat6,
1528
RepositoryFormat7)) and
1529
isinstance(target._format, (RepositoryFormat5,
1530
RepositoryFormat6,
1531
RepositoryFormat7)))
1532
except AttributeError:
1533
return False
1534
1535
@needs_write_lock
1536
def copy_content(self, revision_id=None, basis=None):
1537
"""See InterRepository.copy_content()."""
1538
# weave specific optimised path:
1539
if basis is not None:
1540
# copy the basis in, then fetch remaining data.
1541
basis.copy_content_into(self.target, revision_id)
1542
# the basis copy_content_into could misset this.
1543
try:
1544
self.target.set_make_working_trees(self.source.make_working_trees())
1545
except NotImplementedError:
1546
pass
1547
self.target.fetch(self.source, revision_id=revision_id)
1548
else:
1549
try:
1550
self.target.set_make_working_trees(self.source.make_working_trees())
1551
except NotImplementedError:
1552
pass
1553
# FIXME do not peek!
1554
if self.source.control_files._transport.listable():
1555
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1556
try:
1557
self.target.weave_store.copy_all_ids(
1558
self.source.weave_store,
1559
pb=pb,
1560
from_transaction=self.source.get_transaction(),
1561
to_transaction=self.target.get_transaction())
1562
pb.update('copying inventory', 0, 1)
1563
self.target.control_weaves.copy_multi(
1564
self.source.control_weaves, ['inventory'],
1565
from_transaction=self.source.get_transaction(),
1566
to_transaction=self.target.get_transaction())
1567
self.target._revision_store.text_store.copy_all_ids(
1568
self.source._revision_store.text_store,
1569
pb=pb)
1570
finally:
1571
pb.finished()
1572
else:
1573
self.target.fetch(self.source, revision_id=revision_id)
1574
1575
@needs_write_lock
1576
def fetch(self, revision_id=None, pb=None):
1577
"""See InterRepository.fetch()."""
1578
from bzrlib.fetch import GenericRepoFetcher
1579
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1580
self.source, self.source._format, self.target, self.target._format)
1581
f = GenericRepoFetcher(to_repository=self.target,
1582
from_repository=self.source,
1583
last_revision=revision_id,
1584
pb=pb)
1585
return f.count_copied, f.failed_revisions
1586
1587
@needs_read_lock
1588
def missing_revision_ids(self, revision_id=None):
1589
"""See InterRepository.missing_revision_ids()."""
1590
# we want all revisions to satisfy revision_id in source.
1591
# but we dont want to stat every file here and there.
1592
# we want then, all revisions other needs to satisfy revision_id
1593
# checked, but not those that we have locally.
1594
# so the first thing is to get a subset of the revisions to
1595
# satisfy revision_id in source, and then eliminate those that
1596
# we do already have.
1597
# this is slow on high latency connection to self, but as as this
1598
# disk format scales terribly for push anyway due to rewriting
1599
# inventory.weave, this is considered acceptable.
1600
# - RBC 20060209
1601
if revision_id is not None:
1602
source_ids = self.source.get_ancestry(revision_id)
1603
assert source_ids.pop(0) == None
1604
else:
1605
source_ids = self.source._all_possible_ids()
1606
source_ids_set = set(source_ids)
1607
# source_ids is the worst possible case we may need to pull.
1608
# now we want to filter source_ids against what we actually
1609
# have in target, but dont try to check for existence where we know
1610
# we do not have a revision as that would be pointless.
1611
target_ids = set(self.target._all_possible_ids())
1612
possibly_present_revisions = target_ids.intersection(source_ids_set)
1613
actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
1614
required_revisions = source_ids_set.difference(actually_present_revisions)
1615
required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
1616
if revision_id is not None:
1617
# we used get_ancestry to determine source_ids then we are assured all
1618
# revisions referenced are present as they are installed in topological order.
1619
# and the tip revision was validated by get_ancestry.
1620
return required_topo_revisions
1621
else:
1622
# if we just grabbed the possibly available ids, then
1623
# we only have an estimate of whats available and need to validate
1624
# that against the revision records.
1625
return self.source._eliminate_revisions_not_present(required_topo_revisions)
1626
1627
1628
class InterKnitRepo(InterRepository):
1629
"""Optimised code paths between Knit based repositories."""
1630
1631
_matching_repo_format = RepositoryFormatKnit1()
1632
"""Repository format for testing with."""
1633
1634
@staticmethod
1635
def is_compatible(source, target):
1636
"""Be compatible with known Knit formats.
1637
1638
We dont test for the stores being of specific types becase that
1639
could lead to confusing results, and there is no need to be
1640
overly general.
1641
"""
1642
try:
1643
return (isinstance(source._format, (RepositoryFormatKnit1)) and
1644
isinstance(target._format, (RepositoryFormatKnit1)))
1645
except AttributeError:
1646
return False
1647
1648
@needs_write_lock
1649
def fetch(self, revision_id=None, pb=None):
1650
"""See InterRepository.fetch()."""
1651
from bzrlib.fetch import KnitRepoFetcher
1652
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
1653
self.source, self.source._format, self.target, self.target._format)
1654
f = KnitRepoFetcher(to_repository=self.target,
1655
from_repository=self.source,
1656
last_revision=revision_id,
1657
pb=pb)
1658
return f.count_copied, f.failed_revisions
1659
1660
@needs_read_lock
1661
def missing_revision_ids(self, revision_id=None):
1662
"""See InterRepository.missing_revision_ids()."""
1663
if revision_id is not None:
1664
source_ids = self.source.get_ancestry(revision_id)
1665
assert source_ids.pop(0) == None
1666
else:
1667
source_ids = self.source._all_possible_ids()
1668
source_ids_set = set(source_ids)
1669
# source_ids is the worst possible case we may need to pull.
1670
# now we want to filter source_ids against what we actually
1671
# have in target, but dont try to check for existence where we know
1672
# we do not have a revision as that would be pointless.
1673
target_ids = set(self.target._all_possible_ids())
1674
possibly_present_revisions = target_ids.intersection(source_ids_set)
1675
actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
1676
required_revisions = source_ids_set.difference(actually_present_revisions)
1677
required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
1678
if revision_id is not None:
1679
# we used get_ancestry to determine source_ids then we are assured all
1680
# revisions referenced are present as they are installed in topological order.
1681
# and the tip revision was validated by get_ancestry.
1682
return required_topo_revisions
1683
else:
1684
# if we just grabbed the possibly available ids, then
1685
# we only have an estimate of whats available and need to validate
1686
# that against the revision records.
1687
return self.source._eliminate_revisions_not_present(required_topo_revisions)
1688
1689
InterRepository.register_optimiser(InterWeaveRepo)
1690
InterRepository.register_optimiser(InterKnitRepo)
1691
827
1692
828
1693
class RepositoryTestProviderAdapter(object):
829
1694
"""A tool to generate a suite testing multiple repository formats at once.
853
1718
new_test.id = make_new_test_id()
854
1719
result.addTest(new_test)
855
1720
return result
1721
1722
1723
class InterRepositoryTestProviderAdapter(object):
1724
"""A tool to generate a suite testing multiple inter repository formats.
1725
1726
This is done by copying the test once for each interrepo provider and injecting
1727
the transport_server, transport_readonly_server, repository_format and
1728
repository_to_format classes into each copy.
1729
Each copy is also given a new id() to make it easy to identify.
1730
"""
1731
1732
def __init__(self, transport_server, transport_readonly_server, formats):
1733
self._transport_server = transport_server
1734
self._transport_readonly_server = transport_readonly_server
1735
self._formats = formats
1736
1737
def adapt(self, test):
1738
result = TestSuite()
1739
for interrepo_class, repository_format, repository_format_to in self._formats:
1740
new_test = deepcopy(test)
1741
new_test.transport_server = self._transport_server
1742
new_test.transport_readonly_server = self._transport_readonly_server
1743
new_test.interrepo_class = interrepo_class
1744
new_test.repository_format = repository_format
1745
new_test.repository_format_to = repository_format_to
1746
def make_new_test_id():
1747
new_id = "%s(%s)" % (new_test.id(), interrepo_class.__name__)
1748
return lambda: new_id
1749
new_test.id = make_new_test_id()
1750
result.addTest(new_test)
1751
return result
1752
1753
@staticmethod
1754
def default_test_list():
1755
"""Generate the default list of interrepo permutations to test."""
1756
result = []
1757
# test the default InterRepository between format 6 and the current
1758
# default format.
1759
# XXX: robertc 20060220 reinstate this when there are two supported
1760
# formats which do not have an optimal code path between them.
1761
result.append((InterRepository,
1762
RepositoryFormat6(),
1763
RepositoryFormatKnit1()))
1764
for optimiser in InterRepository._optimisers:
1765
result.append((optimiser,
1766
optimiser._matching_repo_format,
1767
optimiser._matching_repo_format
1768
))
1769
# if there are specific combinations we want to use, we can add them
1770
# here.
1771
return result
1772
1773
1774
class CopyConverter(object):
1775
"""A repository conversion tool which just performs a copy of the content.
1776
1777
This is slow but quite reliable.
1778
"""
1779
1780
def __init__(self, target_format):
1781
"""Create a CopyConverter.
1782
1783
:param target_format: The format the resulting repository should be.
1784
"""
1785
self.target_format = target_format
1786
1787
def convert(self, repo, pb):
1788
"""Perform the conversion of to_convert, giving feedback via pb.
1789
1790
:param to_convert: The disk object to convert.
1791
:param pb: a progress bar to use for progress information.
1792
"""
1793
self.pb = pb
1794
self.count = 0
1795
self.total = 4
1796
# this is only useful with metadir layouts - separated repo content.
1797
# trigger an assertion if not such
1798
repo._format.get_format_string()
1799
self.repo_dir = repo.bzrdir
1800
self.step('Moving repository to repository.backup')
1801
self.repo_dir.transport.move('repository', 'repository.backup')
1802
backup_transport = self.repo_dir.transport.clone('repository.backup')
1803
self.source_repo = repo._format.open(self.repo_dir,
1804
_found=True,
1805
_override_transport=backup_transport)
1806
self.step('Creating new repository')
1807
converted = self.target_format.initialize(self.repo_dir,
1808
self.source_repo.is_shared())
1809
converted.lock_write()
1810
try:
1811
self.step('Copying content into repository.')
1812
self.source_repo.copy_content_into(converted)
1813
finally:
1814
converted.unlock()
1815
self.step('Deleting old repository content.')
1816
self.repo_dir.transport.delete_tree('repository.backup')
1817
self.pb.note('repository converted')
1818
1819
def step(self, message):
1820
"""Update the pb by a step."""
1821
self.count +=1
1822
self.pb.update(message, self.count, self.total)
1823
1824
1825
# Copied from xml.sax.saxutils
1826
def _unescape_xml(data):
1827
"""Unescape &, <, and > in a string of data.
1828
"""
1829
data = data.replace("<", "<")
1830
data = data.replace(">", ">")
1831
# must do ampersand last
1832
return data.replace("&", "&")
Loggerhead is a web-based interface for Breezy
Version: 2.0.1