← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

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, 2006, 2008, 2009, 2010 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
 
# 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
 
"""
18
 
A store that keeps the full text of every version.
 
17
"""A store that keeps the full text of every version.
19
18
 
20
19
This store keeps uncompressed versions of the full text. It does not
21
20
do any sort of delta compression.
22
21
"""
23
22
 
 
23
from __future__ import absolute_import
 
24
 
 
25
import gzip
24
26
import os
 
27
 
 
28
from bzrlib import osutils
 
29
from bzrlib.errors import BzrError, NoSuchFile, FileExists
25
30
import bzrlib.store
26
 
from bzrlib.store import hash_prefix
27
31
from bzrlib.trace import mutter
28
 
from bzrlib.errors import BzrError, NoSuchFile, FileExists
29
32
 
30
 
import gzip
31
 
from cStringIO import StringIO
32
33
 
33
34
 
34
35
class TextStore(bzrlib.store.TransportStore):
44
45
    def _add_compressed(self, fn, f):
45
46
        from cStringIO import StringIO
46
47
        from bzrlib.osutils import pumpfile
47
 
        
 
48
 
48
49
        if isinstance(f, basestring):
49
50
            f = StringIO(f)
50
 
            
 
51
 
51
52
        sio = StringIO()
52
53
        gf = gzip.GzipFile(mode='wb', fileobj=sio)
53
54
        # if pumpfile handles files that don't fit in ram,
65
66
 
66
67
    def _try_put(self, fn, f):
67
68
        try:
68
 
            self._transport.put(fn, f)
 
69
            self._transport.put_file(fn, f, mode=self._file_mode)
69
70
        except NoSuchFile:
70
71
            if not self._prefixed:
71
72
                raise
72
73
            try:
73
 
                self._transport.mkdir(os.path.dirname(fn))
 
74
                self._transport.mkdir(os.path.dirname(fn), mode=self._dir_mode)
74
75
            except FileExists:
75
76
                pass
76
 
            self._transport.put(fn, f)
 
77
            self._transport.put_file(fn, f, mode=self._file_mode)
77
78
 
78
79
    def _get(self, fn):
79
80
        if fn.endswith('.gz'):
95
96
            raise KeyError(fileid + '-' + str(suffix))
96
97
 
97
98
        try:
98
 
            result = other._transport.copy_to([path], self._transport, pb=pb)
 
99
            result = other._transport.copy_to([path], self._transport,
 
100
                                              mode=self._file_mode)
99
101
        except NoSuchFile:
100
102
            if not self._prefixed:
101
103
                raise
102
104
            try:
103
 
                self._transport.mkdir(hash_prefix(fileid)[:-1])
 
105
                self._transport.mkdir(osutils.dirname(path), mode=self._dir_mode)
104
106
            except FileExists:
105
107
                pass
106
 
            result = other._transport.copy_to([path], self._transport, pb=pb)
 
108
            result = other._transport.copy_to([path], self._transport,
 
109
                                              mode=self._file_mode)
107
110
 
108
111
        if result != 1:
109
112
            raise BzrError('Unable to copy file: %r' % (path,))
114
117
        # gzip.GzipFile.read() requires a tell() function
115
118
        # but some transports return objects that cannot seek
116
119
        # so buffer them in a StringIO instead
117
 
        if hasattr(f, 'tell'):
 
120
        if getattr(f, 'tell', None) is not None:
118
121
            return gzip.GzipFile(mode='rb', fileobj=f)
119
 
        else:
 
122
        try:
120
123
            from cStringIO import StringIO
121
124
            sio = StringIO(f.read())
122
125
            return gzip.GzipFile(mode='rb', fileobj=sio)
123
 
 
124
 
 
125
 
def ScratchTextStore():
126
 
    return TextStore(ScratchTransport())
 
126
        finally:
 
127
            f.close()