diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /mercurial/httpconnection.py | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-master.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'mercurial/httpconnection.py')
| -rw-r--r-- | mercurial/httpconnection.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mercurial/httpconnection.py b/mercurial/httpconnection.py index ce316d9..91745b9 100644 --- a/mercurial/httpconnection.py +++ b/mercurial/httpconnection.py @@ -38,7 +38,7 @@ class httpsendfile(object): self.write = self._data.write self.length = os.fstat(self._data.fileno()).st_size self._pos = 0 - self._total = self.length // 1024 * 2 + self._total = self.length / 1024 * 2 def read(self, *args, **kwargs): try: @@ -51,7 +51,7 @@ class httpsendfile(object): # requires authentication. Since we can't know until we try # once whether authentication will be required, just lie to # the user and maybe the push succeeds suddenly at 50%. - self.ui.progress(_('sending'), self._pos // 1024, + self.ui.progress(_('sending'), self._pos / 1024, unit=_('kb'), total=self._total) return ret @@ -70,11 +70,7 @@ def readauthforuri(ui, uri, user): gdict[setting] = val # Find the best match - if '://' in uri: - scheme, hostpath = uri.split('://', 1) - else: - # py2.4.1 doesn't provide the full URI - scheme, hostpath = 'http', uri + scheme, hostpath = uri.split('://', 1) bestuser = None bestlen = 0 bestauth = None |