Merge pull request #16248 from huonw/match-timestamp-scheme

[update-checkout] Require --scheme for --match-timestamp.

Author: huonw

utils/update_checkout.py

@@ -102,9 +102,6 @@ def update_single_repository(args):
                     checkout_target = find_rev_by_timestamp(timestamp,
                                                             repo_name,
                                                             checkout_target)
-            elif timestamp:
-                checkout_target = find_rev_by_timestamp(timestamp, repo_name,
-                                                        "HEAD")
 
             # The clean option restores a repository to pristine condition.
             if should_clean:
@@ -435,10 +432,17 @@ def main():
         dest="n_processes")
     args = parser.parse_args()
 
-    if args.reset_to_remote and not args.scheme:
-        print("update-checkout usage error: --reset-to-remote must specify "
-              "--scheme=foo")
-        sys.exit(1)
+    if not args.scheme:
+        if args.reset_to_remote:
+            print("update-checkout usage error: --reset-to-remote must "
+                  "specify --scheme=foo")
+            sys.exit(1)
+        if args.match_timestamp:
+            # without a scheme, we won't be able match timestamps forward in
+            # time, which is an annoying footgun for bisection etc.
+            print("update-checkout usage error: --match-timestamp must "
+                  "specify --scheme=foo")
+            sys.exit(1)
 
     clone = args.clone
     clone_with_ssh = args.clone_with_ssh