[Python-apps-commits] r6044 - in packages/mercurial/trunk/debian (3 files)

[vicho-guest at users.alioth.debian.org]

    Date: Tuesday, August 31, 2010 @ 08:29:20
  Author: vicho-guest
Revision: 6044

New upstream release 1.6.3

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/from_upstream__issue2255fix-basicauth.diff

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2010-08-30 22:09:48 UTC (rev 6043)
+++ packages/mercurial/trunk/debian/changelog	2010-08-31 08:29:20 UTC (rev 6044)
@@ -1,3 +1,11 @@
+mercurial (1.6.3-1) experimental; urgency=low
+
+  * New upstream release 1.6.3
+  * Deleted patch from_upstream__issue2255fix-basicauth.diff which is now
+        included upstream.
+
+ -- Javi Merino <cibervicho at gmail.com>  Tue, 31 Aug 2010 10:12:42 +0200
+
 mercurial (1.6.2-2) unstable; urgency=low
 
   * The patch that fixed #586907 was not being applied. Now it should

Deleted: packages/mercurial/trunk/debian/patches/from_upstream__issue2255fix-basicauth.diff
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__issue2255fix-basicauth.diff	2010-08-30 22:09:48 UTC (rev 6043)
+++ packages/mercurial/trunk/debian/patches/from_upstream__issue2255fix-basicauth.diff	2010-08-31 08:29:20 UTC (rev 6044)
@@ -1,43 +0,0 @@
-Patch proposed in http://mercurial.selenic.com/bts/issue2255 to fix bug #586907
-
-This file was downloaded from:
-http://mercurial.selenic.com/bts/file1106/issue2255fix-basicauth.diff
-
-diff --git a/mercurial/url.py b/mercurial/url.py
---- a/mercurial/url.py
-+++ b/mercurial/url.py
-@@ -570,6 +570,25 @@
-                 return
-             raise
- 
-+class httpbasicauthhandler(urllib2.HTTPBasicAuthHandler):
-+    def __init__(self, *args, **kwargs):
-+        urllib2.HTTPBasicAuthHandler.__init__(self, *args, **kwargs)
-+        self.retried_req = None
-+
-+    def reset_retry_count(self):
-+        # Python 2.6.5 will call this on 401 or 407 errors and thus loop
-+        # forever. We disable reset_retry_count completely and reset in
-+        # http_error_auth_reqed instead.
-+        pass
-+
-+    def http_error_auth_reqed(self, auth_header, host, req, headers):
-+        # Reset the retry counter once for each request.
-+        if req is not self.retried_req:
-+            self.retried_req = req
-+            self.retried = 0
-+        return urllib2.HTTPBasicAuthHandler.http_error_auth_reqed(
-+                        self, auth_header, host, req, headers)
-+
- def getauthinfo(path):
-     scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path)
-     if not urlpath:
-@@ -615,7 +634,7 @@
-         ui.debug('http auth: user %s, password %s\n' %
-                  (user, passwd and '*' * len(passwd) or 'not set'))
- 
--    handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr),
-+    handlers.extend((httpbasicauthhandler(passmgr),
-                      httpdigestauthhandler(passmgr)))
-     handlers.extend([h(ui, passmgr) for h in handlerfuncs])
-     opener = urllib2.build_opener(*handlers)

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2010-08-30 22:09:48 UTC (rev 6043)
+++ packages/mercurial/trunk/debian/patches/series	2010-08-31 08:29:20 UTC (rev 6044)
@@ -7,4 +7,3 @@
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
-from_upstream__issue2255fix-basicauth.diff