This is an archive of the discontinued LLVM Phabricator instance.

Differential D109550

[clang_format] Add fallback_style flag to clang-format-diff.py
ClosedPublic

Authored by haowei on Sep 9 2021, 3:21 PM.

Details

Reviewers
phosek
Commits
rG38a5bd4115af: [clang_format] Add fallback-style flag to clang-format-diff.py
Summary

fallback-style is a frequently used flag in clang_format, however, it was not supported by clang-format-diff.py script. This change adds this flag.

Diff Detail

Unit TestsFailed

TimeTest
1,790 msx64 debian > AddressSanitizer-x86_64-linux.TestCases::strcmp.c

Event Timeline

haowei requested review of this revision.Sep 9 2021, 3:21 PM
haowei created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptSep 9 2021, 3:21 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
phosek accepted this revision.Sep 9 2021, 3:28 PM
phosek added a subscriber: phosek.

LGTM

clang/tools/clang-format/clang-format-diff.py
62

This is going to be the default name so I don't think you need this line at all.

This revision is now accepted and ready to land.Sep 9 2021, 3:28 PM
Harbormaster completed remote builds in B123319: Diff 371733.Sep 9 2021, 4:08 PM
haowei updated this revision to Diff 371749.Sep 9 2021, 4:35 PM
haowei marked an inline comment as done.
haowei added inline comments.
clang/tools/clang-format/clang-format-diff.py
62

Removed in the latest patch. Locally tested.

This revision was landed with ongoing or failed builds.Sep 9 2021, 4:37 PM
Closed by commit rG38a5bd4115af: [clang_format] Add fallback-style flag to clang-format-diff.py (authored by haowei). · Explain Why
This revision was automatically updated to reflect the committed changes.
haowei marked an inline comment as done.
haowei added a commit: rG38a5bd4115af: [clang_format] Add fallback-style flag to clang-format-diff.py.
Harbormaster completed remote builds in B123331: Diff 371749.Sep 9 2021, 5:10 PM

Revision Contents

PathSize
clang/
tools/
clang-format/
8 lines

Diff 371733

clang/tools/clang-format/clang-format-diff.py

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Lines parser.add_argument('-iregex', metavar='PATTERN', default=
'(case insensitive, overridden by -regex)') '(case insensitive, overridden by -regex)')
parser.add_argument('-sort-includes', action='store_true', default=False, parser.add_argument('-sort-includes', action='store_true', default=False,
help='let clang-format sort include blocks') help='let clang-format sort include blocks')
parser.add_argument('-v', '--verbose', action='store_true', parser.add_argument('-v', '--verbose', action='store_true',
help='be more verbose, ineffective without -i') help='be more verbose, ineffective without -i')
parser.add_argument('-style', parser.add_argument('-style',
help='formatting style to apply (LLVM, GNU, Google, Chromium, ' help='formatting style to apply (LLVM, GNU, Google, Chromium, '
'Microsoft, Mozilla, WebKit)') 'Microsoft, Mozilla, WebKit)')
parser.add_argument('-fallback-style',
dest='fallback_style',
phosekUnsubmitted
Done
ReplyInline Actions

This is going to be the default name so I don't think you need this line at all.

phosek: This is going to be the default name so I don't think you need this line at all.
haoweiAuthorUnsubmitted
Done
ReplyInline Actions

Removed in the latest patch. Locally tested.

haowei: Removed in the latest patch. Locally tested.
help='The name of the predefined style used as a'
'fallback in case clang-format is invoked with'
'-style=file, but can not find the .clang-format'
'file to use.')
parser.add_argument('-binary', default='clang-format', parser.add_argument('-binary', default='clang-format',
help='location of binary to use for clang-format') help='location of binary to use for clang-format')
args = parser.parse_args() args = parser.parse_args()
# Extract changed lines for each file. # Extract changed lines for each file.
filename = None filename = None
lines_by_file = {} lines_by_file = {}
for line in sys.stdin: for line in sys.stdin:
Show All 29 Lines for filename, lines in lines_by_file.items():
command = [args.binary, filename] command = [args.binary, filename]
if args.i: if args.i:
command.append('-i') command.append('-i')
if args.sort_includes: if args.sort_includes:
command.append('-sort-includes') command.append('-sort-includes')
command.extend(lines) command.extend(lines)
if args.style: if args.style:
command.extend(['-style', args.style]) command.extend(['-style', args.style])
if args.fallback_style:
command.extend(['-fallback-style', args.fallback_style])
try: try:
p = subprocess.Popen(command, p = subprocess.Popen(command,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=None, stderr=None,
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
universal_newlines=True) universal_newlines=True)
except OSError as e: except OSError as e:
Show All 22 Lines