← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
from bzrlib.lazy_import import lazy_import
18
20
lazy_import(globals(), """
 
21
import itertools
 
22
 
19
23
from bzrlib import (
20
 
    bzrdir,
 
24
    controldir,
21
25
    errors,
22
26
    knit as _mod_knit,
23
27
    lockable_files,
34
38
""")
35
39
from bzrlib.decorators import needs_read_lock, needs_write_lock
36
40
from bzrlib.repository import (
37
 
    CommitBuilder,
38
41
    InterRepository,
 
42
    IsInWriteGroupError,
 
43
    RepositoryFormatMetaDir,
 
44
    )
 
45
from bzrlib.vf_repository import (
39
46
    InterSameDataRepository,
40
 
    IsInWriteGroupError,
41
 
    MetaDirRepository,
42
 
    MetaDirRepositoryFormat,
43
 
    RepositoryFormat,
44
 
    RootCommitBuilder,
 
47
    MetaDirVersionedFileRepository,
 
48
    MetaDirVersionedFileRepositoryFormat,
 
49
    VersionedFileCommitBuilder,
 
50
    VersionedFileRootCommitBuilder,
45
51
    )
46
52
from bzrlib import symbol_versioning
47
53
 
103
109
        return result
104
110
 
105
111
 
106
 
class KnitRepository(MetaDirRepository):
 
112
class KnitRepository(MetaDirVersionedFileRepository):
107
113
    """Knit format repository."""
108
114
 
109
115
    # These attributes are inherited from the Repository base class. Setting
115
121
 
116
122
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
117
123
        _serializer):
118
 
        MetaDirRepository.__init__(self, _format, a_bzrdir, control_files)
 
124
        super(KnitRepository, self).__init__(_format, a_bzrdir, control_files)
119
125
        self._commit_builder_class = _commit_builder_class
120
126
        self._serializer = _serializer
121
127
        self._reconcile_fixes_text_parents = True
177
183
        result.get_parent_map([('A',)])
178
184
        return result
179
185
 
180
 
    def fileid_involved_between_revs(self, from_revid, to_revid):
181
 
        """Find file_id(s) which are involved in the changes between revisions.
182
 
 
183
 
        This determines the set of revisions which are involved, and then
184
 
        finds all file ids affected by those revisions.
185
 
        """
186
 
        vf = self._get_revision_vf()
187
 
        from_set = set(vf.get_ancestry(from_revid))
188
 
        to_set = set(vf.get_ancestry(to_revid))
189
 
        changed = to_set.difference(from_set)
190
 
        return self._fileid_involved_by_set(changed)
191
 
 
192
 
    def fileid_involved(self, last_revid=None):
193
 
        """Find all file_ids modified in the ancestry of last_revid.
194
 
 
195
 
        :param last_revid: If None, last_revision() will be used.
196
 
        """
197
 
        if not last_revid:
198
 
            changed = set(self.all_revision_ids())
199
 
        else:
200
 
            changed = set(self.get_ancestry(last_revid))
201
 
        if None in changed:
202
 
            changed.remove(None)
203
 
        return self._fileid_involved_by_set(changed)
204
 
 
205
186
    @needs_read_lock
206
187
    def get_revision(self, revision_id):
207
188
        """Return the Revision object for a named revision"""
233
214
        return _KnitsParentsProvider(self.revisions)
234
215
 
235
216
 
236
 
class RepositoryFormatKnit(MetaDirRepositoryFormat):
 
217
class RepositoryFormatKnit(MetaDirVersionedFileRepositoryFormat):
237
218
    """Bzr repository knit format (generalized).
238
219
 
239
220
    This repository format has:
269
250
    _fetch_uses_deltas = True
270
251
    fast_deltas = False
271
252
    supports_funky_characters = True
272
 
    supports_full_versioned_files = True
273
253
    # The revision.kndx could potentially claim a revision has a different
274
254
    # parent to the revision text.
275
255
    revision_graph_can_have_wrong_parents = True
343
323
                                    than normal. I.e. during 'upgrade'.
344
324
        """
345
325
        if not _found:
