Added WebKit style to the BasedOnStyle handling and to the relevant help messages.
llvm-svn: 189765
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp
index cd28c59..2d415b3 100644
--- a/clang/tools/clang-format/ClangFormat.cpp
+++ b/clang/tools/clang-format/ClangFormat.cpp
@@ -64,7 +64,7 @@
static cl::opt<std::string>
Style("style",
cl::desc("Coding style, currently supports:\n"
- " LLVM, Google, Chromium, Mozilla.\n"
+ " LLVM, Google, Chromium, Mozilla, WebKit.\n"
"Use -style=file to load style configuration from\n"
".clang-format file located in one of the parent\n"
"directories of the source file (or current\n"
diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
index bb18730..89fa052 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -82,11 +82,13 @@
def main():
parser = argparse.ArgumentParser(description=
- 'Reformat changed lines in diff')
+ 'Reformat changed lines in diff.')
parser.add_argument('-p', default=0,
help='strip the smallest prefix containing P slashes')
- parser.add_argument('-style',
- help='formatting style to apply (LLVM, Google, Chromium)')
+ parser.add_argument(
+ '-style',
+ help=
+ 'formatting style to apply (LLVM, Google, Chromium, Mozilla, WebKit)')
args = parser.parse_args()
filename = None