Error

diff --git a/README b/README --- a/README +++ b/README @@ -5,6 +5,6 @@ Basic install: $ hg debuginstall # sanity-check setup $ hg # see help -See http://www.selenic.com/mercurial/ for detailed installation +See http://mercurial.selenic.com/ for detailed installation instructions, platform-specific notes, and Mercurial user information. diff --git a/contrib/macosx/Readme.html b/contrib/macosx/Readme.html --- a/contrib/macosx/Readme.html +++ b/contrib/macosx/Readme.html @@ -25,13 +25,13 @@

Documentation

-

Visit the Mercurial web site and wiki

+

Visit the Mercurial web site and wiki

There's also a free book, Distributed revision control with Mercurial

Reporting problems

If you run into any problems, please file a bug online:

-

http://www.selenic.com/mercurial/bts

+

http://mercurial.selenic.com/bts/

diff --git a/contrib/macosx/Welcome.html b/contrib/macosx/Welcome.html --- a/contrib/macosx/Welcome.html +++ b/contrib/macosx/Welcome.html @@ -11,10 +11,10 @@ -

This is a prepackaged release of Mercurial for Mac OS X.

+

This is a prepackaged release of Mercurial for Mac OS X.

-Please be sure to read the latest release notes.

+Please be sure to read the latest release notes.

diff --git a/contrib/mercurial.spec b/contrib/mercurial.spec --- a/contrib/mercurial.spec +++ b/contrib/mercurial.spec @@ -4,8 +4,8 @@ Version: snapshot Release: 0 License: GPL Group: Development/Tools -Source: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz -URL: http://www.selenic.com/mercurial +Source: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz +URL: http://mercurial.selenic.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # From the README: diff --git a/contrib/vim/hgcommand.vim b/contrib/vim/hgcommand.vim --- a/contrib/vim/hgcommand.vim +++ b/contrib/vim/hgcommand.vim @@ -1226,7 +1226,7 @@ finish Author: Mathieu Clabaut Credits: Bob Hiestand -Mercurial: http://www.selenic.com/mercurial +Mercurial: http://mercurial.selenic.com/ Mercurial (noted Hg) is a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects. diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html --- a/contrib/win32/ReadMe.html +++ b/contrib/win32/ReadMe.html @@ -49,7 +49,7 @@

For documentation, please visit the Mercurial web site. + href="http://mercurial.selenic.com/">Mercurial web site. You can also download a free book, Mercurial: The Definitive Guide. @@ -100,7 +100,7 @@ editor = whatever By default, Mercurial will use the merge program defined by the HGMERGE environment variable, or uses the one defined in the mercurial.ini file. (see MergeProgram + href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram on the Mercurial Wiki for more information)

@@ -108,9 +108,9 @@ editor = whatever

Before you report any problems, please consult the Mercurial web site + href="http://mercurial.selenic.com/">Mercurial web site and see if your question is already in our list of Frequently + href="http://mercurial.selenic.com/wiki/FAQ">Frequently Answered Questions (the "FAQ").

diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss --- a/contrib/win32/mercurial.iss +++ b/contrib/win32/mercurial.iss @@ -8,9 +8,9 @@ InfoAfterFile=contrib/win32/postinstall. LicenseFile=COPYING ShowLanguageDialog=yes AppPublisher=Matt Mackall and others -AppPublisherURL=http://www.selenic.com/mercurial -AppSupportURL=http://www.selenic.com/mercurial -AppUpdatesURL=http://www.selenic.com/mercurial +AppPublisherURL=http://mercurial.selenic.com/ +AppSupportURL=http://mercurial.selenic.com/ +AppUpdatesURL=http://mercurial.selenic.com/ AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3} AppContact=mercurial@selenic.com OutputBaseFilename=Mercurial-snapshot @@ -51,7 +51,7 @@ Source: CONTRIBUTORS; DestDir: {app}; De Source: COPYING; DestDir: {app}; DestName: Copying.txt [INI] -Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://www.selenic.com/mercurial/ +Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/ [UninstallDelete] Type: files; Name: {app}\Mercurial.url diff --git a/contrib/win32/postinstall.txt b/contrib/win32/postinstall.txt --- a/contrib/win32/postinstall.txt +++ b/contrib/win32/postinstall.txt @@ -6,4 +6,4 @@ file that comes with this package. Also check the release notes at: - http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew + http://mercurial.selenic.com/wiki/WhatsNew diff --git a/doc/hg.1.txt b/doc/hg.1.txt --- a/doc/hg.1.txt +++ b/doc/hg.1.txt @@ -75,7 +75,7 @@ Written by Matt Mackall により書かれました。情報源 --- -http://selenic.com/mercurial[主なウェブサイト] +http://mercurial.selenic.com/[主なウェブサイト] http://www.serpentine.com/mercurial[Wiki サイト] diff --git a/hgext/keyword.py b/hgext/keyword.py --- a/hgext/keyword.py +++ b/hgext/keyword.py @@ -15,7 +15,7 @@ # audience not running a version control system. # # For in-depth discussion refer to -# . +# . # # Keyword expansion is based on Mercurial's changeset template mappings. # diff --git a/hgext/purge.py b/hgext/purge.py --- a/hgext/purge.py +++ b/hgext/purge.py @@ -1,6 +1,6 @@ # Copyright (C) 2006 - Marco Barisione # -# This is a small extension for Mercurial (http://www.selenic.com/mercurial) +# This is a small extension for Mercurial (http://mercurial.selenic.com/) # that removes files not known to mercurial # # This program was inspired by the "cvspurge" script contained in CVS utilities diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -11,7 +11,7 @@ This extension lets you rebase changeset repository. For more information: -http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject +http://mercurial.selenic.com/wiki/RebaseProject ''' from mercurial import util, repair, merge, cmdutil, commands, error diff --git a/hgext/win32text.py b/hgext/win32text.py --- a/hgext/win32text.py +++ b/hgext/win32text.py @@ -48,7 +48,7 @@ def checknewline(s, newline, ui=None, re # warn if already has 'newline' in repository. # it might cause unexpected eol conversion. # see issue 302: - # http://www.selenic.com/mercurial/bts/issue302 + # http://mercurial.selenic.com/bts/issue302 if newline in s and ui and filename and repo: ui.warn(_('WARNING: %s already has %s line endings\n' 'and does not need EOL conversion by the win32text plugin.\n' diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -987,7 +987,7 @@ def debuginstall(ui): " or misconfigured. Please check your .hgrc file)\n")) else: ui.write(_(" Internal patcher failure, please report this error" - " to http://www.selenic.com/mercurial/bts\n")) + " to http://mercurial.selenic.com/bts/\n")) problems += patchproblems os.unlink(fa) diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -143,7 +143,7 @@ def _runcatch(ui, args): except: ui.warn(_("** unknown exception encountered, details follow\n")) ui.warn(_("** report bug details to " - "http://www.selenic.com/mercurial/bts\n")) + "http://mercurial.selenic.com/bts/\n")) ui.warn(_("** or mercurial@selenic.com\n")) ui.warn(_("** Mercurial Distributed SCM (version %s)\n") % util.version()) diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -255,7 +255,7 @@ setup(name='mercurial', version=version, author='Matt Mackall', author_email='mpm@selenic.com', - url='http://selenic.com/mercurial', + url='http://mercurial.selenic.com/', description='Scalable distributed SCM', license='GNU GPL', scripts=scripts, diff --git a/templates/atom/error.tmpl b/templates/atom/error.tmpl --- a/templates/atom/error.tmpl +++ b/templates/atom/error.tmpl @@ -7,7 +7,7 @@ 1970-01-01T00:00:00+00:00 Error - http://www.selenic.com/mercurial/#error + http://mercurial.selenic.com/#error mercurial diff --git a/templates/gitweb/branches.tmpl b/templates/gitweb/branches.tmpl --- a/templates/gitweb/branches.tmpl +++ b/templates/gitweb/branches.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / branches +Mercurial {repo|escape} / branches

diff --git a/templates/gitweb/changelog.tmpl b/templates/gitweb/changelog.tmpl --- a/templates/gitweb/changelog.tmpl +++ b/templates/gitweb/changelog.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / changelog +Mercurial {repo|escape} / changelog

diff --git a/templates/gitweb/changeset.tmpl b/templates/gitweb/changeset.tmpl --- a/templates/gitweb/changeset.tmpl +++ b/templates/gitweb/changeset.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / changeset +Mercurial {repo|escape} / changeset

diff --git a/templates/gitweb/error.tmpl b/templates/gitweb/error.tmpl --- a/templates/gitweb/error.tmpl +++ b/templates/gitweb/error.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / error +Mercurial {repo|escape} / error

diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl +++ b/templates/gitweb/fileannotate.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / annotate +Mercurial {repo|escape} / annotate

diff --git a/templates/gitweb/filediff.tmpl b/templates/gitweb/filediff.tmpl --- a/templates/gitweb/filediff.tmpl +++ b/templates/gitweb/filediff.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / diff +Mercurial {repo|escape} / diff

diff --git a/templates/gitweb/filelog.tmpl b/templates/gitweb/filelog.tmpl --- a/templates/gitweb/filelog.tmpl +++ b/templates/gitweb/filelog.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / file revisions +Mercurial {repo|escape} / file revisions

diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl +++ b/templates/gitweb/filerevision.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / file revision +Mercurial {repo|escape} / file revision

diff --git a/templates/gitweb/graph.tmpl b/templates/gitweb/graph.tmpl --- a/templates/gitweb/graph.tmpl +++ b/templates/gitweb/graph.tmpl @@ -9,7 +9,7 @@

-Mercurial {repo|escape} / graph +Mercurial {repo|escape} / graph

diff --git a/templates/gitweb/index.tmpl b/templates/gitweb/index.tmpl --- a/templates/gitweb/index.tmpl +++ b/templates/gitweb/index.tmpl @@ -4,7 +4,7 @@

