merge with crew.
--- a/doc/hg.1.txt Wed Jun 14 15:41:06 2006 -0700
+++ b/doc/hg.1.txt Wed Jun 14 15:41:37 2006 -0700
@@ -31,7 +31,7 @@
repository path::
either the pathname of a local repository or the URI of a remote
repository. There are two available URI protocols, http:// which is
- fast and the old-http:// protocol which is much slower but does not
+ fast and the static-http:// protocol which is much slower but does not
require a special server on the web host.
--- a/doc/ja/hg.1.ja.txt Wed Jun 14 15:41:06 2006 -0700
+++ b/doc/ja/hg.1.ja.txt Wed Jun 14 15:41:37 2006 -0700
@@ -70,7 +70,7 @@
repository path::
ローカルのリポジトリのパス名かリモートのリポジトリの URI を表
します。URI のプロトコルとしては現在 2 つが利用可能です。
- http:// は高速で、old-http:// は遅いですがウェブのホストに特別
+ http:// は高速で、static-http:// は遅いですがウェブのホストに特別
なサーバを必要としません。
コマンド
--- a/mercurial/hg.py Wed Jun 14 15:41:06 2006 -0700
+++ b/mercurial/hg.py Wed Jun 14 15:41:37 2006 -0700
@@ -8,6 +8,7 @@
from node import *
from repo import *
from demandload import *
+from i18n import gettext as _
demandload(globals(), "localrepo bundlerepo httprepo sshrepo statichttprepo")
def repository(ui, path=None, create=0):
@@ -17,11 +18,18 @@
if path.startswith("https://"):
return httprepo.httpsrepository(ui, path)
if path.startswith("hg://"):
+ ui.warn(_("hg:// syntax is deprecated, "
+ "please use http:// instead\n"))
return httprepo.httprepository(
ui, path.replace("hg://", "http://"))
if path.startswith("old-http://"):
+ ui.warn(_("old-http:// syntax is deprecated, "
+ "please use static-http:// instead\n"))
return statichttprepo.statichttprepository(
ui, path.replace("old-http://", "http://"))
+ if path.startswith("static-http://"):
+ return statichttprepo.statichttprepository(
+ ui, path.replace("static-http://", "http://"))
if path.startswith("ssh://"):
return sshrepo.sshrepository(ui, path)
if path.startswith("bundle://"):
--- a/tests/test-static-http Wed Jun 14 15:41:06 2006 -0700
+++ b/tests/test-static-http Wed Jun 14 15:41:37 2006 -0700
@@ -1,6 +1,6 @@
#!/bin/sh
-http_proxy= hg clone old-http://localhost:20059/ copy
+http_proxy= hg clone static-http://localhost:20059/ copy
echo $?
ls copy 2>/dev/null || echo copy: No such file or directory
@@ -31,7 +31,7 @@
cd ..
-http_proxy= hg clone old-http://localhost:20059/remote local
+http_proxy= hg clone static-http://localhost:20059/remote local
cd local
hg verify
--- a/tests/test-static-http.out Wed Jun 14 15:41:06 2006 -0700
+++ b/tests/test-static-http.out Wed Jun 14 15:41:37 2006 -0700
@@ -19,6 +19,6 @@
checking files
1 files, 1 changesets, 1 total revisions
foo
-pulling from old-http://localhost:20059/remote
+pulling from static-http://localhost:20059/remote
searching for changes
no changes found