Skip to content
Snippets Groups Projects
Commit 261781f6 authored by Mathieu Courtois's avatar Mathieu Courtois
Browse files

[#33423] fix typo in help messages, remove old tool, unused anymore

parent 15dfdff0
No related branches found
No related tags found
No related merge requests found
F90 = gfortran
exec = convert
all: $(exec)
convert: convert.f90
$(F90) -o $@ $<
rm -f all_procedures.mod data.mod statistics.mod structure.mod
clean:
rm -f *.o
distclean:
rm -f $(exec)
This diff is collapsed.
...@@ -9,7 +9,13 @@ from aslint.logger import logger ...@@ -9,7 +9,13 @@ from aslint.logger import logger
from repository_api import get_branch, get_main_branch, get_repo_name, repository_type from repository_api import get_branch, get_main_branch, get_repo_name, repository_type
from ..ext_utils import get_changed_files, is_admin from ..ext_utils import get_changed_files, is_admin
from .generic import NOOK, OK, branch_checker, branch_user_commit_hook, branch_user_push_hook from .generic import (
NOOK,
OK,
branch_checker,
branch_user_commit_hook,
branch_user_push_hook,
)
# authorized branches names (+ vNN) # authorized branches names (+ vNN)
AUTH_BRANCH = ("^default$", "^edf/", "^asterxx/", "^v([0-9]+(\.[0-9]+)?(_smeca)?)$") AUTH_BRANCH = ("^default$", "^edf/", "^asterxx/", "^v([0-9]+(\.[0-9]+)?(_smeca)?)$")
...@@ -31,7 +37,10 @@ def precommit_git(repopath, amend): ...@@ -31,7 +37,10 @@ def precommit_git(repopath, amend):
# do pretxncommit: check branch, message # do pretxncommit: check branch, message
branch = get_branch(repopath) branch = get_branch(repopath)
if git_branch_checker(branch) is NOOK: if git_branch_checker(branch) is NOOK:
logger.error("You are not allowed to commit in " "branch {0!r}.".format(branch), exit=True) logger.error(
"You are not allowed to commit in " "branch {0!r}.".format(branch),
exit=True,
)
return aslint(repopath, amend=amend) return aslint(repopath, amend=amend)
...@@ -56,7 +65,7 @@ def aslint(repopath, paths=(), amend=False): ...@@ -56,7 +65,7 @@ def aslint(repopath, paths=(), amend=False):
choice = ASCFG.get("check.precommit") choice = ASCFG.get("check.precommit")
if choice == "no": if choice == "no":
logger.warn( logger.warn(
"pre-commit checkings skipped because of 'check.precommit'" "pre-commit checkings skipped because of 'check-precommit'"
" value in your ~/.gitconfig file" " value in your ~/.gitconfig file"
) )
return OK return OK
...@@ -68,7 +77,8 @@ def aslint(repopath, paths=(), amend=False): ...@@ -68,7 +77,8 @@ def aslint(repopath, paths=(), amend=False):
"your ~/.gitconfig file." "your ~/.gitconfig file."
) )
logger.info( logger.info(
"pre-commit: To hide this message you can set the value " "'check.precommit = yes'." "pre-commit: To hide this message you can set the value "
"'check-precommit = yes'."
) )
elif choice != "yes": elif choice != "yes":
logger.warn( logger.warn(
...@@ -105,7 +115,9 @@ def aslint(repopath, paths=(), amend=False): ...@@ -105,7 +115,9 @@ def aslint(repopath, paths=(), amend=False):
else: else:
logger.info("pre-commit: no files to be checked") logger.info("pre-commit: no files to be checked")
if fixed and repository_type(repopath) == "git": if fixed and repository_type(repopath) == "git":
logger.warn("pre-commit: some files were automatically fixed and added by running:") logger.warn(
"pre-commit: some files were automatically fixed and added by running:"
)
toadd = dchg.get("A", []) + dchg.get("M", []) toadd = dchg.get("A", []) + dchg.get("M", [])
cmd = ["git", "add"] + toadd cmd = ["git", "add"] + toadd
logger.info(" ".join(cmd)) logger.info(" ".join(cmd))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment