diff --git a/contrib/hg-ssh b/contrib/hg-ssh --- a/contrib/hg-ssh +++ b/contrib/hg-ssh @@ -6,7 +6,7 @@ # Thomas Arendsen Hein # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """ hg-ssh - a wrapper for ssh access to a limited set of mercurial repos diff --git a/contrib/mercurial.el b/contrib/mercurial.el --- a/contrib/mercurial.el +++ b/contrib/mercurial.el @@ -5,8 +5,8 @@ ;; Author: Bryan O'Sullivan ;; mercurial.el is free software; you can redistribute it and/or -;; modify it under the terms of version 2 of the GNU General Public -;; License as published by the Free Software Foundation. +;; modify it under the terms of the GNU General Public License or any +;; later version. ;; mercurial.el is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of @@ -784,7 +784,7 @@ Push changes G (defun hg-help-overview () "This is an overview of the Mercurial SCM mode for Emacs. -You can find the source code, license (GPL v2), and credits for this +You can find the source code, license (GPLv2+), and credits for this code by typing `M-x find-library mercurial RET'." (interactive) (hg-view-output ("Mercurial Help Overview") diff --git a/contrib/mercurial.spec b/contrib/mercurial.spec --- a/contrib/mercurial.spec +++ b/contrib/mercurial.spec @@ -2,7 +2,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: snapshot Release: 0 -License: GPLv2 +License: GPLv2+ Group: Development/Tools URL: http://mercurial.selenic.com/ Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz diff --git a/contrib/mq.el b/contrib/mq.el --- a/contrib/mq.el +++ b/contrib/mq.el @@ -5,8 +5,8 @@ ;; Author: Bryan O'Sullivan ;; mq.el is free software; you can redistribute it and/or modify it -;; under the terms of version 2 of the GNU General Public License as -;; published by the Free Software Foundation. +;; under the terms of the GNU General Public License version 2 or any +;; later version. ;; mq.el is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html --- a/contrib/win32/ReadMe.html +++ b/contrib/win32/ReadMe.html @@ -148,8 +148,7 @@ editor = whatever Mercurial is free software; you can redistribute it and/or modify it under the terms of the GNU - General Public License version 2 as published by the Free - Software Foundation. + General Public License version 2 or any later version.

