WPT Export: trim lines from branch list, stage changes before committing

third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A utility class for interacting with a local checkout of the Web Platform Tests."""
 
 import logging
 
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.w3c.chromium_commit import ChromiumCommit
@@ skipping 52 matching lines @@
 
     def clean(self):
         self.run(['git', 'reset', '--hard', 'HEAD'])
         self.run(['git', 'clean', '-fdx'])
         self.run(['git', 'checkout', 'origin/master'])
         if self.branch_name in self.all_branches():
             self.run(['git', 'branch', '-D', self.branch_name])
 
     def all_branches(self):
         """Returns a list of local and remote branches."""
-        return self.run(['git', 'branch', '-a']).splitlines()
+        return [s.strip() for s in self.run(['git', 'branch', '-a']).splitlines()]
 
     def create_branch_with_patch(self, message, patch, author):
         """Commits the given patch and pushes to the upstream repo.
 
         Args:
             message: Commit message string.
             patch: A patch that can be applied by git apply.
         """
         self.clean()
         all_branches = self.all_branches()
 
         if self.branch_name in all_branches:
             _log.info('Local branch %s already exists, deleting', self.branch_name)
             self.run(['git', 'branch', '-D', self.branch_name])
 
         _log.info('Creating local branch %s', self.branch_name)
         self.run(['git', 'checkout', '-b', self.branch_name])
 
         # Remove Chromium WPT directory prefix.
         patch = patch.replace(CHROMIUM_WPT_DIR, '')
 
         # TODO(jeffcarp): Use git am -p<n> where n is len(CHROMIUM_WPT_DIR.split(/'))
         # or something not off-by-one.
         self.run(['git', 'apply', '-'], input=patch)
+        self.run(['git', 'add', '.'])
         self.run(['git', 'commit', '--author', author, '-am', message])
         self.run(['git', 'push', REMOTE_NAME, self.branch_name])
 
         return self.branch_name
 
     def test_patch(self, patch):
         """Returns the expected output of a patch against origin/master.
 
         Args:
             patch: The patch to test against.
@@ skipping 19 matching lines @@
 
     def commits_behind_master(self, commit):
         """Returns the number of commits after the given commit on origin/master.
 
         This doesn't include the given commit, and this assumes that the given
         commit is on the the master branch.
         """
         return len(self.run([
             'git', 'rev-list', '{}..origin/master'.format(commit)
         ]).splitlines())