cleanup: fix whitespace in CONTRIBUTORS (and other forgotten files) too

CONTRIBUTORS

@@ -1,80 +1,80 b''
 List of contributors to Kallithea project:
     Marcin Kuźmiński <[e-mail]>
     Lukasz Balcerzak <[e-mail]>
     Jason Harris <[e-mail]>
     Thayne Harbaugh  <[e-mail]>
     cejones <>
     Thomas Waldmann <[e-mail]>
     Lorenzo M. Catucci <[e-mail]>
     Dmitri Kuznetsov <>
     Jared Bunting <[e-mail]>
     Steve Romanow <[e-mail]>
-    Augosto Hermann <[e-mail]>    
-    Ankit Solanki <[e-mail]>    
+    Augosto Hermann <[e-mail]>
+    Ankit Solanki <[e-mail]>
     Liad Shani <[e-mail]>
     Les Peabody <[e-mail]>
     Jonas Oberschweiber <[e-mail]>
     Matt Zuba <[e-mail]>
     Aras Pranckevicius <[e-mail]>
     Tony Bussieres <[e-mail]>
     Erwin Kroon <[e-mail]>
     nansenat16 <[e-mail]>
     Vincent Duvert <[e-mail]>
     Takumi IINO <[e-mail]>
     Indra Talip <[e-mail]>
     James Rhodes <[e-mail]>
     Dominik Ruf <[e-mail]>
     xpol <[e-mail]>
     Vincent Caron <[e-mail]>
     Zachary Auclair <[e-mail]>
     Stefan Engel <[e-mail]>
     Andrew Shadura <[e-mail]>
     Raoul Thill <[e-mail]>
     Philip Jameson <[e-mail]>
     Mads Kiilerich <[e-mail]>
     Dan Sheridan <[e-mail]>
     Dennis Brakhane <[e-mail]>
     Simon Lopez <[e-mail]>
     Jonathan Sternberg <[e-mail]>
     Grzegorz Rożniecki <[e-mail]>
     Andrew Kesterson <[e-mail]>
     David A. Sjøen <[e-mail]>
     Jelmer Vernooij <[e-mail]>
     larikale
     SteveCohen
     RhodeCode GmbH
     Sebastian Kreutzberger <[e-mail]>
     thomas <[e-mail]>
     Bradley M. Kuhn <[e-mail]>
     Sean Farley <[e-mail]>
     Martin Vium <[e-mail]>
     Daniel Anderson <[e-mail]>
     Travis Burtrum <[e-mail]>
     Calinou <[e-mail]>
     Christian Oyarzun <[e-mail]>
     Denis Blanchette <[e-mail]>
     duanhongyi <[e-mail]>
     Henrik Stuart <[e-mail]>
     Ingo von Borstel <[e-mail]>
     Jan Heylen <[e-mail]>
     Jim Hague <[e-mail]>
     Joseph Rivera <[e-mail]>
     Kazunari Kobayashi <[e-mail]>
     Matt Fellows <[e-mail]>
     Max Roman <[e-mail]>
     Michael Pohl <[e-mail]>
     Michael V. DePalatis <[e-mail]>
     Michal Čihař <[e-mail]>
     Morten Skaaning <[e-mail]>
     Na'Tosha Bard <[e-mail]>
     Nick High <[e-mail]>
     Niemand Jedermann <[e-mail]>
     Peter Vitt <[e-mail]>
     Sam Jaques <[e-mail]>
     Thomas De Schampheleire <[e-mail]>
     Tuux <[e-mail]>
     Zoltan Gyarmati <[e-mail]>
     Kevin Bullock <[e-mail]>
     Marc Villetard <[e-mail]>
     Matthias Zilk <[e-mail]>
     Tim Freund <[e-mail]>

LICENSE.md

@@ -1,274 +1,274 b''
 Kallithea License
 =================
 
 Kallithea as a whole is copyrighted by various authors and is licensed under
 the terms of the GNU General Public License, version 3 (GPLv3), which is a
 license published by the Free Software Foundation,
 Inc. [A copy of GPLv3](/COPYING) is included herein.
 
 Some individual files have copyright notices and those who offer changes to
 those files should update the copyright notices in those specific files if
 they so chose.
 
 However, the definitive list of copyright holders for this project is kept in
 [the about page template](kallithea/templates/about.html) so that it is
 displayed appropriately when Kallithea is installed.  This is the most