- Mercurial + Mercurial Repositories list

diff --git a/templates/gitweb/manifest.tmpl b/templates/gitweb/manifest.tmpl --- a/templates/gitweb/manifest.tmpl +++ b/templates/gitweb/manifest.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / files +Mercurial {repo|escape} / files

diff --git a/templates/gitweb/notfound.tmpl b/templates/gitweb/notfound.tmpl --- a/templates/gitweb/notfound.tmpl +++ b/templates/gitweb/notfound.tmpl @@ -5,7 +5,7 @@

-Mercurial Not found: {repo|escape} +Mercurial Not found: {repo|escape}

diff --git a/templates/gitweb/search.tmpl b/templates/gitweb/search.tmpl --- a/templates/gitweb/search.tmpl +++ b/templates/gitweb/search.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / search +Mercurial {repo|escape} / search {sessionvars%hiddenformentry} diff --git a/templates/gitweb/shortlog.tmpl b/templates/gitweb/shortlog.tmpl --- a/templates/gitweb/shortlog.tmpl +++ b/templates/gitweb/shortlog.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / shortlog +Mercurial {repo|escape} / shortlog

diff --git a/templates/gitweb/summary.tmpl b/templates/gitweb/summary.tmpl --- a/templates/gitweb/summary.tmpl +++ b/templates/gitweb/summary.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / summary +Mercurial {repo|escape} / summary {sessionvars%hiddenformentry} diff --git a/templates/gitweb/tags.tmpl b/templates/gitweb/tags.tmpl --- a/templates/gitweb/tags.tmpl +++ b/templates/gitweb/tags.tmpl @@ -8,7 +8,7 @@

-Mercurial {repo|escape} / tags +Mercurial {repo|escape} / tags

diff --git a/templates/monoblue/footer.tmpl b/templates/monoblue/footer.tmpl --- a/templates/monoblue/footer.tmpl +++ b/templates/monoblue/footer.tmpl @@ -8,7 +8,7 @@

-

+

diff --git a/templates/monoblue/index.tmpl b/templates/monoblue/index.tmpl --- a/templates/monoblue/index.tmpl +++ b/templates/monoblue/index.tmpl @@ -26,7 +26,7 @@

-

+

diff --git a/templates/paper/branches.tmpl b/templates/paper/branches.tmpl --- a/templates/paper/branches.tmpl +++ b/templates/paper/branches.tmpl @@ -10,7 +10,7 @@

diff --git a/templates/paper/manifest.tmpl b/templates/paper/manifest.tmpl --- a/templates/paper/manifest.tmpl +++ b/templates/paper/manifest.tmpl @@ -6,7 +6,7 @@

Error {error|escape} - http://www.selenic.com/mercurial/#error + http://mercurial.selenic.com/#error

-Mercurial test / branches +Mercurial test / branches

@@ -573,7 +573,7 @@ 200 Script output follows

-Mercurial test / summary +Mercurial test / summary @@ -724,7 +724,7 @@ 200 Script output follows

-Mercurial test / graph +Mercurial test / graph

diff --git a/tests/test-hgweb-descend-empties.out b/tests/test-hgweb-descend-empties.out --- a/tests/test-hgweb-descend-empties.out +++ b/tests/test-hgweb-descend-empties.out @@ -21,7 +21,7 @@ 200 Script output follows

@@ -192,7 +192,7 @@ 200 Script output follows

diff --git a/tests/test-highlight.out b/tests/test-highlight.out --- a/tests/test-highlight.out +++ b/tests/test-highlight.out @@ -19,7 +19,7 @@ 200 Script output follows

diff --git a/tests/test-issue322 b/tests/test-issue322 --- a/tests/test-issue322 +++ b/tests/test-issue322 @@ -1,5 +1,5 @@ #!/bin/sh -# http://www.selenic.com/mercurial/bts/issue322 +# http://mercurial.selenic.com/bts/issue322 echo % file replaced with directory diff --git a/tests/test-issue352 b/tests/test-issue352 --- a/tests/test-issue352 +++ b/tests/test-issue352 @@ -1,5 +1,5 @@ #!/bin/sh -# http://www.selenic.com/mercurial/bts/issue352 +# http://mercurial.selenic.com/bts/issue352 "$TESTDIR/hghave" eol-in-paths || exit 80 diff --git a/tests/test-issue433 b/tests/test-issue433 --- a/tests/test-issue433 +++ b/tests/test-issue433 @@ -1,5 +1,5 @@ #!/bin/sh -# http://www.selenic.com/mercurial/bts/issue433 +# http://mercurial.selenic.com/bts/issue433 hg init a cd a diff --git a/tests/test-issue660 b/tests/test-issue660 --- a/tests/test-issue660 +++ b/tests/test-issue660 @@ -1,5 +1,5 @@ #!/bin/sh -# http://www.selenic.com/mercurial/bts/issue660 +# http://mercurial.selenic.com/bts/issue660 hg init a