Merge pull request #9912 from graydon/minor-script-tweaks

Author: swift-ci

utils/rusage.py

@@ -91,9 +91,13 @@ def __call__(self, parser, namespace, v, option_string=None):
                     action='store_true',
                     default=False,
                     help="write results as CSV")
+parser.add_argument("--csv-header",
+                    action='store_true',
+                    default=False,
+                    help="Emit CSV header")
 parser.add_argument("--csv-output", default="-",
-                    type=argparse.FileType('ab', 0),
-                    help="Append CSV output to file")
+                    type=argparse.FileType('wb', 0),
+                    help="Write CSV output to file")
 parser.add_argument("--csv-name", type=str,
                     default=str(datetime.datetime.now()),
                     help="Label row in CSV with name")
@@ -147,7 +151,7 @@ def __call__(self, parser, namespace, v, option_string=None):
 if args.csv:
     fieldnames = ["time", "mem", "run"]
     out = csv.DictWriter(args.csv_output, fieldnames, dialect='excel-tab')
-    if args.csv_output.tell() == 0:
+    if args.csv_header:
         out.writeheader()
     out.writerow(dict(time=used.ru_utime,
                       mem=used.ru_maxrss,

utils/update_checkout.py

@@ -42,11 +42,15 @@ def confirm_tag_in_repo(tag, repo_name):
 def find_rev_by_timestamp(timestamp, repo_name, refspec):
     base_args = ["git", "log", "-1", "--format=%H",
                  '--before=' + timestamp]
-    # Prefer the most-recent change _made by swift-ci_ before the timestamp,
-    # falling back to most-recent in general if there is none by swift-ci.
-    rev = shell.capture(base_args + ['--author', 'swift-ci', refspec]).strip()
-    if rev:
-        return rev
+    # On repos with regular batch-automerges from swift-ci -- namely clang,
+    # llvm and lldb -- prefer the most-recent change _made by swift-ci_
+    # before the timestamp, falling back to most-recent in general if there
+    # is none by swift-ci.
+    if repo_name in ["llvm", "clang", "lldb"]:
+        rev = shell.capture(base_args +
+                            ['--author', 'swift-ci', refspec]).strip()
+        if rev:
+            return rev
     rev = shell.capture(base_args + [refspec]).strip()
     if rev:
         return rev