Hello community,
here is the log from the commit of package viewvc for openSUSE:Factory checked
in at 2016-03-26 15:27:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/viewvc (Old)
and /work/SRC/openSUSE:Factory/.viewvc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "viewvc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/viewvc/viewvc.changes 2015-04-10
09:52:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.viewvc.new/viewvc.changes 2016-03-26
15:27:47.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Mar 23 13:18:53 UTC 2016 - astie...@suse.com
+
+- viewvc 1.1.24:
+ * fix minor bug in human_readable boolean calculation
+ * allow hr_funout option to apply to unidiff diffs, too
+ * fix infinite loop in rcsparse
+ * fix iso8601 timezone offset handling
+ * add support for renamed roots
+ * fix minor buglet in viewvc-install error message
+
+-------------------------------------------------------------------
Old:
----
viewvc-1.1.23.tar.gz
New:
----
viewvc-1.1.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ viewvc.spec ++++++
--- /var/tmp/diff_new_pack.73NV91/_old 2016-03-26 15:27:48.000000000 +0100
+++ /var/tmp/diff_new_pack.73NV91/_new 2016-03-26 15:27:48.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package viewvc
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
#
%define viewvc_dir /srv/viewvc
Name: viewvc
-Version: 1.1.23
+Version: 1.1.24
Release: 0
Summary: Browse a Subversion Repository with a Web Browser
License: BSD-3-Clause
++++++ viewvc-1.1.23.tar.gz -> viewvc-1.1.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/CHANGES new/viewvc-1.1.24/CHANGES
--- old/viewvc-1.1.23/CHANGES 2014-11-05 01:14:05.000000000 +0100
+++ new/viewvc-1.1.24/CHANGES 2015-09-23 19:44:20.000000000 +0200
@@ -1,3 +1,12 @@
+Version 1.1.24 (released ??-???-????)
+
+ * fix minor bug in human_readable boolean calculation
+ * allow hr_funout option to apply to unidiff diffs, too
+ * fix infinite loop in rcsparse
+ * fix iso8601 timezone offset handling (issue #542)
+ * add support for renamed roots (issue #544)
+ * fix minor buglet in viewvc-install error message
+
Version 1.1.23 (released 04-Nov-2014)
* fix annotate bug triggered by files with trailing blank lines (issue #533)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/INSTALL new/viewvc-1.1.24/INSTALL
--- old/viewvc-1.1.23/INSTALL 2011-10-04 17:00:01.000000000 +0200
+++ new/viewvc-1.1.24/INSTALL 2015-01-28 20:42:15.000000000 +0100
@@ -120,11 +120,17 @@
path in some of the files, and ViewVC cannot be moved to a
different path after the install.
- Note: while 'root' is usually required to create /usr/local/viewvc,
+ NOTE: while 'root' is usually required to create /usr/local/viewvc,
ViewVC does not have to be installed as root, nor does it run as root.
It is just as valid to place ViewVC in a home directory, too.
- Note: viewvc-install will create directories if needed. It will
+ NOTE: if your system uses a restrictive umask, you might need to
+ adjust the permissions of the directory structure that
+ viewvc-install creates so that, for example, the modules in the
+ lib/ subdirectory are actually readable by the main programs in the
+ bin/ subdirectory.
+
+ NOTE: viewvc-install will create directories if needed. It will
prompt before overwriting files that may have been modified (such
as viewvc.conf), thus making it safe to install over the top of
a previous installation. It will always overwrite program files,
@@ -234,7 +240,7 @@
Options +ExecCGI
AddHandler cgi-script .cgi
- Note: For this to work mod_cgi has to be loaded. And for the .htaccess file
+ NOTE: For this to work mod_cgi has to be loaded. And for the .htaccess file
to be effective, "AllowOverride All" or "AllowOverride Options FileInfo"
needs to have been specified for the directory.
@@ -253,7 +259,7 @@
SetEnv VIEWVC_CONF_PATHNAME /etc/viewvc.conf
- Note: If you are using Mod_Python under Apache 1.3 the tarball generation
+ NOTE: If you are using Mod_Python under Apache 1.3 the tarball generation
feature may not work because it uses multithreading. This works fine
under Apache 2.
@@ -273,7 +279,7 @@
WSGIApplicationGroup %{GLOBAL}
- Note: WSGI support in ViewVC is at this time quite rudimentary,
+ NOTE: WSGI support in ViewVC is at this time quite rudimentary,
bordering on downright experimental. Your mileage may vary.
-----------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/LICENSE.html
new/viewvc-1.1.24/LICENSE.html
--- old/viewvc-1.1.23/LICENSE.html 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/LICENSE.html 2015-10-02 19:40:19.000000000 +0200
@@ -15,7 +15,7 @@
<blockquote>
-<p><strong>Copyright © 1999-2014 The ViewCVS Group. All rights
+<p><strong>Copyright © 1999-2015 The ViewCVS Group. All rights
reserved.</strong></p>
<p>By using ViewVC, you agree to the terms and conditions set forth
@@ -65,6 +65,7 @@
<li>January 23, 2012 — copyright years updated</li>
<li>January 04, 2013 — copyright years updated</li>
<li>May 02, 2014 — copyright years updated</li>
+ <li>October 02, 2015 — copyright years updated</li>
</ul>
</body>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/asp/query.asp
new/viewvc-1.1.24/bin/asp/query.asp
--- old/viewvc-1.1.23/bin/asp/query.asp 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/bin/asp/query.asp 2015-10-02 19:40:19.000000000 +0200
@@ -3,7 +3,7 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/asp/viewvc.asp
new/viewvc-1.1.24/bin/asp/viewvc.asp
--- old/viewvc-1.1.23/bin/asp/viewvc.asp 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/asp/viewvc.asp 2015-10-02 19:40:19.000000000
+0200
@@ -3,7 +3,7 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/cgi/query.cgi
new/viewvc-1.1.24/bin/cgi/query.cgi
--- old/viewvc-1.1.23/bin/cgi/query.cgi 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/bin/cgi/query.cgi 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/cgi/viewvc.cgi
new/viewvc-1.1.24/bin/cgi/viewvc.cgi
--- old/viewvc-1.1.23/bin/cgi/viewvc.cgi 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/cgi/viewvc.cgi 2015-10-02 19:40:19.000000000
+0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/cvsdbadmin
new/viewvc-1.1.24/bin/cvsdbadmin
--- old/viewvc-1.1.23/bin/cvsdbadmin 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/bin/cvsdbadmin 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/loginfo-handler
new/viewvc-1.1.24/bin/loginfo-handler
--- old/viewvc-1.1.23/bin/loginfo-handler 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/loginfo-handler 2015-10-02 19:40:19.000000000
+0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/make-database
new/viewvc-1.1.24/bin/make-database
--- old/viewvc-1.1.23/bin/make-database 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/bin/make-database 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/mod_python/handler.py
new/viewvc-1.1.24/bin/mod_python/handler.py
--- old/viewvc-1.1.23/bin/mod_python/handler.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/mod_python/handler.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/mod_python/query.py
new/viewvc-1.1.24/bin/mod_python/query.py
--- old/viewvc-1.1.23/bin/mod_python/query.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/mod_python/query.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/mod_python/viewvc.py
new/viewvc-1.1.24/bin/mod_python/viewvc.py
--- old/viewvc-1.1.23/bin/mod_python/viewvc.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/mod_python/viewvc.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/standalone.py
new/viewvc-1.1.24/bin/standalone.py
--- old/viewvc-1.1.23/bin/standalone.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/bin/standalone.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
@@ -17,7 +17,7 @@
__author__ = "Peter Funk <p...@artcom-gmbh.de>"
__date__ = "11 November 2001"
-__version__ = "$Revision: 2937 $"
+__version__ = "$Revision: 2976 $"
__credits__ = """Guido van Rossum, for an excellent programming language.
Greg Stein, for writing ViewCVS in the first place.
Ka-Ping Yee, for the GUI code and the framework stolen from pydoc.py.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/svndbadmin
new/viewvc-1.1.24/bin/svndbadmin
--- old/viewvc-1.1.23/bin/svndbadmin 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/bin/svndbadmin 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 2004-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2004-2015 The ViewCVS Group. All Rights Reserved.
# Copyright (C) 2004-2007 James Henstridge
#
# By using this file, you agree to the terms and conditions set forth in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/wsgi/query.fcgi
new/viewvc-1.1.24/bin/wsgi/query.fcgi
--- old/viewvc-1.1.23/bin/wsgi/query.fcgi 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/wsgi/query.fcgi 2015-10-02 19:40:19.000000000
+0200
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/wsgi/query.wsgi
new/viewvc-1.1.24/bin/wsgi/query.wsgi
--- old/viewvc-1.1.23/bin/wsgi/query.wsgi 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/wsgi/query.wsgi 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/wsgi/viewvc.fcgi
new/viewvc-1.1.24/bin/wsgi/viewvc.fcgi
--- old/viewvc-1.1.23/bin/wsgi/viewvc.fcgi 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/wsgi/viewvc.fcgi 2015-10-02 19:40:19.000000000
+0200
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/bin/wsgi/viewvc.wsgi
new/viewvc-1.1.24/bin/wsgi/viewvc.wsgi
--- old/viewvc-1.1.23/bin/wsgi/viewvc.wsgi 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/bin/wsgi/viewvc.wsgi 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/conf/viewvc.conf.dist
new/viewvc-1.1.24/conf/viewvc.conf.dist
--- old/viewvc-1.1.23/conf/viewvc.conf.dist 2014-05-07 17:06:36.000000000
+0200
+++ new/viewvc-1.1.24/conf/viewvc.conf.dist 2015-03-02 21:16:05.000000000
+0100
@@ -156,6 +156,20 @@
##
#root_parents =
+## renamed_roots: Specifies a mapping between the old names of version control
+## roots/repositories and their current names.
+##
+## When the name of a CVS or Subversion root has been changed (e.g. the project
+## name has been changed), existing external links to views of that root will
+## cease to resolve. This mapping causes ViewVC to continue to recognize the
+## previous root name and automatically redirect the web browser to the
appropriate
+## location in the renamed root.
+##
+## Example:
+## renamed_roots = old_root_name: new_root_name,
+## backrub: google,
+#renamed_roots =
+
## default_root: This is the name of the default root. Valid names
## include those explicitly listed in the cvs_roots and svn_roots
## configuration options, as well as those implicitly indicated by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/accept.py
new/viewvc-1.1.24/lib/accept.py
--- old/viewvc-1.1.23/lib/accept.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/accept.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/blame.py
new/viewvc-1.1.24/lib/blame.py
--- old/viewvc-1.1.23/lib/blame.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/blame.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
# Copyright (C) 2000 Curt Hagenlocher <c...@hagenlocher.org>
#
# By using this file, you agree to the terms and conditions set forth in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/compat.py
new/viewvc-1.1.24/lib/compat.py
--- old/viewvc-1.1.23/lib/compat.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/compat.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/config.py
new/viewvc-1.1.24/lib/config.py
--- old/viewvc-1.1.23/lib/config.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/config.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
@@ -120,6 +120,7 @@
'mime_types_files',
'root_parents',
'svn_roots',
+ 'renamed_roots',
)
_allowed_overrides = {
# Mapping of override types to allowed overridable sections.
@@ -218,7 +219,7 @@
### FIXME: This feels like unnecessary depth of knowledge for a
### semi-generic configuration object.
- if opt == 'cvs_roots' or opt == 'svn_roots':
+ if opt == 'cvs_roots' or opt == 'svn_roots' or opt == 'renamed_roots':
value = _parse_roots(opt, value)
setattr(sc, opt, value)
@@ -379,6 +380,7 @@
self.general.cvs_roots = { }
self.general.svn_roots = { }
+ self.general.renamed_roots = { }
self.general.root_parents = []
self.general.default_root = ''
self.general.mime_types_files = ["mimetypes.conf"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/cvsdb.py
new/viewvc-1.1.24/lib/cvsdb.py
--- old/viewvc-1.1.23/lib/cvsdb.py 2014-10-30 21:23:10.000000000 +0100
+++ new/viewvc-1.1.24/lib/cvsdb.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/dbi.py new/viewvc-1.1.24/lib/dbi.py
--- old/viewvc-1.1.23/lib/dbi.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/dbi.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/debug.py
new/viewvc-1.1.24/lib/debug.py
--- old/viewvc-1.1.23/lib/debug.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/debug.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/idiff.py
new/viewvc-1.1.24/lib/idiff.py
--- old/viewvc-1.1.23/lib/idiff.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/idiff.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/popen.py
new/viewvc-1.1.24/lib/popen.py
--- old/viewvc-1.1.23/lib/popen.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/popen.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/query.py
new/viewvc-1.1.24/lib/query.py
--- old/viewvc-1.1.23/lib/query.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/query.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/sapi.py
new/viewvc-1.1.24/lib/sapi.py
--- old/viewvc-1.1.23/lib/sapi.py 2014-11-04 20:02:31.000000000 +0100
+++ new/viewvc-1.1.24/lib/sapi.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vcauth/__init__.py
new/viewvc-1.1.24/lib/vcauth/__init__.py
--- old/viewvc-1.1.23/lib/vcauth/__init__.py 2014-05-07 17:06:36.000000000
+0200
+++ new/viewvc-1.1.24/lib/vcauth/__init__.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 2006-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2006-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vcauth/forbidden/__init__.py
new/viewvc-1.1.24/lib/vcauth/forbidden/__init__.py
--- old/viewvc-1.1.23/lib/vcauth/forbidden/__init__.py 2014-05-07
17:06:36.000000000 +0200
+++ new/viewvc-1.1.24/lib/vcauth/forbidden/__init__.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 2006-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2006-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vcauth/forbiddenre/__init__.py
new/viewvc-1.1.24/lib/vcauth/forbiddenre/__init__.py
--- old/viewvc-1.1.23/lib/vcauth/forbiddenre/__init__.py 2014-05-07
17:06:36.000000000 +0200
+++ new/viewvc-1.1.24/lib/vcauth/forbiddenre/__init__.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 2008-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2008-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vcauth/svnauthz/__init__.py
new/viewvc-1.1.24/lib/vcauth/svnauthz/__init__.py
--- old/viewvc-1.1.23/lib/vcauth/svnauthz/__init__.py 2014-05-07
17:06:36.000000000 +0200
+++ new/viewvc-1.1.24/lib/vcauth/svnauthz/__init__.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 2006-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 2006-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/__init__.py
new/viewvc-1.1.24/lib/vclib/__init__.py
--- old/viewvc-1.1.23/lib/vclib/__init__.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/lib/vclib/__init__.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/__init__.py
new/viewvc-1.1.24/lib/vclib/ccvs/__init__.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/__init__.py 2014-05-02
17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/__init__.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/bincvs.py
new/viewvc-1.1.24/lib/vclib/ccvs/bincvs.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/bincvs.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/bincvs.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/blame.py
new/viewvc-1.1.24/lib/vclib/ccvs/blame.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/blame.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/blame.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
# Copyright (C) 2000 Curt Hagenlocher <c...@hagenlocher.org>
#
# By using this file, you agree to the terms and conditions set forth in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/ccvs.py
new/viewvc-1.1.24/lib/vclib/ccvs/ccvs.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/ccvs.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/ccvs.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/__init__.py
new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/__init__.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/__init__.py 2014-05-02
17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/__init__.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/common.py
new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/common.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/common.py 2014-05-02
17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/common.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/debug.py
new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/debug.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/debug.py 2014-05-02
17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/debug.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/default.py
new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/default.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/default.py 2014-05-02
17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/default.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
@@ -87,6 +87,10 @@
# we stopped at the end of the buffer, so we may have a partial token
buf = self.rcsfile.read(self.CHUNK_SIZE)
+ if buf == '':
+ # signal EOF by returning None as the token
+ del self.buf # so we fail if get() is called again
+ return None
lbuf = len(buf)
idx = end = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/texttools.py
new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/texttools.py
--- old/viewvc-1.1.23/lib/vclib/ccvs/rcsparse/texttools.py 2014-05-02
17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/vclib/ccvs/rcsparse/texttools.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/svn/__init__.py
new/viewvc-1.1.24/lib/vclib/svn/__init__.py
--- old/viewvc-1.1.23/lib/vclib/svn/__init__.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/lib/vclib/svn/__init__.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/svn/svn_ra.py
new/viewvc-1.1.24/lib/vclib/svn/svn_ra.py
--- old/viewvc-1.1.23/lib/vclib/svn/svn_ra.py 2014-05-02 17:01:43.000000000
+0200
+++ new/viewvc-1.1.24/lib/vclib/svn/svn_ra.py 2015-10-02 19:40:19.000000000
+0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/vclib/svn/svn_repos.py
new/viewvc-1.1.24/lib/vclib/svn/svn_repos.py
--- old/viewvc-1.1.23/lib/vclib/svn/svn_repos.py 2014-05-02
17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/vclib/svn/svn_repos.py 2015-10-02
19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/viewvc.py
new/viewvc-1.1.24/lib/viewvc.py
--- old/viewvc-1.1.23/lib/viewvc.py 2014-11-05 01:16:15.000000000 +0100
+++ new/viewvc-1.1.24/lib/viewvc.py 2015-10-02 19:57:00.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
@@ -14,7 +14,7 @@
#
# -----------------------------------------------------------------------
-__version__ = '1.1.23'
+__version__ = '1.1.24'
# this comes from our library; measure the startup time
import debug
@@ -220,6 +220,12 @@
elif cfg.options.root_as_url_component:
needs_redirect = 1
+ # Take care of old-new roots mapping
+ for old_root, new_root in cfg.general.renamed_roots.items():
+ if self.rootname == old_root:
+ self.rootname = new_root
+ needs_redirect = 1
+
self.where = _path_join(path_parts)
self.path_parts = path_parts
@@ -1859,9 +1865,9 @@
if cfg.options.iso8601_timestamps:
if cfg.options.use_localtime:
if tm[8] and time.daylight:
- tz = time.altzone
+ tz = -time.altzone
else:
- tz = time.timezone
+ tz = -time.timezone
tz = float(tz) / 3600.0
tz = string.replace(str.format('{0:+06.2f}', tz), '.', ':')
else:
@@ -2864,7 +2870,7 @@
'rev_selected' : selected_rev,
'diff_format' : diff_format,
'logsort' : logsort,
- 'human_readable' : ezt.boolean(diff_format in ('h', 'l')),
+ 'human_readable' : ezt.boolean(diff_format in ('f', 'h', 'l')),
'log_pagestart' : None,
'log_paging_action' : None,
'log_paging_hidden_values' : [],
@@ -3526,8 +3532,9 @@
raise debug.ViewVCException('Diff format %s not understood'
% format, '400 Bad Request')
- if human_readable:
+ if human_readable or format == 'u':
diff_options['funout'] = cfg.options.hr_funout
+ if human_readable:
diff_options['ignore_white'] = cfg.options.hr_ignore_white
diff_options['ignore_keyword_subst'] = cfg.options.hr_ignore_keyword_subst
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/lib/win32popen.py
new/viewvc-1.1.24/lib/win32popen.py
--- old/viewvc-1.1.23/lib/win32popen.py 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/lib/win32popen.py 2015-10-02 19:40:19.000000000 +0200
@@ -1,6 +1,6 @@
# -*-python-*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.23/viewvc-install
new/viewvc-1.1.24/viewvc-install
--- old/viewvc-1.1.23/viewvc-install 2014-05-02 17:01:43.000000000 +0200
+++ new/viewvc-1.1.24/viewvc-install 2015-10-02 19:40:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- Mode: python -*-
#
-# Copyright (C) 1999-2014 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2015 The ViewCVS Group. All Rights Reserved.
#
# By using this file, you agree to the terms and conditions set forth in
# the LICENSE.html file which can be found at the top level of the ViewVC
@@ -414,7 +414,7 @@
if opt == '--clean-mode':
arg = arg.lower()
if arg not in ('true', 'false'):
- usage_and_exit("Invalid value for --overwrite parameter.")
+ usage_and_exit("Invalid value for --clean-mode parameter.")
CLEAN_MODE = arg
# Print the header greeting.
