← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitpack_repo.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitpack_repo.py
16
16
 
17
17
"""Knit-based pack repository formats."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
from bzrlib.lazy_import import lazy_import
22
20
lazy_import(globals(), """
23
21
from itertools import izip
24
22
import time
25
23
 
26
24
from bzrlib import (
27
 
    controldir,
 
25
    bzrdir,
28
26
    debug,
29
27
    errors,
30
28
    knit,
155
153
    index_class = GraphIndex
156
154
 
157
155
    def _get_matching_bzrdir(self):
158
 
        return controldir.format_registry.make_bzrdir('pack-0.92')
 
156
        return bzrdir.format_registry.make_bzrdir('pack-0.92')
159
157
 
160
158
    def _ignore_setting_bzrdir(self, format):
161
159
        pass
162
160
 
163
161
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
164
162
 
165
 
    @classmethod
166
 
    def get_format_string(cls):
 
163
    def get_format_string(self):
167
164
        """See RepositoryFormat.get_format_string()."""
168
165
        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
169
166
 
195
192
    index_class = GraphIndex
196
193
 
197
194
    def _get_matching_bzrdir(self):
198
 
        return controldir.format_registry.make_bzrdir(
 
195
        return bzrdir.format_registry.make_bzrdir(
199
196
            'pack-0.92-subtree')
200
197
 
201
198
    def _ignore_setting_bzrdir(self, format):
203
200
 
204
201
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
205
202
 
206
 
    @classmethod
207
 
    def get_format_string(cls):
 
203
    def get_format_string(self):
208
204
        """See RepositoryFormat.get_format_string()."""
209
205
        return "Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n"
210
206
 
234
230
    index_class = GraphIndex
235
231
 
236
232
    def _get_matching_bzrdir(self):
237
 
        return controldir.format_registry.make_bzrdir(
 
233
        return bzrdir.format_registry.make_bzrdir(
238
234
            'rich-root-pack')
239
235
 
240
236
    def _ignore_setting_bzrdir(self, format):
242
238
 
243
239
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
244
240
 
245
 
    @classmethod
246
 
    def get_format_string(cls):
 
241
    def get_format_string(self):
247
242
        """See RepositoryFormat.get_format_string()."""
248
243
        return ("Bazaar pack repository format 1 with rich root"
249
244
                " (needs bzr 1.0)\n")
274
269
        return xml5.serializer_v5
275
270
 
276
271
    def _get_matching_bzrdir(self):
277
 
        return controldir.format_registry.make_bzrdir('1.6')
 
272
        return bzrdir.format_registry.make_bzrdir('1.6')
278
273
 
279
274
    def _ignore_setting_bzrdir(self, format):
280
275
        pass
281
276
 
282
277
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
283
278
 
284
 
    @classmethod
285
 
    def get_format_string(cls):
 
279
    def get_format_string(self):
286
280
        """See RepositoryFormat.get_format_string()."""
287
281
        return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
288
282
 
314
308
        return xml6.serializer_v6
315
309
 
316
310
    def _get_matching_bzrdir(self):
317
 
        return controldir.format_registry.make_bzrdir(
 
311
        return bzrdir.format_registry.make_bzrdir(
318
312
            '1.6.1-rich-root')
319
313
 
320
314
    def _ignore_setting_bzrdir(self, format):
322
316
 
323
317
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
324
318
 
325
 
    @classmethod
326
 
    def get_format_string(cls):
 
319
    def get_format_string(self):
327
320
        """See RepositoryFormat.get_format_string()."""
328
321
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
329
322
 
359
352
        return xml7.serializer_v7
360
353
 
361
354
    def _get_matching_bzrdir(self):
362
 
        matching = controldir.format_registry.make_bzrdir(
 
355
        matching = bzrdir.format_registry.make_bzrdir(
363
356
            '1.6.1-rich-root')
364
357
        matching.repository_format = self
365
358
        return matching
369
362
 
370
363
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
371
364
 
372
 
    @classmethod
373
 
    def get_format_string(cls):
 
365
    def get_format_string(self):
374
366
        """See RepositoryFormat.get_format_string()."""
375
367
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
376
368
 
401
393
        return xml5.serializer_v5
402
394
 
403
395
    def _get_matching_bzrdir(self):
404
 
        return controldir.format_registry.make_bzrdir('1.9')
 
396
        return bzrdir.format_registry.make_bzrdir('1.9')
405
397
 
406
398
    def _ignore_setting_bzrdir(self, format):
407
399
        pass
408
400
 
409
401
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
410
402
 
411
 
    @classmethod
412
 
    def get_format_string(cls):
 
403
    def get_format_string(self):
413
404
        """See RepositoryFormat.get_format_string()."""
414
405
        return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
415
406
 
438
429
        return xml6.serializer_v6
439
430
 
440
431
    def _get_matching_bzrdir(self):
441
 
        return controldir.format_registry.make_bzrdir(
 
432
        return bzrdir.format_registry.make_bzrdir(
442
433
            '1.9-rich-root')
443
434
 
444
435
    def _ignore_setting_bzrdir(self, format):
446
437
 
447
438
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
448
439
 
449
 
    @classmethod
450
 
    def get_format_string(cls):
 
440
    def get_format_string(self):
451
441
        """See RepositoryFormat.get_format_string()."""
452
442
        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
453
443
 
479
469
        return xml7.serializer_v7
480
470
 
481
471
    def _get_matching_bzrdir(self):
482
 
        return controldir.format_registry.make_bzrdir(
 
472
        return bzrdir.format_registry.make_bzrdir(
483
473
            'development5-subtree')
484
474
 
485
475
    def _ignore_setting_bzrdir(self, format):
487
477
 
488
478
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
489
479
 
490
 
    @classmethod
491
 
    def get_format_string(cls):
 
480
    def get_format_string(self):
492
481
        """See RepositoryFormat.get_format_string()."""
493
482
        return ("Bazaar development format 2 with subtree support "
494
483
            "(needs bzr.dev from before 1.8)\n")