← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
271
271
        self._real_bzrdir.destroy_branch(name=name)
272
272
        self._next_open_branch_result = None
273
273
 
274
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
274
    def create_workingtree(self, revision_id=None, from_branch=None,
 
275
        accelerator_tree=None, hardlink=False):
275
276
        raise errors.NotLocalUrl(self.transport.base)
276
277
 
277
278
    def find_branch_format(self, name=None):
2368
2369
        self._ensure_real()
2369
2370
        return self._real_branch._get_tags_bytes()
2370
2371
 
 
2372
    @needs_read_lock
2371
2373
    def _get_tags_bytes(self):
 
2374
        if self._tags_bytes is None:
 
2375
            self._tags_bytes = self._get_tags_bytes_via_hpss()
 
2376
        return self._tags_bytes
 
2377
 
 
2378
    def _get_tags_bytes_via_hpss(self):
2372
2379
        medium = self._client._medium
2373
2380
        if medium._is_remote_before((1, 13)):
2374
2381
            return self._vfs_get_tags_bytes()
2384
2391
        return self._real_branch._set_tags_bytes(bytes)
2385
2392
 
2386
2393
    def _set_tags_bytes(self, bytes):
 
2394
        if self.is_locked():
 
2395
            self._tags_bytes = bytes
2387
2396
        medium = self._client._medium
2388
2397
        if medium._is_remote_before((1, 18)):
2389
2398
            self._vfs_set_tags_bytes(bytes)