Mercurial > kallithea
changeset 6370:e285bb7abb28
scripts: apply whitespace cleanup to more files - opt out instead of opt in
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 19 Dec 2016 04:46:48 +0100 |
parents | 1855b7b29d76 |
children | 16234f629cfb |
files | .travis.yml docs/images/.img docs/make.bat docs/theme/nature/static/nature.css_t init.d/celeryd-upstart.conf init.d/kallithea-daemon-arch init.d/kallithea-daemon-debian init.d/kallithea-daemon-gentoo init.d/kallithea-daemon-redhat init.d/kallithea-upstart.conf init.d/supervisord.conf kallithea/bin/ldap_sync.conf kallithea/tests/vcs/aconfig scripts/dbmigrate-test scripts/whitespacecleanup.sh |
diffstat | 14 files changed, 149 insertions(+), 153 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml Mon Dec 19 04:46:48 2016 +0100 +++ b/.travis.yml Mon Dec 19 04:46:48 2016 +0100 @@ -3,7 +3,7 @@ - "2.6" - "2.7" -env: +env: - TEST_DB=sqlite:////tmp/kallithea_test.sqlite - TEST_DB=mysql://root@127.0.0.1/kallithea_test - TEST_DB=postgresql://postgres@127.0.0.1/kallithea_test
--- a/docs/make.bat Mon Dec 19 04:46:48 2016 +0100 +++ b/docs/make.bat Mon Dec 19 04:46:48 2016 +0100 @@ -3,153 +3,153 @@ REM Command file for Sphinx documentation if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build + set SPHINXBUILD=sphinx-build ) set BUILDDIR=_build set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% ) if "%1" == "" goto help if "%1" == "help" ( - :help - echo.Please use `make ^<target^>` where ^<target^> is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. singlehtml to make a single large HTML file - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. devhelp to make HTML files and a Devhelp project - echo. epub to make an epub - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. text to make text files - echo. man to make manual pages - echo. changes to make an overview over all changed/added/deprecated items - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - goto end + :help + echo.Please use `make ^<target^>` where ^<target^> is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. singlehtml to make a single large HTML file + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. devhelp to make HTML files and a Devhelp project + echo. epub to make an epub + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. text to make text files + echo. man to make manual pages + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end ) if "%1" == "clean" ( - for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i - del /q /s %BUILDDIR%\* - goto end + for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i + del /q /s %BUILDDIR%\* + goto end ) if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/html. - goto end + %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/html. + goto end ) if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. - goto end + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. + goto end ) if "%1" == "singlehtml" ( - %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. - goto end + %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. + goto end ) if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle - echo. - echo.Build finished; now you can process the pickle files. - goto end + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle + echo. + echo.Build finished; now you can process the pickle files. + goto end ) if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json - echo. - echo.Build finished; now you can process the JSON files. - goto end + %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json + echo. + echo.Build finished; now you can process the JSON files. + goto end ) if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ .hhp project file in %BUILDDIR%/htmlhelp. - goto end + goto end ) if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ .qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Kallithea.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Kallithea.ghc - goto end + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Kallithea.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Kallithea.ghc + goto end ) if "%1" == "devhelp" ( - %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp - echo. - echo.Build finished. - goto end + %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp + echo. + echo.Build finished. + goto end ) if "%1" == "epub" ( - %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub - echo. - echo.Build finished. The epub file is in %BUILDDIR%/epub. - goto end + %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub + echo. + echo.Build finished. The epub file is in %BUILDDIR%/epub. + goto end ) if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - echo. - echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. - goto end + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + echo. + echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. + goto end ) if "%1" == "text" ( - %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text - echo. - echo.Build finished. The text files are in %BUILDDIR%/text. - goto end + %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text + echo. + echo.Build finished. The text files are in %BUILDDIR%/text. + goto end ) if "%1" == "man" ( - %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man - echo. - echo.Build finished. The manual pages are in %BUILDDIR%/man. - goto end + %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man + echo. + echo.Build finished. The manual pages are in %BUILDDIR%/man. + goto end ) if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes - echo. - echo.The overview file is in %BUILDDIR%/changes. - goto end + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes + echo. + echo.The overview file is in %BUILDDIR%/changes. + goto end ) if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck - echo. - echo.Link check complete; look for any errors in the above output ^ + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck + echo. + echo.Link check complete; look for any errors in the above output ^ or in %BUILDDIR%/linkcheck/output.txt. - goto end + goto end ) if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest - echo. - echo.Testing of doctests in the sources finished, look at the ^ + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest + echo. + echo.Testing of doctests in the sources finished, look at the ^ results in %BUILDDIR%/doctest/output.txt. - goto end + goto end ) :end
--- a/docs/theme/nature/static/nature.css_t Mon Dec 19 04:46:48 2016 +0100 +++ b/docs/theme/nature/static/nature.css_t Mon Dec 19 04:46:48 2016 +0100 @@ -2,11 +2,11 @@ * Sphinx stylesheet -- default theme * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - + @import url("basic.css"); - + /* -- page layout ----------------------------------------------------------- */ - + body { font-family: Arial, sans-serif; font-size: 100%; @@ -28,18 +28,18 @@ hr{ border: 1px solid #B1B4B6; } - + div.document { background-color: #eee; } - + div.body { background-color: #ffffff; color: #3E4349; padding: 0 30px 30px 30px; font-size: 0.8em; } - + div.footer { color: #555; width: 100%; @@ -47,12 +47,12 @@ text-align: center; font-size: 75%; } - + div.footer a { color: #444; text-decoration: underline; } - + div.related { background-color: #577632; line-height: 32px; @@ -60,11 +60,11 @@ text-shadow: 0px 1px 0 #444; font-size: 0.80em; } - + div.related a { color: #E2F3CC; } - + div.sphinxsidebar { font-size: 0.75em; line-height: 1.5em; @@ -73,7 +73,7 @@ div.sphinxsidebarwrapper{ padding: 20px 0; } - + div.sphinxsidebar h3, div.sphinxsidebar h4 { font-family: Arial, sans-serif; @@ -89,30 +89,29 @@ div.sphinxsidebar h4{ font-size: 1.1em; } - + div.sphinxsidebar h3 a { color: #444; } - - + div.sphinxsidebar p { color: #888; padding: 5px 20px; } - + div.sphinxsidebar p.topless { } - + div.sphinxsidebar ul { margin: 10px 20px; padding: 0; color: #000; } - + div.sphinxsidebar a { color: #444; } - + div.sphinxsidebar input { border: 1px solid #ccc; font-family: sans-serif; @@ -126,19 +125,19 @@ div.sphinxsidebar input[type=image] { border: 0; } - + /* -- body styles ----------------------------------------------------------- */ - + a { color: #005B81; text-decoration: none; } - + a:hover { color: #E32E00; text-decoration: underline; } - + div.body h1, div.body h2, div.body h3, @@ -153,30 +152,30 @@ padding: 5px 0 5px 10px; text-shadow: 0px 1px 0 white } - + div.body h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; } div.body h2 { font-size: 150%; background-color: #C8D5E3; } div.body h3 { font-size: 120%; background-color: #D8DEE3; } div.body h4 { font-size: 110%; background-color: #D8DEE3; } div.body h5 { font-size: 100%; background-color: #D8DEE3; } div.body h6 { font-size: 100%; background-color: #D8DEE3; } - + a.headerlink { color: #c60f0f; font-size: 0.8em; padding: 0 4px 0 4px; text-decoration: none; } - + a.headerlink:hover { background-color: #c60f0f; color: white; } - + div.body p, div.body dd, div.body li { line-height: 1.5em; } - + div.admonition p.admonition-title + p { display: inline; } @@ -189,29 +188,29 @@ background-color: #eee; border: 1px solid #ccc; } - + div.seealso { background-color: #ffc; border: 1px solid #ff6; } - + div.topic { background-color: #eee; } - + div.warning { background-color: #ffe4e4; border: 1px solid #f66; } - + p.admonition-title { display: inline; } - + p.admonition-title:after { content: ":"; } - + pre { padding: 10px; background-color: White; @@ -222,7 +221,7 @@ margin: 1.5em 0 1.5em 0; box-shadow: 1px 1px 1px #d8d8d8; } - + tt { background-color: #ecf0f3; color: #222;
--- a/init.d/celeryd-upstart.conf Mon Dec 19 04:46:48 2016 +0100 +++ b/init.d/celeryd-upstart.conf Mon Dec 19 04:46:48 2016 +0100 @@ -2,8 +2,8 @@ # Change variables/paths as necessary and place file /etc/init/celeryd.conf # start/stop/restart as normal upstart job (ie: $ start celeryd) -description "Celery for Kallithea Mercurial Server" -author "Matt Zuba <matt.zuba@goodwillaz.org" +description "Celery for Kallithea Mercurial Server" +author "Matt Zuba <matt.zuba@goodwillaz.org" start on starting kallithea stop on stopped kallithea
--- a/init.d/kallithea-daemon-arch Mon Dec 19 04:46:48 2016 +0100 +++ b/init.d/kallithea-daemon-arch Mon Dec 19 04:46:48 2016 +0100 @@ -47,7 +47,7 @@ ;; stop) stat_busy "Stopping $DAEMON" - [ -n "$PID" ] && kill $PID &>/dev/null + [ -n "$PID" ] && kill $PID &>/dev/null if [ $? = 0 ]; then rm_daemon $DAEMON stat_done @@ -67,4 +67,4 @@ ;; *) echo "usage: $0 {start|stop|restart|status}" -esac \ No newline at end of file +esac
--- a/init.d/kallithea-daemon-debian Mon Dec 19 04:46:48 2016 +0100 +++ b/init.d/kallithea-daemon-debian Mon Dec 19 04:46:48 2016 +0100 @@ -2,9 +2,9 @@ ######################################## #### THIS IS A DEBIAN INIT.D SCRIPT #### ######################################## - + ### BEGIN INIT INFO -# Provides: kallithea +# Provides: kallithea # Required-Start: $all # Required-Stop: $all # Default-Start: 2 3 4 5 @@ -12,29 +12,29 @@ # Short-Description: starts instance of kallithea # Description: starts instance of kallithea using start-stop-daemon ### END INIT INFO - + APP_NAME="kallithea" APP_HOMEDIR="opt" APP_PATH="/$APP_HOMEDIR/$APP_NAME" - + CONF_NAME="production.ini" - + PID_PATH="$APP_PATH/$APP_NAME.pid" LOG_PATH="$APP_PATH/$APP_NAME.log" - + PYTHON_PATH="/$APP_HOMEDIR/$APP_NAME-venv" - + RUN_AS="root" - + DAEMON="$PYTHON_PATH/bin/paster" - + DAEMON_OPTS="serve --daemon \ --user=$RUN_AS \ --group=$RUN_AS \ --pid-file=$PID_PATH \ --log-file=$LOG_PATH $APP_PATH/$CONF_NAME" - - + + start() { echo "Starting $APP_NAME" PYTHON_EGG_CACHE="/tmp" start-stop-daemon -d $APP_PATH \ @@ -43,18 +43,18 @@ --user $RUN_AS \ --exec $DAEMON -- $DAEMON_OPTS } - + stop() { echo "Stopping $APP_NAME" start-stop-daemon -d $APP_PATH \ --stop --quiet \ --pidfile $PID_PATH || echo "$APP_NAME - Not running!" - + if [ -f $PID_PATH ]; then rm $PID_PATH fi } - + status() { echo -n "Checking status of $APP_NAME ... " pid=`cat $PID_PATH` @@ -65,7 +65,7 @@ echo "NOT running" fi } - + case "$1" in status) status @@ -87,4 +87,4 @@ *) echo "Usage: $0 {start|stop|restart}" exit 1 -esac \ No newline at end of file +esac
--- a/init.d/kallithea-daemon-gentoo Mon Dec 19 04:46:48 2016 +0100 +++ b/init.d/kallithea-daemon-gentoo Mon Dec 19 04:46:48 2016 +0100 @@ -56,6 +56,6 @@ #stop() echo "sleep3" sleep 3 - + #start() }
--- a/init.d/kallithea-daemon-redhat Mon Dec 19 04:46:48 2016 +0100 +++ b/init.d/kallithea-daemon-redhat Mon Dec 19 04:46:48 2016 +0100 @@ -129,4 +129,4 @@ ;; esac -exit $RETVAL \ No newline at end of file +exit $RETVAL
--- a/init.d/kallithea-upstart.conf Mon Dec 19 04:46:48 2016 +0100 +++ b/init.d/kallithea-upstart.conf Mon Dec 19 04:46:48 2016 +0100 @@ -2,8 +2,8 @@ # Change variables/paths as necessary and place file /etc/init/kallithea.conf # start/stop/restart as normal upstart job (ie: $ start kallithea) -description "Kallithea Mercurial Server" -author "Matt Zuba <matt.zuba@goodwillaz.org" +description "Kallithea Mercurial Server" +author "Matt Zuba <matt.zuba@goodwillaz.org" start on (local-filesystems and runlevel [2345]) stop on runlevel [!2345] @@ -22,5 +22,5 @@ exec /var/hg/.virtualenvs/kallithea/bin/paster serve --user=$USER --group=$GROUP --pid-file=$PIDFILE --log-file=$LOGFILE $APPINI post-stop script - rm -f $PIDFILE + rm -f $PIDFILE end script
--- a/init.d/supervisord.conf Mon Dec 19 04:46:48 2016 +0100 +++ b/init.d/supervisord.conf Mon Dec 19 04:46:48 2016 +0100 @@ -47,5 +47,5 @@ directory=/srv/kallithea command = /srv/kallithea/venv/bin/paster serve my.ini process_name = %(program_name)s_%(process_num)04d -redirect_stderr=true -stdout_logfile=/%(here)s/kallithea.log +redirect_stderr=true +stdout_logfile=/%(here)s/kallithea.log
--- a/kallithea/bin/ldap_sync.conf Mon Dec 19 04:46:48 2016 +0100 +++ b/kallithea/bin/ldap_sync.conf Mon Dec 19 04:46:48 2016 +0100 @@ -8,4 +8,4 @@ ldap_key = XXXXXXXXX base_dn = dc=example,dc=com -sync_users = True \ No newline at end of file +sync_users = True
--- a/kallithea/tests/vcs/aconfig Mon Dec 19 04:46:48 2016 +0100 +++ b/kallithea/tests/vcs/aconfig Mon Dec 19 04:46:48 2016 +0100 @@ -7,4 +7,3 @@ [universal] foo = bar -
--- a/scripts/dbmigrate-test Mon Dec 19 04:46:48 2016 +0100 +++ b/scripts/dbmigrate-test Mon Dec 19 04:46:48 2016 +0100 @@ -119,4 +119,3 @@ announce "Upgrade complete, now at the shown Alembic revision:" alembic -c "$config_file" current -v ) -
--- a/scripts/whitespacecleanup.sh Mon Dec 19 04:46:48 2016 +0100 +++ b/scripts/whitespacecleanup.sh Mon Dec 19 04:46:48 2016 +0100 @@ -2,7 +2,7 @@ # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes -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|jquery.dataTables)\.js$|/email_templates/|/test_dump_html_mails.ref.html'` +files=`hg mani | egrep -v '/codemirror/|/fontello/|/email_templates/|(/lockfiles.py|^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history|select2/select2|yui.flot|yui.2.9|jquery.dataTables)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'` sed -i -e "s,`printf '\t'`, ,g" $files sed -i -e "s, *$,,g" $files @@ -17,7 +17,6 @@ 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 sed -i -e 's,[ ][ ]*$,,g' -e 's, , ,g' kallithea/public/js/graph.js hg mani | xargs chmod -x