Rev 3056: Jam's review feeback. in file:///v/home/vila/src/bzr/bugs/172701/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/172701/

------------------------------------------------------------
revno: 3056
revision-id:v.ladeuil+lp at free.fr-20071130164824-4hhlwfudheafsf9e
parent: v.ladeuil+lp at free.fr-20071130095122-6xz845lluzjp7tvs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 172701
timestamp: Fri 2007-11-30 17:48:24 +0100
message:
  Jam's review feeback.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-11-30 09:51:22 +0000
+++ b/NEWS	2007-11-30 16:48:24 +0000
@@ -89,9 +89,6 @@
    * Catch connection errors for ftp.
      (Vincent Ladeuil, #164567)
 
-   * Catch ShortReadvErrors while using pycurl.
-     (Vincent Ladeuil, 172701)
-
    * ``check`` no longer reports spurious unreferenced text versions.
      (Robert Collins, John A Meinel, #162931, #165071)
 
@@ -178,6 +175,11 @@
    * Revert doesn't crash when restoring a single file from a deleted
      directory. (Aaron Bentley)
 
+   * Catch ShortReadvErrors while using pycurl. Also make readv more robust by
+     allowing multiple GET requests to be issued if too many ranges are
+     required.
+     (Vincent Ladeuil, #172701)
+
    * Stderr output via logging mechanism now goes through encoded wrapper
      and no more uses utf-8, but terminal encoding instead. So all unicode
      strings now should be readable in non-utf-8 terminal.

=== modified file 'bzrlib/debug.py'
--- a/bzrlib/debug.py	2007-11-30 09:51:22 +0000
+++ b/bzrlib/debug.py	2007-11-30 16:48:24 +0000
@@ -31,7 +31,7 @@
  * fetch - trace history copying between repositories
  * hooks - trace hook execution
  * hpss - trace smart protocol requests and responses
- * htpp - trace http connections, requests and responses
+ * http - trace http connections, requests and responses
  * index - trace major index operations
  * lock - trace when lockdir locks are taken or released
 

=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2007-11-29 23:22:01 +0000
+++ b/bzrlib/tests/test_http.py	2007-11-30 16:48:24 +0000
@@ -942,12 +942,12 @@
         # pycurl does not check HTTP_PROXY for security reasons
         # (for use in a CGI context that we do not care
         # about. Should we ?)
-        raise tests.TestSkipped('pycurl does not check HTTP_PROXY '
-                                'for security reasons')
+        raise tests.TestNotApplicable(
+            'pycurl does not check HTTP_PROXY for security reasons')
 
     def test_HTTP_PROXY_with_NO_PROXY(self):
-        raise tests.TestSkipped('pycurl does not check HTTP_PROXY '
-                                'for security reasons')
+        raise tests.TestNotApplicable(
+            'pycurl does not check HTTP_PROXY for security reasons')
 
     def test_http_proxy_without_scheme(self):
         # pycurl *ignores* invalid proxy env variables. If that