[PATCH 2 of 3 STABLE V2] misc: replace domain of mercurial ML address by mercurial-scm.org
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Thu Feb 9 10:59:54 EST 2017
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1486654816 -32400
# Fri Feb 10 00:40:16 2017 +0900
# Branch stable
# Node ID 2757e877b4d159fda8c6377c91287499808a901f
# Parent 8645ffc1a98ac26a773658fbd103ddb2d224184a
misc: replace domain of mercurial ML address by mercurial-scm.org
This patch also adds new check-code.py pattern to detect invalid usage
of "mercurial at selenic.com".
Change for test-convert-tla.t is tested, but similar change for almost
same test-convert-baz.t isn't yet tested actually, because I couldn't
find out the way to get "GNU Arch baz client".
AFAIK, buildbot skips test-convert-baz.t, too. Does anybody have
appropriate environment for testing?
diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -461,6 +461,8 @@ allfilespats = [
# for safety, "thisyear - 2" is also checked (this can cover the
# issue fixed in af3b5aa61fc0)
'outdated copyright year'),
+ (r'mercurial at selenic\.com',
+ 'use mercurial-scm.org domain for mercurial ML address'),
],
# warnings
[],
diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -41,7 +41,7 @@ AppPublisherURL=https://mercurial-scm.or
AppSupportURL=https://mercurial-scm.org/
AppUpdatesURL=https://mercurial-scm.org/
AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
-AppContact=mercurial at selenic.com
+AppContact=mercurial at mercurial-scm.org
DefaultDirName={pf}\Mercurial
SourceDir=..\..
VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/wix/mercurial.wxs
@@ -43,7 +43,7 @@
</Property>
<!--Property Id='ARPCOMMENTS'>any comments</Property-->
- <Property Id='ARPCONTACT'>mercurial at selenic.com</Property>
+ <Property Id='ARPCONTACT'>mercurial at mercurial-scm.org</Property>
<Property Id='ARPHELPLINK'>https://mercurial-scm.org/wiki/</Property>
<Property Id='ARPURLINFOABOUT'>https://mercurial-scm.org/about/</Property>
<Property Id='ARPURLUPDATEINFO'>https://mercurial-scm.org/downloads/</Property>
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -712,7 +712,7 @@ if sys.platform == 'darwin' and os.path.
setup(name='mercurial',
version=setupversion,
author='Matt Mackall and many others',
- author_email='mercurial at selenic.com',
+ author_email='mercurial at mercurial-scm.org',
url='https://mercurial-scm.org/',
download_url='https://mercurial-scm.org/release/',
description=('Fast scalable distributed SCM (revision control, version '
diff --git a/tests/test-convert-baz.t b/tests/test-convert-baz.t
--- a/tests/test-convert-baz.t
+++ b/tests/test-convert-baz.t
@@ -1,6 +1,6 @@
#require baz symlink
- $ baz my-id "mercurial <mercurial at selenic.com>"
+ $ baz my-id "mercurial <mercurial at mercurial-scm.org>"
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
diff --git a/tests/test-convert-tla.t b/tests/test-convert-tla.t
--- a/tests/test-convert-tla.t
+++ b/tests/test-convert-tla.t
@@ -1,6 +1,6 @@
#require tla symlink
- $ tla my-id "mercurial <mercurial at selenic.com>"
+ $ tla my-id "mercurial <mercurial at mercurial-scm.org>"
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
More information about the Mercurial-devel
mailing list