346
 
            format = RepositoryFormat.find_format(a_bzrdir)
 
326
            format = RepositoryFormatMetaDir.find_format(a_bzrdir)
347
327
        if _override_transport is not None:
348
328
            repo_transport = _override_transport
349
329
        else:
381
361
    """
382
362
 
383
363
    repository_class = KnitRepository
384
 
    _commit_builder_class = CommitBuilder
 
364
    _commit_builder_class = VersionedFileCommitBuilder
385
365
    @property
386
366
    def _serializer(self):
387
367
        return xml5.serializer_v5
389
369
    def __ne__(self, other):
390
370
        return self.__class__ is not other.__class__
391
371
 
392
 
    def get_format_string(self):
 
372
    @classmethod
 
373
    def get_format_string(cls):
393
374
        """See RepositoryFormat.get_format_string()."""
394
375
        return "Bazaar-NG Knit Repository Format 1"
395
376
 
415
396
    """
416
397
 
417
398
    repository_class = KnitRepository
418
 
    _commit_builder_class = RootCommitBuilder
 
399
    _commit_builder_class = VersionedFileRootCommitBuilder
419
400
    rich_root_data = True
420
401
    experimental = True
421
402
    supports_tree_reference = True
424
405
        return xml7.serializer_v7
425
406
 
426
407
    def _get_matching_bzrdir(self):
427
 
        return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
 
408
        return controldir.format_registry.make_bzrdir('dirstate-with-subtree')
428
409
 
429
410
    def _ignore_setting_bzrdir(self, format):
430
411
        pass
431
412
 
432
413
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
433
414
 
434
 
    def get_format_string(self):
 
415
    @classmethod
 
416
    def get_format_string(cls):
435
417
        """See RepositoryFormat.get_format_string()."""
436
418
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
437
419
 
457
439
    """
458
440
 
459
441
    repository_class = KnitRepository
460
 
    _commit_builder_class = RootCommitBuilder
 
442
    _commit_builder_class = VersionedFileRootCommitBuilder
461
443
    rich_root_data = True
462
444
    supports_tree_reference = False
463
445
    @property
465
447
        return xml6.serializer_v6
466
448
 
467
449
    def _get_matching_bzrdir(self):
468
 
        return bzrdir.format_registry.make_bzrdir('rich-root')
 
450
        return controldir.format_registry.make_bzrdir('rich-root')
469
451
 
470
452
    def _ignore_setting_bzrdir(self, format):
471
453
        pass
472
454
 
473
455
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
474
456
 
475
 
    def get_format_string(self):
 
457
    @classmethod
 
458
    def get_format_string(cls):
476
459
        """See RepositoryFormat.get_format_string()."""
477
460
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
478
461
 
505
488
 
506
489
    @needs_read_lock
507
490
    def search_missing_revision_ids(self,
508
 
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
509
 
            find_ghosts=True, revision_ids=None, if_present_ids=None):
 
491
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
492
            limit=None):
510
493
        """See InterRepository.search_missing_revision_ids()."""
511
 
        if symbol_versioning.deprecated_passed(revision_id):
512
 
            symbol_versioning.warn(
513
 
                'search_missing_revision_ids(revision_id=...) was '
514
 
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
515
 
                DeprecationWarning, stacklevel=2)
516
 
            if revision_ids is not None:
517
 
                raise AssertionError(
518
 
                    'revision_ids is mutually exclusive with revision_id')
519
 
            if revision_id is not None:
520
 
                revision_ids = [revision_id]
521
 
        del revision_id
522
494
        source_ids_set = self._present_source_revisions_for(
523
495
            revision_ids, if_present_ids)
524
496
        # source_ids is the worst possible case we may need to pull.
541
513
            # that against the revision records.
542
514
            result_set = set(
543
515
                self.source._eliminate_revisions_not_present(required_revisions))
 
516
        if limit is not None:
 
517
            topo_ordered = self.source.get_graph().iter_topo_order(result_set)
 
518
            result_set = set(itertools.islice(topo_ordered, limit))
544
519
        return self.source.revision_ids_to_search_result(result_set)
545
520
 
546
521