Patchwork [STABLE] doc: update year in copyright lines

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Feb. 8, 2017, 5:19 p.m.
Message ID <05b83627f1922f346806.1486574385@speaknoevil>
Download mbox | patch
Permalink /patch/18352/
State Superseded
Headers show

Comments

Katsunori FUJIWARA - Feb. 8, 2017, 5:19 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1486572068 -32400
#      Thu Feb 09 01:41:08 2017 +0900
# Branch stable
# Node ID 05b83627f1922f34680664080b22bd2b8baac91a
# Parent  af3b5aa61fc05a124697809bf472a5592f38489c
doc: update year in copyright lines

This patch also makes some expected output lines in tests glob-ed for
persistence of them.

I already have patches to avoid this kind of overlooking at the end of
this or later years. But they aren't posted as a part of this series,
because they aren't needed immediately. They should be landed on
"default" branch.
Katsunori FUJIWARA - Feb. 9, 2017, 8:53 a.m.
At Thu, 09 Feb 2017 02:19:45 +0900,
FUJIWARA Katsunori wrote:
> 
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
> # Date 1486572068 -32400
> #      Thu Feb 09 01:41:08 2017 +0900
> # Branch stable
> # Node ID 05b83627f1922f34680664080b22bd2b8baac91a
> # Parent  af3b5aa61fc05a124697809bf472a5592f38489c
> doc: update year in copyright lines

Oops, I overlooked more outdated copyright lines in files below.

  - setup.py
  - contrib/win32/ReadMe.html
  - contrib/win32/mercurial.iss

Please drop this. I'll send V2 soon.

> This patch also makes some expected output lines in tests glob-ed for
> persistence of them.
> 
> I already have patches to avoid this kind of overlooking at the end of
> this or later years. But they aren't posted as a part of this series,
> because they aren't needed immediately. They should be landed on
> "default" branch.
> 
> 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-ssh.8.txt b/mercurial/help/hg-ssh.8.txt
> --- a/mercurial/help/hg-ssh.8.txt
> +++ b/mercurial/help/hg-ssh.8.txt
> @@ -64,7 +64,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/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/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@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Augie Fackler - Feb. 10, 2017, 2:50 a.m.
On Thu, Feb 09, 2017 at 05:53:02PM +0900, FUJIWARA Katsunori wrote:
> At Thu, 09 Feb 2017 02:19:45 +0900,
> FUJIWARA Katsunori wrote:
>> 
>> # HG changeset patch
>> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
>> # Date 1486572068 -32400
>> #      Thu Feb 09 01:41:08 2017 +0900
>> # Branch stable
>> # Node ID 05b83627f1922f34680664080b22bd2b8baac91a
>> # Parent  af3b5aa61fc05a124697809bf472a5592f38489c
>> doc: update year in copyright lines
> 
> Oops, I overlooked more outdated copyright lines in files below.
> 
>  - setup.py
>  - contrib/win32/ReadMe.html
>  - contrib/win32/mercurial.iss
> 
> Please drop this. I'll send V2 soon.

Ack. Dropped.

> 
>> This patch also makes some expected output lines in tests glob-ed for
>> persistence of them.
>> 
>> I already have patches to avoid this kind of overlooking at the end of
>> this or later years. But they aren't posted as a part of this series,
>> because they aren't needed immediately. They should be landed on
>> "default" branch.
>> 
>> 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-ssh.8.txt b/mercurial/help/hg-ssh.8.txt
>> --- a/mercurial/help/hg-ssh.8.txt
>> +++ b/mercurial/help/hg-ssh.8.txt
>> @@ -64,7 +64,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/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/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@mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> 
> --
> ----------------------------------------------------------------------
> [FUJIWARA Katsunori]                             foozy@lares.dti.ne.jp
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

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-ssh.8.txt b/mercurial/help/hg-ssh.8.txt
--- a/mercurial/help/hg-ssh.8.txt
+++ b/mercurial/help/hg-ssh.8.txt
@@ -64,7 +64,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/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/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