Run format-webkit on webkitpy code (without string conversion).

third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py

 # Copyright (c) 2009, 2010, 2011 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 52 matching lines @@
         full_command_args = [self.executable_name] + command_args
         full_kwargs = kwargs
         if 'cwd' not in full_kwargs:
             full_kwargs['cwd'] = self.checkout_root
         return self._run(full_command_args, **full_kwargs)
 
     @classmethod
     def in_working_directory(cls, path, executive=None):
         try:
             executive = executive or Executive()
-            return executive.run_command([cls.executable_name, 'rev-parse', '--is-inside-work-tree'], cwd=path, error_handler=Executive.ignore_error).rstrip() == "true"
-        except OSError, e:
+            return executive.run_command([cls.executable_name, 'rev-parse', '--is-inside-work-tree'],
+                                         cwd=path, error_handler=Executive.ignore_error).rstrip() == "true"
+        except OSError as e:
             # The Windows bots seem to through a WindowsError when git isn't installed.
             return False
 
     def find_checkout_root(self, path):
         # "git rev-parse --show-cdup" would be another way to get to the root
         checkout_root = self._run_git(['rev-parse', '--show-toplevel'], cwd=(path or "./")).strip()
         if not self._filesystem.isabs(checkout_root):  # Sometimes git returns relative paths
             checkout_root = self._filesystem.join(path, checkout_root)
         return checkout_root
 
     @classmethod
     def read_git_config(cls, key, cwd=None, executive=None):
         # FIXME: This should probably use cwd=self.checkout_root.
         # Pass --get-all for cases where the config has multiple values
         # Pass the cwd if provided so that we can handle the case of running webkit-patch outside of the working directory.
         # FIXME: This should use an Executive.
         executive = executive or Executive()
-        return executive.run_command([cls.executable_name, "config", "--get-all", key], error_handler=Executive.ignore_error, cwd=cwd).rstrip('\n')
+        return executive.run_command(
+            [cls.executable_name, "config", "--get-all", key], error_handler=Executive.ignore_error, cwd=cwd).rstrip('\n')
 
     def _discard_local_commits(self):
         self._run_git(['reset', '--hard', self._remote_branch_ref()])
 
     def _local_commits(self, ref='HEAD'):
         return self._run_git(['log', '--pretty=oneline', ref + '...' + self._remote_branch_ref()]).splitlines()
 
     def _rebase_in_progress(self):
         return self._filesystem.exists(self.absolute_path(self._filesystem.join('.git', 'rebase-apply')))
 
@@ skipping 42 matching lines @@
     def current_branch_or_ref(self):
         """Returns the name of the current branch, or the commit hash if HEAD is detached."""
         branch_name = self.current_branch()
         if not branch_name:
             # HEAD is detached; use commit SHA instead.
             return self._run_git(['rev-parse', 'HEAD']).strip()
         return branch_name
 
     def _upstream_branch(self):
         current_branch = self.current_branch()
-        return self._branch_from_ref(self.read_git_config('branch.%s.merge' % current_branch, cwd=self.checkout_root, executive=self._executive).strip())
+        return self._branch_from_ref(self.read_git_config(
+            'branch.%s.merge' % current_branch, cwd=self.checkout_root, executive=self._executive).strip())
 
     def _merge_base(self, git_commit=None):
         if git_commit:
             # Rewrite UPSTREAM to the upstream branch
             if 'UPSTREAM' in git_commit:
                 upstream = self._upstream_branch()
                 if not upstream:
                     raise ScriptError(message='No upstream/tracking branch set.')
                 git_commit = git_commit.replace('UPSTREAM', upstream)
 
@@ skipping 154 matching lines @@
         if self.current_branch() != self._branch_tracking_remote_master():
             return False
         if len(self._local_commits(self._branch_tracking_remote_master())) > 0:
             return False
         return True
 
     def ensure_cleanly_tracking_remote_master(self):
         self._discard_working_directory_changes()
         self._run_git(['checkout', '-q', self._branch_tracking_remote_master()])
         self._discard_local_commits()