/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
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,
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,