/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 tools/weavemerge.sh

  • 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:
 
1
#! /bin/zsh -xe
 
2
 
 
3
weave init test.weave
 
4
 
 
5
weave add test.weave <<EOF
 
6
aaa
 
7
bbb
 
8
ccc
 
9
EOF
 
10
 
 
11
weave add test.weave 0 <<EOF
 
12
aaa
 
13
bbb
 
14
stuff from martin
 
15
ccc
 
16
ddd
 
17
EOF
 
18
 
 
19
weave add test.weave 0 <<EOF
 
20
aaa
 
21
bbb
 
22
stuff from john
 
23
more john stuff
 
24
ccc
 
25
EOF
 
26
 
 
27
weave add test.weave 1 2 <<EOF
 
28
aaa
 
29
bbb
 
30
stuff from martin
 
31
fix up merge
 
32
more john stuff
 
33
ccc
 
34
ddd
 
35
EOF
 
36
 
 
37
weave add test.weave 3 <<EOF
 
38
aaa
 
39
bbb
 
40
stuff from martin
 
41
fix up merge
 
42
modify john's code
 
43
ccc
 
44
ddd
 
45
add stuff here
 
46
EOF
 
47
 
 
48
# v5 
 
49
weave add test.weave 2 <<EOF
 
50
aaa
 
51
bbb
 
52
stuff from john
 
53
more john stuff
 
54
john replaced ccc line
 
55
EOF
 
56
 
 
57
# now try merging 5(2) with 4(3(2 1))
 
 
b'\\ No newline at end of file'