Patchwork [2,of,4,STABLE,V3] misc: replace domain of mercurial ML address by mercurial-scm.org

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Feb. 10, 2017, 3:30 p.m.
Message ID <868c06e78062801b9a95.1486740604@speaknoevil>
Download mbox | patch
Permalink /patch/18396/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - Feb. 10, 2017, 3:30 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1486740233 -32400
#      Sat Feb 11 00:23:53 2017 +0900
# Branch stable
# Node ID 868c06e78062801b9a95621a6c50c8139726d8af
# Parent  f4dcd9cdb900f46557c9bd15abb73b0c5f03403b
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@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?

Patch

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@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@selenic.com
+AppContact=mercurial@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@selenic.com</Property>
+    <Property Id='ARPCONTACT'>mercurial@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@selenic.com',
+      author_email='mercurial@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@selenic.com>"
+  $ baz my-id "mercurial <mercurial@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@selenic.com>"
+  $ tla my-id "mercurial <mercurial@mercurial-scm.org>"
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert=" >> $HGRCPATH