summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoofar <toofar@spalge.com>2023-01-03 19:04:04 +1300
committertoofar <toofar@spalge.com>2023-01-03 19:12:07 +1300
commitc0c09c0faacc308de3e94abe29174df975eed542 (patch)
treea8eaab2f5e8a4c40723c5a1302c862a4d3b54687
parentdf782f8d38f1d16e9a212e2f90dff2979b575f61 (diff)
downloadqutebrowser-c0c09c0faacc308de3e94abe29174df975eed542.tar.gz
qutebrowser-c0c09c0faacc308de3e94abe29174df975eed542.zip
remove "all tools" prompt
I'm more interested in refining the strategies to deal with adapting to whatever tools we choose to go with right now
-rwxr-xr-xscripts/check_mergability.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/scripts/check_mergability.sh b/scripts/check_mergability.sh
index de6604e39..13da15da3 100755
--- a/scripts/check_mergability.sh
+++ b/scripts/check_mergability.sh
@@ -511,7 +511,7 @@ else
# pre-defined auto-formatter configurations. Branches will be created as
# needed.
# format: branch tool1 tool2 ...
- tools="master true
+ tools_all="master true
tmp-black black
tmp-black_isort black isort
tmp-black_usort black usort
@@ -519,9 +519,15 @@ else
tmp-black_isort_pyupgrade black isort pyupgrade
tmp-black_usort_pyupgrade black usort pyupgrade
qt6-v2 true"
- tools="tmp-black black"
-
- prompt_or_summary "Generate report for all tool configurations?"
+ tools="tmp-black_isort_pyupgrade black isort pyupgrade"
+
+ if [ "$(echo "$tools" | wc -l | cut -d' ' -f1)" -gt 1 ] ;then
+ # TODO: turn this "run it with all tool configurations and see which one
+ # is the worst" thing into a CLI option. This script is a cross between
+ # "gather stats" and "refine merge strategies" now and is in need of a bit
+ # of a refactor.
+ prompt_or_summary "Generate report for all tool configurations?"
+ fi
clean_branches
echo "$tools" | while read branch cmds; do