Mercurial > hg-stable
changeset 7271:8046f0a070a6
use our urlopener (proxy handling, etc) instead of urllib
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 27 Oct 2008 21:50:16 +0100 |
| parents | 2db33c1a5654 |
| children | 9105467b8167 |
| files | hgext/mq.py mercurial/commands.py tests/test-convert-darcs tests/test-mq-qimport tests/test-mq-qimport.out |
| diffstat | 4 files changed, 10 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Mon Oct 27 21:50:01 2008 +0100 +++ b/hgext/mq.py Mon Oct 27 21:50:16 2008 +0100 @@ -33,8 +33,8 @@ from mercurial.node import bin, hex, short from mercurial.repo import RepoError from mercurial import commands, cmdutil, hg, patch, revlog, util -from mercurial import repair, extensions -import os, sys, re, errno, urllib +from mercurial import repair, extensions, url +import os, sys, re, errno commands.norepo += " qclone" @@ -1521,10 +1521,7 @@ raise util.Abort(_('need --name to import a patch from -')) text = sys.stdin.read() else: - if os.path.exists(filename): - text = file(filename, 'rb').read() - else: - text = urllib.urlopen(filename).read() + text = url.open(self.ui, filename).read() except IOError: raise util.Abort(_("unable to read %s") % filename) if not patchname:
--- a/mercurial/commands.py Mon Oct 27 21:50:01 2008 +0100 +++ b/mercurial/commands.py Mon Oct 27 21:50:16 2008 +0100 @@ -8,7 +8,7 @@ from node import hex, nullid, nullrev, short from repo import RepoError, NoCapability from i18n import _, gettext -import os, re, sys, urllib +import os, re, sys import hg, util, revlog, bundlerepo, extensions, copies import difflib, patch, time, help, mdiff, tempfile, url import version, socket @@ -1590,13 +1590,11 @@ if pf == '-': ui.status(_("applying patch from stdin\n")) - data = patch.extract(ui, sys.stdin) + pf = sys.stdin else: ui.status(_("applying %s\n") % p) - if os.path.exists(pf): - data = patch.extract(ui, file(pf, 'rb')) - else: - data = patch.extract(ui, urllib.urlopen(pf)) + pf = url.open(ui, pf) + data = patch.extract(ui, pf) tmpname, message, user, date, branch, nodeid, p1, p2 = data if tmpname is None: @@ -2844,10 +2842,7 @@ try: lock = repo.lock() for fname in fnames: - if os.path.exists(fname): - f = open(fname, "rb") - else: - f = urllib.urlopen(fname) + f = url.open(ui, fname) gen = changegroup.readbundle(f, fname) modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) finally:
--- a/tests/test-mq-qimport Mon Oct 27 21:50:01 2008 +0100 +++ b/tests/test-mq-qimport Mon Oct 27 21:50:16 2008 +0100 @@ -25,7 +25,7 @@ cd repo echo % qimport non-existing-file -hg qimport non-existing-file +hg qimport non-existing-file 2>&1 | sed -e 's/\(No such file or directory:\) .*/\1/' echo % import URL echo foo >> foo