/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: Gordon Tyler
  • Date: 2010-01-14 15:24:04 UTC
  • mto: (5037.3.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5046.
  • Revision ID: gordon@doxxx.net-20100114152404-d64ik2afl96lcml0
Reverted changes to test_rules since the original should work now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
    lock,
28
28
    lockdir,
29
29
    repository,
30
 
    repository as _mod_repository,
31
30
    revision,
32
31
    revision as _mod_revision,
33
 
    static_tuple,
34
32
    symbol_versioning,
35
33
)
36
 
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
 
34
from bzrlib.branch import BranchReferenceFormat
37
35
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
36
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
37
from bzrlib.errors import (
43
41
from bzrlib.lockable_files import LockableFiles
44
42
from bzrlib.smart import client, vfs, repository as smart_repo
45
43
from bzrlib.revision import ensure_null, NULL_REVISION
46
 
from bzrlib.repository import RepositoryWriteLockResult
47
44
from bzrlib.trace import mutter, note, warning
48
45
 
49
46
 
117
114
 
118
115
        self._probe_bzrdir()
119
116
 
120
 
    def __repr__(self):
121
 
        return '%s(%r)' % (self.__class__.__name__, self._client)
122
 
 
123
117
    def _probe_bzrdir(self):
124
118
        medium = self._client._medium
125
119
        path = self._path_for_remote_call(self._client)
245
239
        self._ensure_real()
246
240
        self._real_bzrdir.destroy_repository()
247
241
 
248
 
    def create_branch(self, name=None):
 
242
    def create_branch(self):
249
243
        # as per meta1 formats - just delegate to the format object which may
250
244
        # be parameterised.
251
 
        real_branch = self._format.get_branch_format().initialize(self,
252
 
            name=name)
 
245
        real_branch = self._format.get_branch_format().initialize(self)
253
246
        if not isinstance(real_branch, RemoteBranch):
254
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
255
 
                                  name=name)
 
247
            result = RemoteBranch(self, self.find_repository(), real_branch)
256
248
        else:
257
249
            result = real_branch
258
250
        # BzrDir.clone_on_transport() uses the result of create_branch but does
264
256
        self._next_open_branch_result = result
265
257
        return result
266
258
 
267
 
    def destroy_branch(self, name=None):
 
259
    def destroy_branch(self):
268
260
        """See BzrDir.destroy_branch"""
269
261
        self._ensure_real()
270
 
        self._real_bzrdir.destroy_branch(name=name)
 
262
        self._real_bzrdir.destroy_branch()
271
263
        self._next_open_branch_result = None
272
264
 
273
265
    def create_workingtree(self, revision_id=None, from_branch=None):
274
266
        raise errors.NotLocalUrl(self.transport.base)
275
267
 
276
 
    def find_branch_format(self, name=None):
 
268
    def find_branch_format(self):
277
269
        """Find the branch 'format' for this bzrdir.
278
270
 
279
271
        This might be a synthetic object for e.g. RemoteBranch and SVN.
280
272
        """
281
 
        b = self.open_branch(name=name)
 
273
        b = self.open_branch()
282
274
        return b._format
283
275
 
284
 
    def get_branch_reference(self, name=None):
 
276
    def get_branch_reference(self):
285
277
        """See BzrDir.get_branch_reference()."""
286
 
        if name is not None:
287
 
            # XXX JRV20100304: Support opening colocated branches
288
 
            raise errors.NoColocatedBranchSupport(self)
289
278
        response = self._get_branch_reference()
290
279
        if response[0] == 'ref':
291
280
            return response[1]
295
284
    def _get_branch_reference(self):
296
285
        path = self._path_for_remote_call(self._client)
297
286
        medium = self._client._medium
298
 
        candidate_calls = [
299
 
            ('BzrDir.open_branchV3', (2, 1)),
300
 
            ('BzrDir.open_branchV2', (1, 13)),
301
 
            ('BzrDir.open_branch', None),
302
 
            ]
303
 
        for verb, required_version in candidate_calls:
304
 
            if required_version and medium._is_remote_before(required_version):
305
 
                continue
 
287
        if not medium._is_remote_before((1, 13)):
306
288
            try:
307
 
                response = self._call(verb, path)
 
289
                response = self._call('BzrDir.open_branchV2', path)
 
