← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

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
 
    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
 
245
242
        self._ensure_real()
246
243
        self._real_bzrdir.destroy_repository()
247
244
 
248
 
    def create_branch(self, name=None):
 
245
    def create_branch(self):
249
246
        # as per meta1 formats - just delegate to the format object which may
250
247
        # be parameterised.
251
 
        real_branch = self._format.get_branch_format().initialize(self,
252
 
            name=name)
 
248
        real_branch = self._format.get_branch_format().initialize(self)
253
249
        if not isinstance(real_branch, RemoteBranch):
254
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
255
 
                                  name=name)
 
250
            result = RemoteBranch(self, self.find_repository(), real_branch)
256
251
        else:
257
252
            result = real_branch
258
253
        # BzrDir.clone_on_transport() uses the result of create_branch but does
264
259
        self._next_open_branch_result = result
265
260
        return result
266
261
 
267
 
    def destroy_branch(self, name=None):
 
262
    def destroy_branch(self):
268
263
        """See BzrDir.destroy_branch"""
269
264
        self._ensure_real()
270
 
        self._real_bzrdir.destroy_branch(name=name)
 
265
        self._real_bzrdir.destroy_branch()
271
266
        self._next_open_branch_result = None
272
267
 
273
268
    def create_workingtree(self, revision_id=None, from_branch=None):
323
318
        """See BzrDir._get_tree_branch()."""
324
319
        return None, self.open_branch()
325
320
 
326
 
    def open_branch(self, name=None, unsupported=False,
327
 
                    ignore_fallbacks=False):
328
 
        if unsupported:
 
321
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
 
322
        if _unsupported:
329
323
            raise NotImplementedError('unsupported flag support not implemented yet.')
330
324
        if self._next_open_branch_result is not None:
331
325
            # See create_branch for details.
336
330
        if response[0] == 'ref':
337
331
            # a branch reference, use the existing BranchReference logic.
338
332
            format = BranchReferenceFormat()
339
 
            return format.open(self, name=name, _found=True,
340
 
                location=response[1], ignore_fallbacks=ignore_fallbacks)
 
333
            return format.open(self, _found=True, location=response[1],
 
334
                ignore_fallbacks=ignore_fallbacks)
341
335
        branch_format_name = response[1]
342
336
        if not branch_format_name:
343
337
            branch_format_name = None
344
338
        format = RemoteBranchFormat(network_name=branch_format_name)
345
339
        return RemoteBranch(self, self.find_repository(), format=format,
346
 
            setup_stacking=not ignore_fallbacks, name=name)
 
340
            setup_stacking=not ignore_fallbacks)
347
341
 
348
342
    def _open_repo_v1(self, path):
349
343
        verb = 'BzrDir.find_repository'
426
420
        """Return the path to be used for this bzrdir in a remote call."""
427
421
        return client.remote_path_from_transport(self.root_transport)
428
422
 
429
 
    def get_branch_transport(self, branch_format, name=None):
 
423
    def get_branch_transport(self, branch_format):
430
424
        self._ensure_real()
431
 
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
 
425
        return self._real_bzrdir.get_branch_transport(branch_format)
432
426
 
433
427
    def get_repository_transport(self, repository_format):
434
428
        self._ensure_real()
644
638
        return self._custom_format._serializer
645
639
 
646
640
 
647
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
648
 
    bzrdir.ControlComponent):
 
641
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
649
642
    """Repository accessed over rpc.
650
643
 
651
644
    For the moment most operations are performed using local transport-backed
694
687
        # Additional places to query for data.
695
688
        self._fallback_repositories = []
696
689
 
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
690
    def __str__(self):
709
691
        return "%s(%s)" % (self.__class__.__name__, self.base)
710
692
 
918
900
        parents_provider = self._make_parents_provider(other_repository)
919
901
        return graph.Graph(parents_provider)
920
902
 
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
903
    def gather_stats(self, revid=None, committers=None):
931
904
        """See Repository.gather_stats()."""
932
905
        path = self.bzrdir._path_for_remote_call(self._client)
998
971
        pass
999
972
 
1000
973
    def lock_read(self):
1001
 
        """Lock the repository for read operations.
1002
 
 
1003
 
        :return: An object with an unlock method which will release the lock
1004
 
            obtained.
