Updated copyright notices and add "and others" to "hg version"
authorThomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Jun 2007 08:51:34 +0200
changeset 4635 63b9d2deed48a80549bce637517ef9d4ac3f4873
parent 4634 73bf2b586f3f0d2e39c714a2ce84f6e760c42e3c
child 4640 178778ca648f30ef86d80cec6328506a77a82ab9
push id1
push usergszorc@mozilla.com
push dateWed, 18 Mar 2015 16:34:57 +0000
Updated copyright notices and add "and others" to "hg version"
contrib/win32/ReadMe.html
doc/hg.1.txt
doc/hgignore.5.txt
doc/hgmerge.1.txt
doc/hgrc.5.txt
doc/ja/hg.1.ja.txt
doc/ja/hgmerge.1.ja.txt
hg
hgext/convert/__init__.py
hgext/transplant.py
mercurial/bundlerepo.py
mercurial/changelog.py
mercurial/cmdutil.py
mercurial/commands.py
mercurial/context.py
mercurial/demandimport.py
mercurial/dirstate.py
mercurial/extensions.py
mercurial/filelog.py
mercurial/hg.py
mercurial/hgweb/hgweb_mod.py
mercurial/hgweb/server.py
mercurial/localrepo.py
mercurial/manifest.py
mercurial/merge.py
mercurial/repo.py
mercurial/revlog.py
mercurial/sshserver.py
mercurial/statichttprepo.py
mercurial/ui.py
mercurial/util.py
mercurial/verify.py
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -85,18 +85,18 @@ editor = whatever
     <p>Mercurial was written by <a href="http://www.selenic.com">Matt
 	Mackall</a>, and is maintained by Matt and a team of
 	volunteers.</p>
 
     <p>The Windows installer was written by <a
 	href="http://www.serpentine.com/blog">Bryan
 	O'Sullivan</a>.</p>
 
-    <p>Mercurial is Copyright 2005, 2006 Matt Mackall and others.  See the
-      <tt>Contributors.txt</tt> file for a list of contributors.</p>
+    <p>Mercurial is Copyright 2005-2007 Matt Mackall and others.
+	See the <tt>Contributors.txt</tt> file for a list of contributors.</p>
 
     <p>Mercurial is free software; you can redistribute it and/or
       modify it under the terms of the <a
 	href="http://www.gnu.org/copyleft/gpl.html">GNU General Public
 	License</a> as published by the Free Software Foundation; either
       version 2 of the License, or (at your option) any later
       version.</p>
 
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -120,11 +120,11 @@ RESOURCES
 http://selenic.com/mercurial[Main Web Site]
 
 http://selenic.com/hg[Source code repository]
 
 http://selenic.com/mailman/listinfo/mercurial[Mailing list]
 
 COPYING
 -------
-Copyright \(C) 2005, 2006 Matt Mackall.
+Copyright \(C) 2005-2007 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License (GPL).
--- a/doc/hgignore.5.txt
+++ b/doc/hgignore.5.txt
@@ -82,11 +82,11 @@ Mercurial was written by Matt Mackall <m
 
 SEE ALSO
 --------
 hg(1), hgrc(5)
 
 COPYING
 -------
 This manual page is copyright 2006 Vadim Gelfer.
-Mercurial is copyright 2005, 2006 Matt Mackall.
+Mercurial is copyright 2005-2007 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License (GPL).
--- a/doc/hgmerge.1.txt
+++ b/doc/hgmerge.1.txt
@@ -25,11 +25,11 @@ AUTHOR
 Written by Vincent Danjean <Vincent.Danjean@free.fr>
 
 SEE ALSO
 --------
 hg(1) - the command line interface to Mercurial SCM
 
 COPYING
 -------
-Copyright \(C) 2005, 2006 Matt Mackall.
+Copyright \(C) 2005-2007 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License (GPL).
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -556,11 +556,11 @@ Mercurial was written by Matt Mackall <m
 
 SEE ALSO
 --------
 hg(1), hgignore(5)
 
 COPYING
 -------
 This manual page is copyright 2005 Bryan O'Sullivan.
