← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-03 07:18:36 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100203071836-u9b86q68fr9ri5s6
Fix NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
1
 
# Copyright (C) 2005 by Canonical Development 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
import gzip
23
24
import os
 
25
from cStringIO import StringIO
 
26
 
 
27
from bzrlib import osutils
 
28
from bzrlib.errors import BzrError, NoSuchFile, FileExists
24
29
import bzrlib.store
25
30
from bzrlib.trace import mutter
26
 
from bzrlib.errors import BzrError, NoSuchFile, FileExists
27
31
 
28
 
import gzip
29
 
from cStringIO import StringIO
30
32
 
31
33
 
32
34
class TextStore(bzrlib.store.TransportStore):
42
44
    def _add_compressed(self, fn, f):
43
45
        from cStringIO import StringIO
44
46
        from bzrlib.osutils import pumpfile
45
 
        
 
47
 
46
48
        if isinstance(f, basestring):
47
49
            f = StringIO(f)
48
 
            
 
50
 
49
51
        sio = StringIO()
50
52
        gf = gzip.GzipFile(mode='wb', fileobj=sio)
51
53
        # if pumpfile handles files that don't fit in ram,
63
65
 
64
66
    def _try_put(self, fn, f):
65
67
        try:
66
 
            self._transport.put(fn, f, mode=self._file_mode)
 
68
            self._transport.put_file(fn, f, mode=self._file_mode)
67
69
        except NoSuchFile:
68
70
            if not self._prefixed:
69
71
                raise
71
73
                self._transport.mkdir(os.path.dirname(fn), mode=self._dir_mode)
72
74
            except FileExists:
73
75
                pass
74
 
            self._transport.put(fn, f, mode=self._file_mode)
 
76
            self._transport.put_file(fn, f, mode=self._file_mode)
75
77
 
76
78
    def _get(self, fn):
77
79
        if fn.endswith('.gz'):
99
101
            if not self._prefixed:
100
102
                raise
101
103
            try:
102
 
                self._transport.mkdir(self.hash_prefix(fileid)[:-1], mode=self._dir_mode)
 
104
                self._transport.mkdir(osutils.dirname(path), mode=self._dir_mode)
103
105
            except FileExists:
104
106
                pass
105
107
            result = other._transport.copy_to([path], self._transport,
114
116
        # gzip.GzipFile.read() requires a tell() function
115
117
        # but some transports return objects that cannot seek
116
118
        # so buffer them in a StringIO instead
117
 
        if hasattr(f, 'tell'):
 
119
        if getattr(f, 'tell', None) is not None:
118
120
            return gzip.GzipFile(mode='rb', fileobj=f)
119
121
        else:
120
122
            from cStringIO import StringIO