From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001
From: Kate Stone <katherine.stone@apple.com>
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/misc/grep-svn-log.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'lldb/utils/misc/grep-svn-log.py')

diff --git a/lldb/utils/misc/grep-svn-log.py b/lldb/utils/misc/grep-svn-log.py
index ebbfe33..86cc3ef 100755
--- a/lldb/utils/misc/grep-svn-log.py
+++ b/lldb/utils/misc/grep-svn-log.py
@@ -9,7 +9,10 @@ Example:
 svn log -v | grep-svn-log.py '^   D.+why_are_you_missing.h$'
 """
 
-import fileinput, re, sys, StringIO
+import fileinput
+import re
+import sys
+import StringIO
 
 # Separator string for "svn log -v" output.
 separator = '-' * 72
@@ -18,30 +21,37 @@ usage = """Usage: grep-svn-log.py line-pattern
 Example:
     svn log -v | grep-svn-log.py '^   D.+why_are_you_missing.h'"""
 
+
 class Log(StringIO.StringIO):
     """Simple facade to keep track of the log content."""
+
     def __init__(self):
         self.reset()
+
     def add_line(self, a_line):
         """Add a line to the content, if there is a previous line, commit it."""
         global separator
-        if self.prev_line != None:
+        if self.prev_line is not None:
             print >> self, self.prev_line
         self.prev_line = a_line
         self.separator_added = (a_line == separator)
+
     def del_line(self):
         """Forget about the previous line, do not commit it."""
         self.prev_line = None
+
     def reset(self):
         """Forget about the previous lines entered."""
         StringIO.StringIO.__init__(self)
         self.prev_line = None
+
     def finish(self):
         """Call this when you're finished with populating content."""
-        if self.prev_line != None:
+        if self.prev_line is not None:
             print >> self, self.prev_line
         self.prev_line = None
 
+
 def grep(regexp):
     # The log content to be written out once a match is found.
     log = Log()
@@ -50,7 +60,7 @@ def grep(regexp):
     FOUND_LINE_MATCH = 1
     state = LOOKING_FOR_MATCH
 
-    while 1:
+    while True:
         line = sys.stdin.readline()
         if not line:
             return
@@ -72,6 +82,7 @@ def grep(regexp):
             if regexp.search(line):
                 state = FOUND_LINE_MATCH
 
+
 def main():
     if len(sys.argv) != 2:
         print usage
-- 
cgit v1.1