← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: John Arbash Meinel
  • Date: 2006-05-27 04:48:39 UTC
  • mto: (1711.2.26 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1734.
  • Revision ID: john@arbash-meinel.com-20060527044839-83fdd64ce7d708bb
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.

Show diffs side-by-side

added added

removed removed

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