changeset 4635:63b9d2deed48

Updated copyright notices and add "and others" to "hg version"
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 19 Jun 2007 08:51:34 +0200
parents 73bf2b586f3f
children 178778ca648f
files 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
diffstat 32 files changed, 34 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -90,8 +90,8 @@ editor = whatever
 	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
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -125,6 +125,6 @@ http://selenic.com/mailman/listinfo/merc
 
 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
@@ -87,6 +87,6 @@ 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
@@ -30,6 +30,6 @@ hg(1) - the command line interface to Me
 
 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
@@ -561,6 +561,6 @@ 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
@@ -862,6 +862,6 @@ 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
@@ -32,6 +32,6 @@ hg(1) - Mercurial システムへのコマンドラインインターフェイス
 
 著作権情報
 ----
-Copyright (C) 2005, 2006 Matt Mackall.
+Copyright (C) 2005-2007 Matt Mackall.
 このソフトウェアの自由な使用は GNU 一般公有使用許諾 (GPL) のもとで
 認められます。
--- a/hg
+++ b/hg
@@ -2,7 +2,7 @@
 #
 # 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.
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -1,6 +1,6 @@
 # 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.
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -4,7 +4,7 @@ bundlerepo.py - repository class for vie
 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.
--- a/mercurial/changelog.py
+++ b/mercurial/changelog.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1,6 +1,6 @@
 # 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.
@@ -2593,7 +2593,7 @@ def version_(ui):
     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"
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/demandimport.py
+++ b/mercurial/demandimport.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -1,7 +1,7 @@
 """
 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.
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/filelog.py
+++ b/mercurial/filelog.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1,6 +1,6 @@
 # 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
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -1,7 +1,7 @@
 # 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.
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
@@ -1,7 +1,7 @@
 # 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.
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/repo.py
+++ b/mercurial/repo.py
@@ -1,6 +1,6 @@
 # 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
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -4,7 +4,7 @@ revlog.py - storage back-end for mercuri
 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.
--- a/mercurial/sshserver.py
+++ b/mercurial/sshserver.py
@@ -1,6 +1,6 @@
 # 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
--- a/mercurial/statichttprepo.py
+++ b/mercurial/statichttprepo.py
@@ -2,7 +2,7 @@
 #
 # 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.
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -1,6 +1,6 @@
 # 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.
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -2,7 +2,7 @@
 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
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -1,6 +1,6 @@
 # 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.