Indiciate the tree status in the rietveld message when bypassing hooks

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 715 matching lines @@
       for filename in unknown_files:
         print "?      %s" % filename
   return 0
 
 
 def GenerateDiff(files):
   return SVN.GenerateDiff(
       files, GetRepositoryRoot(), full_move=False, revision=None)
 
 
+def GetTreeStatus():
+  tree_status_url = GetCodeReviewSetting('STATUS')
+  return git_cl.GetTreeStatus(tree_status_url) if tree_status_url else "unset"

[iannucci, 2014/01/14 19:45:58]

this should still probably return None instead of 'unset'

+
+
 def OptionallyDoPresubmitChecks(change_info, committing, args):
   if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
     breakpad.SendStack(
         breakpad.DEFAULT_URL + '/breakpad',
         'GclHooksBypassedCommit',
-        'Issue %s/%s bypassed hook when committing' %
-        (change_info.rietveld, change_info.issue),
+        'Issue %s/%s bypassed hook when committing (tree status was "%s")' %
+        (change_info.rietveld, change_info.issue, GetTreeStatus()),
         verbose=False)
     return presubmit_support.PresubmitOutput()
   return DoPresubmitChecks(change_info, committing, True)
 
 
 def defer_attributes(a, b):
   """Copy attributes from an object (like a function) to another."""
   for x in dir(a):
     if not getattr(b, x, None):
       setattr(b, x, getattr(a, x))
@@ skipping 305 matching lines @@
       viewvc_url = GetCodeReviewSetting('VIEW_VC')
       if viewvc_url and revision:
         change_info.append_footer('Committed: ' + viewvc_url + revision)
       elif revision:
         change_info.append_footer('Committed: ' + revision)
       change_info.CloseIssue()
       props = change_info.RpcServer().get_issue_properties(
           change_info.issue, False)
       patch_num = len(props['patchsets'])
       comment = "Committed patchset #%d manually as r%s" % (patch_num, revision)
-      comment += ' (presubmit successful).' if not bypassed else '.'
+      if bypassed:
+        comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'

[Dirk Pranke, 2014/01/14 22:56:21]

Since "tree was closed" is not the same thing as "presubmit was bypassed", it's
too bad that we can't distinguish between these two cases. I.e., it would be
nice to know if the other hooks ran and passed, but we can't currently do this
without a fair amount of rejiggering, I think.

+      else:
+        comment += ' (presubmit successful).'
       change_info.AddComment(comment)
   return 0
 
 
 def CMDchange(args):
   """Creates or edits a changelist.
 
   Only scans the current directory and subdirectories.
   """
   # Verify the user is running the change command from a read-write checkout.
@@ skipping 405 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))