/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 bzrlib/repository.py

  • Committer: Marco Pantaleoni
  • Date: 2010-03-25 14:22:41 UTC
  • mto: This revision was merged to the branch mainline in revision 5174.
  • Revision ID: panta@elasticworld.org-20100325142241-vtl1hshva7uiz3ap
Applied suggestions from merge reviewer (John A Meinel):

- removed duplication of checks for presence of hooks.
- adapted to bazaar style guideline
- simplified test cases callback

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
40
40
    lru_cache,
41
41
    osutils,
42
42
    revision as _mod_revision,
43
 
    static_tuple,
44
43
    symbol_versioning,
45
44
    trace,
46
45
    tsort,
864
863
# Repositories
865
864
 
866
865
 
867
 
class Repository(_RelockDebugMixin, bzrdir.ControlComponent):
 
866
class Repository(_RelockDebugMixin):
868
867
    """Repository holding history for one or more branches.
869
868
 
870
869
    The repository holds and retrieves historical information including
1291
1290
 
1292
1291
        :param _format: The format of the repository on disk.
1293
1292
        :param a_bzrdir: The BzrDir of the repository.
 
1293
 
 
1294
        In the future we will have a single api for all stores for
 
1295
        getting file texts, inventories and revisions, then
 
1296
        this construct will accept instances of those things.
1294
1297
        """
1295
 
        # In the future we will have a single api for all stores for
1296
 
        # getting file texts, inventories and revisions, then
1297
 
        # this construct will accept instances of those things.
1298
1298
        super(Repository, self).__init__()
1299
1299
        self._format = _format
1300
1300
        # the following are part of the public API for Repository:
1315
1315
        # rather copying them?
1316
1316
        self._safe_to_return_from_cache = False
1317
1317
 
1318
 
    @property
1319
 
    def user_transport(self):
1320
 
        return self.bzrdir.user_transport
1321
 
 
1322
 
    @property
1323
 
    def control_transport(self):
1324
 
        return self._transport
1325
 
 
1326
1318
    def __repr__(self):
1327
1319
        if self._fallback_repositories:
1328
1320
            return '%s(%r, fallback_repositories=%r)' % (
1476
1468
 
1477
1469
        # now gather global repository information
1478
1470
        # XXX: This is available for many repos regardless of listability.
1479
 
        if self.user_transport.listable():
 
1471
        if self.bzrdir.root_transport.listable():
1480
1472
            # XXX: do we want to __define len__() ?
1481
1473
            # Maybe the versionedfiles object should provide a different
1482
1474
            # method to get the number of keys.
1514
1506
 
1515
1507
        ret = []
1516
1508
        for branches, repository in bzrdir.BzrDir.find_bzrdirs(
1517
 
                self.user_transport, evaluate=Evaluator()):
 
1509
                self.bzrdir.root_transport, evaluate=Evaluator()):
1518
1510
            if branches is not None:
1519
1511
                ret.extend(branches)
1520
1512
            if not using and repository is not None:
2588
2580
            keys = tsort.topo_sort(parent_map)
2589
2581
        return [None] + list(keys)
2590
2582
 
2591
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
2583
    def pack(self, hint=None):
2592
2584
        """Compress the data within the repository.
2593
2585
 
2594
2586
        This operation only makes sense for some repository types. For other
2604
2596
            obtained from the result of commit_write_group(). Out of
2605
2597
            date hints are simply ignored, because concurrent operations
2606
2598
            can obsolete them rapidly.
2607
 
 
2608
 
        :param clean_obsolete_packs: Clean obsolete packs immediately after
2609
 
            the pack operation.
2610
2599
        """
2611
2600
 
2612
2601
    def get_transaction(self):
2637
2626
    def _make_parents_provider(self):
2638
2627
        return self
2639
2628
 
2640
 
    @needs_read_lock
2641
 
    def get_known_graph_ancestry(self, revision_ids):
2642
 
        """Return the known graph for a set of revision ids and their ancestors.
2643
 
        """
2644
 
        st = static_tuple.StaticTuple
2645
 
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
2646
 
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
2647
 
        return graph.GraphThunkIdsToKeys(known_graph)
2648
 
 
2649
2629
    def get_graph(self, other_repository=None):
2650
2630
        """Return the graph walker for this repository format"""
2651
2631
        parents_provider = self._make_parents_provider()
3053
3033
    # Is the format experimental ?
3054
3034
    experimental = False
3055
3035
 
3056
 
    def __repr__(self):
3057
 
        return "%s()" % self.__class__.__name__
 
3036
    def __str__(self):
 
3037
        return "<%s>" % self.__class__.__name__
3058
3038
 
3059
3039
    def __eq__(self, other):
3060
3040
        # format objects are generally stateless
3401
3381
        :return: None.
3402
3382
        """
3403
3383
        ui.ui_factory.warn_experimental_format_fetch(self)
3404
 
        from bzrlib.fetch import RepoFetcher
3405
 
        # See <https://launchpad.net/bugs/456077> asking for a warning here
3406
 
        if self.source._format.network_name() != self.target._format.network_name():
3407
 
            ui.ui_factory.show_user_warning('cross_format_fetch',
3408
 
                from_format=self.source._format,
3409
 
                to_format=self.target._format)
3410
 
        f = RepoFetcher(to_repository=self.target,
 
3384
        f = _mod_fetch.RepoFetcher(to_repository=self.target,
3411
3385
                               from_repository=self.source,
3412
3386
                               last_revision=revision_id,
3413
3387
                               fetch_spec=fetch_spec,
3991
3965
        """See InterRepository.fetch()."""
3992
3966
        if fetch_spec is not None:
3993
3967
            raise AssertionError("Not implemented yet...")
 
3968
        # See <https://launchpad.net/bugs/456077> asking for a warning here
 
3969
        #
 
3970
        # nb this is only active for local-local fetches; other things using
 
3971
        # streaming.
 
3972
        ui.ui_factory.warn_cross_format_fetch(self.source._format,
 
3973
            self.target._format)
3994
3974
        ui.ui_factory.warn_experimental_format_fetch(self)
3995
3975
        if (not self.source.supports_rich_root()
3996
3976
            and self.target.supports_rich_root()):
3998
3978
            self._revision_id_to_root_id = {}
3999
3979
        else:
4000
3980
            self._converting_to_rich_root = False
4001
 
        # See <https://launchpad.net/bugs/456077> asking for a warning here
4002
 
        if self.source._format.network_name() != self.target._format.network_name():
4003
 
            ui.ui_factory.show_user_warning('cross_format_fetch',
4004
 
                from_format=self.source._format,
4005
 
                to_format=self.target._format)
4006
3981
        revision_ids = self.target.search_missing_revision_ids(self.source,
4007
3982
            revision_id, find_ghosts=find_ghosts).get_keys()
4008
3983
        if not revision_ids:
4291
4266
                    self._extract_and_insert_inventories(
4292
4267
                        substream, src_serializer)
4293
4268
            elif substream_type == 'inventory-deltas':
 
4269
                ui.ui_factory.warn_cross_format_fetch(src_format,
 
4270
                    self.target_repo._format)
4294
4271
                self._extract_and_insert_inventory_deltas(
4295
4272
                    substream, src_serializer)
4296
4273
            elif substream_type == 'chk_bytes':