/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: John Arbash Meinel
  • Date: 2009-10-21 20:53:21 UTC
  • mto: This revision was merged to the branch mainline in revision 4771.
  • Revision ID: john@arbash-meinel.com-20091021205321-j62yud7d5lfx2za1
Revert previous change.

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)
160
154
        Used before calls to self._real_bzrdir.
161
155
        """
162
156
        if not self._real_bzrdir:
163
 
            if 'hpssvfs' in debug.debug_flags:
164
 
                import traceback
165
 
                warning('VFS BzrDir access triggered\n%s',
166
 
                    ''.join(traceback.format_stack()))
167
157
            self._real_bzrdir = BzrDir.open_from_transport(
168
158
                self.root_transport, _server_formats=False)
169
159
            self._format._network_name = \
245
235
        self._ensure_real()
246
236
        self._real_bzrdir.destroy_repository()
247
237
 
248
 
    def create_branch(self, name=None):
 
238
    def create_branch(self):
249
239
        # as per meta1 formats - just delegate to the format object which may
250
240
        # be parameterised.
251
 
        real_branch = self._format.get_branch_format().initialize(self,
252
 
            name=name)
 
241
        real_branch = self._format.get_branch_format().initialize(self)
253
242
        if not isinstance(real_branch, RemoteBranch):
254
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
255
 
                                  name=name)
 
243
            result = RemoteBranch(self, self.find_repository(), real_branch)
256
244
        else:
257
245
            result = real_branch
258
246
        # BzrDir.clone_on_transport() uses the result of create_branch but does
264
252
        self._next_open_branch_result = result
265
253
        return result
266
254
 
267
 
    def destroy_branch(self, name=None):
 
255
    def destroy_branch(self):
268
256
        """See BzrDir.destroy_branch"""
269
257
        self._ensure_real()
270
 
        self._real_bzrdir.destroy_branch(name=name)
 
258
        self._real_bzrdir.destroy_branch()
271
259
        self._next_open_branch_result = None
272
260
 
273
261
    def create_workingtree(self, revision_id=None, from_branch=None):
292
280
    def _get_branch_reference(self):
293
281
        path = self._path_for_remote_call(self._client)
294
282
        medium = self._client._medium
295
 
        candidate_calls = [
296
 
            ('BzrDir.open_branchV3', (2, 1)),
297
 
            ('BzrDir.open_branchV2', (1, 13)),
298
 
            ('BzrDir.open_branch', None),
299
 
            ]
300
 
        for verb, required_version in candidate_calls:
301
 
            if required_version and medium._is_remote_before(required_version):
302
 
                continue
 
283
        if not medium._is_remote_before((1, 13)):
303
284
            try:
304
 
                response = self._call(verb, path)
 
285
                response = self._call('BzrDir.open_branchV2', path)
 
286
                if response[0] not in ('ref', 'branch'):
 
287
                    raise errors.UnexpectedSmartServerResponse(response)
 
288
                return response
305
289
            except errors.UnknownSmartMethod:
306
 
                if required_version is None:
307
 
                    raise
308
 
                medium._remember_remote_is_before(required_version)
309
 
            else:
310
 
                break
311
 
        if verb == 'BzrDir.open_branch':
312
 
            if response[0] != 'ok':
313
 
                raise errors.UnexpectedSmartServerResponse(response)
314
 
            if response[1] != '':
315
 
                return ('ref', response[1])
316
 
            else:
317
 
                return ('branch', '')
318
 
        if response[0] not in ('ref', 'branch'):
 
290
                medium._remember_remote_is_before((1, 13))
 
291
        response = self._call('BzrDir.open_branch', path)
 
292
        if response[0] != 'ok':
319
293
            raise errors.UnexpectedSmartServerResponse(response)
320
 
        return response
 
294
        if response[1] != '':
 
295
            return ('ref', response[1])
 
296
        else:
 
297
            return ('branch', '')
321
298
 
322
299
    def _get_tree_branch(self):
323
300
        """See BzrDir._get_tree_branch()."""
324
301
        return None, self.open_branch()
325
302
 
326
 
    def open_branch(self, name=None, unsupported=False,
327
 
                    ignore_fallbacks=False):
328
 
        if unsupported:
 
303
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
 
304
        if _unsupported:
329
305
            raise NotImplementedError('unsupported flag support not implemented yet.')
330
306
        if self._next_open_branch_result is not None:
331
307
            # See create_branch for details.
336
312
        if response[0] == 'ref':
337
313
            # a branch reference, use the existing BranchReference logic.
338
314
            format = BranchReferenceFormat()
339
 
            return format.open(self, name=name, _found=True,
340
 
                location=response[1], ignore_fallbacks=ignore_fallbacks)
 
315
            return format.open(self, _found=True, location=response[1],
 
316
                ignore_fallbacks=ignore_fallbacks)
341
317
        branch_format_name = response[1]
342
318
        if not branch_format_name:
343
319
            branch_format_name = None
344
320
        format = RemoteBranchFormat(network_name=branch_format_name)
345
321
        return RemoteBranch(self, self.find_repository(), format=format,
346
 
            setup_stacking=not ignore_fallbacks, name=name)
 
322
            setup_stacking=not ignore_fallbacks)
347
323
 
348
324
    def _open_repo_v1(self, path):
349
325
        verb = 'BzrDir.find_repository'
426
402
        """Return the path to be used for this bzrdir in a remote call."""
427
403
        return client.remote_path_from_transport(self.root_transport)
428
404
 
429
 
    def get_branch_transport(self, branch_format, name=None):
 
405
    def get_branch_transport(self, branch_format):
430
406
        self._ensure_real()
431
 
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
 
407
        return self._real_bzrdir.get_branch_transport(branch_format)
432
408
 
433
409
    def get_repository_transport(self, repository_format):
434
410
        self._ensure_real()
621
597
        return self._custom_format._fetch_reconcile
622
598
 
623
599
    def get_format_description(self):
624
 
        self._ensure_real()
625
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
600
        return 'bzr remote repository'
626
601
 
627
602
    def __eq__(self, other):
628
603
        return self.__class__ is other.__class__
644
619
        return self._custom_format._serializer
645
620
 
646
621
 
647
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
648
 
    bzrdir.ControlComponent):
 
622
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
649
623
    """Repository accessed over rpc.
