← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
lazy_import(globals(), """
53
53
    def __repr__(self):
54
54
        return 'KnitParentsProvider(%r)' % self._knit
55
55
 
56
 
    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
57
 
    def get_parents(self, revision_ids):
58
 
        """See graph._StackedParentsProvider.get_parents"""
59
 
        parent_map = self.get_parent_map(revision_ids)
60
 
        return [parent_map.get(r, None) for r in revision_ids]
61
 
 
62
56
    def get_parent_map(self, keys):
63
57
        """See graph._StackedParentsProvider.get_parent_map"""
64
58
        parent_map = {}
124
118
        self._commit_builder_class = _commit_builder_class
125
119
        self._serializer = _serializer
126
120
        self._reconcile_fixes_text_parents = True
127
 
        self._fetch_uses_deltas = True
128
 
        self._fetch_order = 'topological'
129
121
 
130
122
    @needs_read_lock
131
123
    def _all_revision_ids(self):
215
207
        revision_id = osutils.safe_revision_id(revision_id)
216
208
        return self.get_revision_reconcile(revision_id)
217
209
 
 
210
    def _refresh_data(self):
 
211
        if not self.is_locked():
 
212
            return
 
213
        # Create a new transaction to force all knits to see the scope change.
 
214
        # This is safe because we're outside a write group.
 
215
        self.control_files._finish_transaction()
 
216
        if self.is_write_locked():
 
217
            self.control_files._set_write_transaction()
 
218
        else:
 
219
            self.control_files._set_read_transaction()
 
220
 
218
221
    @needs_write_lock
219
222
    def reconcile(self, other=None, thorough=False):
220
223
        """Reconcile this repository."""
222
225
        reconciler = KnitReconciler(self, thorough=thorough)
223
226
        reconciler.reconcile()
224
227
        return reconciler
225
 
    
 
228
 
226
229
    def _make_parents_provider(self):
227
230
        return _KnitsParentsProvider(self.revisions)
228
231
 
259
262
 
260
263
 
261
264
class RepositoryFormatKnit(MetaDirRepositoryFormat):
262
 
    """Bzr repository knit format (generalized). 
 
265
    """Bzr repository knit format (generalized).
263
266
 
264
267
    This repository format has:
265
268
     - knits for file texts and inventory
288
291
    supports_ghosts = True
289
292
    # External lookups are not supported in this format.
290
293
    supports_external_lookups = False
 
294
    # No CHK support.
 
295
    supports_chks = False
 
296
    _fetch_order = 'topological'
 
297
    _fetch_uses_deltas = True
 
298
    fast_deltas = False
291
299
 
292
300
    def _get_inventories(self, repo_transport, repo, name='inventory'):
293
301
        mapper = versionedfile.ConstantMapper(name)
333
341
        dirs = ['knits']
334
342
        files = []
335
343
        utf8_files = [('format', self.get_format_string())]
336
 
        
 
344
 
337
345
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
338
346
        repo_transport = a_bzrdir.get_repository_transport(None)
339
347
        control_files = lockable_files.LockableFiles(repo_transport,
351
359
 
352
360
    def open(self, a_bzrdir, _found=False, _override_transport=None):
353
361
        """See RepositoryFormat.open().
354
 
        
 
362
 
355
363
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
356
364
                                    repository at a slightly different url
357
365
                                    than normal. I.e. during 'upgrade'.
373
381
        repo.signatures = self._get_signatures(repo_transport, repo)
374
382
        repo.inventories = self._get_inventories(repo_transport, repo)
375
383
        repo.texts = self._get_texts(repo_transport, repo)
 
384
        repo.chk_bytes = None
376
385
        repo._transport = repo_transport
377
386
        return repo
378
387
 
453
462
        if not getattr(target_format, 'supports_tree_reference', False):
454
463
            raise errors.BadConversionTarget(
455
464
                'Does not support nested trees', target_format)
456
 
            
 
465
 
457
466
    def get_format_string(self):
458
467
        """See RepositoryFormat.get_format_string()."""
459
468
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"