# HG changeset patch # User Martin Geisler # Date 1240700934 -7200 # Node ID 46293a0c7e9ff247fa033b7fb37b34b148ac1ea6 # Parent 1075f5c1b3fabadab1be016116e1d2ae3c6a57a4 updated license to be explicit about GPL version 2 diff -r 1075f5c1b3fa -r 46293a0c7e9f contrib/hg-relink --- a/contrib/hg-relink Mon Apr 27 16:29:26 2009 +0200 +++ b/contrib/hg-relink Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f contrib/hg-ssh --- a/contrib/hg-ssh Mon Apr 27 16:29:26 2009 +0200 +++ b/contrib/hg-ssh Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hg --- a/hg Mon Apr 27 16:29:26 2009 +0200 +++ b/hg Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/acl.py --- a/hgext/acl.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/acl.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/bookmarks.py --- a/hgext/bookmarks.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/bookmarks.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/bugzilla.py --- a/hgext/bugzilla.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/bugzilla.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/children.py --- a/hgext/children.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/children.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/churn.py --- a/hgext/churn.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/churn.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/convert/__init__.py --- a/hgext/convert/__init__.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/convert/__init__.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/convert/convcmd.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/convert/cvsps.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/convert/filemap.py --- a/hgext/convert/filemap.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/convert/filemap.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/convert/p4.py --- a/hgext/convert/p4.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/convert/p4.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/extdiff.py --- a/hgext/extdiff.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/extdiff.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/fetch.py --- a/hgext/fetch.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/fetch.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/gpg.py --- a/hgext/gpg.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/gpg.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/graphlog.py --- a/hgext/graphlog.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/graphlog.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/hgk.py --- a/hgext/hgk.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/hgk.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/inotify/__init__.py --- a/hgext/inotify/__init__.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/inotify/__init__.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/inotify/client.py --- a/hgext/inotify/client.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/inotify/client.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/inotify/common.py --- a/hgext/inotify/common.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/inotify/common.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/inotify/server.py --- a/hgext/inotify/server.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/inotify/server.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/interhg.py --- a/hgext/interhg.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/interhg.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/keyword.py --- a/hgext/keyword.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/keyword.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/mq.py --- a/hgext/mq.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/mq.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/notify.py --- a/hgext/notify.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/notify.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/pager.py --- a/hgext/pager.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/pager.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/parentrevspec.py --- a/hgext/parentrevspec.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/parentrevspec.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/rebase.py --- a/hgext/rebase.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/rebase.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/record.py --- a/hgext/record.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/record.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/transplant.py --- a/hgext/transplant.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/transplant.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/win32mbcs.py --- a/hgext/win32mbcs.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/win32mbcs.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f hgext/zeroconf/__init__.py --- a/hgext/zeroconf/__init__.py Mon Apr 27 16:29:26 2009 +0200 +++ b/hgext/zeroconf/__init__.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/ancestor.py --- a/mercurial/ancestor.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/ancestor.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/archival.py --- a/mercurial/archival.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/archival.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/bundlerepo.py --- a/mercurial/bundlerepo.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/bundlerepo.py Sun Apr 26 01:08:54 2009 +0200 @@ -6,8 +6,8 @@ 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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/changegroup.py --- a/mercurial/changegroup.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/changegroup.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,8 +3,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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/changelog.py --- a/mercurial/changelog.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/changelog.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/cmdutil.py --- a/mercurial/cmdutil.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/cmdutil.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/commands.py --- a/mercurial/commands.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/commands.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/context.py --- a/mercurial/context.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/context.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/copies.py --- a/mercurial/copies.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/copies.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/demandimport.py --- a/mercurial/demandimport.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/demandimport.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/dirstate.py --- a/mercurial/dirstate.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/dirstate.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,8 +3,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 nullid diff -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/dispatch.py --- a/mercurial/dispatch.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/dispatch.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/encoding.py --- a/mercurial/encoding.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/encoding.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,9 +3,8 @@ 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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/error.py --- a/mercurial/error.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/error.py Sun Apr 26 01:08:54 2009 +0200 @@ -5,8 +5,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. """ # Do not import anything here, please diff -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/extensions.py --- a/mercurial/extensions.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/extensions.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/filelog.py --- a/mercurial/filelog.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/filelog.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/filemerge.py --- a/mercurial/filemerge.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/filemerge.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/graphmod.py --- a/mercurial/graphmod.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/graphmod.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hbisect.py --- a/mercurial/hbisect.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hbisect.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/help.py --- a/mercurial/help.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/help.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hg.py --- a/mercurial/hg.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hg.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/__init__.py --- a/mercurial/hgweb/__init__.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/__init__.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/common.py --- a/mercurial/hgweb/common.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/common.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/hgweb_mod.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/hgwebdir_mod.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/protocol.py --- a/mercurial/hgweb/protocol.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/protocol.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/request.py --- a/mercurial/hgweb/request.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/request.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/server.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/webcommands.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/webutil.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hgweb/wsgicgi.py --- a/mercurial/hgweb/wsgicgi.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hgweb/wsgicgi.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/hook.py --- a/mercurial/hook.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/hook.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/httprepo.py --- a/mercurial/httprepo.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/httprepo.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/i18n.py --- a/mercurial/i18n.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/i18n.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,8 +3,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 gettext, sys, os, encoding diff -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/ignore.py --- a/mercurial/ignore.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/ignore.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/localrepo.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/lock.py --- a/mercurial/lock.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/lock.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/mail.py --- a/mercurial/mail.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/mail.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/manifest.py --- a/mercurial/manifest.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/manifest.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/mdiff.py --- a/mercurial/mdiff.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/mdiff.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/merge.py --- a/mercurial/merge.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/merge.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/node.py --- a/mercurial/node.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/node.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,8 +3,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 binascii diff -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/patch.py --- a/mercurial/patch.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/patch.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/posix.py --- a/mercurial/posix.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/posix.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,9 +3,8 @@ 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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/pure/base85.py --- a/mercurial/pure/base85.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/pure/base85.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/pure/bdiff.py --- a/mercurial/pure/bdiff.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/pure/bdiff.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/pure/diffhelpers.py --- a/mercurial/pure/diffhelpers.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/pure/diffhelpers.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/pure/mpatch.py --- a/mercurial/pure/mpatch.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/pure/mpatch.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/pure/parsers.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/repair.py --- a/mercurial/repair.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/repair.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/repo.py --- a/mercurial/repo.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/repo.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/revlog.py --- a/mercurial/revlog.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/revlog.py Sun Apr 26 01:08:54 2009 +0200 @@ -6,8 +6,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 stuff from node for others to import from revlog diff -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/sshrepo.py --- a/mercurial/sshrepo.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/sshrepo.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/sshserver.py --- a/mercurial/sshserver.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/sshserver.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/statichttprepo.py --- a/mercurial/statichttprepo.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/statichttprepo.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/store.py --- a/mercurial/store.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/store.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/streamclone.py --- a/mercurial/streamclone.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/streamclone.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/strutil.py --- a/mercurial/strutil.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/strutil.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/templatefilters.py --- a/mercurial/templatefilters.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/templatefilters.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/templater.py --- a/mercurial/templater.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/templater.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/transaction.py --- a/mercurial/transaction.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/transaction.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/ui.py --- a/mercurial/ui.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/ui.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/url.py --- a/mercurial/url.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/url.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/util.py --- a/mercurial/util.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/util.py Sun Apr 26 01:08:54 2009 +0200 @@ -5,8 +5,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. This contains helper routines that are independent of the SCM core and hide platform-specific details from the core. diff -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/verify.py --- a/mercurial/verify.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/verify.py Sun Apr 26 01:08:54 2009 +0200 @@ -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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/win32.py --- a/mercurial/win32.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/win32.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,8 +3,8 @@ 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 -r 1075f5c1b3fa -r 46293a0c7e9f mercurial/windows.py --- a/mercurial/windows.py Mon Apr 27 16:29:26 2009 +0200 +++ b/mercurial/windows.py Sun Apr 26 01:08:54 2009 +0200 @@ -3,9 +3,8 @@ 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 -r 1075f5c1b3fa -r 46293a0c7e9f tests/run-tests.py --- a/tests/run-tests.py Mon Apr 27 16:29:26 2009 +0200 +++ b/tests/run-tests.py Sun Apr 26 01:08:54 2009 +0200 @@ -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