← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: Robert Collins
  • Date: 2007-11-18 19:56:39 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
1
 
# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""A store that keeps the full text of every version.
18
18
 
20
20
do any sort of delta compression.
21
21
"""
22
22
 
23
 
from __future__ import absolute_import
24
 
 
25
 
import gzip
26
23
import os
27
 
 
28
 
from bzrlib import osutils
29
 
from bzrlib.errors import BzrError, NoSuchFile, FileExists
30
24
import bzrlib.store
31
25
from bzrlib.trace import mutter
 
26
from bzrlib.errors import BzrError, NoSuchFile, FileExists
32
27
 
 
28
import gzip
 
29
from cStringIO import StringIO
33
30
 
34
31
 
35
32
class TextStore(bzrlib.store.TransportStore):
45
42
    def _add_compressed(self, fn, f):
46
43
        from cStringIO import StringIO
47
44
        from bzrlib.osutils import pumpfile
48
 
 
 
45
        
49
46
        if isinstance(f, basestring):
50
47
            f = StringIO(f)
51
 
 
 
48
            
52
49
        sio = StringIO()
53
50
        gf = gzip.GzipFile(mode='wb', fileobj=sio)
54
51
        # if pumpfile handles files that don't fit in ram,
102
99
            if not self._prefixed:
103
100
                raise
104
101
            try:
105
 
                self._transport.mkdir(osutils.dirname(path), mode=self._dir_mode)
 
102
                self._transport.mkdir(self.hash_prefix(fileid)[:-1], mode=self._dir_mode)
106
103
            except FileExists:
107
104
                pass
108
105
            result = other._transport.copy_to([path], self._transport,
119
116
        # so buffer them in a StringIO instead
120
117
        if getattr(f, 'tell', None) is not None:
121
118
            return gzip.GzipFile(mode='rb', fileobj=f)
122
 
        try:
 
119
        else:
123
120
            from cStringIO import StringIO
124
121
            sio = StringIO(f.read())
125
122
            return gzip.GzipFile(mode='rb', fileobj=sio)
126
 
        finally:
127
 
            f.close()