1005
 
        """
1006
974
        # wrong eventually - want a local lock cache context
1007
975
        if not self._lock_mode:
1008
976
            self._note_lock('r')
1015
983
                repo.lock_read()
1016
984
        else:
1017
985
            self._lock_count += 1
1018
 
        return self
1019
986
 
1020
987
    def _remote_lock_write(self, token):
1021
988
        path = self.bzrdir._path_for_remote_call(self._client)
1061
1028
            raise errors.ReadOnlyError(self)
1062
1029
        else:
1063
1030
            self._lock_count += 1
1064
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
1031
        return self._lock_token or None
1065
1032
 
1066
1033
    def leave_lock_in_place(self):
1067
1034
        if not self._lock_token:
1247
1214
            # state, so always add a lock here. If a caller passes us a locked
1248
1215
            # repository, they are responsible for unlocking it later.
1249
1216
            repository.lock_read()
1250
 
        self._check_fallback_repository(repository)
1251
1217
        self._fallback_repositories.append(repository)
1252
1218
        # If self._real_repository was parameterised already (e.g. because a
1253
1219
        # _real_branch had its get_stacked_on_url method called), then the
1254
1220
        # repository to be added may already be in the _real_repositories list.
1255
1221
        if self._real_repository is not None:
1256
 
            fallback_locations = [repo.user_url for repo in
 
1222
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1257
1223
                self._real_repository._fallback_repositories]
1258
 
            if repository.user_url not in fallback_locations:
 
1224
            if repository.bzrdir.root_transport.base not in fallback_locations:
1259
1225
                self._real_repository.add_fallback_repository(repository)
1260
1226
 
1261
 
    def _check_fallback_repository(self, repository):
1262
 
        """Check that this repository can fallback to repository safely.
1263
 
 
1264
 
        Raise an error if not.
1265
 
 
1266
 
        :param repository: A repository to fallback to.
1267
 
        """
1268
 
        return _mod_repository.InterRepository._assert_same_model(
1269
 
            self, repository)
1270
 
 
1271
1227
    def add_inventory(self, revid, inv, parents):
1272
1228
        self._ensure_real()
1273
1229
        return self._real_repository.add_inventory(revid, inv, parents)
1274
1230
 
1275
1231
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1276
 
            parents, basis_inv=None, propagate_caches=False):
 
1232
                               parents):
1277
1233
        self._ensure_real()
1278
1234
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
1279
 
            delta, new_revision_id, parents, basis_inv=basis_inv,
1280
 
            propagate_caches=propagate_caches)
 
1235
            delta, new_revision_id, parents)
1281
1236
 
1282
1237
    def add_revision(self, rev_id, rev, inv=None, config=None):
1283
1238
        self._ensure_real()
1542
1497
        return self._real_repository.get_signature_text(revision_id)
1543
1498
 
1544
1499
    @needs_read_lock
1545
 
    def _get_inventory_xml(self, revision_id):
1546
 
        self._ensure_real()
1547
 
        return self._real_repository._get_inventory_xml(revision_id)
 
1500
    def get_inventory_xml(self, revision_id):
 
1501
        self._ensure_real()
 
1502
        return self._real_repository.get_inventory_xml(revision_id)
 
1503
 
 
1504
    def deserialise_inventory(self, revision_id, xml):
 
1505
        self._ensure_real()
 
1506
        return self._real_repository.deserialise_inventory(revision_id, xml)
1548
1507
 
1549
1508
    def reconcile(self, other=None, thorough=False):
1550
1509
        self._ensure_real()
1626
1585
        return self._real_repository.inventories
1627
1586
 
1628
1587
    @needs_write_lock
1629
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1588
    def pack(self, hint=None):
1630
1589
        """Compress the data within the repository.
1631
1590
 
1632
1591
        This is not currently implemented within the smart server.
