kallithea Changeset - e285bb7abb28

Changeset - e285bb7abb28

Parent rev.

Child rev.

[Not reviewed]

default

1 14 0

Mads Kiilerich (mads) - 9 years ago 2016-12-19 04:46:48
mads@kiilerich.com

scripts: apply whitespace cleanup to more files - opt out instead of opt in

9 files changed with 5 insertions and 9 deletions:

docs/images/.img

del

docs/theme/nature/static/nature.css_t

init.d/kallithea-daemon-arch

init.d/kallithea-daemon-debian

init.d/kallithea-daemon-redhat

kallithea/bin/ldap_sync.conf

kallithea/tests/vcs/aconfig

scripts/dbmigrate-test

scripts/whitespacecleanup.sh

0 comments (0 inline, 0 general)

docs/images/.img

➞

Show inline comments

deleted file

docs/theme/nature/static/nature.css_t

➞

Show inline comments

@@ @@ -49,97 +49,96 @@ div.footer { @@
+}
 div.footer a {
     color: #444;
     text-decoration: underline;
+}
 div.related {
     background-color: #577632;
     line-height: 32px;
     color: #fff;
     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;
+}
 div.sphinxsidebarwrapper{
     padding: 20px 0;
+}
 div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
     font-family: Arial, sans-serif;
     color: #222;
     font-size: 1.2em;
     font-weight: normal;
     margin: 0;
     padding: 5px 10px;
     background-color: #ddd;
     text-shadow: 1px 1px 0 white
+}
 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;
     font-size: 1em;
+}
 div.sphinxsidebar input[type=text]{
     margin-left: 20px;
+}
 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,
 div.body h4,

init.d/kallithea-daemon-arch

➞

Show inline comments

@@ @@ -22,49 +22,49 @@ ARGS="serve --daemon \ @@
 --log-file=$LOG_FILE \
 $APP_PATH/$CONF_NAME"
 [ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
 if [[ -r $PID_FILE ]]; then
     read -r PID < "$PID_FILE"
     if [[ $PID && ! -d /proc/$PID ]]; then
         unset PID
         rm_daemon $DAEMON
     fi
 fi
 case "$1" in
 start)
     stat_busy "Starting $DAEMON"
     export HOME=$APP_PATH
     [ -z "$PID" ] && $APPL $ARGS &>/dev/null
     if [ $? = 0 ]; then
         add_daemon $DAEMON
         stat_done
     else
         stat_fail
         exit 1
     fi
     ;;
 stop)
     stat_busy "Stopping $DAEMON"
     [ -n "$PID" ] && kill $PID &>/dev/null
     if [ $? = 0 ]; then
         rm_daemon $DAEMON
         stat_done
     else
         stat_fail
         exit 1
     fi
     ;;
 restart)
     $0 stop
     sleep 1
     $0 start
     ;;
 status)
     stat_busy "Checking $name status";
     ck_status $name
     ;;
 *)
     echo "usage: $0 {start|stop|restart|status}"
 esac
@@ \ No newline at end of file @@
 esac

init.d/kallithea-daemon-debian

➞

Show inline comments

