grahamc/hydra2 - Change UKFZFDJOMUNXOF2QTVEA6VQG64DSGQCLJVEMH5OSBOSCZWUMKELQC

Remove the pretty-printed log

It didn't work anymore due to the removal of nix-log2xml. And in any case XSL is the work of the devil.

Created by Eelco Dolstra on October 27, 2016

UKFZFDJOMUNXOF2QTVEA6VQG64DSGQCLJVEMH5OSBOSCZWUMKELQC

Dependencies

In channels

main

Change contents

Deletion in configure.ac at line 77 [13.15951]
B:BD[13.16502] → [13.16502:16521]
```
  src/xsl/Makefile
```

Replacement in release.nix at line 138 [15.1]

B:BD[14.36] → [11.32:105]

        [ libxslt sqlite subversion openssh nix coreutils findutils pixz

[14.36]

[16.0]

        [ sqlite subversion openssh nix coreutils findutils pixz

File deletion: xsl
BF:BFD[17.4] → [18.3087:3101]
BF:BFD[18.3101] → [18.3086:3086]
File deletion: Makefile.am
BF:BFD[18.3086] → [13.2199634:2199669]
BF:BFD[13.2199669] → [13.2199522:2199522]
B:BD[13.2199522] → [13.2199523:2199631]
```
EXTRA_DIST = log2html.xsl mark-errors.xsl
xsldir = $(libexecdir)/hydra/xsl
nobase_xsl_DATA = $(EXTRA_DIST)
```

File deletion: mark-errors.xsl, mark-errors.xsl, mark-errors.xsl

BFD:BFD[19.1811] → [19.1863:1902]

BF:BFD[19.1902] → [20.6043:6043]

BF:BFD[18.3086] → [18.3138:3177]

BF:BFD[18.3177] → [20.6043:6043]

BFD:BFD[20.3437] → [20.6723:6762]

BF:BFD[20.6762] → [20.6043:6043]

B:BD[20.6043] → [20.6044:6147]

∅:D[7.335] → [20.6147:6426]

B:BD[20.6147] → [20.6147:6426]

B:BD[20.6426] → [21.0:56]

B:BD[21.56] → [3.0:52]

∅:D[3.52] → [22.0:51]

B:BD[20.6475] → [22.0:51]

B:BD[22.51] → [3.53:104]

∅:D[22.51] → [20.6475:6702]

∅:D[3.104] → [20.6475:6702]

B:BD[20.6475] → [20.6475:6702]

B:BD[20.6702] → [7.336:337]

∅:D[7.337] → [22.52:70]

B:BD[20.6705] → [22.52:70]

B:BD[20.6147] → [7.287:335]

<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:template match="@*|node()">
    <xsl:copy>
      <xsl:apply-templates select="@*|node()"/>
    </xsl:copy>
  </xsl:template>
  <xsl:template match="line">
    <line>
      <xsl:if test="contains(text(), ' *** ') or
                    contains(text(), 'LaTeX Error') or
                    contains(text(), 'BUILD FAILED') or
                    starts-with(text(), 'FAIL:') or
                    contains(text(), 'FAILURE') or
                    contains(text(), '[ERROR]') or
                    contains(text(), ' error: ') or
                    true">
         <xsl:attribute name="error"></xsl:attribute>
      </xsl:if>
      <xsl:apply-templates select="@*|node()"/>
    </line>
  </xsl:template>
</xsl:stylesheet>
  <xsl:output method='xml' encoding="UTF-8" />

File deletion: log2html.xsl, log2html.xsl, log2html.xsl

BFD:BFD[19.1811] → [19.1827:1863]

BF:BFD[19.1863] → [20.3454:3454]

BF:BFD[18.3086] → [18.3102:3138]

BF:BFD[18.3138] → [20.3454:3454]

BFD:BFD[20.3437] → [20.6005:6041]

BF:BFD[20.6041] → [20.3454:3454]

B:BD[20.3454] → [20.3455:3559]

B:BD[20.3559] → [7.211:286]

∅:D[7.286] → [20.3733:3767]

B:BD[20.3733] → [20.3733:3767]

B:BD[20.3767] → [23.255:263]

B:BD[23.263] → [24.964:1079]

∅:D[24.1079] → [23.379:406]

B:BD[23.379] → [23.379:406]

B:BD[23.406] → [24.1080:1200]

∅:D[24.1200] → [23.527:536]

B:BD[23.527] → [23.527:536]

B:BD[23.536] → [24.1201:1223]

∅:D[24.1223] → [20.3793:3955]

B:BD[20.3793] → [20.3793:3955]

B:BD[20.3955] → [24.1224:1225]

∅:D[24.1225] → [20.3958:4323]

B:BD[20.3958] → [20.3958:4323]

B:BD[20.4323] → [24.1226:1227]

∅:D[24.1227] → [20.4342:4587]

B:BD[20.4342] → [20.4342:4587]

B:BD[20.4587] → [25.1626:1657]

B:BD[25.1657] → [24.1228:1281]

∅:D[24.1281] → [25.1712:1755]

B:BD[25.1712] → [25.1712:1755]

B:BD[25.1755] → [24.1282:1283]

∅:D[24.1283] → [20.4688:4855]

B:BD[20.4688] → [20.4688:4855]

B:BD[20.4855] → [24.1284:1329]

∅:D[24.1329] → [20.4906:4948]

B:BD[20.4906] → [20.4906:4948]

B:BD[20.4948] → [26.631:646]

∅:D[26.646] → [24.1402:1448]

B:BD[24.1402] → [24.1402:1448]

∅:D[24.1448] → [20.5424:5490]

B:BD[20.5424] → [20.5424:5490]

B:BD[20.5490] → [24.1449:1450]

∅:D[24.1450] → [20.5495:5514]

B:BD[20.5495] → [20.5495:5514]

B:BD[20.5514] → [24.1451:1452]

∅:D[24.1452] → [20.5517:5552]

B:BD[20.5517] → [20.5517:5552]

∅:D[5.249] → [23.537:561]

B:BD[20.5552] → [23.537:561]

∅:D[27.175] → [20.5563:5592]

∅:D[23.561] → [20.5563:5592]

B:BD[20.5563] → [20.5563:5592]

B:BD[20.5592] → [23.562:629]

∅:D[23.629] → [20.5650:5666]

∅:D[28.3554] → [20.5650:5666]

B:BD[20.5650] → [20.5650:5666]

∅:D[29.111] → [30.244:280]

B:BD[20.5666] → [30.244:280]

B:BD[30.280] → [23.700:763]

∅:D[23.763] → [30.338:354]

B:BD[30.338] → [30.338:354]

B:BD[30.354] → [6.0:34]

∅:D[6.34] → [23.764:776]

B:BD[20.5695] → [23.764:776]

∅:D[27.187] → [20.5707:5726]

∅:D[23.776] → [20.5707:5726]

B:BD[20.5707] → [20.5707:5726]

B:BD[20.5726] → [24.1453:1454]

∅:D[24.1454] → [20.5729:5984]

B:BD[20.5729] → [20.5729:5984]

B:BD[20.5984] → [24.1455:1456]

∅:D[24.1456] → [29.112:130]

B:BD[20.5987] → [29.112:130]

B:BD[20.5666] → [29.0:31]

B:BD[29.31] → [23.630:699]

∅:D[23.699] → [29.95:111]

B:BD[29.95] → [29.95:111]

B:BD[20.5552] → [5.53:249]

<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:output method='html' encoding="UTF-8" omit-xml-declaration="yes" />
  <xsl:template match="logfile">
    <p>
    <a href="javascript:" class="btn btn-info tree-expand-all"><i class="icon-plus icon-white"></i> Expand all</a>
    <xsl:text> </xsl:text>
    <a href="javascript:" class="btn btn-info tree-collapse-all"><i class="icon-minus icon-white"></i> Collapse all</a>
    </p>
    <ul class='tree'>
      <xsl:for-each select='line|nest'>
        <li>
          <xsl:apply-templates select='.'/>
        </li>
      </xsl:for-each>
    </ul>
  </xsl:template>
  <xsl:template match="nest">
    <!-- The tree should be collapsed by default if all children are
         unimportant or if the header is unimportant. -->
<!--    <xsl:variable name="collapsed"
                  select="count(.//line[not(@priority = 3)]) = 0 or ./head[@priority = 3]" /> -->
    <xsl:variable name="collapsed" select="count(.//*[@error]) = 0"/>
    <xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable>
    <xsl:variable name="arg"><xsl:choose><xsl:when test="$collapsed">true</xsl:when><xsl:otherwise>false</xsl:otherwise></xsl:choose></xsl:variable>
    <xsl:if test="line|nest">
      <a href="javascript:" class="tree-toggle"></a>
      <xsl:text> </xsl:text>
    </xsl:if>
    <xsl:apply-templates select='head'/>
    <!-- Be careful to only generate <ul>s if there are <li>s, otherwise it’s malformed. -->
    <xsl:if test="line|nest">
      <ul class='subtree' style="{$style}">
        <xsl:for-each select='line|nest'>
          <li>
            <xsl:apply-templates select='.'/>
          </li>
        </xsl:for-each>
      </ul>
    </xsl:if>
  </xsl:template>
  <xsl:template match="head|line">
    <span class="code">
      <xsl:if test="@error">
        <xsl:attribute name="class">code errorLine</xsl:attribute>
      </xsl:if>
      <xsl:if test="@priority = 3">
        <xsl:attribute name="class">code prio3</xsl:attribute>
      </xsl:if>
      <xsl:apply-templates/><br/>
    </span>
  </xsl:template>
  <xsl:template match="storeref">
    <em class='storeref'>
      <span class='popup'><xsl:apply-templates/></span>
      <span class='elided'>/...</span><xsl:apply-templates select='name'/><xsl:apply-templates select='path'/>
    </em>
  </xsl:template>
</xsl:stylesheet>
      <xsl:if test="@warning">
        <xsl:attribute name="class">code warningLine</xsl:attribute>
      </xsl:if>
    <xsl:variable name="lineno"><xsl:number count="head|line" level="any" /></xsl:variable>
    <a class="lineno" href="#line-{$lineno}" id="line-{$lineno}"><xsl:value-of select="$lineno" /> </a>

Replacement in src/Makefile.am at line 1 [31.21]

B:BD[31.21] → [12.234:323]

SUBDIRS = hydra-evaluator hydra-eval-jobs hydra-queue-runner sql script lib root xsl ttf

[31.21]

[31.62]

SUBDIRS = hydra-evaluator hydra-eval-jobs hydra-queue-runner sql script lib root ttf

Deletion in src/lib/Hydra/Controller/Build.pm at line 158 [34.1]
∅:D[32.18] → [33.359:384]
∅:D[10.54] → [33.359:384]
B:BD[33.359] → [33.359:384]
B:BD[33.384] → [35.846:932]
∅:D[36.279] → [33.465:552]
∅:D[37.540] → [33.465:552]
∅:D[35.932] → [33.465:552]
B:BD[33.465] → [33.465:552]
B:BD[33.552] → [7.13:84]
```
        # !!! quick hack
        my $pipeline = ($logPath =~ /.bz2$/ ? "bzip2 -d < $logPath" : "cat $logPath")
            . " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"
            . " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " -";
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 159 [34.1]

B:BD[33.679] → [7.85:160]

        $c->stash->{logtext} = decode("utf-8", `ulimit -t 5 ; $pipeline`);

[33.679]

[33.723]

        $c->stash->{logtext} = logContents($logPath);

Deletion in src/lib/Hydra/Controller/Build.pm at line 166 [34.1]
B:BD[38.431] → [38.431:447]
```
        return;
```
Deletion in src/root/log.tt at line 10 [40.11783]
B:BD[39.785] → [8.0:8]
```
<hr />
```
Replacement in src/root/log.tt at line 11 [40.11783]
B:BD[40.11918] → [20.460:483]
B:BD[20.483] → [41.6354:6368]
∅:D[41.6368] → [20.484:491]
B:BD[40.11956] → [20.484:491]
```
<div class="buildlog">
[% logtext %]
</div>
```
[40.11896]
[40.11963]
```
<pre class="taillog" id="contents">
[% HTML.escape(logtext) %]
</pre>
```

Replacement in src/root/plain-reload.tt at line 1 [42.1]

B:BD[42.1] → [42.2:38]

[% WRAPPER layout.tt title=title %]

[42.1]

[42.38]

[% WRAPPER layout.tt title="Log of " _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job $build.project.name:$build.jobset.name:$build.job.name" %]

Replacement in src/root/plain-reload.tt at line 8 [42.1]

B:BD[42.63] → [4.0:183]

<h2>Last 50 log lines of [% INCLUDE renderFullJobNameOfBuild %] build <a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a>[%IF step %] step [% step.stepnr %][% END %]</h2>

[42.63]

[42.93]

<p>Below are the last 50 log lines. The <a href="[% c.uri_for('/build' build.id 'log') %]">full log</a> is also available.</p>

File deletion: logfile.css, logfile.css, logfile.css
BFD:BFD[19.1194] → [19.1243:1278]
BF:BFD[19.1278] → [20.611:611]
BFD:BFD[20.493] → [20.1948:1983]
BF:BFD[20.1983] → [20.611:611]
BF:BFD[18.2111] → [18.2160:2195]
BF:BFD[18.2195] → [20.611:611]
B:BD[20.1309] → [20.1309:1343]
B:BD[20.1343] → [24.939:963]
∅:D[24.963] → [20.1368:1471]
B:BD[20.1368] → [20.1368:1471]
B:BD[20.1560] → [20.1560:1773]
∅:D[43.142] → [20.1773:1775]
B:BD[20.1773] → [20.1773:1775]
B:BD[20.1776] → [20.1776:1777]
B:BD[20.1894] → [23.184:254]
∅:D[23.254] → [28.3478:3491]
B:BD[20.1894] → [28.3478:3491]
∅:D[28.3491] → [20.1903:1946]
B:BD[20.1903] → [20.1903:1946]
∅:D[30.243] → [25.1482:1484]
B:BD[20.1946] → [25.1482:1484]
B:BD[25.1484] → [5.0:52]
B:BD[20.1946] → [30.207:210]
∅:D[44.62] → [30.210:243]
B:BD[30.210] → [30.210:243]
B:BD[30.210] → [2.0:15]
∅:D[2.15] → [44.13:62]
B:BD[44.13] → [44.13:62]
B:BD[20.1773] → [43.125:142]
```
em.storeref {
    color: #500000;
    position: relative;
    width: 100%;
}
em.storeref:hover {
    background-color: #eeeeee;
}
*.popup {
    display: none;
    background: #ffffcd;
    border: solid #555555 1px;
    position: absolute;
    top: 0em;
    left: 0em;
    margin: 0;
    padding: 0;
    z-index: 100;
}
em.storeref:hover span.popup {
    display: inline;
}
span.code {
    white-space: pre-wrap;
    font-family: monospace;
}
.errorLine {
    color: #ff0000;
    font-weight: bold;
}
a.lineno {
    color: #909090;
    float: right;
}
}
.prio3 {
    font-style: italic;
.warningLine {
    color: darkorange;
    font-weight: bold;
}
    width: 40em;
```
Replacement in src/root/static/css/hydra.css at line 122 [40.8691]
B:BD[9.78] → [9.78:92]
```
pre.taillog {
```
[9.78]
[9.92]
```
pre.log, pre.taillog {
```
Deletion in src/root/static/css/hydra.css at line 124 [40.8691]
B:BD[9.116] → [9.116:160]
```
    max-height: 60em;
    overflow: hidden;
```

Remove the pretty-printed log

Dependencies

In channels

Change contents

Deletion in configure.ac at line 77 [13.15951]

Replacement in release.nix at line 138 [15.1]

File deletion: xsl

File deletion: Makefile.am

File deletion: mark-errors.xsl, mark-errors.xsl, mark-errors.xsl

File deletion: log2html.xsl, log2html.xsl, log2html.xsl

Replacement in src/Makefile.am at line 1 [31.21]

Deletion in src/lib/Hydra/Controller/Build.pm at line 158 [34.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 159 [34.1]

Deletion in src/lib/Hydra/Controller/Build.pm at line 166 [34.1]

Deletion in src/root/log.tt at line 10 [40.11783]

Replacement in src/root/log.tt at line 11 [40.11783]

Replacement in src/root/plain-reload.tt at line 1 [42.1]

Replacement in src/root/plain-reload.tt at line 8 [42.1]

File deletion: logfile.css, logfile.css, logfile.css

Replacement in src/root/static/css/hydra.css at line 122 [40.8691]

Deletion in src/root/static/css/hydra.css at line 124 [40.8691]