mirror of
git://git.yoctoproject.org/yocto-autobuilder2.git
synced 2025-07-19 11:59:02 +02:00
yocto_console_view: Merge all unresolved revisions into one entry
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8d95b24b8b
commit
c31ca19a34
|
@ -182,8 +182,8 @@ class Console {
|
|||
|
||||
this.sortBuildersByTags(this.all_builders);
|
||||
|
||||
if (this.changesBySSID == null) { this.changesBySSID = {}; }
|
||||
if (this.changesByRevision == null) { this.changesByRevision = {}; }
|
||||
this.changesBySSID = {};
|
||||
this.changesByRevision = {};
|
||||
for (change of Array.from(this.changes)) {
|
||||
this.changesBySSID[change.sourcestamp.ssid] = change;
|
||||
this.changesByRevision[change.revision] = change;
|
||||
|
@ -414,12 +414,6 @@ class Console {
|
|||
if ((change == null)) {
|
||||
change = this.makeFakeChange(rev, build.started_at, rev);
|
||||
}
|
||||
if ((buildset != null) && (buildset.parent_buildid != null)) {
|
||||
oldrev = `Unresolved ${buildset.parent_buildid}`;
|
||||
delete this.changesBySSID[oldrev];
|
||||
}
|
||||
oldrev = `Unresolved ${build.builderid}-${build.buildid}`;
|
||||
delete this.changesBySSID[oldrev];
|
||||
|
||||
change.caption = "Commit";
|
||||
if ((build.properties != null ? build.properties.yp_build_branch : undefined) != null) {
|
||||
|
@ -442,27 +436,14 @@ class Console {
|
|||
change.reason = build.properties.reason[0];
|
||||
}
|
||||
} else {
|
||||
if ((buildset != null) && (buildset.parent_buildid != null)) {
|
||||
rev = `Unresolved ${buildset.parent_buildid}`;
|
||||
if ((change == null)) {
|
||||
change = this.changesBySSID[rev];
|
||||
}
|
||||
if ((change == null)) {
|
||||
oldrev = `Unresolved ${build.builderid}-${build.buildid}`;
|
||||
delete this.changesBySSID[oldrev];
|
||||
change = this.makeFakeChange(rev, build.started_at, rev);
|
||||
}
|
||||
rev = `Unresolved Revision`;
|
||||
if ((change == null)) {
|
||||
change = this.changesBySSID[rev];
|
||||
}
|
||||
if ((change == null)) {
|
||||
rev = `Unresolved ${build.builderid}-${build.buildid}`;
|
||||
if ((change == null)) {
|
||||
change = this.changesBySSID[rev];
|
||||
}
|
||||
if ((change == null)) {
|
||||
change = this.makeFakeChange(rev, build.started_at, rev);
|
||||
}
|
||||
change = this.makeFakeChange(rev, build.started_at, rev);
|
||||
change.caption = rev;
|
||||
}
|
||||
change.caption = rev;
|
||||
}
|
||||
|
||||
if (change.buildersById[build.builderid].builds.indexOf(build) == -1) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user