comparison mercurial/httprepo.py @ 10264:d6512b3e9ac0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents 37c4ce51a12d 25e572394f5c
children 08a0f04b56bd
comparison
equal deleted inserted replaced
10260:fe699ca08a45 10264:d6512b3e9ac0
2 # 2 #
3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> 3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> 4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
5 # 5 #
6 # This software may be used and distributed according to the terms of the 6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2, incorporated herein by reference. 7 # GNU General Public License version 2 or any later version.
8 8
9 from node import bin, hex, nullid 9 from node import bin, hex, nullid
10 from i18n import _ 10 from i18n import _
11 import repo, changegroup, statichttprepo, error, url, util 11 import repo, changegroup, statichttprepo, error, url, util
12 import os, urllib, urllib2, urlparse, zlib, httplib 12 import os, urllib, urllib2, urlparse, zlib, httplib