-Mercurial is copyright 2005, 2006 Matt Mackall.
+Mercurial is copyright 2005-2007 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License (GPL).
--- a/doc/ja/hg.1.ja.txt
+++ b/doc/ja/hg.1.ja.txt
@@ -857,11 +857,11 @@ http://selenic.com/mercurial[主なウェブサイト]
 http://www.serpentine.com/mercurial[Wiki サイト]
 
 http://selenic.com/hg[ソースコードのリポジトリ]
 
 http://selenic.com/mailman/listinfo/mercurial[メーリングリスト]
 
 著作権情報
 -----
-Copyright (C) 2005, 2006 Matt Mackall.
+Copyright (C) 2005-2007 Matt Mackall.
 このソフトウェアの自由な使用は GNU 一般公有使用許諾 (GPL) のもとで
 認められます。
--- a/doc/ja/hgmerge.1.ja.txt
+++ b/doc/ja/hgmerge.1.ja.txt
@@ -27,11 +27,11 @@ HGMERGE が設定されていない場合に使われます。
 Vincent Danjean <Vincent.Danjean@free.fr> によって書かれました。
 
 関連情報
 --
 hg(1) - Mercurial システムへのコマンドラインインターフェイス
 
 著作権情報
 ----
-Copyright (C) 2005, 2006 Matt Mackall.
+Copyright (C) 2005-2007 Matt Mackall.
 このソフトウェアの自由な使用は GNU 一般公有使用許諾 (GPL) のもとで
 認められます。
--- a/hg
+++ b/hg
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 #
 # mercurial - scalable distributed SCM
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import mercurial.commands
 mercurial.commands.run()
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -1,11 +1,11 @@
 # convert.py Foreign SCM converter
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from common import NoRepo
 from cvs import convert_cvs
 from git import convert_git
 from hg import convert_mercurial
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -1,11 +1,11 @@
 # Patch transplanting extension for Mercurial
 #
-# Copyright 2006 Brendan Cully <brendan@kublai.com>
+# Copyright 2006, 2007 Brendan Cully <brendan@kublai.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from mercurial.i18n import _
 import os, tempfile
 from mercurial import bundlerepo, changegroup, cmdutil, commands, hg, merge
 from mercurial import patch, revlog, util
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -1,15 +1,15 @@
 """
 bundlerepo.py - repository class for viewing uncompressed bundles
 
 This provides a read-only repository interface to bundles as if
 they were part of the actual repository.
 
-Copyright 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
+Copyright 2006, 2007 Benoit Boissinot <bboissin@gmail.com>
 
 This software may be used and distributed according to the terms
 of the GNU General Public License, incorporated herein by reference.
 """
 
 from node import *
 from i18n import _
 import changegroup, util, os, struct, bz2, tempfile
--- a/mercurial/changelog.py
+++ b/mercurial/changelog.py
@@ -1,11 +1,11 @@
 # changelog.py - changelog class for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from revlog import *
 from i18n import _
 import os, time, util
 
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1,11 +1,11 @@
 # cmdutil.py - help for command processing in mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
 from i18n import _
 import os, sys, atexit, signal, pdb, traceback, socket, errno, shlex
 import mdiff, bdiff, util, templater, patch, commands, hg, lock, time
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1,11 +1,11 @@
 # commands.py - command processing for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import demandimport; demandimport.enable()
 from node import *
 from i18n import _
 import bisect, os, re, sys, urllib, shlex, stat
@@ -2588,17 +2588,17 @@ def verify(ui, repo):
     """
     return hg.verify(repo)
 
 def version_(ui):
     """output version and copyright information"""
     ui.write(_("Mercurial Distributed SCM (version %s)\n")
              % version.get_version())
     ui.status(_(
-        "\nCopyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com>\n"
+        "\nCopyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> 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"
     ))
 
 # Command options and aliases are listed here, alphabetically
 
 globalopts = [
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1,11 +1,11 @@
 # context.py - changeset and file context objects for mercurial
 #
-# Copyright 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
 from i18n import _
 import ancestor, bdiff, repo, revlog, util, os, errno
 
--- a/mercurial/demandimport.py
+++ b/mercurial/demandimport.py
@@ -1,11 +1,11 @@
 # demandimport.py - global demand-loading of modules for Mercurial
 #
-# Copyright 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 '''
 demandimport - automatic demandloading of modules
 
 To enable this module, do:
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -1,12 +1,12 @@
 """
 dirstate.py - working directory tracking for mercurial
 
-Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 
 This software may be used and distributed according to the terms
 of the GNU General Public License, incorporated herein by reference.
 """
 
 from node import *
 from i18n import _
 import struct, os, time, bisect, stat, strutil, util, re, errno, ignore
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -1,11 +1,11 @@
 # extensions.py - extension handling for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import imp, os
 import commands, hg, util, sys
 from i18n import _
 
--- a/mercurial/filelog.py
+++ b/mercurial/filelog.py
@@ -1,11 +1,11 @@
 # filelog.py - file history class for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from revlog import *
 import os
 
 class filelog(revlog):
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1,11 +1,11 @@
 # hg.py - repository classes for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
 from repo import *
 from i18n import _
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -1,12 +1,12 @@
 # hgweb/hgweb_mod.py - Web interface for a repository.
 #
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import os, mimetypes, re, zlib, mimetools, cStringIO, sys
 import tempfile, urllib, bz2
 from mercurial.node import *
 from mercurial.i18n import gettext as _
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
@@ -1,12 +1,12 @@
 # hgweb/server.py - The standalone hg web server.
 #
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import os, sys, errno, urllib, BaseHTTPServer, socket, SocketServer, traceback
 from mercurial import ui, hg, util, templater
 from hgweb_mod import hgweb
 from hgwebdir_mod import hgwebdir
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1,11 +1,11 @@
 # localrepo.py - read/write repository class for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
 from i18n import _
 import repo, changegroup
 import changelog, dirstate, filelog, manifest, context
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -1,11 +1,11 @@
 # manifest.py - manifest revision class for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from revlog import *
 from i18n import _
 import array, bisect, struct, mdiff
 
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1,11 +1,11 @@
 # merge.py - directory-level update/merge handling for Mercurial
 #
-# Copyright 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
 from i18n import _
 import errno, util, os, tempfile, context
 
--- a/mercurial/repo.py
+++ b/mercurial/repo.py
@@ -1,11 +1,11 @@
 # repo.py - repository base classes for mercurial
 #
-# Copyright 2005 Matt Mackall <mpm@selenic.com>
+# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 class RepoError(Exception):
     pass
 
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1,15 +1,15 @@
 """
 revlog.py - storage back-end for mercurial
 
 This provides efficient delta storage with O(1) retrieve and append
 and O(changes) merge between branches
 
-Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 
 This software may be used and distributed according to the terms
 of the GNU General Public License, incorporated herein by reference.
 """
 
 from node import *
 from i18n import _
 import binascii, changegroup, errno, ancestor, mdiff, os
--- a/mercurial/sshserver.py
+++ b/mercurial/sshserver.py
@@ -1,11 +1,11 @@
 # sshserver.py - ssh protocol server support for mercurial
 #
-# Copyright 2005 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
 from node import *
 import os, streamclone, sys, tempfile, util
--- a/mercurial/statichttprepo.py
+++ b/mercurial/statichttprepo.py
@@ -1,13 +1,13 @@
 # statichttprepo.py - simple http repository class for mercurial
 #
 # This provides read-only repo access to repositories exported via static http
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
 import changelog, filelog, httprangereader
 import repo, localrepo, manifest, os, urllib, urllib2, util
 
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -1,11 +1,11 @@
 # ui.py - user interface bits for mercurial
 #
-# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
 import errno, getpass, os, re, socket, sys, tempfile
 import ConfigParser, traceback, util
 
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1,13 +1,13 @@
 """
 util.py - Mercurial utility functions and platform specfic implementations
 
  Copyright 2005 K. Thananchayan <thananck@yahoo.com>
- Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
+ Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
  Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
 
 This software may be used and distributed according to the terms
 of the GNU General Public License, incorporated herein by reference.
 
 This contains helper routines that are independent of the SCM core and hide
 platform-specific details from the core.
 """
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -1,11 +1,11 @@
 # verify.py - repository integrity checking for Mercurial
 #
-# Copyright 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
 from i18n import _
 import revlog, mdiff