[WPT Export] Delete remote branch, add label, additional refactoring

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 12 matching lines @@
         Args:
             host: A Host object.
             path: Optional, the directory where LocalWPT will check out web-platform-tests.
             no_fetch: Optional, passing true will skip updating the local WPT.
                 Intended for use only in development after fetching once.
             use_github: Optional, passing true will check if the GitHub remote is enabled
                 (necessary for later pull request steps).
         """
         self.host = host
         self.path = path
+        self.branch_name = 'chromium-export-try'
 
         if no_fetch:
             _log.info('Skipping remote WPT fetch')
             return
 
         if self.host.filesystem.exists(self.path):
             _log.info('WPT checkout exists at %s, fetching latest', self.path)
             self.run(['git', 'fetch', '--all'])
             self.run(['git', 'checkout', 'origin/master'])
         else:
@@ skipping 18 matching lines @@
         position = position.strip()
         assert position
 
         chromium_commit = ChromiumCommit(self.host, position=position)
         return sha, chromium_commit
 
     def clean(self):
         self.run(['git', 'reset', '--hard', 'HEAD'])
         self.run(['git', 'clean', '-fdx'])
         self.run(['git', 'checkout', 'origin/master'])
+        try:
+            self.run(['git', 'branch', '-D', self.branch_name])
+        except ScriptError:
+            pass

[qyearsley, 2017/01/06 19:20:24]

What kind of circumstance would result in a ScriptError here? Would this always
mean that the branch has already been removed or there's some messed-up state?
Maybe it makes sense to abort with an error message?

[jeffcarp, 2017/01/06 23:51:59]

If the branch doesn't exist, it throws a ScriptError. Only deleting it if it
exists might fix the problem, but I vaguely remember there was a reason I did it
this way.

 
     def all_branches(self):
         """Returns a list of local and remote branches."""
         return self.run(['git', 'branch', '-a']).splitlines()
 
     def create_branch_with_patch(self, message, patch):
         """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()
-        branch_name = 'chromium-export-try'
-        remote_branch_name = 'remotes/github/%s' % branch_name
+        remote_branch_name = 'remotes/github/%s' % self.branch_name

[qyearsley, 2017/01/06 19:20:24]

Where is the remote name "github" determined?

[jeffcarp, 2017/01/06 23:51:59]

Right now it's set manually when I add it to the local WPT repo. It should
probably be automated. I'll make a bug.

 
-        if branch_name in all_branches:
-            _log.info('Local branch %s already exists, deleting', branch_name)
-            self.run(['git', 'branch', '-D', branch_name])
+        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])
 
+        # TODO(jeffcarp): this is broken

[qyearsley, 2017/01/06 19:20:24]

Should be more specific: What's broken, how, and what's the next thing "to do"
here?

[jeffcarp, 2017/01/07 00:08:48]

Removing this functionality. Since we're deleting the remote branch now after
merge, it should not exist.

         if remote_branch_name in all_branches:
-            _log.info('Remote branch %s already exists, deleting', branch_name)
+            _log.info('Remote branch %s already exists, deleting', self.branch_name)
             # TODO(jeffcarp): Investigate what happens when remote branch exists.
-            self.run(['git', 'push', 'github', ':{}'.format(branch_name)])
+            self.run(['git', 'push', 'github', ':{}'.format(self.branch_name)])
 
-        _log.info('Creating local branch %s', branch_name)
-        self.run(['git', 'checkout', '-b', 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', 'commit', '-am', message])
-        self.run(['git', 'push', 'github', branch_name])
+        self.run(['git', 'push', 'github', self.branch_name])
 
-        return 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.
 
         Returns:
             A string containing the diff the patch produced.
         """
         self.clean()
 
         # Remove Chromium WPT directory prefix.
         patch = patch.replace(CHROMIUM_WPT_DIR, '')
 
         try:
             self.run(['git', 'apply', '-'], input=patch)
             self.run(['git', 'add', '.'])
             output = self.run(['git', 'diff', 'origin/master'])
         except ScriptError as error:
-            _log.error('Error while applying patch: %s', error)
+            _log.info('Patch did not apply cleanly, skipping...')

[qyearsley, 2017/01/06 19:20:24]

This could also be "warning" rather than "info".

             output = ''
 
         self.clean()
         return output
 
     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())