← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Martin Pool
  • Date: 2010-02-17 05:12:01 UTC
  • mfrom: (4797.2.16 2.1)
  • mto: This revision was merged to the branch mainline in revision 5037.
  • Revision ID: mbp@sourcefrog.net-20100217051201-1sd9dssoujfdc6c4
merge 2.1 back to trunk

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
1028
1027
 
1029
1028
        :seealso: add_inventory, for the contract.
1030
1029
        """
1031
 
        inv_lines = self._serializer.write_inventory_to_lines(inv)
 
1030
        inv_lines = self._serialise_inventory_to_lines(inv)
1032
1031
        return self._inventory_add_lines(revision_id, parents,
1033
1032
            inv_lines, check_content=False)
1034
1033
 
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:
1903
1895
                rev = self._serializer.read_revision_from_string(text)
1904
1896
                yield (revid, rev)
1905
1897
 
 
1898
    @needs_read_lock
 
1899
    def get_revision_xml(self, revision_id):
 
1900
        # TODO: jam 20070210 This shouldn't be necessary since get_revision
 
1901
        #       would have already do it.
 
1902
        # TODO: jam 20070210 Just use _serializer.write_revision_to_string()
 
1903
        # TODO: this can't just be replaced by:
 
1904
        # return self._serializer.write_revision_to_string(
 
1905
        #     self.get_revision(revision_id))
 
1906
        # as cStringIO preservers the encoding unlike write_revision_to_string
 
1907
        # or some other call down the path.
 
1908
        rev = self.get_revision(revision_id)
 
1909
        rev_tmp = cStringIO.StringIO()
 
1910
        # the current serializer..
 
1911
        self._serializer.write_revision(rev, rev_tmp)
 
1912
        rev_tmp.seek(0)
 
1913
        return rev_tmp.getvalue()
 
1914
 
1906
1915
    def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1907
1916
        """Produce a generator of revision deltas.
1908
1917
 
2421
2430
                result.revision_id, revision_id))
2422
2431
        return result
2423
2432
 
 
2433
    def _serialise_inventory(self, inv):
 
2434
        return self._serializer.write_inventory_to_string(inv)
 
2435
 
 
2436
    def _serialise_inventory_to_lines(self, inv):
 
2437
        return self._serializer.write_inventory_to_lines(inv)
 
2438
 
2424
2439
    def get_serializer_format(self):
2425
2440
        return self._serializer.format_num
2426
2441
 
2490
2505
            else:
2491
2506
                next_id = parents[0]
2492
2507
 
 
2508
    @needs_read_lock
 
2509
    def get_revision_inventory(self, revision_id):
 
2510
        """Return inventory of a past revision."""
 
2511
        # TODO: Unify this with get_inventory()
 
2512
        # bzr 0.0.6 and later imposes the constraint that the inventory_id
 
2513
        # must be the same as its revision, so this is trivial.
 
2514
        if revision_id is None:
 
2515
            # This does not make sense: if there is no revision,
 
2516
            # then it is the current tree inventory surely ?!
 
2517
            # and thus get_root_id() is something that looks at the last
 
2518
            # commit on the branch, and the get_root_id is an inventory check.
 
2519
            raise NotImplementedError
 
2520
            # return Inventory(self.get_root_id())
 
2521
        else:
 
2522
            return self.get_inventory(revision_id)
 
2523
 
2493
2524
    def is_shared(self):
2494
2525
        """Return True if this repository is flagged as a shared repository."""
2495
2526
        raise NotImplementedError(self.is_shared)
2529
2560
            return RevisionTree(self, Inventory(root_id=None),
2530
2561
                                _mod_revision.NULL_REVISION)
2531
2562
        else:
2532
 
            inv = self.get_inventory(revision_id)
 
2563
            inv = self.get_revision_inventory(revision_id)
2533
2564
            return RevisionTree(self, inv, revision_id)
2534
2565
 
