/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/remote.py

  • Committer: Martin Pool
  • Date: 2010-04-21 09:57:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@canonical.com-20100421095718-u3c4w7k1crba29fq
Change info code to use user_url etc

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
27
27
    lock,
28
28
    lockdir,
29
29
    repository,
30
 
    repository as _mod_repository,
31
30
    revision,
32
31
    revision as _mod_revision,
33
32
    static_tuple,
1240
1239
            # state, so always add a lock here. If a caller passes us a locked
1241
1240
            # repository, they are responsible for unlocking it later.
1242
1241
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1242
        self._fallback_repositories.append(repository)
1245
1243
        # If self._real_repository was parameterised already (e.g. because a
1246
1244
        # _real_branch had its get_stacked_on_url method called), then the
1247
1245
        # repository to be added may already be in the _real_repositories list.
1248
1246
        if self._real_repository is not None:
1249
 
            fallback_locations = [repo.user_url for repo in
 
1247
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1248
                self._real_repository._fallback_repositories]
1251
 
            if repository.user_url not in fallback_locations:
 
1249
            if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1250
                self._real_repository.add_fallback_repository(repository)
1253
1251
 
1254
 
    def _check_fallback_repository(self, repository):
1255
 
        """Check that this repository can fallback to repository safely.
1256
 
 
1257
 
        Raise an error if not.
1258
 
 
1259
 
        :param repository: A repository to fallback to.
1260
 
        """
1261
 
        return _mod_repository.InterRepository._assert_same_model(
1262
 
            self, repository)
1263
 
 
1264
1252
    def add_inventory(self, revid, inv, parents):
1265
1253
        self._ensure_real()
1266
1254
        return self._real_repository.add_inventory(revid, inv, parents)
1619
1607
        return self._real_repository.inventories
1620
1608
 
1621
1609
    @needs_write_lock
1622
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1610
    def pack(self, hint=None):
1623
1611
        """Compress the data within the repository.
1624
1612
 
1625
1613
        This is not currently implemented within the smart server.
1626
1614
        """
1627
1615
        self._ensure_real()
1628
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1616
        return self._real_repository.pack(hint=hint)
1629
1617
 
1630
1618
    @property
1631
1619
    def revisions(self):
2193
2181
            self._real_branch = None
2194
2182
        # Fill out expected attributes of branch for bzrlib API users.
2195
2183
        self._clear_cached_state()
2196
 
        # TODO: deprecate self.base in favor of user_url
2197
 
        self.base = self.bzrdir.user_url
 
2184
        self.base = self.bzrdir.root_transport.base
2198
2185
        self._name = name
2199
2186
        self._control_files = None
2200
2187
        self._lock_mode = None