[PATCH STABLE V4] misc: update year in copyright lines
Augie Fackler
raf at durin42.com
Sat Feb 11 13:28:58 EST 2017
queued for stable, thanks
> On Feb 11, 2017, at 12:25 PM, FUJIWARA Katsunori <foozy at lares.dti.ne.jp> wrote:
>
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1486833813 -32400
> # Sun Feb 12 02:23:33 2017 +0900
> # Branch stable
> # Node ID 75149f84eac79994b99e159cda8d8f1bec75b5a2
> # Parent 22a4f664c1a5244ea7c40eefce60effc4382ac5b
> misc: update year in copyright lines
>
> This patch also makes some expected output lines in tests glob-ed for
> persistence of them.
>
> BTW, files below aren't yet changed in 2017, but this patch also
> updates copyright of them, because:
>
> - mercurial/help/hg.1.txt
>
> almost all of "man hg" output comes from online help of hg
> command, and is already changed in 2017
>
> - mercurial/help/hgignore.5.txt
> - mercurial/help/hgrc.5
>
> "copyright 2005-201X Matt Mackall" in them mentions about
> copyright of Mercurial itself
>
> diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html
> --- a/contrib/win32/ReadMe.html
> +++ b/contrib/win32/ReadMe.html
> @@ -140,7 +140,7 @@ editor = whatever
> </p>
>
> <p>
> - Mercurial is Copyright 2005-2016 Matt Mackall and others. See
> + Mercurial is Copyright 2005-2017 Matt Mackall and others. See
> the <tt>Contributors.txt</tt> file for a list of contributors.
> </p>
>
> diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
> --- a/contrib/win32/mercurial.iss
> +++ b/contrib/win32/mercurial.iss
> @@ -21,7 +21,7 @@
> #endif
>
> [Setup]
> -AppCopyright=Copyright 2005-2016 Matt Mackall and others
> +AppCopyright=Copyright 2005-2017 Matt Mackall and others
> AppName=Mercurial
> AppVersion={#VERSION}
> #if ARCH == "x64"
> @@ -45,7 +45,7 @@ AppContact=mercurial at mercurial-scm.org
> DefaultDirName={pf}\Mercurial
> SourceDir=..\..
> VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
> -VersionInfoCopyright=Copyright 2005-2016 Matt Mackall and others
> +VersionInfoCopyright=Copyright 2005-2017 Matt Mackall and others
> VersionInfoCompany=Matt Mackall and others
> InternalCompressLevel=max
> SolidCompression=true
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -6576,7 +6576,7 @@ def version_(ui, **opts):
> util.version())
> license = _(
> "(see https://mercurial-scm.org for more information)\n"
> - "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
> + "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
> "This is free software; see the source for copying conditions. "
> "There is NO\nwarranty; "
> "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
> diff --git a/mercurial/help/hg.1.txt b/mercurial/help/hg.1.txt
> --- a/mercurial/help/hg.1.txt
> +++ b/mercurial/help/hg.1.txt
> @@ -112,7 +112,7 @@ Mailing list: https://www.mercurial-scm.
>
> Copying
> """""""
> -Copyright (C) 2005-2016 Matt Mackall.
> +Copyright (C) 2005-2017 Matt Mackall.
> Free use of this software is granted under the terms of the GNU General
> Public License version 2 or any later version.
>
> diff --git a/mercurial/help/hgignore.5.txt b/mercurial/help/hgignore.5.txt
> --- a/mercurial/help/hgignore.5.txt
> +++ b/mercurial/help/hgignore.5.txt
> @@ -26,7 +26,7 @@ See Also
> Copying
> =======
> This manual page is copyright 2006 Vadim Gelfer.
> -Mercurial is copyright 2005-2016 Matt Mackall.
> +Mercurial is copyright 2005-2017 Matt Mackall.
> Free use of this software is granted under the terms of the GNU General
> Public License version 2 or any later version.
>
> diff --git a/mercurial/help/hgrc.5.txt b/mercurial/help/hgrc.5.txt
> --- a/mercurial/help/hgrc.5.txt
> +++ b/mercurial/help/hgrc.5.txt
> @@ -34,7 +34,7 @@ See Also
> Copying
> =======
> This manual page is copyright 2005 Bryan O'Sullivan.
> -Mercurial is copyright 2005-2016 Matt Mackall.
> +Mercurial is copyright 2005-2017 Matt Mackall.
> Free use of this software is granted under the terms of the GNU General
> Public License version 2 or any later version.
>
> diff --git a/setup.py b/setup.py
> --- a/setup.py
> +++ b/setup.py
> @@ -664,7 +664,7 @@ extra = {}
> if py2exeloaded:
> extra['console'] = [
> {'script':'hg',
> - 'copyright':'Copyright (C) 2005-2016 Matt Mackall and others',
> + 'copyright':'Copyright (C) 2005-2017 Matt Mackall and others',
> 'product_version':version}]
> # sub command of 'build' because 'py2exe' does not handle sub_commands
> build.sub_commands.insert(0, ('build_hgextindex', None))
> diff --git a/tests/test-help.t b/tests/test-help.t
> --- a/tests/test-help.t
> +++ b/tests/test-help.t
> @@ -445,7 +445,7 @@ Test help option with version option
> Mercurial Distributed SCM (version *) (glob)
> (see https://mercurial-scm.org for more information)
>
> - Copyright (C) 2005-2016 Matt Mackall and others
> + Copyright (C) 2005-* Matt Mackall and others (glob)
> This is free software; see the source for copying conditions. There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>
> diff --git a/tests/test-hgrc.t b/tests/test-hgrc.t
> --- a/tests/test-hgrc.t
> +++ b/tests/test-hgrc.t
> @@ -71,7 +71,7 @@ issue1829: wrong indentation
> Mercurial Distributed SCM (version *) (glob)
> (see https://mercurial-scm.org for more information)
>
> - Copyright (C) 2005-2016 Matt Mackall and others
> + Copyright (C) 2005-* Matt Mackall and others (glob)
> This is free software; see the source for copying conditions. There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> $ unset FAKEPATH
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list