This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9885

copyright: update to 2021
ClosedPublic

Authored by mharbison72 on Jan 27 2021, 12:57 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGed43b6fa847e: copyright: update to 2021

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Jan 27 2021, 12:57 AM
mharbison72 added a comment.Jan 27 2021, 1:02 AM

Last year, phabricator ate contrib/packaging/wix/COPYING.rtf, but it looks OK to me now. Whoever queues it should just double check that it isn't a zero length file after importing.

pulkit accepted this revision.Jan 28 2021, 1:19 PM
This revision is now accepted and ready to land.Jan 28 2021, 1:19 PM
mharbison72 added a commit: rHGed43b6fa847e: copyright: update to 2021.Jan 28 2021, 5:13 PM
Closed by commit rHGed43b6fa847e: copyright: update to 2021 (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25369

contrib/packaging/debian/copyright

Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mercurial Upstream-Name: mercurial
Source: https://www.mercurial-scm.org/ Source: https://www.mercurial-scm.org/
Files: * Files: *
Copyright: 2005-2020, Matt Mackall <mpm@selenic.com> and others. Copyright: 2005-2021, Matt Mackall <mpm@selenic.com> and others.
License: GPL-2+ License: GPL-2+
This program is free software; you can redistribute it This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version 2 of the License, or (at your option) any later
version. version.
. .
This program is distributed in the hope that it will be This program is distributed in the hope that it will be

contrib/packaging/inno/mercurial.iss

; Script generated by the Inno Setup Script Wizard. ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#ifndef ARCH #ifndef ARCH
#define ARCH = "x86" #define ARCH = "x86"
#endif #endif
[Setup] [Setup]
AppCopyright=Copyright 2005-2020 Matt Mackall and others AppCopyright=Copyright 2005-2021 Matt Mackall and others
AppName=Mercurial AppName=Mercurial
AppVersion={#VERSION} AppVersion={#VERSION}
OutputBaseFilename=Mercurial-{#VERSION}{#SUFFIX} OutputBaseFilename=Mercurial-{#VERSION}{#SUFFIX}
#if ARCH == "x64" #if ARCH == "x64"
AppVerName=Mercurial {#VERSION} (64-bit) AppVerName=Mercurial {#VERSION} (64-bit)
ArchitecturesAllowed=x64 ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64
#else #else
AppVerName=Mercurial {#VERSION} AppVerName=Mercurial {#VERSION}
#endif #endif
InfoAfterFile=../postinstall.txt InfoAfterFile=../postinstall.txt
LicenseFile=Copying.txt LicenseFile=Copying.txt
ShowLanguageDialog=yes ShowLanguageDialog=yes
AppPublisher=Matt Mackall and others AppPublisher=Matt Mackall and others
AppPublisherURL=https://mercurial-scm.org/ AppPublisherURL=https://mercurial-scm.org/
AppSupportURL=https://mercurial-scm.org/ AppSupportURL=https://mercurial-scm.org/
AppUpdatesURL=https://mercurial-scm.org/ AppUpdatesURL=https://mercurial-scm.org/
{{ 'AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}' }} {{ 'AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}' }}
AppContact=mercurial@mercurial-scm.org AppContact=mercurial@mercurial-scm.org
DefaultDirName={pf}\Mercurial DefaultDirName={pf}\Mercurial
SourceDir=stage SourceDir=stage
VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
VersionInfoCopyright=Copyright 2005-2020 Matt Mackall and others VersionInfoCopyright=Copyright 2005-2021 Matt Mackall and others
VersionInfoCompany=Matt Mackall and others VersionInfoCompany=Matt Mackall and others
VersionInfoVersion={#QUAD_VERSION} VersionInfoVersion={#QUAD_VERSION}
InternalCompressLevel=max InternalCompressLevel=max
SolidCompression=true SolidCompression=true
SetupIconFile=../mercurial.ico SetupIconFile=../mercurial.ico
AllowNoIcons=true AllowNoIcons=true
DefaultGroupName=Mercurial DefaultGroupName=Mercurial
PrivilegesRequired=none PrivilegesRequired=none

contrib/packaging/wix/COPYING.rtf

  • This is a binary file.

contrib/win32/ReadMe.html

</p> </p>
<p> <p>
The Windows installer was written by <a The Windows installer was written by <a
href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>. href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.
</p> </p>
<p> <p>
Mercurial is Copyright 2005-2020 Matt Mackall and others. Mercurial is Copyright 2005-2021 Matt Mackall and others.
</p> </p>
<p> <p>
Mercurial is free software; you can redistribute it and/or Mercurial is free software; you can redistribute it and/or
modify it under the terms of the <a modify it under the terms of the <a
href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
General Public License version 2</a> or any later version. General Public License version 2</a> or any later version.
</p> </p>

mercurial/commands.py

ui.pager(b'version') ui.pager(b'version')
fm = ui.formatter(b"version", opts) fm = ui.formatter(b"version", opts)
fm.startitem() fm.startitem()
fm.write( fm.write(
b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version() b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
) )
license = _( license = _(
b"(see https://mercurial-scm.org for more information)\n" b"(see https://mercurial-scm.org for more information)\n"
b"\nCopyright (C) 2005-2020 Matt Mackall and others\n" b"\nCopyright (C) 2005-2021 Matt Mackall and others\n"
b"This is free software; see the source for copying conditions. " b"This is free software; see the source for copying conditions. "
b"There is NO\nwarranty; " b"There is NO\nwarranty; "
b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
) )
if not ui.quiet: if not ui.quiet:
fm.plain(license) fm.plain(license)
if ui.verbose: if ui.verbose:

mercurial/helptext/hg.1.txt

Main Web Site: https://mercurial-scm.org/ Main Web Site: https://mercurial-scm.org/
Source code repository: https://www.mercurial-scm.org/repo/hg Source code repository: https://www.mercurial-scm.org/repo/hg
Mailing list: https://www.mercurial-scm.org/mailman/listinfo/mercurial/ Mailing list: https://www.mercurial-scm.org/mailman/listinfo/mercurial/
Copying Copying
""""""" """""""
Copyright (C) 2005-2020 Matt Mackall. Copyright (C) 2005-2021 Matt Mackall.
Free use of this software is granted under the terms of the GNU General Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version. Public License version 2 or any later version.
.. include:: common.txt .. include:: common.txt

mercurial/helptext/hgignore.5.txt

See Also See Also
======== ========
|hg(1)|_, |hgrc(5)|_ |hg(1)|_, |hgrc(5)|_
Copying Copying
======= =======
This manual page is copyright 2006 Vadim Gelfer. This manual page is copyright 2006 Vadim Gelfer.
Mercurial is copyright 2005-2020 Matt Mackall. Mercurial is copyright 2005-2021 Matt Mackall.
Free use of this software is granted under the terms of the GNU General Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version. Public License version 2 or any later version.
.. include:: common.txt .. include:: common.txt

mercurial/helptext/hgrc.5.txt

See Also See Also
======== ========
|hg(1)|_, |hgignore(5)|_ |hg(1)|_, |hgignore(5)|_
Copying Copying
======= =======
This manual page is copyright 2005 Bryan O'Sullivan. This manual page is copyright 2005 Bryan O'Sullivan.
Mercurial is copyright 2005-2020 Matt Mackall. Mercurial is copyright 2005-2021 Matt Mackall.
Free use of this software is granted under the terms of the GNU General Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version. Public License version 2 or any later version.
.. include:: common.txt .. include:: common.txt

setup.py

if issetuptools: if issetuptools:
extra['python_requires'] = supportedpy extra['python_requires'] = supportedpy
if py2exeloaded: if py2exeloaded:
extra['console'] = [ extra['console'] = [
{ {
'script': 'hg', 'script': 'hg',
'copyright': 'Copyright (C) 2005-2020 Matt Mackall and others', 'copyright': 'Copyright (C) 2005-2021 Matt Mackall and others',
'product_version': version, 'product_version': version,
} }
] ]
# Sub command of 'build' because 'py2exe' does not handle sub_commands. # Sub command of 'build' because 'py2exe' does not handle sub_commands.
# Need to override hgbuild because it has a private copy of # Need to override hgbuild because it has a private copy of
# build.sub_commands. # build.sub_commands.
hgbuild.sub_commands.insert(0, ('build_hgextindex', None)) hgbuild.sub_commands.insert(0, ('build_hgextindex', None))
# put dlls in sub directory so that they won't pollute PATH # put dlls in sub directory so that they won't pollute PATH