##// END OF EJS Templates
cleanup: fix whitespace in CONTRIBUTORS (and other forgotten files) too
Mads Kiilerich -
r5379:1949ece7 default
parent child Browse files
Show More
@@ -1,25 +1,25 b''
1 [db_settings]
1 [db_settings]
2 # Used to identify which repository this database is versioned under.
2 # Used to identify which repository this database is versioned under.
3 # You can use the name of your project.
3 # You can use the name of your project.
4 repository_id={{ locals().pop('repository_id') }}
4 repository_id={{ locals().pop('repository_id') }}
5
5
6 # The name of the database table used to track the schema version.
6 # The name of the database table used to track the schema version.
7 # This name shouldn't already be used by your project.
7 # This name shouldn't already be used by your project.
8 # If this is changed once a database is under version control, you'll need to
8 # If this is changed once a database is under version control, you'll need to
9 # change the table name in each database too.
9 # change the table name in each database too.
10 version_table={{ locals().pop('version_table') }}
10 version_table={{ locals().pop('version_table') }}
11
11
12 # When committing a change script, Migrate will attempt to generate the
12 # When committing a change script, Migrate will attempt to generate the
13 # sql for all supported databases; normally, if one of them fails - probably
13 # sql for all supported databases; normally, if one of them fails - probably
14 # because you don't have that database installed - it is ignored and the
14 # because you don't have that database installed - it is ignored and the
15 # commit continues, perhaps ending successfully.
15 # commit continues, perhaps ending successfully.
16 # Databases in this list MUST compile successfully during a commit, or the
16 # Databases in this list MUST compile successfully during a commit, or the
17 # entire commit will fail. List the databases your application will actually
17 # entire commit will fail. List the databases your application will actually
18 # be using to ensure your updates to that database work properly.
18 # be using to ensure your updates to that database work properly.
19 # This must be a list; example: ['postgres','sqlite']
19 # This must be a list; example: ['postgres','sqlite']
20 required_dbs={{ locals().pop('required_dbs') }}
20 required_dbs={{ locals().pop('required_dbs') }}
21
21
22 # When creating new change scripts, Migrate will stamp the new script with
22 # When creating new change scripts, Migrate will stamp the new script with
23 # a version number. By default this is latest_version + 1. You can set this
23 # a version number. By default this is latest_version + 1. You can set this
24 # to 'true' to tell Migrate to use the UTC timestamp instead.
24 # to 'true' to tell Migrate to use the UTC timestamp instead.
25 use_timestamp_numbering='false' No newline at end of file
25 use_timestamp_numbering='false'
@@ -1,20 +1,21 b''
1 #!/bin/bash -x
1 #!/bin/bash -x
2
2
3 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
3 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
4
4
5 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$'`
5 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$'`
6
6 sed -i -e "s,`printf '\t'`, ,g" $files
7 sed -i -e "s,`printf '\t'`, ,g" $files
7 sed -i -e "s, *$,,g" $files
8 sed -i -e "s, *$,,g" $files
8 # ensure one trailing newline - remove empty last line and make last line include trailing newline:
9 # ensure one trailing newline - remove empty last line and make last line include trailing newline:
9 sed -i -e '$,${/^$/d}' -e '$a\' $files
10 sed -i -e '$,${/^$/d}' -e '$a\' $files
10
11
11 sed -i -e 's,\([^ /]\){,\1 {,g' `hg loc '*.css'`
12 sed -i -e 's,\([^ /]\){,\1 {,g' `hg loc '*.css'`
12 sed -i -e 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'`
13 sed -i -e 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'`
13
14
14 sed -i -e 's/^\( [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css
15 sed -i -e 's/^\( [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css
15 sed -i -e '1s|, |,|g' kallithea/public/css/{style,contextbar}.css
16 sed -i -e '1s|, |,|g' kallithea/public/css/{style,contextbar}.css
16 sed -i -e 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css
17 sed -i -e 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css
17 sed -i -e 's/^\([^ ,/].*\) */\1 /g' kallithea/public/css/{style,contextbar}.css
18 sed -i -e 's/^\([^ ,/].*\) */\1 /g' kallithea/public/css/{style,contextbar}.css
18 sed -i -e 's,^--$,-- ,g' kallithea/templates/email_templates/main.txt
19 sed -i -e 's,^--$,-- ,g' kallithea/templates/email_templates/main.txt
19
20
20 hg diff
21 hg diff
General Comments 0
You need to be logged in to leave comments. Login now