changeset bca419132437 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=bca419132437
description:
style: add a user interface wrapper class
makes things work both with mercurial and stand alone with stdio
diffstat:
util/style.py | 60 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 16 deletions(-)
diffs (102 lines):
diff -r ae1182b73fdb -r bca419132437 util/style.py
--- a/util/style.py Fri Apr 15 10:43:06 2011 -0700
+++ b/util/style.py Fri Apr 15 10:43:30 2011 -0700
@@ -45,6 +45,38 @@
whitespace_types = set(('C', 'C++', 'swig', 'python', 'asm', 'isa', 'scons'))
format_types = set(('C', 'C++'))
+class UserInterface(object):
+ def __init__(self, verbose=False, auto=False):
+ self.auto = auto
+ self.verbose = verbose
+
+ def prompt(self, prompt, results, default):
+ if self.auto:
+ return self.auto
+
+ while True:
+ result = self.do_prompt(prompt, results, default)
+ if result in results:
+ return result
+
+class MercurialUI(UserInterface):
+ def __init__(self, ui, *args, **kwargs):
+ super(MercurialUI, self).__init__(*args, **kwargs)
+ self.ui = ui
+
+ def do_prompt(self, prompt, results, default):
+ return self.ui.prompt(prompt, default=default)
+
+ def write(self, string):
+ self.ui.write(string)
+
+class StdioUI(UserInterface):
+ def do_prompt(self, prompt, results, default):
+ return raw_input(prompt) or default
+
+ def write(self, string):
+ sys.stdout.write(string)
+
def checkwhite_line(line):
match = lead.search(line)
if match and match.group(1).find('\t') != -1:
@@ -225,10 +257,15 @@
break
return modified
-def do_check_style(ui, repo, *files, **args):
+def do_check_style(hgui, repo, *files, **args):
"""check files for proper m5 style guidelines"""
from mercurial import mdiff, util
+ auto = args.get('auto', False)
+ if auto:
+ auto = 'f'
+ ui = MercurialUI(hgui, hgui.verbose, auto)
+
if files:
files = frozenset(files)
@@ -236,14 +273,7 @@
return files and name in files
def prompt(name, func, fixonly=None):
- if args.get('auto', False):
- result = 'f'
- else:
- while True:
- result = ui.prompt("(a)bort, (i)gnore, or (f)ix?", default='a')
- if result in 'aif':
- break
-
+ result = ui.prompt("(a)bort, (i)gnore, or (f)ix?", 'aif', 'a')
if result == 'a':
return True
elif result == 'f':
@@ -312,7 +342,9 @@
if prompt(fname, fixwhite, fixonly):
return True
-def do_check_format(ui, repo, **args):
+def do_check_format(hgui, repo, **args):
+ ui = MercurialUI(hgui, hgui.verbose, auto)
+
modified, added, removed, deleted, unknown, ignore, clean = repo.status()
verbose = 0
@@ -323,13 +355,9 @@
if stats:
stats.dump()
result = ui.prompt("invalid formatting\n(i)gnore or (a)bort?",
- "^[ia]$", "a")
- if result.startswith('i'):
- pass
- elif result.startswith('a'):
+ 'ai', 'a')
+ if result == 'a':
return True
- else:
- raise util.Abort(_("Invalid response: '%s'") % result)
return False
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