650
624
 
651
625
    For the moment most operations are performed using local transport-backed
694
668
        # Additional places to query for data.
695
669
        self._fallback_repositories = []
696
670
 
697
 
    @property
698
 
    def user_transport(self):
699
 
        return self.bzrdir.user_transport
700
 
 
701
 
    @property
702
 
    def control_transport(self):
703
 
        # XXX: Normally you shouldn't directly get at the remote repository
704
 
        # transport, but I'm not sure it's worth making this method
705
 
        # optional -- mbp 2010-04-21
706
 
        return self.bzrdir.get_repository_transport(None)
707
 
        
708
671
    def __str__(self):
709
672
        return "%s(%s)" % (self.__class__.__name__, self.base)
710
673
 
918
881
        parents_provider = self._make_parents_provider(other_repository)
919
882
        return graph.Graph(parents_provider)
920
883
 
921
 
    @needs_read_lock
922
 
    def get_known_graph_ancestry(self, revision_ids):
923
 
        """Return the known graph for a set of revision ids and their ancestors.
924
 
        """
925
 
        st = static_tuple.StaticTuple
926
 
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
927
 
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
928
 
        return graph.GraphThunkIdsToKeys(known_graph)
929
 
 
930
884
    def gather_stats(self, revid=None, committers=None):
931
885
        """See Repository.gather_stats()."""
932
886
        path = self.bzrdir._path_for_remote_call(self._client)
992
946
    def is_write_locked(self):
993
947
        return self._lock_mode == 'w'
994
948
 
995
 
    def _warn_if_deprecated(self, branch=None):
996
 
        # If we have a real repository, the check will be done there, if we
997
 
        # don't the check will be done remotely.
998
 
        pass
999
 
 
1000
949
    def lock_read(self):
1001
 
        """Lock the repository for read operations.
1002
 
 
1003
 
        :return: A bzrlib.lock.LogicalLockResult.
1004
 
        """
1005
950
        # wrong eventually - want a local lock cache context
1006
951
        if not self._lock_mode:
1007
952
            self._note_lock('r')
1014
959
                repo.lock_read()
1015
960
        else:
1016
961
            self._lock_count += 1
1017
 
        return lock.LogicalLockResult(self.unlock)
1018
962
 
1019
963
    def _remote_lock_write(self, token):
1020
964
        path = self.bzrdir._path_for_remote_call(self._client)
1060
1004
            raise errors.ReadOnlyError(self)
1061
1005
        else:
1062
1006
            self._lock_count += 1
1063
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
1007
        return self._lock_token or None
1064
1008
 
1065
1009
    def leave_lock_in_place(self):
1066
1010
        if not self._lock_token:
1246
1190
            # state, so always add a lock here. If a caller passes us a locked
1247
1191
            # repository, they are responsible for unlocking it later.
1248
1192
            repository.lock_read()
1249
 
        self._check_fallback_repository(repository)
1250
1193
        self._fallback_repositories.append(repository)
1251
1194
        # If self._real_repository was parameterised already (e.g. because a
1252
1195
        # _real_branch had its get_stacked_on_url method called), then the
1253
1196
        # repository to be added may already be in the _real_repositories list.
1254
1197
        if self._real_repository is not None:
1255
 
            fallback_locations = [repo.user_url for repo in
 
1198
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1256
1199
                self._real_repository._fallback_repositories]
1257
 
            if repository.user_url not in fallback_locations:
 
1200
            if repository.bzrdir.root_transport.base not in fallback_locations:
1258
1201
                self._real_repository.add_fallback_repository(repository)
1259
1202
 
1260
 
    def _check_fallback_repository(self, repository):
1261
 
        """Check that this repository can fallback to repository safely.
1262
 
 
1263
 
        Raise an error if not.
1264
 
 
1265
 
        :param repository: A repository to fallback to.
1266
 
        """
1267
 
        return _mod_repository.InterRepository._assert_same_model(
1268
 
            self, repository)
1269
 
 
1270
1203
    def add_inventory(self, revid, inv, parents):
1271
1204
        self._ensure_real()
1272
1205
        return self._real_repository.add_inventory(revid, inv, parents)
1273
1206
 
1274
1207
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1275
 
            parents, basis_inv=None, propagate_caches=False):
 
1208
                               parents):
1276
1209
        self._ensure_real()
1277
1210
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
1278
 
            delta, new_revision_id, parents, basis_inv=basis_inv,
1279
 
            propagate_caches=propagate_caches)
 
1211
            delta, new_revision_id, parents)
1280
1212
 
1281
1213
    def add_revision(self, rev_id, rev, inv=None, config=None):
1282
1214
        self._ensure_real()
1541
1473
        return self._real_repository.get_signature_text(revision_id)
1542
1474
 
1543
1475
    @needs_read_lock
1544
 
    def _get_inventory_xml(self, revision_id):
1545
 
        self._ensure_real()
1546
 
        return self._real_repository._get_inventory_xml(revision_id)
 
1476
    def get_inventory_xml(self, revision_id):
 
1477
        self._ensure_real()
 
1478
        return self._real_repository.get_inventory_xml(revision_id)
 
1479
 
 
1480
    def deserialise_inventory(self, revision_id, xml):
 
1481
        self._ensure_real()
 
1482
        return self._real_repository.deserialise_inventory(revision_id, xml)
1547
1483
 
1548
1484
    def reconcile(self, other=None, thorough=False):
1549
1485
        self._ensure_real()
1625
1561
        return self._real_repository.inventories
1626
1562
 
1627
1563
    @needs_write_lock
1628
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1564
    def pack(self, hint=None):
1629
1565
        """Compress the data within the repository.
1630
1566
 
1631
1567
        This is not currently implemented within the smart server.
1632
1568
        """
1633
1569
        self._ensure_real()
1634
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1570
        return self._real_repository.pack(hint=hint)
1635
1571
 
1636
1572
    @property
1637
1573
    def revisions(self):
2059
1995
                self._network_name)
2060
1996
 
2061
1997
    def get_format_description(self):
2062
 
        self._ensure_real()
2063
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
1998
        return 'Remote BZR Branch'
2064
1999
 
2065
2000
    def network_name(self):
2066
2001
        return self._network_name
2067
2002
 
2068
 
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2069
 
        return a_bzrdir.open_branch(name=name, 
2070
 
            ignore_fallbacks=ignore_fallbacks)
 
2003
    def open(self, a_bzrdir, ignore_fallbacks=False):
 
2004
        return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2071
2005
 
2072
 
    def _vfs_initialize(self, a_bzrdir, name):
 
2006
    def _vfs_initialize(self, a_bzrdir):
2073
2007
        # Initialisation when using a local bzrdir object, or a non-vfs init
2074
2008
        # method is not available on the server.
2075
2009
        # self._custom_format is always set - the start of initialize ensures
2076
2010
        # that.
2077
2011
        if isinstance(a_bzrdir, RemoteBzrDir):
2078
2012
            a_bzrdir._ensure_real()
2079
 
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2080
 
                name)
 
2013
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2081
2014
        else:
2082
2015
            # We assume the bzrdir is parameterised; it may not be.
2083
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
2016
            result = self._custom_format.initialize(a_bzrdir)
2084
2017
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2085
2018
            not isinstance(result, RemoteBranch)):
2086
 
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2087
 
                                  name=name)
 
2019
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2088
2020
        return result
2089
2021
 
2090
 
    def initialize(self, a_bzrdir, name=None):
 
2022
    def initialize(self, a_bzrdir):
2091
2023
        # 1) get the network name to use.
2092
2024
        if self._custom_format:
2093
2025
            network_name = self._custom_format.network_name()
2099
2031
            network_name = reference_format.network_name()
2100
2032
        # Being asked to create on a non RemoteBzrDir:
2101
2033
        if not isinstance(a_bzrdir, RemoteBzrDir):
2102
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2034
            return self._vfs_initialize(a_bzrdir)
2103
2035
        medium = a_bzrdir._client._medium
2104
2036
        if medium._is_remote_before((1, 13)):
2105
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2037
            return self._vfs_initialize(a_bzrdir)
2106
2038
        # Creating on a remote bzr dir.
2107
2039
        # 2) try direct creation via RPC
2108
2040
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2109
 
        if name is not None:
2110
 
            # XXX JRV20100304: Support creating colocated branches
2111
 
            raise errors.NoColocatedBranchSupport(self)
2112
2041
        verb = 'BzrDir.create_branch'
2113
2042
        try:
2114
2043
            response = a_bzrdir._call(verb, path, network_name)
2115
2044
        except errors.UnknownSmartMethod:
2116
2045
            # Fallback - use vfs methods
2117
2046
            medium._remember_remote_is_before((1, 13))
2118
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2047
            return self._vfs_initialize(a_bzrdir)
2119
2048
        if response[0] != 'ok':
2120
2049
            raise errors.UnexpectedSmartServerResponse(response)
2121
2050
        # Turn the response into a RemoteRepository object.
2129
2058
                a_bzrdir._client)
2130
2059
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2131
2060
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2132
 
            format=format, setup_stacking=False, name=name)
 
2061
            format=format, setup_stacking=False)
2133
2062
        # XXX: We know this is a new branch, so it must have revno 0, revid
