← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-05 10:48:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3693.
  • Revision ID: andrew.bennetts@canonical.com-20080905104803-6g72dz6wcldosfs2
Remove monkey-patching of branch._ensure_real from test_remote.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
1
 
# Copyright (C) 2005 by Canonical Development Ltd
2
 
 
 
1
# Copyright (C) 2005 Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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):
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
121
123
            sio = StringIO(f.read())
122
124
            return gzip.GzipFile(mode='rb', fileobj=sio)
123
 
 
124
 
 
125
 
def ScratchTextStore():
126
 
    return TextStore(ScratchTransport())