← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-11 08:45:19 UTC
  • mfrom: (4597.9.22 reports-conflict-resolved)
  • Revision ID: pqm@pqm.ubuntu.com-20101111084519-bmk1zmblp7kex41a
(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
2369
2369
        self._ensure_real()
2370
2370
        return self._real_branch._get_tags_bytes()
2371
2371
 
2372
 
    @needs_read_lock
2373
2372
    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):
2379
2373
        medium = self._client._medium
2380
2374
        if medium._is_remote_before((1, 13)):
2381
2375
            return self._vfs_get_tags_bytes()
2391
2385
        return self._real_branch._set_tags_bytes(bytes)
2392
2386
 
2393
2387
    def _set_tags_bytes(self, bytes):
2394
 
        if self.is_locked():
2395
 
            self._tags_bytes = bytes
2396
2388
        medium = self._client._medium
2397
2389
        if medium._is_remote_before((1, 18)):
2398
2390
            self._vfs_set_tags_bytes(bytes)