Mercurial > public > mercurial-scm > hg

diff mercurial/httppeer.py @ 40426:588f1e9a4d16 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
http: work around custom http client classes that refuse extra attrs I have no idea what is going on with our custom http client code at Google, but it chokes on these extra attributes we're tucking on http clients. Since it feels more than a little wrong to just stuff extra data on a client, let's degrade gracefully when the client class refuses the attributes.
author Augie Fackler <augie@google.com>
date Mon, 29 Oct 2018 16:23:42 -0400
parents dac438b7346e
children a9b609fbe39c
line wrap: on
line diff
--- a/mercurial/httppeer.py	Thu Oct 25 21:33:43 2018 +0800
+++ b/mercurial/httppeer.py	Mon Oct 29 16:23:42 2018 -0400
@@ -405,11 +405,15 @@
         return True
 
     def close(self):
+        try:
+            reqs, sent, recv = (self._urlopener.requestscount,
+                                self._urlopener.sentbytescount,
+                                self._urlopener.receivedbytescount)
+        except AttributeError:
+            return
         self.ui.note(_('(sent %d HTTP requests and %d bytes; '
                        'received %d bytes in responses)\n') %
-                     (self._urlopener.requestscount,
-                      self._urlopener.sentbytescount,
-                      self._urlopener.receivedbytescount))
+                     (reqs, sent, recv))
 
     # End of ipeerconnection interface.