-important place to update copyright notices. 
+important place to update copyright notices.
 
 Third-Party Code Incorporated in Kallithea
 ==========================================
 
 Various third-party code under GPLv3-compatible licenses is included as part
 of Kallithea.
 
 
 
 Bootstrap
 ---------
 
 Kallithea incorporates parts of the Javascript system called
 [Bootstrap](http://getbootstrap.com/), which is:
 
 Copyright © 2012 Twitter, Inc.
 
 and licensed under
 [the Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
 
 A copy of the Apache License 2.0 is also included in this distribution in its
 entirety in the file Apache-License-2.0.txt
 
 
 
 Codemirror
 ----------
 
 Kallithea incorporates parts of the Javascript system called
 [Codemirror](http://codemirror.net/), version 4.7.0, which is primarily:
 
 Copyright &copy; 2013-2014 by Marijn Haverbeke <[e-mail]>
 
 and licensed under the MIT-permissive license, which is
 [included in this distribution](MIT-Permissive-License.txt).
 
 Additional files from upstream Codemirror are copyrighted by various authors
 and licensed under other permissive licenses.  The sub-directories under
 [.../public/codemirror](kallithea/public/codemirror) include the copyright and
 license notice and information as they appeared in Codemirror's upstream
 release.
 
 
 
 jQuery
 ------
 
 Kallithea incorporates the Javascript system called
 [jQuery](http://jquery.org/),
 [herein](kallithea/public/js/jquery-1.11.1.min.js), and the Corresponding
 Source can be found in https://github.com/jquery/jquery at tag 1.11.1
 (mirrored at https://kallithea-scm.org/repos/mirror/jquery/files/1.11.1/ ).
 
 It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an
 [MIT-permissive license](MIT-Permissive-License.txt).
 
 
 
 Mousetrap
 ---------
 
 Kallithea incorporates parts of the Javascript system called
 [Mousetrap](http://craig.is/killing/mice/), which is:
 
    Copyright 2013 Craig Campbell
 
 and licensed under
 [the Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
 
 A [copy of the Apache License 2.0](Apache-License-2.0.txt) is also included
 in this distribution.
 
 
 
 Mergely
 -------
 
 Kallithea incorporates some code from the Javascript system called
 [Mergely](http://www.mergely.com/), version 3.3.9.
 [Mergely's license](http://www.mergely.com/license.php), a
 [copy of which is included in this repository](LICENSE-MERGELY.html),
 is (GPL|LGPL|MPL).  Kallithea as GPLv3'd project chooses the GPL arm of that
 tri-license.
 
 
 
 Select2
 -------
 
 Kallithea incorporates parts of the Javascript system called
 [Select2](http://ivaynberg.github.io/select2/), which is:
 
 Copyright 2012 Igor Vaynberg (and probably others)
 
 and is licensed [under the following license](https://github.com/ivaynberg/select2/blob/master/LICENSE):
 
 > This software is licensed under the Apache License, Version 2.0 (the
 > "Apache License") or the GNU General Public License version 2 (the "GPL
 > License"). You may choose either license to govern your use of this
 > software only upon the condition that you accept all of the terms of either
 > the Apache License or the GPL License.
 
 A [copy of the Apache License 2.0](Apache-License-2.0.txt) is also included
 in this distribution.
 
 Kallithea will take the Apache license fork of the dual license, since
 Kallithea is GPLv3'd.
 
 
 
 Select2-Bootstrap-CSS
 ---------------------
 
 Kallithea incorporates some CSS from a system called
 [Select2-bootstrap-css](https://github.com/t0m/select2-bootstrap-css), which
 is:
 
 Copyright &copy; 2013 Tom Terrace (and likely others)
 
 and licensed under the MIT-permissive license, which is
 [included in this distribution](MIT-Permissive-License.txt).
 
 
 
 History.js
 ----------
 
 Kallithea incorporates some CSS from a system called History.js, which is
 
 Copyright 2010-2011 Benjamin Arthur Lupton <[e-mail]>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice,
    this list of conditions and the following disclaimer.
 
 2. Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 
 
 YUI
 ---
 
 Kallithea incorporates parts of the Javascript system called
 [YUI 2 — Yahoo! User Interface Library](http://yui.github.io/yui2/docs/yui_2.9.0_full/),
 which is made available under the [BSD License](http://yuilibrary.com/license/):
 
 Copyright &copy; 2013 Yahoo! Inc. All rights reserved.
 
 Redistribution and use of this software in source and binary forms, with or
 without modification, are permitted provided that the following conditions are
 met:
 
 * Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
 
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
 * Neither the name of Yahoo! Inc. nor the names of YUI's contributors may be
   used to endorse or promote products derived from this software without
   specific prior written permission of Yahoo! Inc.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 Kallithea includes a minified version of YUI 2.9. To build yui.2.9.js:
 
     git clone https://github.com/yui/builder
     git clone https://github.com/yui/yui2
     cd yui2/
     git checkout hudson-yui2-2800
     ln -sf JumpToPageDropDown.js src/paginator/js/JumpToPageDropdown.js # work around inconsistent casing
     rm -f tmp.js
     for m in yahoo event dom connection animation dragdrop element datasource autocomplete container event-delegate json datatable paginator; do
       rm -f build/\$m/\$m.js
       ( cd src/\$m && ant build deploybuild ) && sed -e 's,@VERSION@,2.9.0,g' -e 's,@BUILD@,2800,g' build/\$m/\$m.js >> tmp.js
     done
     java -jar ../builder/componentbuild/lib/yuicompressor/yuicompressor-2.4.4.jar tmp.js -o yui.2.9.js
 
 In compliance with GPLv3 the Corresponding Source for this Object Code is made
 available on
 [https://kallithea-scm.org/repos/mirror](https://kallithea-scm.org/repos/mirror).
 
 
 
 Flot
 ----
 
 Kallithea incorporates some CSS from a system called
 [Flot](http://code.google.com/p/flot/), which is:
 
 Copyright 2006 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 
 A [copy of the Apache License 2.0](Apache-License-2.0.txt) is also included
 in this distribution.
 
 
 
 Migrate
 -------
 
 Kallithea incorporates in kallithea/lib/dbmigrate/migrate parts of the Python
 system called [Migrate or sqlalchemy-migrate](https://github.com/stackforge/sqlalchemy-migrate),
 which is:
 
 Copyright (c) 2009 Evan Rosson, Jan Dittberner, Domen Kožar
 
 and licensed under the MIT-permissive license, which is
 [included in this distribution](MIT-Permissive-License.txt).
 
 
 Icon fonts
 ----------
 
 Kallithea incorporates subsets of both
 [Font Awesome](http://fontawesome.io) and
 [GitHub Octicons](https://octicons.github.com) for icons. Font Awesome is:
 
 Copyright (c) 2012, Dave Gandy
 
 Octicons is:
 
 Copyright (c) 2012-2014 GitHub
 
 These two sets are distributed under [SIL OFL 1.1](http://scripts.sil.org/OFL)
 and have been combined into one font called "kallithea."
 
 
 EOF

kallithea/lib/dbmigrate/migrate.cfg

@@ -1,20 +1,20 b''
 [db_settings]
 # Used to identify which repository this database is versioned under.
 # You can use the name of your project.
 repository_id=kallithea_db_migrations
 
 # The name of the database table used to track the schema version.
 # This name shouldn't already be used by your project.
-# If this is changed once a database is under version control, you'll need to 
-# change the table name in each database too. 
+# If this is changed once a database is under version control, you'll need to
+# change the table name in each database too.
 version_table=db_migrate_version
 
-# When committing a change script, Migrate will attempt to generate the 
+# When committing a change script, Migrate will attempt to generate the
 # sql for all supported databases; normally, if one of them fails - probably
-# because you don't have that database installed - it is ignored and the 
-# commit continues, perhaps ending successfully. 
-# Databases in this list MUST compile successfully during a commit, or the 
-# entire commit will fail. List the databases your application will actually 
+# because you don't have that database installed - it is ignored and the
+# commit continues, perhaps ending successfully.
+# Databases in this list MUST compile successfully during a commit, or the
+# entire commit will fail. List the databases your application will actually
 # be using to ensure your updates to that database work properly.
 # This must be a list; example: ['postgres','sqlite']
 required_dbs=['sqlite']

kallithea/lib/dbmigrate/migrate/versioning/templates/repository/default/migrate.cfg

@@ -1,25 +1,25 b''
 [db_settings]
 # Used to identify which repository this database is versioned under.
 # You can use the name of your project.
 repository_id={{ locals().pop('repository_id') }}
 
 # The name of the database table used to track the schema version.
 # This name shouldn't already be used by your project.
-# If this is changed once a database is under version control, you'll need to 
-# change the table name in each database too. 
+# If this is changed once a database is under version control, you'll need to
+# change the table name in each database too.
 version_table={{ locals().pop('version_table') }}
 
-# When committing a change script, Migrate will attempt to generate the 
+# When committing a change script, Migrate will attempt to generate the
 # sql for all supported databases; normally, if one of them fails - probably
-# because you don't have that database installed - it is ignored and the 
-# commit continues, perhaps ending successfully. 
-# Databases in this list MUST compile successfully during a commit, or the 
-# entire commit will fail. List the databases your application will actually 
+# because you don't have that database installed - it is ignored and the
+# commit continues, perhaps ending successfully.
+# Databases in this list MUST compile successfully during a commit, or the
+# entire commit will fail. List the databases your application will actually
 # be using to ensure your updates to that database work properly.
 # This must be a list; example: ['postgres','sqlite']
 required_dbs={{ locals().pop('required_dbs') }}
 
 # When creating new change scripts, Migrate will stamp the new script with
 # a version number. By default this is latest_version + 1. You can set this
 # to 'true' to tell Migrate to use the UTC timestamp instead.
-use_timestamp_numbering='false'
  No newline at end of file
+use_timestamp_numbering='false'

kallithea/lib/dbmigrate/migrate/versioning/templates/repository/pylons/migrate.cfg

@@ -1,20 +1,20 b''
 [db_settings]
 # Used to identify which repository this database is versioned under.
 # You can use the name of your project.
 repository_id={{ locals().pop('repository_id') }}
 
 # The name of the database table used to track the schema version.
 # This name shouldn't already be used by your project.
-# If this is changed once a database is under version control, you'll need to 
-# change the table name in each database too. 
+# If this is changed once a database is under version control, you'll need to
+# change the table name in each database too.
 version_table={{ locals().pop('version_table') }}
 
-# When committing a change script, Migrate will attempt to generate the 
+# When committing a change script, Migrate will attempt to generate the
 # sql for all supported databases; normally, if one of them fails - probably
-# because you don't have that database installed - it is ignored and the 
-# commit continues, perhaps ending successfully. 
-# Databases in this list MUST compile successfully during a commit, or the 
-# entire commit will fail. List the databases your application will actually 
+# because you don't have that database installed - it is ignored and the
+# commit continues, perhaps ending successfully.
+# Databases in this list MUST compile successfully during a commit, or the
+# entire commit will fail. List the databases your application will actually
 # be using to ensure your updates to that database work properly.
 # This must be a list; example: ['postgres','sqlite']
 required_dbs={{ locals().pop('required_dbs') }}

setup.cfg

@@ -1,53 +1,53 b''
 [egg_info]
-tag_build = 
+tag_build =
 tag_svn_revision = 0
 tag_date = 0
 
 [nosetests]
 verbose = True
 verbosity = 2
 with-pylons = test.ini
 detailed-errors = 1
 nologcapture = 1
 
 [pytest]
 # only look for tests in kallithea/tests
 python_files = kallithea/tests/**/test_*.py
 addopts =
     # --verbose
     # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings.
     -rfEsxXw
     # Shorter scrollbacks; less stuff to scroll through
     --tb=short
 
 [compile_catalog]
 domain = kallithea
 directory = kallithea/i18n
 statistics = true
 
 [extract_messages]
 add_comments = TRANSLATORS:
 output_file = kallithea/i18n/kallithea.pot
 msgid-bugs-address = [e-mail]
 copyright-holder = Various authors, licensing as GPLv3
 no-wrap = true
 
 [init_catalog]
 domain = kallithea
 input_file = kallithea/i18n/kallithea.pot
 output_dir = kallithea/i18n
 
 [update_catalog]
 domain = kallithea
 input_file = kallithea/i18n/kallithea.pot
 output_dir = kallithea/i18n
 previous = true
 
 [build_sphinx]
 source-dir = docs/
 build-dir = docs/_build
 all_files = 1
 
 [upload_sphinx]
 upload-dir = docs/_build/html
 

whitespacecleanup.sh

@@ -1,20 +1,21 b''
 #!/bin/bash -x
 
 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
 
-files=`hg loc '*.py' '*.html' '*.css' '*.rst' '*.txt' '*.js' | egrep -v '/lockfiles.py|LICENSE-MERGELY.html|/codemirror/|/fontello/|(graph|mergely|native.history|select2/select2|yui.flot|yui.2.9)\.js$'`
+files=`hg loc '*.py' '*.html' '*.css' '*.rst' '*.txt' '*.js' '*.ini' '*.cfg' CONTRIBUTORS LICENSE.md| egrep -v '/lockfiles.py|LICENSE-MERGELY.html|/codemirror/|/fontello/|(graph|mergely|native.history|select2/select2|yui.flot|yui.2.9)\.js$'`
+
 sed -i -e "s,`printf '\t'`,    ,g" $files
 sed -i -e "s,  *$,,g" $files
 # ensure one trailing newline - remove empty last line and make last line include trailing newline:
 sed -i -e '$,${/^$/d}' -e '$a\' $files
 
 sed -i -e 's,\([^ /]\){,\1 {,g' `hg loc '*.css'`
 sed -i -e 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'`
 
 sed -i -e 's/^\(    [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css
 sed -i -e '1s|, |,|g' kallithea/public/css/{style,contextbar}.css
 sed -i -e 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css
 sed -i -e 's/^\([^ ,/].*\)   */\1 /g' kallithea/public/css/{style,contextbar}.css
 sed -i -e 's,^--$,-- ,g' kallithea/templates/email_templates/main.txt
 
 hg diff