290
                if response[0] not in ('ref', 'branch'):
 
291
                    raise errors.UnexpectedSmartServerResponse(response)
 
292
                return response
308
293
            except errors.UnknownSmartMethod:
309
 
                if required_version is None:
310
 
                    raise
311
 
                medium._remember_remote_is_before(required_version)
312
 
            else:
313
 
                break
314
 
        if verb == 'BzrDir.open_branch':
315
 
            if response[0] != 'ok':
316
 
                raise errors.UnexpectedSmartServerResponse(response)
317
 
            if response[1] != '':
318
 
                return ('ref', response[1])
319
 
            else:
320
 
                return ('branch', '')
321
 
        if response[0] not in ('ref', 'branch'):
 
294
                medium._remember_remote_is_before((1, 13))
 
295
        response = self._call('BzrDir.open_branch', path)
 
296
        if response[0] != 'ok':
322
297
            raise errors.UnexpectedSmartServerResponse(response)
323
 
        return response
 
298
        if response[1] != '':
 
299
            return ('ref', response[1])
 
300
        else:
 
301
            return ('branch', '')
324
302
 
325
 
    def _get_tree_branch(self, name=None):
 
303
    def _get_tree_branch(self):
326
304
        """See BzrDir._get_tree_branch()."""
327
 
        return None, self.open_branch(name=name)
 
305
        return None, self.open_branch()
328
306
 
329
 
    def open_branch(self, name=None, unsupported=False,
330
 
                    ignore_fallbacks=False):
331
 
        if unsupported:
 
307
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
 
308
        if _unsupported:
332
309
            raise NotImplementedError('unsupported flag support not implemented yet.')
333
310
        if self._next_open_branch_result is not None:
334
311
            # See create_branch for details.
339
316
        if response[0] == 'ref':
340
317
            # a branch reference, use the existing BranchReference logic.
341
318
            format = BranchReferenceFormat()
342
 
            return format.open(self, name=name, _found=True,
343
 
                location=response[1], ignore_fallbacks=ignore_fallbacks)
 
319
            return format.open(self, _found=True, location=response[1],
 
320
                ignore_fallbacks=ignore_fallbacks)
344
321
        branch_format_name = response[1]
345
322
        if not branch_format_name:
346
323
            branch_format_name = None
347
324
        format = RemoteBranchFormat(network_name=branch_format_name)
348
325
        return RemoteBranch(self, self.find_repository(), format=format,
349
 
            setup_stacking=not ignore_fallbacks, name=name)
 
326
            setup_stacking=not ignore_fallbacks)
350
327
 
351
328
    def _open_repo_v1(self, path):
352
329
        verb = 'BzrDir.find_repository'
429
406
        """Return the path to be used for this bzrdir in a remote call."""
430
407
        return client.remote_path_from_transport(self.root_transport)
431
408
 
432
 
    def get_branch_transport(self, branch_format, name=None):
 
409
    def get_branch_transport(self, branch_format):
433
410
        self._ensure_real()
434
 
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
 
411
        return self._real_bzrdir.get_branch_transport(branch_format)
435
412
 
436
413
    def get_repository_transport(self, repository_format):
437
414
        self._ensure_real()
647
624
        return self._custom_format._serializer
648
625
 
649
626
 
650
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
651
 
    bzrdir.ControlComponent):
 
627
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
652
628
    """Repository accessed over rpc.
653
629
 
654
630
    For the moment most operations are performed using local transport-backed
697
673
        # Additional places to query for data.
698
674
        self._fallback_repositories = []
699
675
 
700
 
    @property
701
 
    def user_transport(self):
702
 
        return self.bzrdir.user_transport
703
 
 
704
 
    @property
705
 
    def control_transport(self):
706
 
        # XXX: Normally you shouldn't directly get at the remote repository
707
 
        # transport, but I'm not sure it's worth making this method
708
 
        # optional -- mbp 2010-04-21
709
 
        return self.bzrdir.get_repository_transport(None)
710
 
        
711
676
    def __str__(self):
712
677
        return "%s(%s)" % (self.__class__.__name__, self.base)
713
678
 
921
886
        parents_provider = self._make_parents_provider(other_repository)
922
887
        return graph.Graph(parents_provider)
923
888
 
924
 
    @needs_read_lock
925
 
    def get_known_graph_ancestry(self, revision_ids):
926
 
        """Return the known graph for a set of revision ids and their ancestors.
