From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/utils/git-svn/convert.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lldb/utils/git-svn/convert.py') diff --git a/lldb/utils/git-svn/convert.py b/lldb/utils/git-svn/convert.py index c230a01..589522c 100755 --- a/lldb/utils/git-svn/convert.py +++ b/lldb/utils/git-svn/convert.py @@ -11,15 +11,19 @@ Usage: 4. git svn dcommit [--commit-url https://id@llvm.org/svn/llvm-project/lldb/trunk] """ -import os, re, sys +import os +import re +import sys import StringIO + def usage(problem_file=None): if problem_file: print "%s is not a file" % problem_file print "Usage: convert.py raw-message-source [raw-message-source2 ...]" sys.exit(0) + def do_convert(file): """Skip all preceding mail message headers until 'From: ' is encountered. Then for each line ('From: ' header included), replace the dos style CRLF @@ -38,7 +42,8 @@ def do_convert(file): # By default, splitlines() don't include line breaks. CRLF should be gone. for line in content.splitlines(): - # Wait till we scan the 'From: ' header before start printing the lines. + # Wait till we scan the 'From: ' header before start printing the + # lines. if not from_header_seen: if not line.startswith('From: '): continue @@ -52,6 +57,7 @@ def do_convert(file): print "done" + def main(): if len(sys.argv) == 1: usage() -- cgit v1.1