← 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-05-11 14:13:31 UTC
  • mto: (5218.2.2 bytes_to_entry_c)
  • mto: This revision was merged to the branch mainline in revision 5225.
  • Revision ID: john@arbash-meinel.com-20100511141331-rizo2ez6bze3ao66
Some small tweaks to the chk_map code.

Find out that we actually weren't using the global definition because we
were assigning inside the if block. So factor that out into a helper.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
273
273
    def create_workingtree(self, revision_id=None, from_branch=None):
274
274
        raise errors.NotLocalUrl(self.transport.base)
275
275
 
276
 
    def find_branch_format(self):
 
276
    def find_branch_format(self, name=None):
277
277
        """Find the branch 'format' for this bzrdir.
278
278
 
279
279
        This might be a synthetic object for e.g. RemoteBranch and SVN.
280
280
        """
281
 
        b = self.open_branch()
 
281
        b = self.open_branch(name=name)
282
282
        return b._format
283
283
 
284
 
    def get_branch_reference(self):
 
284
    def get_branch_reference(self, name=None):
285
285
        """See BzrDir.get_branch_reference()."""
 
286
        if name is not None:
 
287
            # XXX JRV20100304: Support opening colocated branches
 
288
            raise errors.NoColocatedBranchSupport(self)
286
289
        response = self._get_branch_reference()
287
290
        if response[0] == 'ref':
288
291
            return response[1]
319
322
            raise errors.UnexpectedSmartServerResponse(response)
320
323
        return response
321
324
 
322
 
    def _get_tree_branch(self):
 
325
    def _get_tree_branch(self, name=None):
323
326
        """See BzrDir._get_tree_branch()."""
324
 
        return None, self.open_branch()
 
327
        return None, self.open_branch(name=name)
325
328
 
326
329
    def open_branch(self, name=None, unsupported=False,
327
330
                    ignore_fallbacks=False):
1000
1003
    def lock_read(self):
1001
1004
        """Lock the repository for read operations.
1002
1005
 
1003
 
        :return: An object with an unlock method which will release the lock
1004
 
            obtained.
 
1006
        :return: A bzrlib.lock.LogicalLockResult.
1005
1007
        """
1006
1008
        # wrong eventually - want a local lock cache context
1007
1009
        if not self._lock_mode:
1015
1017
                repo.lock_read()
1016
1018
        else:
1017
1019
            self._lock_count += 1
1018
 
        return self
 
1020
        return lock.LogicalLockResult(self.unlock)
1019
1021
 
1020
1022
    def _remote_lock_write(self, token):
1021
1023
        path = self.bzrdir._path_for_remote_call(self._client)
1313
1315
        return self._real_repository.make_working_trees()
1314
1316
 
1315
1317
    def refresh_data(self):
1316
 
        """Re-read any data needed to to synchronise with disk.
 
1318
        """Re-read any data needed to synchronise with disk.
1317
1319
 
1318
1320
        This method is intended to be called after another repository instance
1319
1321
        (such as one used by a smart server) has inserted data into the
1320
 
        repository. It may not be called during a write group, but may be
1321
 
        called at any other time.
 
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.
1322
1327
        """
1323
 
        if self.is_in_write_group():
1324
 
            raise errors.InternalBzrError(
1325
 
                "May not refresh_data while in a write group.")
1326
1328
        if self._real_repository is not None:
1327
1329
            self._real_repository.refresh_data()
1328
1330
 
2396
2398
    def lock_read(self):
2397
2399
        """Lock the branch for read operations.
2398
2400
 
2399
 
        :return: An object with an unlock method which will release the lock
2400
 
            obtained.
 
2401
        :return: A bzrlib.lock.LogicalLockResult.
2401
2402
        """
2402
2403
        self.repository.lock_read()
2403
2404
        if not self._lock_mode:
2408
2409
                self._real_branch.lock_read()
2409
2410
        else:
2410
2411
            self._lock_count += 1
2411
 
        return self
 
2412
        return lock.LogicalLockResult(self.unlock)
2412
2413
 
2413
2414
    def _remote_lock_write(self, token):
2414
2415
        if token is None: