Chromium Code Reviews| Index: PRESUBMIT.py |
| diff --git a/PRESUBMIT.py b/PRESUBMIT.py |
| index 1e6526f26ea9c9dca0f46179f948e5a14216afed..fc558c71b5a818ca0f3717aabbdb309be462852b 100644 |
| --- a/PRESUBMIT.py |
| +++ b/PRESUBMIT.py |
| @@ -11,6 +11,7 @@ for more details about the presubmit API built into gcl. |
| import re |
| import sys |
| +from xml.dom import minidom |
|
Alexei Svitkine (slow)
2014/03/05 16:06:37
Nit: Remove.
yiyaoliu
2014/03/05 18:14:25
Done.
|
| _EXCLUDED_PATHS = ( |
| @@ -1011,16 +1012,15 @@ def _CheckCygwinShell(input_api, output_api): |
| items=cygwin_shell)] |
| return [] |
| - |
| def _CheckUserActionUpdate(input_api, output_api): |
| """Checks if any new user action has been added.""" |
| - if any('chromeactions.txt' == input_api.os_path.basename(f) for f in |
| + if any('actions.xml' == input_api.os_path.basename(f) for f in |
| input_api.LocalPaths()): |
| - # If chromeactions.txt is already included in the changelist, the PRESUBMIT |
| - # for chromeactions.txt will do a more complete presubmit check. |
| + # If actions.xml is already included in the changelist, the PRESUBMIT |
| + # for actions.xml will do a more complete presubmit check. |
| return [] |
| - with open('tools/metrics/actions/chromeactions.txt') as f: |
| + with open('tools/metrics/actions/actions.xml') as f: |
| current_actions = f.read() |
| file_filter = lambda f: f.LocalPath().endswith(('.cc', '.mm')) |
| @@ -1030,12 +1030,12 @@ def _CheckUserActionUpdate(input_api, output_api): |
| match = input_api.re.search(action_re, line) |
| if match: |
| for action_name in match.groups(): |
| - name_pattern = r'\t%s\n' % action_name |
| - if name_pattern not in current_actions: |
| + action = 'name="{0}"'.format(action_name) |
| + if action not in current_actions: |
| return [output_api.PresubmitPromptWarning( |
| 'File %s line %d: %s is missing in ' |
| - 'tools/metrics/actions/chromeactions.txt. Please run ' |
| - 'tools/metrics/actions/extract_actions.py --hash to update.' |
| + 'tools/metrics/actions/actions.xml. Please run ' |
| + 'tools/metrics/actions/extract_actions.py to update.' |
| % (f.LocalPath(), line_num, action_name))] |
| return [] |