/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2873
2873
            self.revisions[rev_id] = rev
2874
2874
 
2875
2875
    def _load_old_inventory(self, rev_id):
2876
 
        f = self.branch.repository.inventory_store.get(rev_id)
2877
 
        try:
2878
 
            old_inv_xml = f.read()
2879
 
        finally:
2880
 
            f.close()
 
2876
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
2881
2877
        inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
2882
2878
        inv.revision_id = rev_id
2883
2879
        rev = self.revisions[rev_id]
2961
2957
                ie.revision = previous_ie.revision
2962
2958
                return
2963
2959
        if ie.has_text():
2964
 
            f = self.branch.repository._text_store.get(ie.text_id)
2965
 
            try:
2966
 
                file_lines = f.readlines()
2967
 
            finally:
2968
 
                f.close()
 
2960
            text = self.branch.repository._text_store.get(ie.text_id)
 
2961
            file_lines = text.readlines()
2969
2962
            w.add_lines(rev_id, previous_revisions, file_lines)
2970
2963
            self.text_count += 1
2971
2964
        else:
3252
3245
        # XXX: It's a bit ugly that the network name is here, because we'd
3253
3246
        # like to believe that format objects are stateless or at least
3254
3247
        # immutable,  However, we do at least avoid mutating the name after
3255
 
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
 
3248
        # it's returned.  See <https://bugs.edge.launchpad.net/bzr/+bug/504102>
3256
3249
        self._network_name = None
3257
3250
 
3258
3251
    def __repr__(self):