1633
1592
        """
1634
1593
        self._ensure_real()
1635
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1594
        return self._real_repository.pack(hint=hint)
1636
1595
 
1637
1596
    @property
1638
1597
    def revisions(self):
2066
2025
    def network_name(self):
2067
2026
        return self._network_name
2068
2027
 
2069
 
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2070
 
        return a_bzrdir.open_branch(name=name, 
2071
 
            ignore_fallbacks=ignore_fallbacks)
 
2028
    def open(self, a_bzrdir, ignore_fallbacks=False):
 
2029
        return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2072
2030
 
2073
 
    def _vfs_initialize(self, a_bzrdir, name):
 
2031
    def _vfs_initialize(self, a_bzrdir):
2074
2032
        # Initialisation when using a local bzrdir object, or a non-vfs init
2075
2033
        # method is not available on the server.
2076
2034
        # self._custom_format is always set - the start of initialize ensures
2077
2035
        # that.
2078
2036
        if isinstance(a_bzrdir, RemoteBzrDir):
2079
2037
            a_bzrdir._ensure_real()
2080
 
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2081
 
                name)
 
2038
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2082
2039
        else:
2083
2040
            # We assume the bzrdir is parameterised; it may not be.
2084
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
2041
            result = self._custom_format.initialize(a_bzrdir)
2085
2042
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2086
2043
            not isinstance(result, RemoteBranch)):
2087
 
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2088
 
                                  name=name)
 
2044
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2089
2045
        return result
2090
2046
 
2091
 
    def initialize(self, a_bzrdir, name=None):
 
2047
    def initialize(self, a_bzrdir):
2092
2048
        # 1) get the network name to use.
2093
2049
        if self._custom_format:
2094
2050
            network_name = self._custom_format.network_name()
2100
2056
            network_name = reference_format.network_name()
2101
2057
        # Being asked to create on a non RemoteBzrDir:
2102
2058
        if not isinstance(a_bzrdir, RemoteBzrDir):
2103
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2059
            return self._vfs_initialize(a_bzrdir)
2104
2060
        medium = a_bzrdir._client._medium
2105
2061
        if medium._is_remote_before((1, 13)):
2106
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2062
            return self._vfs_initialize(a_bzrdir)
2107
2063
        # Creating on a remote bzr dir.
2108
2064
        # 2) try direct creation via RPC
2109
2065
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2110
 
        if name is not None:
2111
 
            # XXX JRV20100304: Support creating colocated branches
2112
 
            raise errors.NoColocatedBranchSupport(self)
2113
2066
        verb = 'BzrDir.create_branch'
2114
2067
        try:
2115
2068
            response = a_bzrdir._call(verb, path, network_name)
2116
2069
        except errors.UnknownSmartMethod:
2117
2070
            # Fallback - use vfs methods
2118
2071
            medium._remember_remote_is_before((1, 13))
2119
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2072
            return self._vfs_initialize(a_bzrdir)
2120
2073
        if response[0] != 'ok':
2121
2074
            raise errors.UnexpectedSmartServerResponse(response)
2122
2075
        # Turn the response into a RemoteRepository object.
2130
2083
                a_bzrdir._client)
2131
2084
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2132
2085
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2133
 
            format=format, setup_stacking=False, name=name)
 
2086
            format=format, setup_stacking=False)
2134
2087
        # XXX: We know this is a new branch, so it must have revno 0, revid
2135
2088
        # NULL_REVISION. Creating the branch locked would make this be unable
2136
2089
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2163
2116
    """
2164
2117
 
2165
2118
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2166
 
        _client=None, format=None, setup_stacking=True, name=None):
 
2119
        _client=None, format=None, setup_stacking=True):
2167
2120
        """Create a RemoteBranch instance.
2168
2121
 
2169
2122
        :param real_branch: An optional local implementation of the branch
2175
2128
        :param setup_stacking: If True make an RPC call to determine the
2176
2129
            stacked (or not) status of the branch. If False assume the branch
2177
2130
            is not stacked.
2178
 
        :param name: Colocated branch name
2179
2131
        """
2180
2132
        # We intentionally don't call the parent class's __init__, because it
2181
2133
        # will try to assign to self.tags, which is a property in this subclass.
2200
2152
            self._real_branch = None
2201
2153
        # Fill out expected attributes of branch for bzrlib API users.
2202
2154
        self._clear_cached_state()
2203
 
        # TODO: deprecate self.base in favor of user_url
2204
 
        self.base = self.bzrdir.user_url
2205
 
        self._name = name
 
2155
        self.base = self.bzrdir.root_transport.base
2206
2156
        self._control_files = None
2207
2157
        self._lock_mode = None
2208
2158
        self._lock_token = None
2273
2223
                    'to use vfs implementation')
2274
2224
            self.bzrdir._ensure_real()
2275
2225
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2276
 
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
 
2226
                ignore_fallbacks=self._real_ignore_fallbacks)
2277
2227
            if self.repository._real_repository is None:
2278
2228
                # Give the remote repository the matching real repo.
2279
2229
                real_repo = self._real_branch.repository
2394
2344
            self._vfs_set_tags_bytes(bytes)
2395
2345
 
2396
2346
    def lock_read(self):
2397
 
        """Lock the branch for read operations.
2398
 
 
2399
 
        :return: An object with an unlock method which will release the lock
2400
 
            obtained.
2401
 
        """
2402
2347
        self.repository.lock_read()
2403
2348
        if not self._lock_mode:
2404
2349
            self._note_lock('r')
2408
2353
                self._real_branch.lock_read()
2409
2354
        else:
2410
2355
            self._lock_count += 1
2411
 
        return self
2412
2356
 
2413
2357
    def _remote_lock_write(self, token):
2414
2358
        if token is None:
2415
2359
            branch_token = repo_token = ''
2416
2360
        else:
2417
2361
            branch_token = token
2418
 
            repo_token = self.repository.lock_write().repository_token
 
2362
            repo_token = self.repository.lock_write()
2419
2363
            self.repository.unlock()
2420
2364
        err_context = {'token': token}
2421
2365
        response = self._call(
2458
2402
            self._lock_count += 1
2459
2403
            # Re-lock the repository too.
2460
2404
            self.repository.lock_write(self._repo_lock_token)
2461
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2405
        return self._lock_token or None
2462
2406
 
2463
2407
    def _unlock(self, branch_token, repo_token):
2464
2408
        err_context = {'token': str((branch_token, repo_token))}