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/packages/Python/lldbsuite/test/lldbpexpect.py | 52 ++++++++++++++++------
 1 file changed, 39 insertions(+), 13 deletions(-)

(limited to 'lldb/packages/Python/lldbsuite/test/lldbpexpect.py')

diff --git a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
index d37d6fa..a19e6ef 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
@@ -20,7 +20,7 @@ else:
     import pexpect
 
     class PExpectTest(TestBase):
-    
+
         mydir = TestBase.compute_mydir(__file__)
 
         def setUp(self):
@@ -30,40 +30,66 @@ else:
             pass
 
         def launch(self, timeout=None):
-            if timeout is None: timeout = 30
+            if timeout is None:
+                timeout = 30
             logfile = sys.stdout if self.TraceOn() else None
-            self.child = pexpect.spawn('%s --no-use-colors %s' % (lldbtest_config.lldbExec, self.launchArgs()), logfile=logfile)
+            self.child = pexpect.spawn(
+                '%s --no-use-colors %s' %
+                (lldbtest_config.lldbExec, self.launchArgs()), logfile=logfile)
             self.child.timeout = timeout
             self.timeout = timeout
 
         def expect(self, patterns=None, timeout=None, exact=None):
-            if patterns is None: return None
-            if timeout is None: timeout = self.timeout
-            if exact is None: exact = False
+            if patterns is None:
+                return None
+            if timeout is None:
+                timeout = self.timeout
+            if exact is None:
+                exact = False
             if exact:
                 return self.child.expect_exact(patterns, timeout=timeout)
             else:
                 return self.child.expect(patterns, timeout=timeout)
 
         def expectall(self, patterns=None, timeout=None, exact=None):
-            if patterns is None: return None
-            if timeout is None: timeout = self.timeout
-            if exact is None: exact = False
+            if patterns is None:
+                return None
+            if timeout is None:
+                timeout = self.timeout
+            if exact is None:
+                exact = False
             for pattern in patterns:
                 self.expect(pattern, timeout=timeout, exact=exact)
 
-        def sendimpl(self, sender, command, patterns=None, timeout=None, exact=None):
+        def sendimpl(
+                self,
+                sender,
+                command,
+                patterns=None,
+                timeout=None,
+                exact=None):
             sender(command)
             return self.expect(patterns=patterns, timeout=timeout, exact=exact)
 
         def send(self, command, patterns=None, timeout=None, exact=None):
-            return self.sendimpl(self.child.send, command, patterns, timeout, exact)
+            return self.sendimpl(
+                self.child.send,
+                command,
+                patterns,
+                timeout,
+                exact)
 
         def sendline(self, command, patterns=None, timeout=None, exact=None):
-            return self.sendimpl(self.child.sendline, command, patterns, timeout, exact)
+            return self.sendimpl(
+                self.child.sendline,
+                command,
+                patterns,
+                timeout,
+                exact)
 
         def quit(self, gracefully=None):
-            if gracefully is None: gracefully = True
+            if gracefully is None:
+                gracefully = True
             self.child.sendeof()
             self.child.close(force=not gracefully)
             self.child = None
-- 
cgit v1.1