Rev 6520: (jelmer) Implement ResponseFile.readline. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6520 [merge]
revision-id: pqm at pqm.ubuntu.com-20120410102646-rv7zpi85e168o1k4
parent: pqm at pqm.ubuntu.com-20120402023645-28dkcb0awh3i1flc
parent: jelmer at samba.org-20120406113805-77qrvjv7s19m8p1l
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2012-04-10 10:26:46 +0000
message:
  (jelmer) Implement ResponseFile.readline. (Jelmer Vernooij)
modified:
  bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/transport/http/response.py'
--- a/bzrlib/transport/http/response.py	2012-02-14 14:55:25 +0000
+++ b/bzrlib/transport/http/response.py	2012-04-06 11:38:05 +0000
@@ -66,12 +66,20 @@
         self._pos += len(data)
         return data
 
+    def readline(self):
+        data = self._file.readline()
+        self._pos += len(data)
+        return data
+
+    def tell(self):
+        return self._pos
+
     def seek(self, offset, whence=os.SEEK_SET):
         if whence == os.SEEK_SET:
             if offset < self._pos:
-                raise AsserttionError(
+                raise AssertionError(
                     "Can't seek backwards, pos: %s, offset: %s"
-                    % (self._pos, offfset))
+                    % (self._pos, offset))
             to_discard = offset - self._pos
         elif whence == os.SEEK_CUR:
             to_discard = offset

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-03-30 02:23:41 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-04-06 11:38:05 +0000
@@ -35,6 +35,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* Implement ``ResponseFile.readline`` and ``ReponseFile.tell``,
+  fixing some clones over HTTP. (Jelmer Vernooij, #963769)
+
 Documentation
 *************