maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format-diff.py: Fix 'beintroduced' in help output 

Also update docs to reflect recently changed -i inplace edit behaviour.

llvm-svn: 196336
This commit is contained in:
Alp Toker 2013-12-04 00:48:22 +00:00
parent f95fe9b870
commit 0e7f6da674
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/docs/ClangFormat.rst
View File

@ -146,7 +146,7 @@ shortcut in the BBEdit preferences, under Menus & Shortcuts.
Visual Studio Integration Visual Studio Integration
========================= =========================
Download the latest Visual Studio plugin from the `alpha build site Download the latest Visual Studio extension from the `alpha build site
<http://llvm.org/builds/>`_. The default key-binding is Ctrl-R,Ctrl-F. <http://llvm.org/builds/>`_. The default key-binding is Ctrl-R,Ctrl-F.
@ -158,12 +158,14 @@ a unified diff and reformats all contained lines with :program:`clang-format`.
.. code-block:: console .. code-block:: console
usage: clang-format-diff.py [-h] [-p P] [-style STYLE] usage: clang-format-diff.py [-h] [-i] [-p P] [-style STYLE]
Reformat changed lines in diff. Reformat changed lines in diff. Without -i option just output the diff that
would be introduced.
optional arguments: optional arguments:
-h, --help show this help message and exit -h, --help show this help message and exit
-i apply edits to files instead of displaying a diff
-p P strip the smallest prefix containing P slashes -p P strip the smallest prefix containing P slashes
-style STYLE formatting style to apply (LLVM, Google, Chromium, Mozilla, -style STYLE formatting style to apply (LLVM, Google, Chromium, Mozilla,
WebKit) WebKit)
@ -172,7 +174,7 @@ So to reformat all the lines in the latest :program:`git` commit, just do:
.. code-block:: console .. code-block:: console
git diff -U0 HEAD^ | clang-format-diff.py -p1 git diff -U0 HEAD^ | clang-format-diff.py -i -p1
The :option:`-U0` will create a diff without context lines (the script would format The :option:`-U0` will create a diff without context lines (the script would format
those as well). those as well).

2
clang/tools/clang-format/clang-format-diff.py
View File

@ -37,7 +37,7 @@ binary = 'clang-format'
def main(): def main():
parser = argparse.ArgumentParser(description= parser = argparse.ArgumentParser(description=
'Reformat changed lines in diff. Without -i ' 'Reformat changed lines in diff. Without -i '
'option just output the diff that would be' 'option just output the diff that would be '
'introduced.') 'introduced.')
parser.add_argument('-i', action='store_true', default=False, parser.add_argument('-i', action='store_true', default=False,
help='apply edits to files instead of displaying a diff') help='apply edits to files instead of displaying a diff')