927
 
        """
928
 
        st = static_tuple.StaticTuple
929
 
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
930
 
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
931
 
        return graph.GraphThunkIdsToKeys(known_graph)
932
 
 
933
889
    def gather_stats(self, revid=None, committers=None):
934
890
        """See Repository.gather_stats()."""
935
891
        path = self.bzrdir._path_for_remote_call(self._client)
1001
957
        pass
1002
958
 
1003
959
    def lock_read(self):
1004
 
        """Lock the repository for read operations.
1005
 
 
1006
 
        :return: A bzrlib.lock.LogicalLockResult.
1007
 
        """
1008
960
        # wrong eventually - want a local lock cache context
1009
961
        if not self._lock_mode:
1010
962
            self._note_lock('r')
1017
969
                repo.lock_read()
1018
970
        else:
1019
971
            self._lock_count += 1
1020
 
        return lock.LogicalLockResult(self.unlock)
1021
972
 
1022
973
    def _remote_lock_write(self, token):
1023
974
        path = self.bzrdir._path_for_remote_call(self._client)
1063
1014
            raise errors.ReadOnlyError(self)
1064
1015
        else:
1065
1016
            self._lock_count += 1
1066
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
1017
        return self._lock_token or None
1067
1018
 
1068
1019
    def leave_lock_in_place(self):
1069
1020
        if not self._lock_token:
1249
1200
            # state, so always add a lock here. If a caller passes us a locked
1250
1201
            # repository, they are responsible for unlocking it later.
1251
1202
            repository.lock_read()
1252
 
        self._check_fallback_repository(repository)
1253
1203
        self._fallback_repositories.append(repository)
1254
1204
        # If self._real_repository was parameterised already (e.g. because a
1255
1205
        # _real_branch had its get_stacked_on_url method called), then the
1256
1206
        # repository to be added may already be in the _real_repositories list.
1257
1207
        if self._real_repository is not None:
1258
 
            fallback_locations = [repo.user_url for repo in
 
1208
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1259
1209
                self._real_repository._fallback_repositories]
1260
 
            if repository.user_url not in fallback_locations:
 
1210
            if repository.bzrdir.root_transport.base not in fallback_locations:
1261
1211
                self._real_repository.add_fallback_repository(repository)
1262
1212
 
1263
 
    def _check_fallback_repository(self, repository):
1264
 
        """Check that this repository can fallback to repository safely.
1265
 
 
1266
 
        Raise an error if not.
1267
 
 
1268
 
        :param repository: A repository to fallback to.
1269
 
        """
1270
 
        return _mod_repository.InterRepository._assert_same_model(
1271
 
            self, repository)
1272
 
 
1273
1213
    def add_inventory(self, revid, inv, parents):
1274
1214
        self._ensure_real()
1275
1215
        return self._real_repository.add_inventory(revid, inv, parents)
1276
1216
 
1277
1217
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1278
 
            parents, basis_inv=None, propagate_caches=False):
 
1218
                               parents):
1279
1219
        self._ensure_real()
1280
1220
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
1281
 
            delta, new_revision_id, parents, basis_inv=basis_inv,
1282
 
            propagate_caches=propagate_caches)
 
1221
            delta, new_revision_id, parents)
1283
1222
 
1284
1223
    def add_revision(self, rev_id, rev, inv=None, config=None):
1285
1224
        self._ensure_real()
1315
1254
        return self._real_repository.make_working_trees()
1316
1255
 
1317
1256
    def refresh_data(self):
1318
 
        """Re-read any data needed to synchronise with disk.
 
1257
        """Re-read any data needed to to synchronise with disk.
1319
1258
 
1320
1259
        This method is intended to be called after another repository instance
1321
1260
        (such as one used by a smart server) has inserted data into the
1322
 
        repository. On all repositories this will work outside of write groups.
1323
 
        Some repository formats (pack and newer for bzrlib native formats)
1324
 
        support refresh_data inside write groups. If called inside a write
1325
 
        group on a repository that does not support refreshing in a write group
1326
 
        IsInWriteGroupError will be raised.
 
1261
        repository. It may not be called during a write group, but may be
 
1262
        called at any other time.
1327
1263
        """
 
1264
        if self.is_in_write_group():
 