diff --git a/doc/hg.1.txt b/doc/hg.1.txt --- a/doc/hg.1.txt +++ b/doc/hg.1.txt @@ -95,6 +95,6 @@ Copying ------- Copyright (C) 2005-2010 Matt Mackall. Free use of this software is granted under the terms of the GNU General -Public License version 2. +Public License version 2 or any later version. .. include:: common.txt diff --git a/doc/hgignore.5.txt b/doc/hgignore.5.txt --- a/doc/hgignore.5.txt +++ b/doc/hgignore.5.txt @@ -106,6 +106,6 @@ Copying This manual page is copyright 2006 Vadim Gelfer. Mercurial is copyright 2005-2010 Matt Mackall. Free use of this software is granted under the terms of the GNU General -Public License version 2. +Public License version 2 or any later version. .. include:: common.txt diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt --- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt @@ -951,6 +951,6 @@ Copying This manual page is copyright 2005 Bryan O'Sullivan. Mercurial is copyright 2005-2010 Matt Mackall. Free use of this software is granted under the terms of the GNU General -Public License version 2. +Public License version 2 or any later version. .. include:: common.txt diff --git a/hg b/hg --- a/hg +++ b/hg @@ -5,7 +5,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # enable importing on demand to reduce startup time try: diff --git a/hgext/acl.py b/hgext/acl.py --- a/hgext/acl.py +++ b/hgext/acl.py @@ -3,8 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. -# +# GNU General Public License version 2 or any later version. '''hooks for controlling repository access diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py --- a/hgext/bookmarks.py +++ b/hgext/bookmarks.py @@ -3,7 +3,7 @@ # Copyright 2008 David Soria Parra # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''track a line of development with movable markers diff --git a/hgext/bugzilla.py b/hgext/bugzilla.py --- a/hgext/bugzilla.py +++ b/hgext/bugzilla.py @@ -3,7 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''hooks for integrating with the Bugzilla bug tracker diff --git a/hgext/children.py b/hgext/children.py --- a/hgext/children.py +++ b/hgext/children.py @@ -6,7 +6,7 @@ # Thomas Arendsen Hein # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''command to display child changesets''' diff --git a/hgext/churn.py b/hgext/churn.py --- a/hgext/churn.py +++ b/hgext/churn.py @@ -4,7 +4,7 @@ # Copyright 2008 Alexander Solovyov # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''command to display statistics about repository history''' diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''import revisions from foreign VCS repositories into Mercurial''' diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py --- a/hgext/convert/bzr.py +++ b/hgext/convert/bzr.py @@ -3,7 +3,7 @@ # Copyright 2008, 2009 Marek Kubica and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # This module is for handling 'bzr', that was formerly known as Bazaar-NG; # it cannot access 'bar' repositories, but they were never used very much diff --git a/hgext/convert/common.py b/hgext/convert/common.py --- a/hgext/convert/common.py +++ b/hgext/convert/common.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import base64, errno import os diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py +++ b/hgext/convert/convcmd.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from common import NoRepo, MissingTool, SKIPREV, mapfile from cvs import convert_cvs diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py --- a/hgext/convert/cvs.py +++ b/hgext/convert/cvs.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os, locale, re, socket, errno from cStringIO import StringIO diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py +++ b/hgext/convert/cvsps.py @@ -1,10 +1,9 @@ -# # Mercurial built-in replacement for cvsps. # # Copyright 2008, Frank Kingswood # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os import re diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -3,7 +3,7 @@ # Copyright 2007-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from common import NoRepo, checktool, commandline, commit, converter_source from mercurial.i18n import _ diff --git a/hgext/convert/filemap.py b/hgext/convert/filemap.py --- a/hgext/convert/filemap.py +++ b/hgext/convert/filemap.py @@ -2,7 +2,7 @@ # Copyright 2007 Alexis S. L. Carvalho # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import shlex from mercurial.i18n import _ diff --git a/hgext/convert/git.py b/hgext/convert/git.py --- a/hgext/convert/git.py +++ b/hgext/convert/git.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os from mercurial import util diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py --- a/hgext/convert/gnuarch.py +++ b/hgext/convert/gnuarch.py @@ -4,7 +4,7 @@ # and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from common import NoRepo, commandline, commit, converter_source from mercurial.i18n import _ diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # Notes for hg->hg conversion: # diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py --- a/hgext/convert/monotone.py +++ b/hgext/convert/monotone.py @@ -4,7 +4,7 @@ # others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os, re from mercurial import util diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py --- a/hgext/convert/p4.py +++ b/hgext/convert/p4.py @@ -1,11 +1,9 @@ -# # Perforce source for convert extension. # # Copyright 2009, Frank Kingswood # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. -# +# GNU General Public License version 2 or any later version. from mercurial import util from mercurial.i18n import _ diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -3,7 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''command to allow external programs to compare revisions diff --git a/hgext/fetch.py b/hgext/fetch.py --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -3,7 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''pull, update and merge in one command''' diff --git a/hgext/gpg.py b/hgext/gpg.py --- a/hgext/gpg.py +++ b/hgext/gpg.py @@ -1,7 +1,7 @@ # Copyright 2005, 2006 Benoit Boissinot # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''commands to sign and verify changesets''' diff --git a/hgext/graphlog.py b/hgext/graphlog.py --- a/hgext/graphlog.py +++ b/hgext/graphlog.py @@ -3,7 +3,7 @@ # Copyright 2007 Joel Rosdahl # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''command to view revision graphs from a shell diff --git a/hgext/hgcia.py b/hgext/hgcia.py --- a/hgext/hgcia.py +++ b/hgext/hgcia.py @@ -1,5 +1,7 @@ # Copyright (C) 2007-8 Brendan Cully -# Published under the GNU GPL +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2 or any later version. """hooks for integrating with the CIA.vc notification service diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Chris Mason # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''browse the repository in a graphical way diff --git a/hgext/highlight/__init__.py b/hgext/highlight/__init__.py --- a/hgext/highlight/__init__.py +++ b/hgext/highlight/__init__.py @@ -3,7 +3,7 @@ # Copyright 2008, 2009 Patrick Mezard and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # # The original module was split in an interface and an implementation # file to defer pygments loading and speedup extension setup. diff --git a/hgext/highlight/highlight.py b/hgext/highlight/highlight.py --- a/hgext/highlight/highlight.py +++ b/hgext/highlight/highlight.py @@ -3,7 +3,7 @@ # Copyright 2007-2009 Adam Hupp and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # # The original module was split in an interface and an implementation # file to defer pygments loading and speedup extension setup. diff --git a/hgext/inotify/__init__.py b/hgext/inotify/__init__.py --- a/hgext/inotify/__init__.py +++ b/hgext/inotify/__init__.py @@ -4,7 +4,7 @@ # Copyright 2007, 2008 Brendan Cully # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''accelerate status report using Linux's inotify service''' diff --git a/hgext/inotify/client.py b/hgext/inotify/client.py --- a/hgext/inotify/client.py +++ b/hgext/inotify/client.py @@ -5,7 +5,7 @@ # Copyright 2009 Nicolas Dumazet # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from mercurial.i18n import _ import common, server diff --git a/hgext/inotify/common.py b/hgext/inotify/common.py --- a/hgext/inotify/common.py +++ b/hgext/inotify/common.py @@ -4,7 +4,7 @@ # Copyright 2007, 2008 Brendan Cully # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import cStringIO, socket, struct diff --git a/hgext/inotify/linux/__init__.py b/hgext/inotify/linux/__init__.py --- a/hgext/inotify/linux/__init__.py +++ b/hgext/inotify/linux/__init__.py @@ -4,7 +4,7 @@ # This library is free software; you can redistribute it and/or modify # it under the terms of version 2.1 of the GNU Lesser General Public -# License, incorporated herein by reference. +# License, or any later version. '''Low-level interface to the Linux inotify subsystem. diff --git a/hgext/inotify/linux/_inotify.c b/hgext/inotify/linux/_inotify.c --- a/hgext/inotify/linux/_inotify.c +++ b/hgext/inotify/linux/_inotify.c @@ -5,7 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License, incorporated herein by reference. + * Public License or any later version. */ #include diff --git a/hgext/inotify/linux/watcher.py b/hgext/inotify/linux/watcher.py --- a/hgext/inotify/linux/watcher.py +++ b/hgext/inotify/linux/watcher.py @@ -4,7 +4,7 @@ # This library is free software; you can redistribute it and/or modify # it under the terms of version 2.1 of the GNU Lesser General Public -# License, incorporated herein by reference. +# License, or any later version. '''High-level interfaces to the Linux inotify subsystem. diff --git a/hgext/inotify/server.py b/hgext/inotify/server.py --- a/hgext/inotify/server.py +++ b/hgext/inotify/server.py @@ -4,7 +4,7 @@ # Copyright 2007, 2008 Brendan Cully # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from mercurial.i18n import _ from mercurial import cmdutil, osutil, util diff --git a/hgext/interhg.py b/hgext/interhg.py --- a/hgext/interhg.py +++ b/hgext/interhg.py @@ -6,7 +6,7 @@ # Edward Lee # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''expand expressions into changelog and summaries diff --git a/hgext/keyword.py b/hgext/keyword.py --- a/hgext/keyword.py +++ b/hgext/keyword.py @@ -3,7 +3,7 @@ # Copyright 2007-2009 Christian Ebert # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # # $Id$ # diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Chris Mason # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''manage a stack of patches diff --git a/hgext/notify.py b/hgext/notify.py --- a/hgext/notify.py +++ b/hgext/notify.py @@ -3,7 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''hooks for sending email notifications at commit/push time diff --git a/hgext/pager.py b/hgext/pager.py --- a/hgext/pager.py +++ b/hgext/pager.py @@ -3,7 +3,7 @@ # Copyright 2008 David Soria Parra # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # # To load the extension, add it to your .hgrc file: # diff --git a/hgext/parentrevspec.py b/hgext/parentrevspec.py --- a/hgext/parentrevspec.py +++ b/hgext/parentrevspec.py @@ -3,7 +3,7 @@ # Copyright (C) 2007 Alexis S. L. Carvalho # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''interpret suffixes to refer to ancestor revisions diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''command to send changesets as (a series of) patch emails diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -3,7 +3,7 @@ # Copyright 2008 Stefano Tortarolo # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''command to move sets of revisions to a different ancestor diff --git a/hgext/record.py b/hgext/record.py --- a/hgext/record.py +++ b/hgext/record.py @@ -3,7 +3,7 @@ # Copyright 2007 Bryan O'Sullivan # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''commands to interactively select changes for commit/qrefresh''' diff --git a/hgext/relink.py b/hgext/relink.py --- a/hgext/relink.py +++ b/hgext/relink.py @@ -3,7 +3,7 @@ # Copyright (C) 2007 Brendan Cully # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """recreates hardlinks between repository clones""" diff --git a/hgext/schemes.py b/hgext/schemes.py --- a/hgext/schemes.py +++ b/hgext/schemes.py @@ -1,7 +1,7 @@ # Copyright 2009, Alexander Solovyov # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """extend schemes with shortcuts to repository swarms diff --git a/hgext/share.py b/hgext/share.py --- a/hgext/share.py +++ b/hgext/share.py @@ -1,7 +1,7 @@ # Copyright 2006, 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''share a common history between several working directories''' diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007 Brendan Cully # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''command to transplant changesets from another branch diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -6,7 +6,7 @@ # Author: Shun-ichi Goto # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # '''allow the use of MBCS paths with problematic encodings diff --git a/hgext/win32text.py b/hgext/win32text.py --- a/hgext/win32text.py +++ b/hgext/win32text.py @@ -3,7 +3,7 @@ # Copyright 2005, 2007-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''perform automatic newline conversion diff --git a/hgext/zeroconf/__init__.py b/hgext/zeroconf/__init__.py --- a/hgext/zeroconf/__init__.py +++ b/hgext/zeroconf/__init__.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. '''discover and advertise repositories on the local network diff --git a/i18n/hggettext b/i18n/hggettext --- a/i18n/hggettext +++ b/i18n/hggettext @@ -5,7 +5,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # The normalize function is taken from pygettext which is distributed # with Python under the Python License, which is GPL compatible. diff --git a/mercurial/ancestor.py b/mercurial/ancestor.py --- a/mercurial/ancestor.py +++ b/mercurial/ancestor.py @@ -3,7 +3,7 @@ # Copyright 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import heapq diff --git a/mercurial/archival.py b/mercurial/archival.py --- a/mercurial/archival.py +++ b/mercurial/archival.py @@ -3,7 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ from node import hex diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007 Benoit Boissinot # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """Repository class for viewing uncompressed bundles. diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -3,7 +3,7 @@ # Copyright 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import util diff --git a/mercurial/changelog.py b/mercurial/changelog.py --- a/mercurial/changelog.py +++ b/mercurial/changelog.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import bin, hex, nullid from i18n import _ diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import hex, nullid, nullrev, short from i18n import _ diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import hex, nullid, nullrev, short from lock import release diff --git a/mercurial/config.py b/mercurial/config.py --- a/mercurial/config.py +++ b/mercurial/config.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import error diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import nullid, nullrev, short, hex from i18n import _ diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -3,7 +3,7 @@ # Copyright 2008 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import util diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py --- a/mercurial/demandimport.py +++ b/mercurial/demandimport.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. ''' demandimport - automatic demandloading of modules diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import nullid from i18n import _ diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import os, sys, atexit, signal, pdb, socket, errno, shlex, time diff --git a/mercurial/encoding.py b/mercurial/encoding.py --- a/mercurial/encoding.py +++ b/mercurial/encoding.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import error import sys, unicodedata, locale, os diff --git a/mercurial/error.py b/mercurial/error.py --- a/mercurial/error.py +++ b/mercurial/error.py @@ -3,7 +3,7 @@ # Copyright 2005-2008 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """Mercurial exceptions. diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import imp, os import util, cmdutil, help diff --git a/mercurial/fancyopts.py b/mercurial/fancyopts.py --- a/mercurial/fancyopts.py +++ b/mercurial/fancyopts.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import getopt diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import revlog diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007, 2008 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import short from i18n import _ diff --git a/mercurial/graphmod.py b/mercurial/graphmod.py --- a/mercurial/graphmod.py +++ b/mercurial/graphmod.py @@ -4,7 +4,7 @@ # Copyright 2007 Joel Rosdahl # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """supports walking the history as DAGs suitable for graphical output diff --git a/mercurial/hbisect.py b/mercurial/hbisect.py --- a/mercurial/hbisect.py +++ b/mercurial/hbisect.py @@ -6,7 +6,7 @@ # Inspired by git bisect, extension skeleton taken from mq.py. # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os from i18n import _ diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -3,7 +3,7 @@ # Copyright 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import gettext, _ import sys, os diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -4,7 +4,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ from lock import release diff --git a/mercurial/hgweb/__init__.py b/mercurial/hgweb/__init__.py --- a/mercurial/hgweb/__init__.py +++ b/mercurial/hgweb/__init__.py @@ -4,7 +4,7 @@ # Copyright 2005 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import hgweb_mod, hgwebdir_mod diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py --- a/mercurial/hgweb/common.py +++ b/mercurial/hgweb/common.py @@ -4,7 +4,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import errno, mimetypes, os diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -4,7 +4,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os from mercurial import ui, hg, hook, error, encoding, templater diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -4,7 +4,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os, re, time from mercurial.i18n import _ diff --git a/mercurial/hgweb/protocol.py b/mercurial/hgweb/protocol.py --- a/mercurial/hgweb/protocol.py +++ b/mercurial/hgweb/protocol.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import cStringIO, zlib, tempfile, errno, os, sys, urllib, copy from mercurial import util, streamclone diff --git a/mercurial/hgweb/request.py b/mercurial/hgweb/request.py --- a/mercurial/hgweb/request.py +++ b/mercurial/hgweb/request.py @@ -4,7 +4,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import socket, cgi, errno from mercurial import util diff --git a/mercurial/hgweb/server.py b/mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py +++ b/mercurial/hgweb/server.py @@ -4,7 +4,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os, sys, errno, urllib, BaseHTTPServer, socket, SocketServer, traceback from mercurial import hg, util, error diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os, mimetypes, re, cgi, copy import webutil diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py +++ b/mercurial/hgweb/webutil.py @@ -4,7 +4,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os, copy from mercurial import match, patch, util, error diff --git a/mercurial/hgweb/wsgicgi.py b/mercurial/hgweb/wsgicgi.py --- a/mercurial/hgweb/wsgicgi.py +++ b/mercurial/hgweb/wsgicgi.py @@ -3,7 +3,7 @@ # Copyright 2006 Eric Hopper # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # # This was originally copied from the public domain code at # http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side diff --git a/mercurial/hook.py b/mercurial/hook.py --- a/mercurial/hook.py +++ b/mercurial/hook.py @@ -3,7 +3,7 @@ # Copyright 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import os, sys diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py --- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -4,7 +4,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import bin, hex, nullid from i18n import _ diff --git a/mercurial/i18n.py b/mercurial/i18n.py --- a/mercurial/i18n.py +++ b/mercurial/i18n.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import encoding import gettext, sys, os diff --git a/mercurial/ignore.py b/mercurial/ignore.py --- a/mercurial/ignore.py +++ b/mercurial/ignore.py @@ -3,7 +3,7 @@ # Copyright 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import util, match diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import bin, hex, nullid, nullrev, short from i18n import _ diff --git a/mercurial/lock.py b/mercurial/lock.py --- a/mercurial/lock.py +++ b/mercurial/lock.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import util, error import errno, os, socket, time diff --git a/mercurial/mail.py b/mercurial/mail.py --- a/mercurial/mail.py +++ b/mercurial/mail.py @@ -3,7 +3,7 @@ # Copyright 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import util, encoding diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import mdiff, parsers, error, revlog diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -3,7 +3,7 @@ # Copyright 2008, 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import re import util diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import bdiff, mpatch, util diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import nullid, nullrev, hex, bin from i18n import _ diff --git a/mercurial/minirst.py b/mercurial/minirst.py --- a/mercurial/minirst.py +++ b/mercurial/minirst.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """simplified reStructuredText parser. diff --git a/mercurial/node.py b/mercurial/node.py --- a/mercurial/node.py +++ b/mercurial/node.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import binascii diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -4,7 +4,7 @@ # Copyright 2007 Chris Mason # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ from node import hex, nullid, short diff --git a/mercurial/posix.py b/mercurial/posix.py --- a/mercurial/posix.py +++ b/mercurial/posix.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import osutil diff --git a/mercurial/pure/base85.py b/mercurial/pure/base85.py --- a/mercurial/pure/base85.py +++ b/mercurial/pure/base85.py @@ -3,7 +3,7 @@ # Copyright (C) 2009 Brendan Cully # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import struct diff --git a/mercurial/pure/bdiff.py b/mercurial/pure/bdiff.py --- a/mercurial/pure/bdiff.py +++ b/mercurial/pure/bdiff.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import struct, difflib diff --git a/mercurial/pure/diffhelpers.py b/mercurial/pure/diffhelpers.py --- a/mercurial/pure/diffhelpers.py +++ b/mercurial/pure/diffhelpers.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. def addlines(fp, hunk, lena, lenb, a, b): while True: diff --git a/mercurial/pure/mpatch.py b/mercurial/pure/mpatch.py --- a/mercurial/pure/mpatch.py +++ b/mercurial/pure/mpatch.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import struct try: diff --git a/mercurial/pure/osutil.py b/mercurial/pure/osutil.py --- a/mercurial/pure/osutil.py +++ b/mercurial/pure/osutil.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import os import stat as _stat diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from mercurial.node import bin, nullid, nullrev from mercurial import util diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -4,7 +4,7 @@ # Copyright 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import changegroup from node import nullrev, short diff --git a/mercurial/repo.py b/mercurial/repo.py --- a/mercurial/repo.py +++ b/mercurial/repo.py @@ -4,7 +4,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import error diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """Storage back-end for Mercurial. diff --git a/mercurial/sshrepo.py b/mercurial/sshrepo.py --- a/mercurial/sshrepo.py +++ b/mercurial/sshrepo.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import bin, hex from i18n import _ diff --git a/mercurial/sshserver.py b/mercurial/sshserver.py --- a/mercurial/sshserver.py +++ b/mercurial/sshserver.py @@ -4,7 +4,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ from node import bin, hex diff --git a/mercurial/statichttprepo.py b/mercurial/statichttprepo.py --- a/mercurial/statichttprepo.py +++ b/mercurial/statichttprepo.py @@ -5,7 +5,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import changelog, byterange, url, error diff --git a/mercurial/store.py b/mercurial/store.py --- a/mercurial/store.py +++ b/mercurial/store.py @@ -3,7 +3,7 @@ # Copyright 2008 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import osutil, util diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -3,7 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import util, error from i18n import _ diff --git a/mercurial/strutil.py b/mercurial/strutil.py --- a/mercurial/strutil.py +++ b/mercurial/strutil.py @@ -3,7 +3,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. def findall(haystack, needle, start=0, end=None): if end is None: diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import errno, os from i18n import _ diff --git a/mercurial/tags.py b/mercurial/tags.py --- a/mercurial/tags.py +++ b/mercurial/tags.py @@ -4,7 +4,7 @@ # Copyright 2009 Greg Ward # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # Currently this module only deals with reading and caching tags. # Eventually, it could take care of updating (adding/removing/moving) diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py --- a/mercurial/templatefilters.py +++ b/mercurial/templatefilters.py @@ -3,7 +3,7 @@ # Copyright 2005-2008 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import cgi, re, os, time, urllib, textwrap import util, encoding diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -3,7 +3,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import re, sys, os diff --git a/mercurial/transaction.py b/mercurial/transaction.py --- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -9,7 +9,7 @@ # Copyright 2005, 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import os, errno diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -3,7 +3,7 @@ # Copyright 2005-2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import errno, getpass, os, socket, sys, tempfile, traceback diff --git a/mercurial/url.py b/mercurial/url.py --- a/mercurial/url.py +++ b/mercurial/url.py @@ -5,7 +5,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. import urllib, urllib2, urlparse, httplib, os, re, socket, cStringIO from i18n import _ diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -5,7 +5,7 @@ # Copyright 2006 Vadim Gelfer # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """Mercurial utility functions and platform specfic implementations. diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -3,7 +3,7 @@ # Copyright 2006, 2007 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import nullid, short from i18n import _ diff --git a/mercurial/win32.py b/mercurial/win32.py --- a/mercurial/win32.py +++ b/mercurial/win32.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """Utility functions that use win32 API. diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -3,7 +3,7 @@ # Copyright 2005-2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from i18n import _ import osutil, error diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -271,7 +271,7 @@ setup(name='mercurial', author_email='mpm@selenic.com', url='http://mercurial.selenic.com/', description='Scalable distributed SCM', - license='GNU GPL', + license='GNU GPLv2+', scripts=scripts, packages=packages, ext_modules=ext_modules, diff --git a/tests/printrepr.py b/tests/printrepr.py --- a/tests/printrepr.py +++ b/tests/printrepr.py @@ -3,7 +3,7 @@ # Copyright 2009 Matt Mackall and others # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. """prints repr(sys.stdin) but preserves newlines in input""" diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -5,7 +5,7 @@ # Copyright 2006 Matt Mackall # # This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. # Modifying this script is tricky because it has many modes: # - serial (default) vs parallel (-jN, N > 1)