SAtacker created this revision.
SAtacker added a reviewer: JonasToth.
Herald added subscribers: carlosgalvezp, xazax.hun.
SAtacker published this revision for review.
Herald added a project: clang-tools-extra.
Herald added a subscriber: cfe-commits.

Depends on D120331 <https://reviews.llvm.org/D120331>

- Ensures that both options -config and -config-file exclude each other

Signed-off-by: Shreyas Atre <shreyasatr...@gmail.com>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D120385

Files:
  clang-tools-extra/clang-tidy/tool/run-clang-tidy.py


Index: clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
===================================================================
--- clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -225,7 +225,8 @@
   parser.add_argument('-checks', default=None,
                       help='checks filter, when not specified, use clang-tidy '
                       'default')
-  parser.add_argument('-config', default=None,
+  group = parser.add_mutually_exclusive_group()
+  group.add_argument('-config', default=None,
                       help='Specifies a configuration in YAML/JSON format: '
                       '  -config="{Checks: \'*\', '
                       '                       CheckOptions: [{key: x, '
@@ -233,9 +234,9 @@
                       'When the value is empty, clang-tidy will '
                       'attempt to find a file named .clang-tidy for '
                       'each source file in its parent directories.')
-  parser.add_argument('-config-file', default=None,
+  group.add_argument('-config-file', default=None,
                       help='Specify the path of .clang-tidy or custom config'
-                      'file: e.g. -config-file=/some/path/myTidyConfigFile'
+                      ' file: e.g. -config-file=/some/path/myTidyConfigFile'
                       'This option internally works exactly the same way as'
                       '-config option after reading specified config file.'
                       'Use either -config-file or -config, not both.')


Index: clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
===================================================================
--- clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -225,7 +225,8 @@
   parser.add_argument('-checks', default=None,
                       help='checks filter, when not specified, use clang-tidy '
                       'default')
-  parser.add_argument('-config', default=None,
+  group = parser.add_mutually_exclusive_group()
+  group.add_argument('-config', default=None,
                       help='Specifies a configuration in YAML/JSON format: '
                       '  -config="{Checks: \'*\', '
                       '                       CheckOptions: [{key: x, '
@@ -233,9 +234,9 @@
                       'When the value is empty, clang-tidy will '
                       'attempt to find a file named .clang-tidy for '
                       'each source file in its parent directories.')
-  parser.add_argument('-config-file', default=None,
+  group.add_argument('-config-file', default=None,
                       help='Specify the path of .clang-tidy or custom config'
-                      'file: e.g. -config-file=/some/path/myTidyConfigFile'
+                      ' file: e.g. -config-file=/some/path/myTidyConfigFile'
                       'This option internally works exactly the same way as'
                       '-config option after reading specified config file.'
                       'Use either -config-file or -config, not both.')
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to