Remove the --allow-local-commits flag from wpt-import.

Change-Id: I4c54ce01d990dc8b2d6a6ffdb46f0774157faa71
Reviewed-on: https://chromium-review.googlesource.com/577722
Reviewed-by: Jeff Carpenter <jeffcarp@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487992}

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

@@ -52,7 +52,7 @@ class TestImporter(object):
         log_level = logging.DEBUG if self.verbose else logging.INFO
         logging.basicConfig(level=log_level, format='%(message)s')
 
-        if not self.checkout_is_okay(options.allow_local_commits):
+        if not self.checkout_is_okay():
             return 1
 
         credentials = read_credentials(self.host, options.credentials_json)
@@ -202,9 +202,6 @@ class TestImporter(object):
         parser.add_argument(
             '-v', '--verbose', action='store_true',
             help='log extra details that may be helpful when debugging')
-        parser.add_argument(
-            '--allow-local-commits', action='store_true',
-            help='allow script to run even if we have local commits')
         parser.add_argument(
             '--ignore-exportable-commits', action='store_true',
             help='do not check for exportable commits that would be clobbered')
@@ -223,17 +220,16 @@ class TestImporter(object):
 
         return parser.parse_args(argv)
 
-    def checkout_is_okay(self, allow_local_commits):
-        git_diff_retcode, _ = self.run(['git', 'diff', '--quiet', 'HEAD'], exit_on_failure=False)
+    def checkout_is_okay(self):
+        git_diff_retcode, _ = self.run(
+            ['git', 'diff', '--quiet', 'HEAD'], exit_on_failure=False)
         if git_diff_retcode:
             _log.warning('Checkout is dirty; aborting.')
             return False
-
-        local_commits = self.run(['git', 'log', '--oneline', 'origin/master..HEAD'])[1]
-        if local_commits and not allow_local_commits:
-            _log.warning('Checkout has local commits; aborting. Use --allow-local-commits to allow this.')
-            return False
-
+        _, local_commits = self.run(
+            ['git', 'log', '--oneline', 'origin/master..HEAD'])[1]
+        if local_commits:
+            _log.warning('Checkout has local commits before import.')
         return True
 
     def exportable_but_not_exported_commits(self, local_wpt):

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

@@ -28,7 +28,7 @@ class TestImporterTest(LoggingTestCase):
         importer.exportable_but_not_exported_commits = lambda _: [
             MockChromiumCommit(host, change_id='Iba5eba11')
         ]
-        importer.checkout_is_okay = lambda _: True
+        importer.checkout_is_okay = lambda: True
         return_code = importer.main(['--credentials-json=/tmp/creds.json'])
         self.assertEqual(return_code, 0)
         self.assertLog([
@@ -52,7 +52,7 @@ class TestImporterTest(LoggingTestCase):
         importer.exportable_but_not_exported_commits = lambda _: [
             MockChromiumCommit(host, position='refs/heads/master@{#431}')
         ]
-        importer.checkout_is_okay = lambda _: True
+        importer.checkout_is_okay = lambda: True
         return_code = importer.main(['--credentials-json=/tmp/creds.json'])
         self.assertEqual(return_code, 0)
         self.assertLog([