Ticket #27196: hgforest-crew.hg-1.7-0.patch

forest.py

@@ -53 +53 @@
 import os
 import re
 import shutil
+import urllib
+import urllib2
 
 from mercurial import cmdutil, commands, error, hg, hgweb, node, util
 from mercurial import localrepo, sshrepo, sshserver, httprepo, statichttprepo
+from mercurial import url
 from mercurial.i18n import gettext as _
 
 # For backwards compatibility, we need the following function definition.
@@ -280 +283 @@
 httprepo.httprepository.forests = _httprepo_forests
 
 
+
+def _forests_do_cmd(self, cmd, **args):
+    data = args.pop('data', None)
+    headers = args.pop('headers', {})
+    self.ui.debug("sending %s command\n" % cmd)
+    q = {"cmd": cmd}
+    q.update(args)
+    qs = '?%s' % urllib.urlencode(q)
+    cu = "%s%s" % (self._url, qs)
+    req = urllib2.Request(cu, data, headers)
+    if data is not None:
+        # len(data) is broken if data doesn't fit into Py_ssize_t
+        # add the header ourself to avoid OverflowError
+        size = data.__len__()
+        self.ui.debug("sending %s bytes\n" % size)
+        req.add_unredirected_header('Content-Length', '%d' % size)
+    try:
+        resp = self.urlopener.open(req)
+    except urllib2.HTTPError, inst:
+        if inst.code == 401:
+            raise util.Abort(_('authorization failed'))
+        raise
+    except httplib.HTTPException, inst:
+        self.ui.debug('http error while sending %s command\n' % cmd)
+        self.ui.traceback()
+        raise IOError(None, inst)
+    except IndexError:
+        # this only happens with Python 2.3, later versions raise URLError
+        raise util.Abort(_('http error, possibly caused by proxy setting'))
+    # record the url we got redirected to
+    resp_url = resp.geturl()
+    if resp_url.endswith(qs):
+        resp_url = resp_url[:-len(qs)]
+    if self._url.rstrip('/') != resp_url.rstrip('/'):
+        self.ui.status(_('real URL is %s\n') % resp_url)
+    self._url = resp_url
+    try:
+        proto = resp.getheader('content-type')
+    except AttributeError:
+        proto = resp.headers['content-type']
+
+    safeurl = url.hidepassword(self._url)
+    # accept old "text/plain" and "application/hg-changegroup" for now
+    if not (proto.startswith('application/mercurial-') or
+            proto.startswith('text/plain') or
+            proto.startswith('application/hg-changegroup')):
+        self.ui.debug("requested URL: '%s'\n" % url.hidepassword(cu))
+        raise error.RepoError(
+            _("'%s' does not appear to be an hg repository:\n"
+              "---%%<--- (%s)\n%s\n---%%<---\n")
+            % (safeurl, proto, resp.read()))
+
+    if proto.startswith('application/mercurial-'):
+        try:
+            version = proto.split('-', 1)[1]
+            version_info = tuple([int(n) for n in version.split('.')])
+        except ValueError:
+            raise error.RepoError(_("'%s' sent a broken Content-Type "
+                                    "header (%s)") % (safeurl, proto))
+        if version_info > (0, 1):
+            raise error.RepoError(_("'%s' uses newer protocol %s") %
+                                  (safeurl, version))
+
+    return resp
+ 
+httprepo.httprepository.do_cmd = _forests_do_cmd
+
+
+
+def _forests_do_read(self, cmd, **args):
+    fp = self.do_cmd(cmd, **args)
+    try:
+        return fp.read()
+    finally:
+        # if using keepalive, allow connection to be reused
+        fp.close()
+
+httprepo.httprepository.do_read = _forests_do_read
+
+
+
 def _httpserver_do_capabilities(self, req):
     caps = ['lookup', 'changegroupsubset', 'forests']
     if self.configbool('server', 'uncompressed'):