# HG changeset patch # User Martin Geisler # Date 2009-04-25 23:08:54 # Node ID 46293a0c7e9ff247fa033b7fb37b34b148ac1ea6 # Parent 1075f5c1b3fabadab1be016116e1d2ae3c6a57a4 updated license to be explicit about GPL version 2 diff --git a/contrib/hg-relink b/contrib/hg-relink --- a/contrib/hg-relink +++ b/contrib/hg-relink @@ -2,8 +2,8 @@ # # Copyright (C) 2007 Brendan Cully # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import os, sys diff --git a/contrib/hg-ssh b/contrib/hg-ssh --- a/contrib/hg-ssh +++ b/contrib/hg-ssh @@ -4,8 +4,8 @@ # Author(s): # Thomas Arendsen Hein # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. """ hg-ssh - a wrapper for ssh access to a limited set of mercurial repos diff --git a/hg b/hg --- a/hg +++ b/hg @@ -4,8 +4,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # 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 @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # # this hook allows to allow or deny access to parts of a repo when # taking incoming changesets. diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py --- a/hgext/bookmarks.py +++ b/hgext/bookmarks.py @@ -2,8 +2,8 @@ # # Copyright 2008 David Soria Parra # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''mercurial bookmarks diff --git a/hgext/bugzilla.py b/hgext/bugzilla.py --- a/hgext/bugzilla.py +++ b/hgext/bugzilla.py @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''Bugzilla integration diff --git a/hgext/children.py b/hgext/children.py --- a/hgext/children.py +++ b/hgext/children.py @@ -4,8 +4,8 @@ # Author(s): # Thomas Arendsen Hein # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from mercurial import cmdutil from mercurial.commands import templateopts diff --git a/hgext/churn.py b/hgext/churn.py --- a/hgext/churn.py +++ b/hgext/churn.py @@ -3,8 +3,8 @@ # Copyright 2006 Josef "Jeff" Sipek # Copyright 2008 Alexander Solovyov # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''command to show certain statistics about revision history''' from mercurial.i18n import _ diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''converting foreign VCS repositories to Mercurial''' import convcmd diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py +++ b/hgext/convert/convcmd.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from common import NoRepo, MissingTool, SKIPREV, mapfile from cvs import convert_cvs diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py +++ b/hgext/convert/cvsps.py @@ -3,8 +3,8 @@ # # Copyright 2008, Frank Kingswood # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import os import re diff --git a/hgext/convert/filemap.py b/hgext/convert/filemap.py --- a/hgext/convert/filemap.py +++ b/hgext/convert/filemap.py @@ -1,8 +1,8 @@ # Copyright 2007 Bryan O'Sullivan # Copyright 2007 Alexis S. L. Carvalho # -# This software may be used and distributed according to the terms of -# the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import shlex from mercurial.i18n import _ diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py --- a/hgext/convert/p4.py +++ b/hgext/convert/p4.py @@ -3,8 +3,8 @@ # # Copyright 2009, Frank Kingswood # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # from mercurial import util diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. ''' The `extdiff' Mercurial extension allows you to use external programs diff --git a/hgext/fetch.py b/hgext/fetch.py --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''pulling, updating and merging in one command''' from mercurial.i18n import _ diff --git a/hgext/gpg.py b/hgext/gpg.py --- a/hgext/gpg.py +++ b/hgext/gpg.py @@ -2,8 +2,8 @@ # # Copyright 2005, 2006 Benoit Boissinot # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import os, tempfile, binascii from mercurial import util, commands diff --git a/hgext/graphlog.py b/hgext/graphlog.py --- a/hgext/graphlog.py +++ b/hgext/graphlog.py @@ -2,8 +2,8 @@ # # Copyright 2007 Joel Rosdahl # -# This software may be used and distributed according to the terms of -# the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''show revision graphs in terminal windows This extension adds a --graph option to the incoming, outgoing and log diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -2,8 +2,8 @@ # # Copyright 2005, 2006 Chris Mason # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''browsing the repository in a graphical way The hgk extension allows browsing the history of a repository in a diff --git a/hgext/inotify/__init__.py b/hgext/inotify/__init__.py --- a/hgext/inotify/__init__.py +++ b/hgext/inotify/__init__.py @@ -3,8 +3,8 @@ # Copyright 2006, 2007, 2008 Bryan O'Sullivan # Copyright 2007, 2008 Brendan Cully # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''inotify-based status acceleration for Linux systems ''' diff --git a/hgext/inotify/client.py b/hgext/inotify/client.py --- a/hgext/inotify/client.py +++ b/hgext/inotify/client.py @@ -3,8 +3,8 @@ # Copyright 2006, 2007, 2008 Bryan O'Sullivan # Copyright 2007, 2008 Brendan Cully # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from mercurial.i18n import _ import common diff --git a/hgext/inotify/common.py b/hgext/inotify/common.py --- a/hgext/inotify/common.py +++ b/hgext/inotify/common.py @@ -3,8 +3,8 @@ # Copyright 2006, 2007, 2008 Bryan O'Sullivan # Copyright 2007, 2008 Brendan Cully # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import cStringIO, socket, struct diff --git a/hgext/inotify/server.py b/hgext/inotify/server.py --- a/hgext/inotify/server.py +++ b/hgext/inotify/server.py @@ -3,8 +3,8 @@ # Copyright 2006, 2007, 2008 Bryan O'Sullivan # Copyright 2007, 2008 Brendan Cully # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from mercurial.i18n import _ from mercurial import osutil, util diff --git a/hgext/interhg.py b/hgext/interhg.py --- a/hgext/interhg.py +++ b/hgext/interhg.py @@ -5,8 +5,8 @@ # Contributor(s): # Edward Lee # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # # The `interhg' Mercurial extension allows you to change changelog and # summary text just like InterWiki way. diff --git a/hgext/keyword.py b/hgext/keyword.py --- a/hgext/keyword.py +++ b/hgext/keyword.py @@ -2,8 +2,8 @@ # # Copyright 2007, 2008 Christian Ebert # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # # $Id$ # diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -2,8 +2,8 @@ # # Copyright 2005, 2006 Chris Mason # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''patch management and development diff --git a/hgext/notify.py b/hgext/notify.py --- a/hgext/notify.py +++ b/hgext/notify.py @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''hook extension to email notifications on commits/pushes diff --git a/hgext/pager.py b/hgext/pager.py --- a/hgext/pager.py +++ b/hgext/pager.py @@ -2,8 +2,8 @@ # # Copyright 2008 David Soria Parra # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # # 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 @@ -2,8 +2,8 @@ # # Copyright (C) 2007 Alexis S. L. Carvalho # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''\ use suffixes to refer to ancestor revisions diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -2,8 +2,8 @@ # # Copyright 2008 Stefano Tortarolo # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''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 @@ -2,8 +2,8 @@ # # Copyright 2007 Bryan O'Sullivan # -# This software may be used and distributed according to the terms of -# the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''interactive change selection during commit or qrefresh''' diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -2,8 +2,8 @@ # # Copyright 2006, 2007 Brendan Cully # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''patch transplanting tool diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -5,8 +5,8 @@ # Version: 0.2 # Author: Shun-ichi Goto # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # """allow to use MBCS path with problematic encoding. diff --git a/hgext/zeroconf/__init__.py b/hgext/zeroconf/__init__.py --- a/hgext/zeroconf/__init__.py +++ b/hgext/zeroconf/__init__.py @@ -2,9 +2,8 @@ # # 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. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. '''zeroconf support for mercurial repositories diff --git a/mercurial/ancestor.py b/mercurial/ancestor.py --- a/mercurial/ancestor.py +++ b/mercurial/ancestor.py @@ -2,8 +2,8 @@ # # Copyright 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import heapq diff --git a/mercurial/archival.py b/mercurial/archival.py --- a/mercurial/archival.py +++ b/mercurial/archival.py @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms of -# the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -6,8 +6,8 @@ they were part of the actual repository. Copyright 2006, 2007 Benoit Boissinot -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ from node import nullid diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -3,8 +3,8 @@ changegroup.py - Mercurial changegroup m Copyright 2006 Matt Mackall -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ from i18n import _ diff --git a/mercurial/changelog.py b/mercurial/changelog.py --- a/mercurial/changelog.py +++ b/mercurial/changelog.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from node import hex, nullid, nullrev, short from lock import release diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -2,8 +2,8 @@ # # Copyright 2006, 2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2008 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import util, heapq diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py --- a/mercurial/demandimport.py +++ b/mercurial/demandimport.py @@ -2,8 +2,8 @@ # # Copyright 2006, 2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. ''' demandimport - automatic demandloading of modules diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -3,8 +3,8 @@ dirstate.py - working directory tracking Copyright 2005-2007 Matt Mackall -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ from node import nullid diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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,9 +3,8 @@ encoding.py - character transcoding supp 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. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ import sys, unicodedata, locale, os, error diff --git a/mercurial/error.py b/mercurial/error.py --- a/mercurial/error.py +++ b/mercurial/error.py @@ -5,8 +5,8 @@ This allows us to catch exceptions at hi Copyright 2005-2008 Matt Mackall -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ # Do not import anything here, please diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import imp, os import util, cmdutil diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import revlog diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -2,8 +2,8 @@ # # Copyright 2006, 2007, 2008 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 2008 Dirkjan Ochtman # Copyright 2007 Joel Rosdahl # -# This software may be used and distributed according to the terms of -# the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from node import nullrev diff --git a/mercurial/hbisect.py b/mercurial/hbisect.py --- a/mercurial/hbisect.py +++ b/mercurial/hbisect.py @@ -4,8 +4,8 @@ # Copyright 2005, 2006 Benoit Boissinot # 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, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import os from i18n import _ diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -2,8 +2,8 @@ # # Copyright 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -3,8 +3,8 @@ # Copyright 2005-2007 Matt Mackall # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import os from mercurial import ui, hg, util, hook, error, encoding 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 @@ -3,8 +3,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import os 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 @@ -2,8 +2,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import cStringIO, zlib, tempfile, errno, os, sys 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 @@ -3,8 +3,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 21 May 2005 - (c) 2005 Jake Edge # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2006 Eric Hopper # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. # # 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 @@ -2,8 +2,8 @@ # # Copyright 2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import util, os, sys diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py --- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -3,8 +3,8 @@ # Copyright 2005, 2006 Matt Mackall # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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,8 +3,8 @@ i18n.py - internationalization support f Copyright 2005, 2006 Matt Mackall -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ import gettext, sys, os, encoding diff --git a/mercurial/ignore.py b/mercurial/ignore.py --- a/mercurial/ignore.py +++ b/mercurial/ignore.py @@ -2,8 +2,8 @@ # # Copyright 2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import util, re diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import errno, os, socket, time, util, error import warnings diff --git a/mercurial/mail.py b/mercurial/mail.py --- a/mercurial/mail.py +++ b/mercurial/mail.py @@ -2,8 +2,8 @@ # # Copyright 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import os, smtplib, socket diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import array, struct, mdiff, parsers, util, error, revlog diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -2,8 +2,8 @@ # # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import bdiff, mpatch, re, struct, util diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -2,8 +2,8 @@ # # Copyright 2006, 2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from node import nullid, nullrev, hex, bin from i18n import _ diff --git a/mercurial/node.py b/mercurial/node.py --- a/mercurial/node.py +++ b/mercurial/node.py @@ -3,8 +3,8 @@ node.py - basic nodeid manipulation for Copyright 2005, 2006 Matt Mackall -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ import binascii diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -3,8 +3,8 @@ # Copyright 2006 Brendan Cully # Copyright 2007 Chris Mason # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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,9 +3,8 @@ posix.py - Posix utility function implem 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. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ from i18n import _ diff --git a/mercurial/pure/base85.py b/mercurial/pure/base85.py --- a/mercurial/pure/base85.py +++ b/mercurial/pure/base85.py @@ -2,8 +2,8 @@ # # Copyright (C) 2009 Brendan Cully # -# This software may be used and distributed according to the terms of -# the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import struct diff --git a/mercurial/pure/bdiff.py b/mercurial/pure/bdiff.py --- a/mercurial/pure/bdiff.py +++ b/mercurial/pure/bdiff.py @@ -2,8 +2,8 @@ # # Copyright 2009 Matt Mackall and others # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2009 Matt Mackall and others # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2009 Matt Mackall and others # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import struct try: diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -2,8 +2,8 @@ # # Copyright 2009 Matt Mackall and others # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 2005, 2006 Chris Mason # Copyright 2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import changegroup, os from node import nullrev, short diff --git a/mercurial/repo.py b/mercurial/repo.py --- a/mercurial/repo.py +++ b/mercurial/repo.py @@ -3,8 +3,8 @@ # Copyright 2005, 2006 Matt Mackall # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import error diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -6,8 +6,8 @@ and O(changes) merge between branches Copyright 2005-2007 Matt Mackall -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ # import stuff from node for others to import from revlog diff --git a/mercurial/sshrepo.py b/mercurial/sshrepo.py --- a/mercurial/sshrepo.py +++ b/mercurial/sshrepo.py @@ -2,8 +2,8 @@ # # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -3,8 +3,8 @@ # Copyright 2005-2007 Matt Mackall # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -4,8 +4,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -2,8 +2,8 @@ # # Copyright 2008 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import os, stat, osutil, util diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import util, error from i18n import _ diff --git a/mercurial/strutil.py b/mercurial/strutil.py --- a/mercurial/strutil.py +++ b/mercurial/strutil.py @@ -2,8 +2,8 @@ # # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. def findall(haystack, needle, start=0, end=None): if end is None: diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py --- a/mercurial/templatefilters.py +++ b/mercurial/templatefilters.py @@ -2,8 +2,8 @@ # # Copyright 2005-2008 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import cgi, re, os, time, urllib, textwrap import util, templater, encoding diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -2,8 +2,8 @@ # # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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 @@ -8,8 +8,8 @@ # # Copyright 2005, 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import os, errno diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -2,8 +2,8 @@ # # Copyright 2005-2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. from i18n import _ import errno, getpass, os, re, socket, sys, tempfile diff --git a/mercurial/url.py b/mercurial/url.py --- a/mercurial/url.py +++ b/mercurial/url.py @@ -4,8 +4,8 @@ # Copyright 2006, 2007 Alexis S. L. Carvalho # Copyright 2006 Vadim Gelfer # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import urllib, urllib2, urlparse, httplib, os, re from i18n import _ diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -5,8 +5,8 @@ util.py - Mercurial utility functions an Copyright 2005-2007 Matt Mackall Copyright 2006 Vadim Gelfer -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. This contains helper routines that are independent of the SCM core and hide platform-specific details from the core. diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -2,8 +2,8 @@ # # Copyright 2006, 2007 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. 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,8 +3,8 @@ win32.py - utility functions that use wi Copyright 2005-2009 Matt Mackall and others -This software may be used and distributed according to the terms of -the GNU General Public License, incorporated herein by reference. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. Mark Hammond's win32all package allows better functionality on Windows. this module overrides definitions in util.py. if not diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -3,9 +3,8 @@ windows.py - Windows utility function im 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. +This software may be used and distributed according to the terms of the +GNU General Public License version 2, incorporated herein by reference. """ from i18n import _ diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -4,8 +4,8 @@ # # Copyright 2006 Matt Mackall # -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. import difflib import errno