Mercurial > kallithea
changeset 8770:0a84ef075575
scripts: handle running with pending deleted files
Don't fail on files in manifest missing in working directory.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 11 Oct 2020 10:13:25 +0200 |
| parents | d35d14b05b82 |
| children | f8971422795e |
| files | scripts/docs-headings.py scripts/logformat.py scripts/run-all-cleanup scripts/whitespacecleanup.sh |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/docs-headings.py Sat Nov 14 15:41:39 2020 +0100 +++ b/scripts/docs-headings.py Sun Oct 11 10:13:25 2020 +0200 @@ -31,7 +31,7 @@ def main(): - filenames = subprocess.check_output(['hg', 'loc', 'set:**.rst+kallithea/i18n/how_to']).splitlines() + filenames = subprocess.check_output(['hg', 'files', 'set:**.rst+kallithea/i18n/how_to']).splitlines() for fn in filenames: fn = fn.decode() print('processing %s' % fn)
--- a/scripts/logformat.py Sat Nov 14 15:41:39 2020 +0100 +++ b/scripts/logformat.py Sun Oct 11 10:13:25 2020 +0200 @@ -40,7 +40,7 @@ if len(sys.argv) < 2: print('Cleanup of superfluous % formatting of log statements.') print('Usage:') - print(''' hg revert `hg loc '*.py'|grep -v logformat.py` && scripts/logformat.py `hg loc '*.py'` && hg diff''') + print(''' hg revert `hg files 'set:**.py'|grep -v logformat.py` && scripts/logformat.py `hg files 'set:**.py'` && hg diff''') raise SystemExit(1) for f in sys.argv[1:]:
--- a/scripts/run-all-cleanup Sat Nov 14 15:41:39 2020 +0100 +++ b/scripts/run-all-cleanup Sun Oct 11 10:13:25 2020 +0200 @@ -9,5 +9,5 @@ scripts/generate-ini.py scripts/whitespacecleanup.sh -hg loc 'set:!binary()&grep("^#!.*python")' '*.py' | xargs scripts/pyflakes +hg files 'set:!binary()&grep("^#!.*python")' 'set:**.py' | xargs scripts/pyflakes echo "no blocking problems found by $0"
--- a/scripts/whitespacecleanup.sh Sat Nov 14 15:41:39 2020 +0100 +++ b/scripts/whitespacecleanup.sh Sun Oct 11 10:13:25 2020 +0200 @@ -2,7 +2,7 @@ # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes -files=`hg mani | egrep -v '/fontello/|/templates/email/|(^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'` +files=`hg files | egrep -v '/fontello/|/templates/email/|(^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'` sed -i "s/`printf '\r'`//g" $files sed -i -e "s,`printf '\t'`, ,g" $files @@ -11,14 +11,14 @@ # 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 {,g' `hg files 'set:**.css'` +sed -i -e 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg files 'set:**.css'` -hg mani | xargs chmod -x -hg loc 'set:!binary()&grep("^#!")&!(**_tmpl.py)&!(**/template**)' | xargs chmod +x +hg files | xargs chmod -x +hg files 'set:!binary()&grep("^#!")&!(**_tmpl.py)&!(**/template**)' | xargs chmod +x # isort is installed from dev_requirements.txt -hg loc 'set:!binary()&grep("^#!.*python")' '*.py' | xargs isort --line-width 160 --lines-after-imports 2 +hg files 'set:!binary()&grep("^#!.*python")' 'set:**.py' | xargs isort --line-width 160 --lines-after-imports 2 echo "diff after $0:" hg diff