Switching nacl_deps_bump to git.

nacl_deps_bump_cronjob.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This tool is a wrapper around nacl_deps_bump.py that is intended to be
 run from a cron job.
 
 This tool kicks off try jobs for updating nacl_revision in Chromium's
 DEPS file.  To reduce load on the try servers, it kicks off a new try
 job when a sufficient number of new NaCl revisions have appeared, or a
 sufficient time has elapsed, since its last try job.
 
 Like nacl_deps_bump.py, this tool should be run from a Git checkout of
 Chromium.
 """
 
 import optparse
 import re
 import subprocess
 import time
 
-import pysvn
-
 import nacl_deps_bump
 
 
 # When this number of new revisions accumulates, we kick off a new build.
 REVS_THRESHOLD = 10
 
 # When the last revision is this old, we kick off a new build.
 TIME_THRESHOLD = 60 * 60 * 12 # 12 hours
 
 
 # Returns a list of NaCl SVN revision numbers that we have already
 # kicked off try jobs for.  This is based on the branch names in the
 # current Git repo.  This is imperfect because we might have created a
 # branch before but failed to send a try job for it.  We err on the
 # side of not spamming the trybots.
 def GetExistingJobs():
   proc = subprocess.Popen(['git', 'for-each-ref',
                            '--format', '%(refname:short)',
                            'refs/heads/*'], stdout=subprocess.PIPE)
   revs = []
   for line in proc.stdout:
-    match = re.match('nacl-deps-r(\d+)$', line.strip())
+    match = re.match('nacl-deps-(.*)$', line.strip())
     if match is not None:
-      revs.append(int(match.group(1)))
+      revs.append(match.group(1))
   assert proc.wait() == 0, proc.wait()
   return revs
 
 
-# Returns the time that the given SVN revision was committed, as a
+# Returns the time that the given GIT revision was committed, as a

[Mark Seaborn, 2015/01/28 16:34:21]

"Git"

[bradn, 2015/01/28 17:37:33]

Done.

 # Unix timestamp.
-def GetRevTime(svn_root, rev_num):
-  rev = pysvn.Revision(pysvn.opt_revision_kind.number, rev_num)
-  rev_info_list = pysvn.Client().log(svn_root,
-                                     revision_start=rev, revision_end=rev)
-  assert len(rev_info_list) == 1, rev_info_list
-  return rev_info_list[0].date
+def GetRevTime(git_dir, rev):
+  return int(subprocess.check_output(
+      ['git', 'log', '--pretty=format:%ct', '-n1', rev], cwd=git_dir))
 
 
 def Main():
+  nacl_git_dir = nacl_deps_bump.NACL_GIT_ROOT
+
   parser = optparse.OptionParser('%prog\n\n' + __doc__.strip())
   options, args = parser.parse_args()
   if len(args) != 0:
     parser.error('Got unexpected arguments')
 
   do_build = False
 
-  last_tried_rev = max([1] + GetExistingJobs())
-  print 'Last tried NaCl revision is r%i' % last_tried_rev
-  age = time.time() - GetRevTime(nacl_deps_bump.NACL_SVN_ROOT, last_tried_rev)
-  print 'Age of r%i is %.1f hours' % (last_tried_rev, age / (60 * 60))
+  last_tried_time, last_tried_rev = max(
+      [(1, '')] +
+      [(GetRevTime(nacl_git_dir, i), i) for i in GetExistingJobs()])

[Mark Seaborn, 2015/01/28 16:34:21]

"i" -> "rev"

[bradn, 2015/01/28 17:37:33]

Done.

+  print 'Last tried NaCl revision is %s' % last_tried_rev
+  age = time.time() - last_tried_time
+  print 'Age of %s is %.1f hours' % (last_tried_rev, age / (60 * 60))
   if age > TIME_THRESHOLD:
     print 'Time threshold passed: trigger new build'
     do_build = True
   else:
     print 'Time threshold not passed'
 
-  newest_rev = nacl_deps_bump.GetNaClRev()
-  rev_diff = newest_rev - last_tried_rev
+  newest_rev = nacl_deps_bump.GetNaClRev(nacl_git_dir)
+  rev_diff = len(nacl_deps_bump.GetLog(
+      nacl_git_dir, last_tried_rev, newest_rev)) - 1

[Mark Seaborn, 2015/01/28 16:34:21]

I don't think the "- 1" is right.  Remove that?

[bradn, 2015/01/28 17:37:33]

Ah, you're correct, didn't actually check the behavior.
Changed.

   print 'There have been %i NaCl revisions since our last try job' % rev_diff
   # Note that this comparison ignores that the commits might be to
   # branches rather the trunk.
   if rev_diff > REVS_THRESHOLD:
     print 'Revision count threshold passed: trigger new build'
     do_build = True
   else:
     print 'Revision count threshold not passed'
 
   if do_build:
     print 'Running nacl_deps_bump'
     nacl_deps_bump.Main(['--revision', str(newest_rev)])
   else:
     print 'Not running nacl_deps_bump'
 
 
 if __name__ == '__main__':
   Main()