checkkconfigsymbols: use ArgumentParser
Replace the deprecated OptionParser with ArgumentParser, as recommended by pylint. Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
7c5227af25
Коммит
14390e3164
|
@ -8,6 +8,7 @@
|
||||||
# Licensed under the terms of the GNU GPL License version 2
|
# Licensed under the terms of the GNU GPL License version 2
|
||||||
|
|
||||||
|
|
||||||
|
import argparse
|
||||||
import difflib
|
import difflib
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
@ -15,7 +16,6 @@ import signal
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
from multiprocessing import Pool, cpu_count
|
from multiprocessing import Pool, cpu_count
|
||||||
from optparse import OptionParser
|
|
||||||
from subprocess import Popen, PIPE, STDOUT
|
from subprocess import Popen, PIPE, STDOUT
|
||||||
|
|
||||||
|
|
||||||
|
@ -43,62 +43,58 @@ REGEX_QUOTES = re.compile("(\"(.*?)\")")
|
||||||
|
|
||||||
def parse_options():
|
def parse_options():
|
||||||
"""The user interface of this module."""
|
"""The user interface of this module."""
|
||||||
usage = "%prog [options]\n\n" \
|
usage = "Run this tool to detect Kconfig symbols that are referenced but " \
|
||||||
"Run this tool to detect Kconfig symbols that are referenced but " \
|
"not defined in Kconfig. If no option is specified, " \
|
||||||
"not defined in\nKconfig. The output of this tool has the " \
|
"checkkconfigsymbols defaults to check your current tree. " \
|
||||||
"format \'Undefined symbol\\tFile list\'\n\n" \
|
"Please note that specifying commits will 'git reset --hard\' " \
|
||||||
"If no option is specified, %prog will default to check your\n" \
|
"your current tree! You may save uncommitted changes to avoid " \
|
||||||
"current tree. Please note that specifying commits will " \
|
"losing data."
|
||||||
"\'git reset --hard\'\nyour current tree! You may save " \
|
|
||||||
"uncommitted changes to avoid losing data."
|
|
||||||
|
|
||||||
parser = OptionParser(usage=usage)
|
parser = argparse.ArgumentParser(description=usage)
|
||||||
|
|
||||||
parser.add_option('-c', '--commit', dest='commit', action='store',
|
parser.add_argument('-c', '--commit', dest='commit', action='store',
|
||||||
default="",
|
default="",
|
||||||
help="Check if the specified commit (hash) introduces "
|
help="check if the specified commit (hash) introduces "
|
||||||
"undefined Kconfig symbols.")
|
"undefined Kconfig symbols")
|
||||||
|
|
||||||
parser.add_option('-d', '--diff', dest='diff', action='store',
|
parser.add_argument('-d', '--diff', dest='diff', action='store',
|
||||||
default="",
|
default="",
|
||||||
help="Diff undefined symbols between two commits. The "
|
help="diff undefined symbols between two commits "
|
||||||
"input format bases on Git log's "
|
"(e.g., -d commmit1..commit2)")
|
||||||
"\'commmit1..commit2\'.")
|
|
||||||
|
|
||||||
parser.add_option('-f', '--find', dest='find', action='store_true',
|
parser.add_argument('-f', '--find', dest='find', action='store_true',
|
||||||
default=False,
|
default=False,
|
||||||
help="Find and show commits that may cause symbols to be "
|
help="find and show commits that may cause symbols to be "
|
||||||
"missing. Required to run with --diff.")
|
"missing (required to run with --diff)")
|
||||||
|
|
||||||
parser.add_option('-i', '--ignore', dest='ignore', action='store',
|
parser.add_argument('-i', '--ignore', dest='ignore', action='store',
|
||||||
default="",
|
default="",
|
||||||
help="Ignore files matching this pattern. Note that "
|
help="ignore files matching this Python regex "
|
||||||
"the pattern needs to be a Python regex. To "
|
"(e.g., -i '.*defconfig')")
|
||||||
"ignore defconfigs, specify -i '.*defconfig'.")
|
|
||||||
|
|
||||||
parser.add_option('-s', '--sim', dest='sim', action='store', default="",
|
parser.add_argument('-s', '--sim', dest='sim', action='store', default="",
|
||||||
help="Print a list of maximum 10 string-similar symbols.")
|
help="print a list of max. 10 string-similar symbols")
|
||||||
|
|
||||||
parser.add_option('', '--force', dest='force', action='store_true',
|
parser.add_argument('--force', dest='force', action='store_true',
|
||||||
default=False,
|
default=False,
|
||||||
help="Reset current Git tree even when it's dirty.")
|
help="reset current Git tree even when it's dirty")
|
||||||
|
|
||||||
parser.add_option('', '--no-color', dest='color', action='store_false',
|
parser.add_argument('--no-color', dest='color', action='store_false',
|
||||||
default=True,
|
default=True,
|
||||||
help="Don't print colored output. Default when not "
|
help="don't print colored output (default when not "
|
||||||
"outputting to a terminal.")
|
"outputting to a terminal)")
|
||||||
|
|
||||||
(opts, _) = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
if opts.commit and opts.diff:
|
if args.commit and args.diff:
|
||||||
sys.exit("Please specify only one option at once.")
|
sys.exit("Please specify only one option at once.")
|
||||||
|
|
||||||
if opts.diff and not re.match(r"^[\w\-\.]+\.\.[\w\-\.]+$", opts.diff):
|
if args.diff and not re.match(r"^[\w\-\.]+\.\.[\w\-\.]+$", args.diff):
|
||||||
sys.exit("Please specify valid input in the following format: "
|
sys.exit("Please specify valid input in the following format: "
|
||||||
"\'commit1..commit2\'")
|
"\'commit1..commit2\'")
|
||||||
|
|
||||||
if opts.commit or opts.diff:
|
if args.commit or args.diff:
|
||||||
if not opts.force and tree_is_dirty():
|
if not args.force and tree_is_dirty():
|
||||||
sys.exit("The current Git tree is dirty (see 'git status'). "
|
sys.exit("The current Git tree is dirty (see 'git status'). "
|
||||||
"Running this script may\ndelete important data since it "
|
"Running this script may\ndelete important data since it "
|
||||||
"calls 'git reset --hard' for some performance\nreasons. "
|
"calls 'git reset --hard' for some performance\nreasons. "
|
||||||
|
@ -106,27 +102,27 @@ def parse_options():
|
||||||
"'--force' if you\nwant to ignore this warning and "
|
"'--force' if you\nwant to ignore this warning and "
|
||||||
"continue.")
|
"continue.")
|
||||||
|
|
||||||
if opts.commit:
|
if args.commit:
|
||||||
opts.find = False
|
args.find = False
|
||||||
|
|
||||||
if opts.ignore:
|
if args.ignore:
|
||||||
try:
|
try:
|
||||||
re.match(opts.ignore, "this/is/just/a/test.c")
|
re.match(args.ignore, "this/is/just/a/test.c")
|
||||||
except:
|
except:
|
||||||
sys.exit("Please specify a valid Python regex.")
|
sys.exit("Please specify a valid Python regex.")
|
||||||
|
|
||||||
return opts
|
return args
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""Main function of this module."""
|
"""Main function of this module."""
|
||||||
opts = parse_options()
|
args = parse_options()
|
||||||
|
|
||||||
global color
|
global color
|
||||||
color = opts.color and sys.stdout.isatty()
|
color = args.color and sys.stdout.isatty()
|
||||||
|
|
||||||
if opts.sim and not opts.commit and not opts.diff:
|
if args.sim and not args.commit and not args.diff:
|
||||||
sims = find_sims(opts.sim, opts.ignore)
|
sims = find_sims(args.sim, args.ignore)
|
||||||
if sims:
|
if sims:
|
||||||
print("%s: %s" % (yel("Similar symbols"), ', '.join(sims)))
|
print("%s: %s" % (yel("Similar symbols"), ', '.join(sims)))
|
||||||
else:
|
else:
|
||||||
|
@ -137,17 +133,17 @@ def main():
|
||||||
defined = {}
|
defined = {}
|
||||||
undefined = {}
|
undefined = {}
|
||||||
|
|
||||||
if opts.commit or opts.diff:
|
if args.commit or args.diff:
|
||||||
head = get_head()
|
head = get_head()
|
||||||
|
|
||||||
# get commit range
|
# get commit range
|
||||||
commit_a = None
|
commit_a = None
|
||||||
commit_b = None
|
commit_b = None
|
||||||
if opts.commit:
|
if args.commit:
|
||||||
commit_a = opts.commit + "~"
|
commit_a = args.commit + "~"
|
||||||
commit_b = opts.commit
|
commit_b = args.commit
|
||||||
elif opts.diff:
|
elif args.diff:
|
||||||
split = opts.diff.split("..")
|
split = args.diff.split("..")
|
||||||
commit_a = split[0]
|
commit_a = split[0]
|
||||||
commit_b = split[1]
|
commit_b = split[1]
|
||||||
undefined_a = {}
|
undefined_a = {}
|
||||||
|
@ -155,11 +151,11 @@ def main():
|
||||||
|
|
||||||
# get undefined items before the commit
|
# get undefined items before the commit
|
||||||
execute("git reset --hard %s" % commit_a)
|
execute("git reset --hard %s" % commit_a)
|
||||||
undefined_a, _ = check_symbols(opts.ignore)
|
undefined_a, _ = check_symbols(args.ignore)
|
||||||
|
|
||||||
# get undefined items for the commit
|
# get undefined items for the commit
|
||||||
execute("git reset --hard %s" % commit_b)
|
execute("git reset --hard %s" % commit_b)
|
||||||
undefined_b, defined = check_symbols(opts.ignore)
|
undefined_b, defined = check_symbols(args.ignore)
|
||||||
|
|
||||||
# report cases that are present for the commit but not before
|
# report cases that are present for the commit but not before
|
||||||
for feature in sorted(undefined_b):
|
for feature in sorted(undefined_b):
|
||||||
|
@ -179,7 +175,7 @@ def main():
|
||||||
|
|
||||||
# default to check the entire tree
|
# default to check the entire tree
|
||||||
else:
|
else:
|
||||||
undefined, defined = check_symbols(opts.ignore)
|
undefined, defined = check_symbols(args.ignore)
|
||||||
|
|
||||||
# now print the output
|
# now print the output
|
||||||
for feature in sorted(undefined):
|
for feature in sorted(undefined):
|
||||||
|
@ -188,16 +184,16 @@ def main():
|
||||||
files = sorted(undefined.get(feature))
|
files = sorted(undefined.get(feature))
|
||||||
print("%s: %s" % (yel("Referencing files"), ", ".join(files)))
|
print("%s: %s" % (yel("Referencing files"), ", ".join(files)))
|
||||||
|
|
||||||
sims = find_sims(feature, opts.ignore, defined)
|
sims = find_sims(feature, args.ignore, defined)
|
||||||
sims_out = yel("Similar symbols")
|
sims_out = yel("Similar symbols")
|
||||||
if sims:
|
if sims:
|
||||||
print("%s: %s" % (sims_out, ', '.join(sims)))
|
print("%s: %s" % (sims_out, ', '.join(sims)))
|
||||||
else:
|
else:
|
||||||
print("%s: %s" % (sims_out, "no similar symbols found"))
|
print("%s: %s" % (sims_out, "no similar symbols found"))
|
||||||
|
|
||||||
if opts.find:
|
if args.find:
|
||||||
print("%s:" % yel("Commits changing symbol"))
|
print("%s:" % yel("Commits changing symbol"))
|
||||||
commits = find_commits(feature, opts.diff)
|
commits = find_commits(feature, args.diff)
|
||||||
if commits:
|
if commits:
|
||||||
for commit in commits:
|
for commit in commits:
|
||||||
commit = commit.split(" ", 1)
|
commit = commit.split(" ", 1)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче