Add " (CQ)" to the author name in the console if the commit-queue was used.

buildbot/changes/svnpoller.py

 # This file is part of Buildbot.  Buildbot is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation, version 2.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
@@ skipping 184 matching lines @@
             if prefix.startswith("/"):
                 prefix = prefix[1:]
             log.msg("SVNPoller: svnurl=%s, root=%s, so prefix=%s" %
                     (self.svnurl, root, prefix))
             return prefix
         d.addCallback(determine_prefix)
         return d
 
     def get_logs(self, _):
         args = []
-        args.extend(["log", "--xml", "--verbose", "--non-interactive"])
+        args.extend(["log", "--xml", "--verbose", "--non-interactive",
+            "--with-all-revprops"])

[sadrul, 2012/01/26 17:57:49]

You suggested in the previous CL for this that this should be moved to
scripts/master/. I see that SVNPoller is subclassed in
scripts/master/try_job_svn.py. If I understand this right, I should do something
similar (in chromium_svnpoller.py?). I am not sure what else I should change to
make sure the subclass'ed SVNPoller is used. So for now, I have kept this change
here.

[M-A Ruel, 2012/01/26 18:53:47]

Yes, I want you to do the same thing that what is done with try_job_svn.py. Then
you can use the subclassed class in each master.cfg. This way, we can start with
master.chromium.fyi/master.cfg first and once it's determined to work, we can
enable all the other masters.

So in short;
In master.cfg, instead of "from buildbot.changes import svnpoller", use "from
master import svnpoller"

Then in scripts/master/svnpoller.py:

class SVNPoller(svnpoller.SVNPoller):
  def get_logs(self, _):
    args = ["log", "--xml", "--verbose", "--non-interactive",
"--with-all-revprops"]
(...)
  def create_changes(self, new_logentries):
(...)

         if self.svnuser:
             args.extend(["--username=%s" % self.svnuser])
         if self.svnpasswd:
             args.extend(["--password=%s" % self.svnpasswd])
         args.extend(["--limit=%d" % (self.histmax), self.svnurl])
         d = self.getProcessOutput(args)
         return d
 
     def parse_logs(self, output):
         # parse the XML output, return a list of <logentry> nodes
@@ skipping 66 matching lines @@
         relative_path = path[len(self._prefix):]
         if relative_path.startswith("/"):
             relative_path = relative_path[1:]
         where = self.split_file(relative_path)
         # 'where' is either None or (branch, final_path)
         return where
 
     def create_changes(self, new_logentries):
         changes = []
 
+        def commit_bot_used(logentry):
+            revprops = logentry.getElementsByTagName('revprops')
+            if revprops is not None:
+                for revprop in revprops.getElementsByTagName('property'):
+                    if revprop.getAttribute("name") == "commit-bot":
+                        return True
+            return False
+
         for el in new_logentries:
             revision = str(el.getAttribute("revision"))
 
             revlink=''
 
             if self.revlinktmpl:
                 if revision:
                     revlink = self.revlinktmpl % urllib.quote_plus(revision)
 
             log.msg("Adding change revision %s" % (revision,))
             author   = self._get_text(el, "author")
             comments = self._get_text(el, "msg")
+            used_cq  = commit_bot_used(el)
             # there is a "date" field, but it provides localtime in the
             # repository's timezone, whereas we care about buildmaster's
             # localtime (since this will get used to position the boxes on
             # the Waterfall display, etc). So ignore the date field, and
             # addChange will fill in with the current time
             branches = {}
             try:
                 pathlist = el.getElementsByTagName("paths")[0]
             except IndexError: # weird, we got an empty revision
                 log.msg("ignoring commit with no paths")
@@ skipping 25 matching lines @@
             for branch in branches.keys():
                 action = branches[branch]['action']
                 files  = branches[branch]['files']
                 number_of_files_changed = len(files)
 
                 if action == u'D' and number_of_files_changed == 1 and files[0] == '':
                     log.msg("Ignoring deletion of branch '%s'" % branch)
                 else:
                     chdict = dict(
                             who=author,
+                            cq=used_cq,
                             files=files,
                             comments=comments,
                             revision=revision,
                             branch=branch,
                             revlink=revlink,
                             category=self.category,
                             repository=self.svnurl,
                             project = self.project)
                     changes.append(chdict)
 
         return changes
 
     @defer.deferredGenerator
     def submit_changes(self, changes):
         for chdict in changes:
             wfd = defer.waitForDeferred(self.master.addChange(**chdict))
             yield wfd
             wfd.getResult()
 
     def finished_ok(self, res):
         if self.cachepath:
             f = open(self.cachepath, "w")
             f.write(str(self.last_change))
             f.close()
 
         log.msg("SVNPoller finished polling %s" % res)
         return res