/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/store/text.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-10 20:03:44 UTC
  • mto: This revision was merged to the branch mainline in revision 5376.
  • Revision ID: john@arbash-meinel.com-20100810200344-6muerwvkafqu7w47
Rework things a bit so the logic can be shared.

It turns out that some of the peak memory is actually during the inventory
to string to bundle translations. So re-use the refcount logic there.
This actually does show a decrease in peak memory.
Specifically 'cd bzr.dev; bzr send ../2.2' drops from 221MB peak to 156MB.

We don't speed anything up (16.5s both ways), but peak memory is quite
a bit better.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
118
118
        # so buffer them in a StringIO instead
119
119
        if getattr(f, 'tell', None) is not None:
120
120
            return gzip.GzipFile(mode='rb', fileobj=f)
121
 
        else:
 
121
        try:
122
122
            from cStringIO import StringIO
123
123
            sio = StringIO(f.read())
124
124
            return gzip.GzipFile(mode='rb', fileobj=sio)
 
125
        finally:
 
126
            f.close()