/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/fastimport/processors/generic_processor.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-03 13:09:57 UTC
  • mfrom: (6846.3.1 mark-0)
  • Revision ID: jelmer@jelmer.uk-20180203130957-u1wi0t5o4s95s38b
Merge lp:~jelmer/brz/mark-0

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/processors/generic_processor.py
25
25
    errors,
26
26
    osutils,
27
27
    progress,
 
28
    revision as _mod_revision,
28
29
    )
29
30
from ....bzr.knitpack_repo import KnitPackRepository
30
31
from ....trace import (
466
467
 
467
468
    def _init_id_map(self):
468
469
        """Load the id-map and check it matches the repository.
469
 
        
 
470
 
470
471
        :return: the number of entries in the map
471
472
        """
472
473
        # Currently, we just check the size. In the future, we might
474
475
        # are identical as well.
475
476
        self.cache_mgr.marks, known = idmapfile.load_id_map(
476
477
            self.id_map_path)
 
478
        if self.cache_mgr.add_mark('0', _mod_revision.NULL_REVISION):
 
479
            known += 1
 
480
 
477
481
        existing_count = len(self.repo.all_revision_ids())
478
482
        if existing_count < known:
479
483
            raise plugin_errors.BadRepositorySize(known, existing_count)