Merge pull request #3823 from gottesmm/updatecheckout-fix

Updatecheckout fix

Author: gribozavr

utils/python-lint

@@ -13,4 +13,4 @@ if [[ $? != 0 ]]; then
   echo "Could not change directory to '$SCRIPT_DIR/..'."
   exit 1
 fi
-flake8
+flake8 $@

utils/update-checkout

@@ -32,14 +32,18 @@ sys.path.append(os.path.join(SCRIPT_DIR, 'swift_build_support'))
 from swift_build_support import shell  # noqa (E402)
 
 
-def update_single_repository(repo_path, branch, reset_to_remote):
+def update_single_repository(repo_path, branch, reset_to_remote, should_clean):
     if not os.path.isdir(repo_path):
         return
 
     print("--- Updating '" + repo_path + "' ---")
     with shell.pushd(repo_path, dry_run=False, echo=False):
         shell.call(["git", "fetch"], echo=False)
 
+        if should_clean:
+            shell.call(['git', 'clean', '-fdx'],
+                       echo=False)
+
         if branch:
             status = shell.capture(['git', 'status', '--porcelain', '-uno'],
                                    echo=False)
@@ -83,7 +87,8 @@ def update_all_repositories(args, config, scheme_name):
 
         update_single_repository(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
                                  repo_branch,
-                                 args.reset_to_remote)
+                                 args.reset_to_remote,
+                                 args.clean)
 
 
 def obtain_additional_swift_sources(
@@ -194,6 +199,10 @@ By default, updates your checkouts of Swift, SourceKit, LLDB, and SwiftPM.""")
         '--reset-to-remote',
         help='Reset each branch to the remote state.',
         action='store_true')
+    parser.add_argument(
+        '--clean',
+        help='Clean unrelated files from each repository.',
+        action='store_true')
     parser.add_argument(
         "--config",
         default=os.path.join(SCRIPT_DIR, "update-checkout-config.json"),