Bug 148188 – Make Dashboard.Branches be objects of the form {repository, branchName} and update existing code to work with these new objects.

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Jason Marcell]

Make Dashboard.Branches be objects of the form {repository, branchName} and update existing code to work with these new objects.

[Jason Marcell]

Created attachment 259400 [details]
=Make Dashboard.Branches be objects of the form {repository, branchName} and update existing code to work with these new objects.

[Jason Marcell]

Comment on attachment 259400 [details]
=Make Dashboard.Branches be objects of the form {repository, branchName} and update existing code to work with these new objects.

View in context: https://bugs.webkit.org/attachment.cgi?id=259400&action=review

> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:212
> +                key = repository.name;

This should be 'repositoryName'

> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:215
>              this.revision[repository] = parseRevisionProperty(revisionProperty, key, fallbackKey);

This should be
this.revision[repositoryName] ...

I'll upload a new patch that addresses these two issues.

[Jason Marcell]

Created attachment 259477 [details]
Patch

[Alexey Proskuryakov]

Comment on attachment 259477 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=259477&action=review

> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:172
> -            for (var i = 0; i < length; ++i)
> -                content.appendChild(lines[i]);
> +            for (var j = 0; j < length; ++j)
> +                content.appendChild(lines[j]);

Jason and myself landed this part in r188758, to quickly fix a regression caused by broken iteration.

[Jason Marcell]

Created attachment 259647 [details]
Patch

[Jason Marcell]

Uploaded a new patch since Alexey landed the change in r188758.

[Jason Marcell]

Created attachment 259676 [details]
Patch

[Daniel Bates]

Comment on attachment 259676 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=259676&action=review

> Tools/ChangeLog:12
> +        (BuildbotCombinedQueueView): Changed to work with new {repository, branchName} object.

Maybe it would be more descriptive to write:

Changed to work with new branch objects which represent a (repository, "branch name")-pair.

> Tools/ChangeLog:18
> +        (BuildbotQueueView.prototype._appendPendingRevisionCount): Changed to work with new {repository, branchName}
> +        object.

Ditto.

> Tools/ChangeLog:24
> +        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: Added isSVN property
> +        to Dashboard.Repository object. Also removed Internal Dashboard.Repository object.

I'm unclear how these change relate to the purpose of this bug. Please make these change in a separate bug.

> Tools/ChangeLog:28
> +        (WebKitBuildbot.prototype.get defaultBranches): Changed to new {repository, branchName} format.

Maybe it would be more descriptive to write:

Changed to work with new branch objects which represent a (repository, "branch name")-pair.

> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:41
> +                indicesOfFirstQueueWithRepository[repositoryName] = {queueIndex: i, branchIndex: j};

Nit: There should be a space character after the '{' and before the '}';

> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:46
> +            message += " === combinedQueues[" + expected.queueIndex + "].branch[" + expected.branchIndex + "] === " + expectedBranch.name;

Nit: Remove the space character at the beginning of this line or there will be two space characters before the second === in the printed message.

> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:40
> -        OpenSource: { name: "openSource", order: 0 },
> -        Internal: { name: "internal", order: 1 },
> +        OpenSource: { isSVN: true, name: "openSource", order: 0 },

I'm unclear how these change relate to the purpose of this bug. Please make these change in a separate bug.

[Jason Marcell]

Created attachment 259691 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 259691 [details]
Patch

Clearing flags on attachment: 259691

Committed r188814: <http://trac.webkit.org/changeset/188814>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.