← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.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/branch.py
92
92
        self._revision_id_to_revno_cache = None
93
93
        self._partial_revision_id_to_revno_cache = {}
94
94
        self._partial_revision_history_cache = []
95
 
        self._tags_bytes = None
96
95
        self._last_revision_info_cache = None
97
96
        self._merge_sorted_revisions_cache = None
98
97
        self._open_hook()
228
227
            possible_transports=[self.bzrdir.root_transport])
229
228
        return a_branch.repository
230
229
 
231
 
    @needs_read_lock
232
230
    def _get_tags_bytes(self):
233
231
        """Get the bytes of a serialised tags dict.
234
232
 
241
239
        :return: The bytes of the tags file.
242
240
        :seealso: Branch._set_tags_bytes.
243
241
        """
244
 
        if self._tags_bytes is None:
245
 
            self._tags_bytes = self._transport.get_bytes('tags')
246
 
        return self._tags_bytes
 
242
        return self._transport.get_bytes('tags')
247
243
 
248
244
    def _get_nick(self, local=False, possible_transports=None):
249
245
        config = self.get_config()
880
876
 
881
877
        :seealso: Branch._get_tags_bytes.
882
878
        """
883
 
        return _run_with_write_locked_target(self, self._set_tags_bytes_locked,
884
 
                bytes)
885
 
 
886
 
    def _set_tags_bytes_locked(self, bytes):
887
 
        self._tags_bytes = bytes
888
 
        return self._transport.put_bytes('tags', bytes)
 
879
        return _run_with_write_locked_target(self, self._transport.put_bytes,
 
880
            'tags', bytes)
889
881
 
890
882
    def _cache_revision_history(self, rev_history):
891
883
        """Set the cached revision history to rev_history.
921
913
        self._merge_sorted_revisions_cache = None
922
914
        self._partial_revision_history_cache = []
923
915
        self._partial_revision_id_to_revno_cache = {}
924
 
        self._tags_bytes = None
925
916
 
926
917
    def _gen_revision_history(self):
927
918
        """Return sequence of revision hashes on to this branch.
3355
3346
        if isinstance(format, remote.RemoteBranchFormat):
3356
3347
            format._ensure_real()
3357
3348
            return format._custom_format
3358
 
        return format
 
3349
        return format                                                                                                  
3359
3350
 
3360
3351
    @needs_write_lock
3361
3352
    def copy_content_into(self, revision_id=None):