--- a/contrib/hg-ssh Mon Jan 18 22:59:32 2010 +0100
+++ b/contrib/hg-ssh Tue Jan 19 22:45:09 2010 -0600
@@ -6,7 +6,7 @@
# Thomas Arendsen Hein <thomas@intevation.de>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""
hg-ssh - a wrapper for ssh access to a limited set of mercurial repos
--- a/contrib/memory.py Mon Jan 18 22:59:32 2010 +0100
+++ b/contrib/memory.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''helper extension to measure memory usage
--- a/contrib/mercurial.el Mon Jan 18 22:59:32 2010 +0100
+++ b/contrib/mercurial.el Tue Jan 19 22:45:09 2010 -0600
@@ -5,8 +5,8 @@
;; Author: Bryan O'Sullivan <bos@serpentine.com>
;; mercurial.el is free software; you can redistribute it and/or
-;; modify it under the terms of version 2 of the GNU General Public
-;; License as published by the Free Software Foundation.
+;; modify it under the terms of the GNU General Public License or any
+;; later version.
;; mercurial.el is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -784,7 +784,7 @@
(defun hg-help-overview ()
"This is an overview of the Mercurial SCM mode for Emacs.
-You can find the source code, license (GPL v2), and credits for this
+You can find the source code, license (GPLv2+), and credits for this
code by typing `M-x find-library mercurial RET'."
(interactive)
(hg-view-output ("Mercurial Help Overview")
--- a/contrib/mercurial.spec Mon Jan 18 22:59:32 2010 +0100
+++ b/contrib/mercurial.spec Tue Jan 19 22:45:09 2010 -0600
@@ -2,7 +2,7 @@
Name: mercurial
Version: snapshot
Release: 0
-License: GPLv2
+License: GPLv2+
Group: Development/Tools
URL: http://mercurial.selenic.com/
Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
--- a/contrib/mq.el Mon Jan 18 22:59:32 2010 +0100
+++ b/contrib/mq.el Tue Jan 19 22:45:09 2010 -0600
@@ -5,8 +5,8 @@
;; Author: Bryan O'Sullivan <bos@serpentine.com>
;; mq.el is free software; you can redistribute it and/or modify it
-;; under the terms of version 2 of the GNU General Public License as
-;; published by the Free Software Foundation.
+;; under the terms of the GNU General Public License version 2 or any
+;; later version.
;; mq.el is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/contrib/win32/ReadMe.html Mon Jan 18 22:59:32 2010 +0100
+++ b/contrib/win32/ReadMe.html Tue Jan 19 22:45:09 2010 -0600
@@ -148,8 +148,7 @@
Mercurial is free software; you can redistribute it and/or
modify it under the terms of the <a
href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
- General Public License version 2</a> as published by the Free
- Software Foundation.
+ General Public License version 2</a> or any later version.
</p>
<p>
--- a/doc/hg.1.txt Mon Jan 18 22:59:32 2010 +0100
+++ b/doc/hg.1.txt Tue Jan 19 22:45:09 2010 -0600
@@ -95,6 +95,6 @@
-------
Copyright (C) 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License version 2.
+Public License version 2 or any later version.
.. include:: common.txt
--- a/doc/hgignore.5.txt Mon Jan 18 22:59:32 2010 +0100
+++ b/doc/hgignore.5.txt Tue Jan 19 22:45:09 2010 -0600
@@ -106,6 +106,6 @@
This manual page is copyright 2006 Vadim Gelfer.
Mercurial is copyright 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License version 2.
+Public License version 2 or any later version.
.. include:: common.txt
--- a/doc/hgrc.5.txt Mon Jan 18 22:59:32 2010 +0100
+++ b/doc/hgrc.5.txt Tue Jan 19 22:45:09 2010 -0600
@@ -955,6 +955,6 @@
This manual page is copyright 2005 Bryan O'Sullivan.
Mercurial is copyright 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License version 2.
+Public License version 2 or any later version.
.. include:: common.txt
--- a/hg Mon Jan 18 22:59:32 2010 +0100
+++ b/hg Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
# enable importing on demand to reduce startup time
try:
--- a/hgext/acl.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/acl.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,8 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
-#
+# GNU General Public License version 2 or any later version.
'''hooks for controlling repository access
--- a/hgext/bookmarks.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/bookmarks.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008 David Soria Parra <dsp@php.net>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''track a line of development with movable markers
--- a/hgext/bugzilla.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/bugzilla.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''hooks for integrating with the Bugzilla bug tracker
--- a/hgext/children.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/children.py Tue Jan 19 22:45:09 2010 -0600
@@ -6,7 +6,7 @@
# Thomas Arendsen Hein <thomas@intevation.de>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''command to display child changesets'''
--- a/hgext/churn.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/churn.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2008 Alexander Solovyov <piranha@piranha.org.ua>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''command to display statistics about repository history'''
--- a/hgext/convert/__init__.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/__init__.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''import revisions from foreign VCS repositories into Mercurial'''
--- a/hgext/convert/bzr.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/bzr.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008, 2009 Marek Kubica <marek@xivilization.net> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
# This module is for handling 'bzr', that was formerly known as Bazaar-NG;
# it cannot access 'bar' repositories, but they were never used very much
--- a/hgext/convert/common.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/common.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import base64, errno
import os
--- a/hgext/convert/convcmd.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/convcmd.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from common import NoRepo, MissingTool, SKIPREV, mapfile
from cvs import convert_cvs
--- a/hgext/convert/cvs.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/cvs.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os, locale, re, socket, errno
from cStringIO import StringIO
--- a/hgext/convert/cvsps.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/cvsps.py Tue Jan 19 22:45:09 2010 -0600
@@ -1,10 +1,9 @@
-#
# Mercurial built-in replacement for cvsps.
#
# Copyright 2008, Frank Kingswood <frank@kingswood-consulting.co.uk>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os
import re
--- a/hgext/convert/darcs.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/darcs.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2007-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from common import NoRepo, checktool, commandline, commit, converter_source
from mercurial.i18n import _
--- a/hgext/convert/filemap.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/filemap.py Tue Jan 19 22:45:09 2010 -0600
@@ -2,7 +2,7 @@
# Copyright 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import shlex
from mercurial.i18n import _
--- a/hgext/convert/git.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/git.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os
from mercurial import util
--- a/hgext/convert/gnuarch.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/gnuarch.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from common import NoRepo, commandline, commit, converter_source
from mercurial.i18n import _
--- a/hgext/convert/hg.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/hg.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
# Notes for hg->hg conversion:
#
--- a/hgext/convert/monotone.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/monotone.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os, re
from mercurial import util
--- a/hgext/convert/p4.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/convert/p4.py Tue Jan 19 22:45:09 2010 -0600
@@ -1,11 +1,9 @@
-#
# Perforce source for convert extension.
#
# Copyright 2009, Frank Kingswood <frank@kingswood-consulting.co.uk>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
-#
+# GNU General Public License version 2 or any later version.
from mercurial import util
from mercurial.i18n import _
--- a/hgext/extdiff.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/extdiff.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''command to allow external programs to compare revisions
--- a/hgext/fetch.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/fetch.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''pull, update and merge in one command'''
--- a/hgext/gpg.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/gpg.py Tue Jan 19 22:45:09 2010 -0600
@@ -1,7 +1,7 @@
# Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''commands to sign and verify changesets'''
--- a/hgext/graphlog.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/graphlog.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2007 Joel Rosdahl <joel@rosdahl.net>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''command to view revision graphs from a shell
--- a/hgext/hgcia.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/hgcia.py Tue Jan 19 22:45:09 2010 -0600
@@ -1,5 +1,7 @@
# Copyright (C) 2007-8 Brendan Cully <brendan@kublai.com>
-# Published under the GNU GPL
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
"""hooks for integrating with the CIA.vc notification service
--- a/hgext/hgk.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/hgk.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Chris Mason <mason@suse.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''browse the repository in a graphical way
--- a/hgext/highlight/__init__.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/highlight/__init__.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008, 2009 Patrick Mezard <pmezard@gmail.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
#
# The original module was split in an interface and an implementation
# file to defer pygments loading and speedup extension setup.
--- a/hgext/highlight/highlight.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/highlight/highlight.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2007-2009 Adam Hupp <adam@hupp.org> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
#
# The original module was split in an interface and an implementation
# file to defer pygments loading and speedup extension setup.
--- a/hgext/inotify/__init__.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/__init__.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''accelerate status report using Linux's inotify service'''
--- a/hgext/inotify/client.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/client.py Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
# Copyright 2009 Nicolas Dumazet <nicdumz@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from mercurial.i18n import _
import common, server
--- a/hgext/inotify/common.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/common.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import cStringIO, socket, struct
--- a/hgext/inotify/linux/__init__.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/linux/__init__.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# This library is free software; you can redistribute it and/or modify
# it under the terms of version 2.1 of the GNU Lesser General Public
-# License, incorporated herein by reference.
+# License, or any later version.
'''Low-level interface to the Linux inotify subsystem.
--- a/hgext/inotify/linux/_inotify.c Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/linux/_inotify.c Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of version 2.1 of the GNU Lesser General
- * Public License, incorporated herein by reference.
+ * Public License or any later version.
*/
#include <Python.h>
--- a/hgext/inotify/linux/watcher.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/linux/watcher.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# This library is free software; you can redistribute it and/or modify
# it under the terms of version 2.1 of the GNU Lesser General Public
-# License, incorporated herein by reference.
+# License, or any later version.
'''High-level interfaces to the Linux inotify subsystem.
--- a/hgext/inotify/linuxserver.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/linuxserver.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2007, 2008 Brendan Cully <brendan@kublai.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from mercurial.i18n import _
from mercurial import osutil, util
--- a/hgext/inotify/server.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/inotify/server.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Nicolas Dumazet <nicdumz@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from mercurial.i18n import _
from mercurial import cmdutil, osutil, util
--- a/hgext/interhg.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/interhg.py Tue Jan 19 22:45:09 2010 -0600
@@ -6,7 +6,7 @@
# Edward Lee <edward.lee@engineering.uiuc.edu>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''expand expressions into changelog and summaries
--- a/hgext/keyword.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/keyword.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2007-2009 Christian Ebert <blacktrash@gmx.net>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
#
# $Id$
#
--- a/hgext/mq.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/mq.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Chris Mason <mason@suse.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''manage a stack of patches
--- a/hgext/notify.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/notify.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''hooks for sending email notifications at commit/push time
--- a/hgext/pager.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/pager.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008 David Soria Parra <dsp@php.net>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
#
# To load the extension, add it to your .hgrc file:
#
--- a/hgext/parentrevspec.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/parentrevspec.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright (C) 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''interpret suffixes to refer to ancestor revisions
--- a/hgext/patchbomb.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/patchbomb.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''command to send changesets as (a series of) patch emails
--- a/hgext/rebase.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/rebase.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008 Stefano Tortarolo <stefano.tortarolo at gmail dot com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''command to move sets of revisions to a different ancestor
--- a/hgext/record.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/record.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''commands to interactively select changes for commit/qrefresh'''
--- a/hgext/relink.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/relink.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright (C) 2007 Brendan Cully <brendan@kublai.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""recreates hardlinks between repository clones"""
--- a/hgext/schemes.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/schemes.py Tue Jan 19 22:45:09 2010 -0600
@@ -1,7 +1,7 @@
# Copyright 2009, Alexander Solovyov <piranha@piranha.org.ua>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""extend schemes with shortcuts to repository swarms
--- a/hgext/share.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/share.py Tue Jan 19 22:45:09 2010 -0600
@@ -1,7 +1,7 @@
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''share a common history between several working directories'''
--- a/hgext/transplant.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/transplant.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007 Brendan Cully <brendan@kublai.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''command to transplant changesets from another branch
--- a/hgext/win32mbcs.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/win32mbcs.py Tue Jan 19 22:45:09 2010 -0600
@@ -6,7 +6,7 @@
# Author: Shun-ichi Goto <shunichi.goto@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
#
'''allow the use of MBCS paths with problematic encodings
--- a/hgext/win32text.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/win32text.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2007-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''perform automatic newline conversion
--- a/hgext/zeroconf/__init__.py Mon Jan 18 22:59:32 2010 +0100
+++ b/hgext/zeroconf/__init__.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''discover and advertise repositories on the local network
--- a/i18n/hggettext Mon Jan 18 22:59:32 2010 +0100
+++ b/i18n/hggettext Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
# The normalize function is taken from pygettext which is distributed
# with Python under the Python License, which is GPL compatible.
--- a/mercurial/ancestor.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/ancestor.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import heapq
--- a/mercurial/archival.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/archival.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
from node import hex
--- a/mercurial/bundlerepo.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/bundlerepo.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007 Benoit Boissinot <bboissin@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""Repository class for viewing uncompressed bundles.
--- a/mercurial/changegroup.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/changegroup.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import util
--- a/mercurial/changelog.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/changelog.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import bin, hex, nullid
from i18n import _
--- a/mercurial/cmdutil.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/cmdutil.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import hex, nullid, nullrev, short
from i18n import _
--- a/mercurial/commands.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/commands.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import hex, nullid, nullrev, short
from lock import release
--- a/mercurial/config.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/config.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import error
--- a/mercurial/context.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/context.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import nullid, nullrev, short, hex
from i18n import _
@@ -493,6 +493,17 @@
return None
+ def ancestors(self):
+ seen = set(str(self))
+ visit = [self]
+ while visit:
+ for parent in visit.pop(0).parents():
+ s = str(parent)
+ if s not in seen:
+ visit.append(parent)
+ seen.add(s)
+ yield parent
+
class workingctx(changectx):
"""A workingctx object makes access to data related to
the current working directory convenient.
--- a/mercurial/copies.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/copies.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import util
@@ -28,27 +28,6 @@
f = _dirname(f)
return d
-def _findoldnames(fctx, limit):
- "find files that path was copied from, back to linkrev limit"
- old = {}
- seen = set()
- orig = fctx.path()
- visit = [(fctx, 0)]
- while visit:
- fc, depth = visit.pop()
- s = str(fc)
- if s in seen:
- continue
- seen.add(s)
- if fc.path() != orig and fc.path() not in old:
- old[fc.path()] = (depth, fc.path()) # remember depth
- if fc.rev() is not None and fc.rev() < limit:
- continue
- visit += [(p, depth - 1) for p in fc.parents()]
-
- # return old names sorted by depth
- return [o[1] for o in sorted(old.values())]
-
def _findlimit(repo, a, b):
"""Find the earliest revision that's an ancestor of a or b but not both,
None if no such revision exists.
@@ -138,23 +117,50 @@
fullcopy = {}
diverge = {}
+ def related(f1, f2, limit):
+ g1, g2 = f1.ancestors(), f2.ancestors()
+ try:
+ while 1:
+ f1r, f2r = f1.rev(), f2.rev()
+ if f1r > f2r:
+ f1 = g1.next()
+ elif f2r > f1r:
+ f2 = g2.next()
+ elif f1 == f2:
+ return f1 # a match
+ elif f1r == f2r or f1r < limit or f2r < limit:
+ return False # copy no longer relevant
+ except StopIteration:
+ return False
+
def checkcopies(f, m1, m2):
'''check possible copies of f from m1 to m2'''
- c1 = ctx(f, m1[f])
- for of in _findoldnames(c1, limit):
+ of = None
+ seen = set([f])
+ for oc in ctx(f, m1[f]).ancestors():
+ ocr = oc.rev()
+ of = oc.path()
+ if of in seen:
+ # check limit late - grab last rename before
+ if ocr < limit:
+ break
+ continue
+ seen.add(of)
+
fullcopy[f] = of # remember for dir rename detection
- if of in m2: # original file not in other manifest?
- # if the original file is unchanged on the other branch,
- # no merge needed
- if m2[of] != ma.get(of):
- c2 = ctx(of, m2[of])
- ca = c1.ancestor(c2)
- # related and named changed on only one side?
- if ca and (ca.path() == f or ca.path() == c2.path()):
- if c1 != ca or c2 != ca: # merge needed?
- copy[f] = of
- elif of in ma:
- diverge.setdefault(of, []).append(f)
+ if of not in m2:
+ continue # no match, keep looking
+ if m2[of] == ma.get(of):
+ break # no merge needed, quit early
+ c2 = ctx(of, m2[of])
+ cr = related(oc, c2, ca.rev())
+ if of == f or of == c2.path(): # non-divergent
+ copy[f] = of
+ of = None
+ break
+
+ if of in ma:
+ diverge.setdefault(of, []).append(f)
repo.ui.debug(" searching for copies back to rev %d\n" % limit)
--- a/mercurial/demandimport.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/demandimport.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
'''
demandimport - automatic demandloading of modules
--- a/mercurial/dirstate.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/dirstate.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import nullid
from i18n import _
--- a/mercurial/dispatch.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/dispatch.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import os, sys, atexit, signal, pdb, socket, errno, shlex, time
--- a/mercurial/encoding.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/encoding.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import error
import sys, unicodedata, locale, os
--- a/mercurial/error.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/error.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2008 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""Mercurial exceptions.
--- a/mercurial/extensions.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/extensions.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import imp, os
import util, cmdutil, help
--- a/mercurial/fancyopts.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/fancyopts.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import getopt
--- a/mercurial/filelog.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/filelog.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import revlog
--- a/mercurial/filemerge.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/filemerge.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import short
from i18n import _
--- a/mercurial/graphmod.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/graphmod.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2007 Joel Rosdahl <joel@rosdahl.net>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""supports walking the history as DAGs suitable for graphical output
--- a/mercurial/hbisect.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hbisect.py Tue Jan 19 22:45:09 2010 -0600
@@ -6,7 +6,7 @@
# Inspired by git bisect, extension skeleton taken from mq.py.
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os
from i18n import _
--- a/mercurial/help.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/help.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import gettext, _
import sys, os
--- a/mercurial/hg.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hg.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
from lock import release
--- a/mercurial/hgweb/__init__.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/__init__.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2005 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import hgweb_mod, hgwebdir_mod
--- a/mercurial/hgweb/common.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/common.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import errno, mimetypes, os
--- a/mercurial/hgweb/hgweb_mod.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/hgweb_mod.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os
from mercurial import ui, hg, hook, error, encoding, templater
--- a/mercurial/hgweb/hgwebdir_mod.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/hgwebdir_mod.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os, re, time
from mercurial.i18n import _
--- a/mercurial/hgweb/protocol.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/protocol.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import cStringIO, zlib, tempfile, errno, os, sys, urllib, copy
from mercurial import util, streamclone
--- a/mercurial/hgweb/request.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/request.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import socket, cgi, errno
from mercurial import util
@@ -25,7 +25,8 @@
'static': [('cmd', ['static']), ('file', None)]
}
-def expand(form):
+def normalize(form):
+ # first expand the shortcuts
for k in shortcuts.iterkeys():
if k in form:
for name, value in shortcuts[k]:
@@ -33,6 +34,9 @@
value = form[k]
form[name] = value
del form[k]
+ # And strip the values
+ for k, v in form.iteritems():
+ form[k] = [i.strip() for i in v]
return form
class wsgirequest(object):
@@ -47,7 +51,9 @@
self.multiprocess = wsgienv['wsgi.multiprocess']
self.run_once = wsgienv['wsgi.run_once']
self.env = wsgienv
- self.form = expand(cgi.parse(self.inp, self.env, keep_blank_values=1))
+ self.form = normalize(cgi.parse(self.inp,
+ self.env,
+ keep_blank_values=1))
self._start_response = start_response
self.server_write = None
self.headers = []
--- a/mercurial/hgweb/server.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/server.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os, sys, errno, urllib, BaseHTTPServer, socket, SocketServer, traceback
from mercurial import hg, util, error
--- a/mercurial/hgweb/webcommands.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/webcommands.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os, mimetypes, re, cgi, copy
import webutil
--- a/mercurial/hgweb/webutil.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/webutil.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os, copy
from mercurial import match, patch, util, error
--- a/mercurial/hgweb/wsgicgi.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hgweb/wsgicgi.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Eric Hopper <hopper@omnifarious.org>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
#
# This was originally copied from the public domain code at
# http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side
--- a/mercurial/hook.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/hook.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import os, sys
--- a/mercurial/httprepo.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/httprepo.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import bin, hex, nullid
from i18n import _
--- a/mercurial/i18n.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/i18n.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import encoding
import gettext, sys, os
--- a/mercurial/ignore.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/ignore.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import util, match
--- a/mercurial/localrepo.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/localrepo.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import bin, hex, nullid, nullrev, short
from i18n import _
--- a/mercurial/lock.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/lock.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import util, error
import errno, os, socket, time
--- a/mercurial/mail.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/mail.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import util, encoding
--- a/mercurial/manifest.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/manifest.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import mdiff, parsers, error, revlog
--- a/mercurial/match.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/match.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008, 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import re
import util
--- a/mercurial/mdiff.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/mdiff.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import bdiff, mpatch, util
--- a/mercurial/merge.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/merge.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import nullid, nullrev, hex, bin
from i18n import _
--- a/mercurial/minirst.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/minirst.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""simplified reStructuredText parser.
--- a/mercurial/node.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/node.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import binascii
--- a/mercurial/patch.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/patch.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2007 Chris Mason <chris.mason@oracle.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
from node import hex, nullid, short
--- a/mercurial/posix.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/posix.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import osutil
--- a/mercurial/pure/base85.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/pure/base85.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright (C) 2009 Brendan Cully <brendan@kublai.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import struct
--- a/mercurial/pure/bdiff.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/pure/bdiff.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import struct, difflib
--- a/mercurial/pure/diffhelpers.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/pure/diffhelpers.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
def addlines(fp, hunk, lena, lenb, a, b):
while True:
--- a/mercurial/pure/mpatch.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/pure/mpatch.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import struct
try:
--- a/mercurial/pure/osutil.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/pure/osutil.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import os
import stat as _stat
--- a/mercurial/pure/parsers.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/pure/parsers.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from mercurial.node import bin, nullid, nullrev
from mercurial import util
--- a/mercurial/repair.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/repair.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2007 Matt Mackall
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import changegroup
from node import nullrev, short
--- a/mercurial/repo.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/repo.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import error
--- a/mercurial/revlog.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/revlog.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""Storage back-end for Mercurial.
--- a/mercurial/sshrepo.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/sshrepo.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import bin, hex
from i18n import _
--- a/mercurial/sshserver.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/sshserver.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
from node import bin, hex
--- a/mercurial/statichttprepo.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/statichttprepo.py Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import changelog, byterange, url, error
--- a/mercurial/store.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/store.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2008 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import osutil, util
--- a/mercurial/streamclone.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/streamclone.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import util, error
from i18n import _
--- a/mercurial/strutil.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/strutil.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
def findall(haystack, needle, start=0, end=None):
if end is None:
--- a/mercurial/subrepo.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/subrepo.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import errno, os, re
from i18n import _
--- a/mercurial/tags.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/tags.py Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
# Copyright 2009 Greg Ward <greg@gerg.ca>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
# Currently this module only deals with reading and caching tags.
# Eventually, it could take care of updating (adding/removing/moving)
--- a/mercurial/templatefilters.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/templatefilters.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2008 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import cgi, re, os, time, urllib, textwrap
import util, encoding
--- a/mercurial/templatekw.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/templatekw.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import hex
import encoding, patch, util, error
--- a/mercurial/templater.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/templater.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import re, sys, os
--- a/mercurial/transaction.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/transaction.py Tue Jan 19 22:45:09 2010 -0600
@@ -9,7 +9,7 @@
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import os, errno
--- a/mercurial/ui.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/ui.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import errno, getpass, os, socket, sys, tempfile, traceback
--- a/mercurial/url.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/url.py Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
import urllib, urllib2, urlparse, httplib, os, re, socket, cStringIO
from i18n import _
--- a/mercurial/util.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/util.py Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""Mercurial utility functions and platform specfic implementations.
--- a/mercurial/verify.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/verify.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from node import nullid, short
from i18n import _
--- a/mercurial/win32.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/win32.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""Utility functions that use win32 API.
--- a/mercurial/windows.py Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/windows.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
from i18n import _
import osutil, error
--- a/setup.py Mon Jan 18 22:59:32 2010 +0100
+++ b/setup.py Tue Jan 19 22:45:09 2010 -0600
@@ -273,7 +273,7 @@
author_email='mpm@selenic.com',
url='http://mercurial.selenic.com/',
description='Scalable distributed SCM',
- license='GNU GPL',
+ license='GNU GPLv2+',
scripts=scripts,
packages=packages,
ext_modules=extmodules,
--- a/tests/printrepr.py Mon Jan 18 22:59:32 2010 +0100
+++ b/tests/printrepr.py Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
"""prints repr(sys.stdin) but preserves newlines in input"""
--- a/tests/run-tests.py Mon Jan 18 22:59:32 2010 +0100
+++ b/tests/run-tests.py Tue Jan 19 22:45:09 2010 -0600
@@ -5,7 +5,7 @@
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
# Modifying this script is tricky because it has many modes:
# - serial (default) vs parallel (-jN, N > 1)