1265
            raise errors.InternalBzrError(
 
1266
                "May not refresh_data while in a write group.")
1328
1267
        if self._real_repository is not None:
1329
1268
            self._real_repository.refresh_data()
1330
1269
 
1544
1483
        return self._real_repository.get_signature_text(revision_id)
1545
1484
 
1546
1485
    @needs_read_lock
1547
 
    def _get_inventory_xml(self, revision_id):
1548
 
        self._ensure_real()
1549
 
        return self._real_repository._get_inventory_xml(revision_id)
 
1486
    def get_inventory_xml(self, revision_id):
 
1487
        self._ensure_real()
 
1488
        return self._real_repository.get_inventory_xml(revision_id)
 
1489
 
 
1490
    def deserialise_inventory(self, revision_id, xml):
 
1491
        self._ensure_real()
 
1492
        return self._real_repository.deserialise_inventory(revision_id, xml)
1550
1493
 
1551
1494
    def reconcile(self, other=None, thorough=False):
1552
1495
        self._ensure_real()
1628
1571
        return self._real_repository.inventories
1629
1572
 
1630
1573
    @needs_write_lock
1631
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1574
    def pack(self, hint=None):
1632
1575
        """Compress the data within the repository.
1633
1576
 
1634
1577
        This is not currently implemented within the smart server.
1635
1578
        """
1636
1579
        self._ensure_real()
1637
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1580
        return self._real_repository.pack(hint=hint)
1638
1581
 
1639
1582
    @property
1640
1583
    def revisions(self):
2068
2011
    def network_name(self):
2069
2012
        return self._network_name
2070
2013
 
2071
 
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2072
 
        return a_bzrdir.open_branch(name=name, 
2073
 
            ignore_fallbacks=ignore_fallbacks)
 
2014
    def open(self, a_bzrdir, ignore_fallbacks=False):
 
2015
        return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2074
2016
 
2075
 
    def _vfs_initialize(self, a_bzrdir, name):
 
2017
    def _vfs_initialize(self, a_bzrdir):
2076
2018
        # Initialisation when using a local bzrdir object, or a non-vfs init
2077
2019
        # method is not available on the server.
2078
2020
        # self._custom_format is always set - the start of initialize ensures
2079
2021
        # that.
2080
2022
        if isinstance(a_bzrdir, RemoteBzrDir):
2081
2023
            a_bzrdir._ensure_real()
2082
 
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2083
 
                name)
 
2024
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2084
2025
        else:
2085
2026
            # We assume the bzrdir is parameterised; it may not be.
2086
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
2027
            result = self._custom_format.initialize(a_bzrdir)
2087
2028
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2088
2029
            not isinstance(result, RemoteBranch)):
2089
 
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2090
 
                                  name=name)
 
2030
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2091
2031
        return result
2092
2032
 
2093
 
    def initialize(self, a_bzrdir, name=None):
 
2033
    def initialize(self, a_bzrdir):
2094
2034
        # 1) get the network name to use.
2095
2035
        if self._custom_format:
2096
2036
            network_name = self._custom_format.network_name()
2102
2042
            network_name = reference_format.network_name()
2103
2043
        # Being asked to create on a non RemoteBzrDir:
2104
2044
        if not isinstance(a_bzrdir, RemoteBzrDir):
2105
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2045
            return self._vfs_initialize(a_bzrdir)
2106
2046
        medium = a_bzrdir._client._medium
2107
2047
        if medium._is_remote_before((1, 13)):
2108
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2048
            return self._vfs_initialize(a_bzrdir)
2109
2049
        # Creating on a remote bzr dir.
2110
2050
        # 2) try direct creation via RPC
2111
2051
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2112
 
        if name is not None:
2113
 
            # XXX JRV20100304: Support creating colocated branches
2114
 
            raise errors.NoColocatedBranchSupport(self)
2115
2052
        verb = 'BzrDir.create_branch'
2116
2053
        try:
2117
2054
            response = a_bzrdir._call(verb, path, network_name)
2118
2055
        except errors.UnknownSmartMethod:
2119
2056
            # Fallback - use vfs methods
2120
2057
            medium._remember_remote_is_before((1, 13))
2121
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2058
            return self._vfs_initialize(a_bzrdir)
2122
2059
        if response[0] != 'ok':