2535
2566
    def revision_trees(self, revision_ids):
2588
2619
            keys = tsort.topo_sort(parent_map)
2589
2620
        return [None] + list(keys)
2590
2621
 
2591
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
2622
    def pack(self, hint=None):
2592
2623
        """Compress the data within the repository.
2593
2624
 
2594
2625
        This operation only makes sense for some repository types. For other
2604
2635
            obtained from the result of commit_write_group(). Out of
2605
2636
            date hints are simply ignored, because concurrent operations
2606
2637
            can obsolete them rapidly.
2607
 
 
2608
 
        :param clean_obsolete_packs: Clean obsolete packs immediately after
2609
 
            the pack operation.
2610
2638
        """
2611
2639
 
2612
2640
    def get_transaction(self):
2637
2665
    def _make_parents_provider(self):
2638
2666
        return self
2639
2667
 
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
2668
    def get_graph(self, other_repository=None):
2650
2669
        """Return the graph walker for this repository format"""
2651
2670
        parents_provider = self._make_parents_provider()
3053
3072
    # Is the format experimental ?
3054
3073
    experimental = False
3055
3074
 
3056
 
    def __repr__(self):
3057
 
        return "%s()" % self.__class__.__name__
 
3075
    def __str__(self):
 
3076
        return "<%s>" % self.__class__.__name__
3058
3077
 
3059
3078
    def __eq__(self, other):
3060
3079
        # format objects are generally stateless
3178
3197
        """
3179
3198
        raise NotImplementedError(self.open)
3180
3199
 
3181
 
    def _run_post_repo_init_hooks(self, repository, a_bzrdir, shared):
3182
 
        from bzrlib.bzrdir import BzrDir, RepoInitHookParams
3183
 
        hooks = BzrDir.hooks['post_repo_init']
3184
 
        if not hooks:
3185
 
            return
3186
 
        params = RepoInitHookParams(repository, self, a_bzrdir, shared)
3187
 
        for hook in hooks:
3188
 
            hook(params)
3189
 
 
3190
3200
 
3191
3201
class MetaDirRepositoryFormat(RepositoryFormat):
3192
3202
    """Common base class for the new repositories using the metadir layout."""
3401
3411
        :return: None.
3402
3412
        """
3403
3413
        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,
 
3414
        f = _mod_fetch.RepoFetcher(to_repository=self.target,
3411
3415
                               from_repository=self.source,
3412
3416
                               last_revision=revision_id,
3413
3417
                               fetch_spec=fetch_spec,
3991
3995
        """See InterRepository.fetch()."""
3992
3996
        if fetch_spec is not None:
3993
3997
            raise AssertionError("Not implemented yet...")
 
3998
        # See <https://launchpad.net/bugs/456077> asking for a warning here
 
3999
        #
 
4000
        # nb this is only active for local-local fetches; other things using
 
4001
        # streaming.
 
4002
        ui.ui_factory.warn_cross_format_fetch(self.source._format,
 
4003
            self.target._format)
3994
4004
        ui.ui_factory.warn_experimental_format_fetch(self)
3995
4005
        if (not self.source.supports_rich_root()
3996
4006
            and self.target.supports_rich_root()):
3998
4008
            self._revision_id_to_root_id = {}
3999
4009
        else:
4000
4010
            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
4011
        revision_ids = self.target.search_missing_revision_ids(self.source,
4007
4012
            revision_id, find_ghosts=find_ghosts).get_keys()
4008
4013
        if not revision_ids:
4291
4296
                    self._extract_and_insert_inventories(
4292
4297
                        substream, src_serializer)
4293
4298
            elif substream_type == 'inventory-deltas':
 
4299
                ui.ui_factory.warn_cross_format_fetch(src_format,
 
4300
                    self.target_repo._format)
4294
4301
                self._extract_and_insert_inventory_deltas(
4295
4302
                    substream, src_serializer)
4296
4303
            elif substream_type == 'chk_bytes':