proxy: remove unneeded _set_hostport for compatibility with Python 2.7.7rc1 With Python 2.7.7rc1, "hg pull" through HTTP CONNECT tunnel fails due to the removal of _set_hostport [1]. ... File "mercurial/url.py", line 372, in https_open return self.do_open(self._makeconnection, req) ... File "mercurial/url.py", line 342, in connect _generic_proxytunnel(self) File "mercurial/url.py", line 228, in _generic_proxytunnel self._set_hostport(self.host, self.port) AttributeError: httpsconnection instance has no attribute '_set_hostport' self._set_hostport(self.host, self.port) should be noop and can be removed because: - _set_hostport() [2] was the function to parse "host:port" string and set them to self.host and self.port, - and (self.host, self.port) pair should be valid since connect() is called prior to _generic_proxytunnel(). [1]: http://hg.python.org/cpython/rev/568041fd8090 [2]: http://hg.python.org/cpython/file/3a1db0d2747e/Lib/httplib.py#l721

     1

#!/usr/bin/env python

     2

# Undump a dump from dumprevlog

     3

# $ hg init

     4

# $ undumprevlog < repo.dump

     5

     6

import sys

     7

from mercurial import revlog, node, scmutil, util, transaction

     8

     9

for fp in (sys.stdin, sys.stdout, sys.stderr):

    10

    util.setbinary(fp)

    11

    12

opener = scmutil.opener('.', False)

    13

tr = transaction.transaction(sys.stderr.write, opener, "undump.journal")

    14

while True:

    15

    l = sys.stdin.readline()

    16

    if not l:

    17

        break

    18

    if l.startswith("file:"):

    19

        f = l[6:-1]

    20

        r = revlog.revlog(opener, f)

    21

        print f

    22

    elif l.startswith("node:"):

    23

        n = node.bin(l[6:-1])

    24

    elif l.startswith("linkrev:"):

    25

        lr = int(l[9:-1])

    26

    elif l.startswith("parents:"):

    27

        p = l[9:-1].split()

    28

        p1 = node.bin(p[0])

    29

        p2 = node.bin(p[1])

    30

    elif l.startswith("length:"):

    31

        length = int(l[8:-1])

    32

        sys.stdin.readline() # start marker

    33

        d = sys.stdin.read(length)

    34

        sys.stdin.readline() # end marker

    35

        r.addrevision(d, tr, lr, p1, p2)

    36

    37

tr.close()