2123
2060
            raise errors.UnexpectedSmartServerResponse(response)
2124
2061
        # Turn the response into a RemoteRepository object.
2132
2069
                a_bzrdir._client)
2133
2070
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2134
2071
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2135
 
            format=format, setup_stacking=False, name=name)
 
2072
            format=format, setup_stacking=False)
2136
2073
        # XXX: We know this is a new branch, so it must have revno 0, revid
2137
2074
        # NULL_REVISION. Creating the branch locked would make this be unable
2138
2075
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2165
2102
    """
2166
2103
 
2167
2104
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2168
 
        _client=None, format=None, setup_stacking=True, name=None):
 
2105
        _client=None, format=None, setup_stacking=True):
2169
2106
        """Create a RemoteBranch instance.
2170
2107
 
2171
2108
        :param real_branch: An optional local implementation of the branch
2177
2114
        :param setup_stacking: If True make an RPC call to determine the
2178
2115
            stacked (or not) status of the branch. If False assume the branch
2179
2116
            is not stacked.
2180
 
        :param name: Colocated branch name
2181
2117
        """
2182
2118
        # We intentionally don't call the parent class's __init__, because it
2183
2119
        # will try to assign to self.tags, which is a property in this subclass.
2202
2138
            self._real_branch = None
2203
2139
        # Fill out expected attributes of branch for bzrlib API users.
2204
2140
        self._clear_cached_state()
2205
 
        # TODO: deprecate self.base in favor of user_url
2206
 
        self.base = self.bzrdir.user_url
2207
 
        self._name = name
 
2141
        self.base = self.bzrdir.root_transport.base
2208
2142
        self._control_files = None
2209
2143
        self._lock_mode = None
2210
2144
        self._lock_token = None
2275
2209
                    'to use vfs implementation')
2276
2210
            self.bzrdir._ensure_real()
2277
2211
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2278
 
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
 
2212
                ignore_fallbacks=self._real_ignore_fallbacks)
2279
2213
            if self.repository._real_repository is None:
2280
2214
                # Give the remote repository the matching real repo.
2281
2215
                real_repo = self._real_branch.repository
2396
2330
            self._vfs_set_tags_bytes(bytes)
2397
2331
 
2398
2332
    def lock_read(self):
2399
 
        """Lock the branch for read operations.
2400
 
 
2401
 
        :return: A bzrlib.lock.LogicalLockResult.
2402
 
        """
2403
2333
        self.repository.lock_read()
2404
2334
        if not self._lock_mode:
2405
2335
            self._note_lock('r')
2409
2339
                self._real_branch.lock_read()
2410
2340
        else:
2411
2341
            self._lock_count += 1
2412
 
        return lock.LogicalLockResult(self.unlock)
2413
2342
 
2414
2343
    def _remote_lock_write(self, token):
2415
2344
        if token is None:
2416
2345
            branch_token = repo_token = ''
2417
2346
        else:
2418
2347
            branch_token = token
2419
 
            repo_token = self.repository.lock_write().repository_token
 
2348
            repo_token = self.repository.lock_write()
2420
2349
            self.repository.unlock()
2421
2350
        err_context = {'token': token}
2422
2351
        response = self._call(
2459
2388
            self._lock_count += 1
2460
2389
            # Re-lock the repository too.
2461
2390
            self.repository.lock_write(self._repo_lock_token)
2462
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2391
        return self._lock_token or None
2463
2392
 
2464
2393
    def _unlock(self, branch_token, repo_token):
2465
2394
        err_context = {'token': str((branch_token, repo_token))}
2894
2823
        raise NoSuchRevision(find('branch'), err.error_args[0])
2895
2824
    elif err.error_verb == 'nosuchrevision':
2896
2825
        raise NoSuchRevision(find('repository'), err.error_args[0])
2897
 
    elif err.error_verb == 'nobranch':
2898
 
        if len(err.error_args) >= 1:
2899
 
            extra = err.error_args[0]
2900
 
        else:
2901
 
            extra = None
2902
 
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2903
 
            detail=extra)
 
2826
    elif err.error_tuple == ('nobranch',):
 
2827
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2904
2828
    elif err.error_verb == 'norepository':
2905
2829
        raise errors.NoRepositoryPresent(find('bzrdir'))
2906
2830
    elif err.error_verb == 'LockContention':