2134
2063
        # NULL_REVISION. Creating the branch locked would make this be unable
2135
2064
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2162
2091
    """
2163
2092
 
2164
2093
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2165
 
        _client=None, format=None, setup_stacking=True, name=None):
 
2094
        _client=None, format=None, setup_stacking=True):
2166
2095
        """Create a RemoteBranch instance.
2167
2096
 
2168
2097
        :param real_branch: An optional local implementation of the branch
2174
2103
        :param setup_stacking: If True make an RPC call to determine the
2175
2104
            stacked (or not) status of the branch. If False assume the branch
2176
2105
            is not stacked.
2177
 
        :param name: Colocated branch name
2178
2106
        """
2179
2107
        # We intentionally don't call the parent class's __init__, because it
2180
2108
        # will try to assign to self.tags, which is a property in this subclass.
2199
2127
            self._real_branch = None
2200
2128
        # Fill out expected attributes of branch for bzrlib API users.
2201
2129
        self._clear_cached_state()
2202
 
        # TODO: deprecate self.base in favor of user_url
2203
 
        self.base = self.bzrdir.user_url
2204
 
        self._name = name
 
2130
        self.base = self.bzrdir.root_transport.base
2205
2131
        self._control_files = None
2206
2132
        self._lock_mode = None
2207
2133
        self._lock_token = None
2272
2198
                    'to use vfs implementation')
2273
2199
            self.bzrdir._ensure_real()
2274
2200
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2275
 
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
 
2201
                ignore_fallbacks=self._real_ignore_fallbacks)
2276
2202
            if self.repository._real_repository is None:
2277
2203
                # Give the remote repository the matching real repo.
2278
2204
                real_repo = self._real_branch.repository
2393
2319
            self._vfs_set_tags_bytes(bytes)
2394
2320
 
2395
2321
    def lock_read(self):
2396
 
        """Lock the branch for read operations.
2397
 
 
2398
 
        :return: A bzrlib.lock.LogicalLockResult.
2399
 
        """
2400
2322
        self.repository.lock_read()
2401
2323
        if not self._lock_mode:
2402
2324
            self._note_lock('r')
2406
2328
                self._real_branch.lock_read()
2407
2329
        else:
2408
2330
            self._lock_count += 1
2409
 
        return lock.LogicalLockResult(self.unlock)
2410
2331
 
2411
2332
    def _remote_lock_write(self, token):
2412
2333
        if token is None:
2413
2334
            branch_token = repo_token = ''
2414
2335
        else:
2415
2336
            branch_token = token
2416
 
            repo_token = self.repository.lock_write().repository_token
 
2337
            repo_token = self.repository.lock_write()
2417
2338
            self.repository.unlock()
2418
2339
        err_context = {'token': token}
2419
2340
        response = self._call(
2456
2377
            self._lock_count += 1
2457
2378
            # Re-lock the repository too.
2458
2379
            self.repository.lock_write(self._repo_lock_token)
2459
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2380
        return self._lock_token or None
2460
2381
 
2461
2382
    def _unlock(self, branch_token, repo_token):
2462
2383
        err_context = {'token': str((branch_token, repo_token))}
2891
2812
        raise NoSuchRevision(find('branch'), err.error_args[0])
2892
2813
    elif err.error_verb == 'nosuchrevision':
2893
2814
        raise NoSuchRevision(find('repository'), err.error_args[0])
2894
 
    elif err.error_verb == 'nobranch':
2895
 
        if len(err.error_args) >= 1:
2896
 
            extra = err.error_args[0]
2897
 
        else:
2898
 
            extra = None
2899
 
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2900
 
            detail=extra)
 
2815
    elif err.error_tuple == ('nobranch',):
 
2816
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2901
2817
    elif err.error_verb == 'norepository':
2902
2818
        raise errors.NoRepositoryPresent(find('bzrdir'))
2903
2819
    elif err.error_verb == 'LockContention':