Merge branch 'restore-gerrit-changeid-in-branch' of git://github.com/…

…djmitche/buildbot (PR #1024)
buildbot · Dec 25, 2013 · fc89020 · fc89020
2 parents f518276 + 202a18a
commit fc89020
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/master/buildbot/changes/gerritchangesource.py b/master/buildbot/changes/gerritchangesource.py
@@ -155,7 +155,8 @@ def addChangeFromEvent(self, properties, event):
                 'repository': "ssh://%s@%s:%s/%s" % (
                     self.username, self.gerritserver,
                     self.gerritport, event_change["project"]),
-                'branch': event_change["branch"],
+                'branch': "%s/%s" % (event_change["branch"],
+                                     event_change['number']),
                 'revision': event["patchSet"]["revision"],
                 'revlink': event_change["url"],
                 'comments': event_change["subject"],

diff --git a/master/buildbot/test/unit/test_changes_gerritchangesource.py b/master/buildbot/test/unit/test_changes_gerritchangesource.py
@@ -52,7 +52,7 @@ def test_describe(self):
                        'author': u'Dustin <dustin@mozilla.com>',
                        'comments': u'fix 1234',
                        'project': u'pr',
-                       'branch': u'br',
+                       'branch': u'br/4321',
                        'revlink': u'http://buildbot.net',
                        'properties': {u'event.change.owner.email': u'dustin@mozilla.com',
                                       u'event.change.subject': u'fix 1234',