@@ @@ -42,49 +42,49 @@ start() { @@
       --pidfile $PID_PATH \
       --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`
   status=`ps ax | grep $pid | grep -ve grep`
   if [ "$?" -eq 0 ]; then
     echo "running"
   else
     echo "NOT running"
   fi
+}
 case "$1" in
   status)
    status
     ;;
   start)
     start
     ;;
   stop)
     stop
     ;;
   restart)
     echo "Restarting $APP_NAME"
     ### stop ###
     stop
     wait
     ### start ###
     start
     ;;
   *)
     echo "Usage: $0 {start|stop|restart}"
     exit 1
 esac
@@ \ No newline at end of file @@
 esac

init.d/kallithea-daemon-redhat

➞

Show inline comments

@@ @@ -84,49 +84,49 @@ stop_kallithea () { @@
 status_kallithea() {
   if [ -e $LOCK_FILE ]; then
     # exit with non-zero to indicate failure
     RETVAL=1
   else
     RETVAL=0
   fi
   return $RETVAL
+}
 restart_kallithea () {
     stop_kallithea
     start_kallithea
     RETVAL=$?
+}
 case "$1" in
   start)
     echo -n $"Starting $DESC: "
     start_kallithea
     echo
     ;;
   stop)
     echo -n $"Stopping $DESC: "
     stop_kallithea
     echo
     ;;
   status)
     status_kallithea
     RETVAL=$?
     if [ ! $RETVAL -eq 0 ]; then
       echo "Kallithea server is running..."
     else
       echo "Kallithea server is stopped."
     fi
     ;;
   restart)
     echo -n $"Restarting $DESC: "
     restart_kallithea
     echo
     ;;
   *)
     echo $"Usage: $0 {start|stop|restart|status}"
     RETVAL=1
     ;;
 esac
 exit $RETVAL
@@ \ No newline at end of file @@
 exit $RETVAL

kallithea/bin/ldap_sync.conf

➞

Show inline comments

 [default]
 api_url = http://kallithea.example.com/_admin/api
 api_user = admin
 api_key = XXXXXXXXXXXX
 ldap_uri = ldap://ldap.example.com:389
 ldap_user = cn=kallithea,dc=example,dc=com
 ldap_key = XXXXXXXXX
 base_dn = dc=example,dc=com
 sync_users = True
@@ \ No newline at end of file @@
 sync_users = True

kallithea/tests/vcs/aconfig

➞

Show inline comments

 [user]
 name = Foo Bar
 email = foo.bar@example.com
 [ui]
 username = Foo Bar foo.bar@example.com
 [universal]
 foo = bar

scripts/dbmigrate-test

➞

Show inline comments

@@ @@ -74,49 +74,48 @@ Upgrade to: $to_rev_hash (${to_rev:- @@
 Extra packages: ${EXTRA:-(none)}
 EOD
 mkdir "$temp/repos" # empty
 # Enable caching for old pip versions (this will cache the pip upgrade)
 # Newer pip versions cache automatically, and don't use this variable.
 if [ ! "$PIP_DOWNLOAD_CACHE" ]; then
     export PIP_DOWNLOAD_CACHE=$HOME/.cache/pip/legacy
 fi
 install_kallithea() {
     local prefix=$1
     local rev=$2
     announce "Installing Kallithea $rev in $prefix..."
     "${VIRTUALENV:-virtualenv}" --quiet "$prefix-env"
     HG archive --rev "$rev" "$prefix"
+    (
         cd "$prefix"
         . "$prefix-env/bin/activate"
         pip install --quiet --upgrade pip setuptools mercurial $EXTRA
         pip install --quiet -e .
+    )
+}
 install_kallithea "$temp/from" "$from_rev_hash"
+(
     cd "$temp/from"
     . "$temp/from-env/bin/activate"
     announce "Initializing database..."
     quiet_if_ok paster setup-db "$config_file" --repos="$temp/repos" --user=doe --email=doe@example.com --password=123456 --no-public-access --force-yes
     alembic -c "$config_file" current -v
+)
 install_kallithea "$temp/to" "$to_rev_hash"
+(
     cd "$temp/to"
     . "$temp/to-env/bin/activate"
     announce "Commencing database upgrade from shown Alembic revision to head..."
     alembic -c "$config_file" current -v
     alembic -c "$config_file" upgrade head
     announce "Upgrade complete, now at the shown Alembic revision:"
     alembic -c "$config_file" current -v
+)

scripts/whitespacecleanup.sh

➞

Show inline comments

 #!/bin/bash -x
 # 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
 sed -i -e 's,\([^ ]\)\\$,\1 \\,g' -e 's,\(["'"'"']["'"'"']["'"'"']\) \\$,\1\\,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
 sed -i -e 's,[ 	][ 	]*$,,g' -e 's, 	,	,g' kallithea/public/js/graph.js
 hg mani | xargs chmod -x
 hg loc 'set:!binary()&grep("^#!")&!(**_tmpl.py)&!(**/template**)' | xargs chmod +x
 hg diff

0 comments (0 inline, 0 general)