[PATCH] hgweb: show commit phase if it's not public
Anton Shestakov
av6 at dwimlabs.net
Fri Nov 17 03:53:14 UTC 2017
# HG changeset patch
# User Anton Shestakov <av6 at dwimlabs.net>
# Date 1510842063 -28800
# Thu Nov 16 22:21:03 2017 +0800
# Node ID f1e997d4a24fb59ddd33c3780104dc002f870f5c
# Parent 5ec3062f234c53970beae8b8d4f20b30cfa9f889
# EXP-Topic hgweb-more-info
hgweb: show commit phase if it's not public
In spartan theme phase is shown on its own table row, because there's no single
line of "tags". Everywhere else phase is prepended to the list of "tags" of a
changeset. Its element has a purple-ish color in gitweb and monoblue, and a
dotted line under it and no color in paper and coal (as these themes are frugal
with colors).
This patch intentionally doesn't touch graph, because it needs a rewrite. I'll
get to it pretty soon and in the process will add phase and everything that's
still coming (e.g. obsolescence and instabilities).
diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map
--- a/mercurial/templates/gitweb/map
+++ b/mercurial/templates/gitweb/map
@@ -262,11 +262,12 @@ filecompchild = '
</tr>'
shortlog = shortlog.tmpl
graph = graph.tmpl
+phasetag = '{ifeq(phase, 'public', '', '<span class="phasetag" title="{phase|escape}">{phase|escape}</span> ')}'
tagtag = '<span class="tagtag" title="{name|escape}">{name|escape}</span> '
branchtag = '<span class="branchtag" title="{name|escape}">{name|escape}</span> '
inbranchtag = '<span class="inbranchtag" title="{name|escape}">{name|escape}</span> '
bookmarktag = '<span class="bookmarktag" title="{name|escape}">{name|escape}</span> '
-alltags = '<span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
+alltags = '<span class="logtags">{phasetag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
shortlogentry = '
<tr class="parity{parity}">
<td class="age"><i class="age">{date|rfc822date}</i></td>
diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map
--- a/mercurial/templates/monoblue/map
+++ b/mercurial/templates/monoblue/map
@@ -221,11 +221,12 @@ filecompchild = '
<dt>child {rev}</dt>
<dd><a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>'
shortlog = shortlog.tmpl
+phasetag = '{ifeq(phase, 'public', '', '<span class="phasetag" title="{phase|escape}">{phase|escape}</span> ')}'
tagtag = '<span class="tagtag" title="{name|escape}">{name|escape}</span> '
branchtag = '<span class="branchtag" title="{name|escape}">{name|escape}</span> '
inbranchtag = '<span class="inbranchtag" title="{name|escape}">{name|escape}</span> '
bookmarktag = '<span class="bookmarktag" title="{name|escape}">{name|escape}</span> '
-alltags = '<span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
+alltags = '<span class="logtags">{phasetag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
shortlogentry = '
<tr class="parity{parity}">
<td class="nowrap age">{date|rfc822date}</td>
diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map
--- a/mercurial/templates/paper/map
+++ b/mercurial/templates/paper/map
@@ -198,12 +198,13 @@ branchentry = '
</a>
</td>
</tr>'
+phasetag = '{ifeq(phase, 'public', '', '<span class="phase">{phase|escape}</span> ')}'
changelogtag = '<span class="tag">{name|escape}</span> '
changesettag = '<span class="tag">{tag|escape}</span> '
changesetbookmark = '<span class="tag">{bookmark|escape}</span> '
changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
changelogbranchname = '<span class="branchname">{name|escape}</span> '
-alltags = '{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}'
+alltags = '{phasetag}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}'
filediffparent = '
<tr>
diff --git a/mercurial/templates/spartan/changelogentry.tmpl b/mercurial/templates/spartan/changelogentry.tmpl
--- a/mercurial/templates/spartan/changelogentry.tmpl
+++ b/mercurial/templates/spartan/changelogentry.tmpl
@@ -18,6 +18,10 @@
<th class="date">date:</th>
<td class="date">{date|rfc822date}</td>
</tr>
+ {ifeq(phase, 'public', '', '<tr>
+ <th class="phase">phase:</th>
+ <td class="phase">{phase|escape}</td>
+ </tr>')}
<tr>
<th class="files"><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>
<td class="files">{files}</td>
diff --git a/mercurial/templates/spartan/changeset.tmpl b/mercurial/templates/spartan/changeset.tmpl
--- a/mercurial/templates/spartan/changeset.tmpl
+++ b/mercurial/templates/spartan/changeset.tmpl
@@ -33,6 +33,10 @@
<th class="date">date:</th>
<td class="date age">{date|rfc822date}</td>
</tr>
+{ifeq(phase, 'public', '', '<tr>
+ <th class="phase">phase:</th>
+ <td class="phase">{phase|escape}</td>
+</tr>')}
<tr>
<th class="files">files:</th>
<td class="files">{files}</td>
diff --git a/mercurial/templates/static/style-gitweb.css b/mercurial/templates/static/style-gitweb.css
--- a/mercurial/templates/static/style-gitweb.css
+++ b/mercurial/templates/static/style-gitweb.css
@@ -122,6 +122,10 @@ span.logtags span {
background-color: #ffaaff;
border-color: #ffccff #ff00ee #ff00ee #ffccff;
}
+span.logtags span.phasetag {
+ background-color: #dfafff;
+ border-color: #e2b8ff #ce48ff #ce48ff #e2b8ff;
+}
span.logtags span.tagtag {
background-color: #ffffaa;
border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
diff --git a/mercurial/templates/static/style-monoblue.css b/mercurial/templates/static/style-monoblue.css
--- a/mercurial/templates/static/style-monoblue.css
+++ b/mercurial/templates/static/style-monoblue.css
@@ -233,6 +233,10 @@ span.logtags span {
background-color: #ffaaff;
border-color: #ffccff #ff00ee #ff00ee #ffccff;
}
+span.logtags span.phasetag {
+ background-color: #dfafff;
+ border-color: #e2b8ff #ce48ff #ce48ff #e2b8ff;
+}
span.logtags span.tagtag {
background-color: #ffffaa;
border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
diff --git a/mercurial/templates/static/style-paper.css b/mercurial/templates/static/style-paper.css
--- a/mercurial/templates/static/style-paper.css
+++ b/mercurial/templates/static/style-paper.css
@@ -137,6 +137,15 @@ a { text-decoration:none; }
margin: 1em 0;
}
+.phase {
+ color: #999;
+ font-size: 70%;
+ border-bottom: 1px dotted #999;
+ font-weight: normal;
+ margin-left: .5em;
+ vertical-align: baseline;
+}
+
.tag {
color: #999;
font-size: 70%;
diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t
+++ b/tests/test-hgweb-commands.t
@@ -775,7 +775,7 @@ Logs and changes
<td class="author">test</td>
<td class="description">
<a href="/rev/cad8025a2e87">branch commit with null character: </a>
- <span class="branchhead">unstable</span> <span class="tag">tip</span> <span class="tag">something</span>
+ <span class="phase">draft</span> <span class="branchhead">unstable</span> <span class="tag">tip</span> <span class="tag">something</span>
</td>
</tr>
<tr>
@@ -783,7 +783,7 @@ Logs and changes
<td class="author">test</td>
<td class="description">
<a href="/rev/1d22e65f027e">branch</a>
- <span class="branchhead">stable</span>
+ <span class="phase">draft</span> <span class="branchhead">stable</span>
</td>
</tr>
<tr>
@@ -791,7 +791,7 @@ Logs and changes
<td class="author">test</td>
<td class="description">
<a href="/rev/a4f92ed23982">Added tag 1.0 for changeset 2ef0ac749a14</a>
- <span class="branchhead">default</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span>
</td>
</tr>
<tr>
@@ -799,7 +799,7 @@ Logs and changes
<td class="author">test</td>
<td class="description">
<a href="/rev/2ef0ac749a14">base</a>
- <span class="tag">1.0</span> <span class="tag">anotherthing</span>
+ <span class="phase">draft</span> <span class="tag">1.0</span> <span class="tag">anotherthing</span>
</td>
</tr>
@@ -880,7 +880,7 @@ Logs and changes
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
changeset 0:<a href="/rev/2ef0ac749a14">2ef0ac749a14</a>
- <span class="tag">1.0</span> <span class="tag">anotherthing</span>
+ <span class="phase">draft</span> <span class="tag">1.0</span> <span class="tag">anotherthing</span>
</h3>
@@ -1054,7 +1054,7 @@ Logs and changes
<td class="author">test</td>
<td class="description">
<a href="/rev/2ef0ac749a14">base</a>
- <span class="tag">1.0</span> <span class="tag">anotherthing</span>
+ <span class="phase">draft</span> <span class="tag">1.0</span> <span class="tag">anotherthing</span>
</td>
</tr>
@@ -1312,7 +1312,7 @@ File-related
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
view foo @ 1:<a href="/rev/a4f92ed23982">a4f92ed23982</a>
- <span class="branchhead">default</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span>
</h3>
@@ -1446,7 +1446,7 @@ File-related
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
view foo @ 2:<a href="/rev/1d22e65f027e">1d22e65f027e</a>
- <span class="branchhead">stable</span>
+ <span class="phase">draft</span> <span class="branchhead">stable</span>
</h3>
@@ -1584,7 +1584,7 @@ Overviews
<td>
<a class="list" href="/rev/cad8025a2e87?style=gitweb">
<b>branch commit with null character: </b>
- <span class="logtags"><span class="branchtag" title="unstable">unstable</span> <span class="tagtag" title="tip">tip</span> <span class="bookmarktag" title="something">something</span> </span>
+ <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="unstable">unstable</span> <span class="tagtag" title="tip">tip</span> <span class="bookmarktag" title="something">something</span> </span>
</a>
</td>
<td class="link" nowrap>
@@ -1598,7 +1598,7 @@ Overviews
<td>
<a class="list" href="/rev/1d22e65f027e?style=gitweb">
<b>branch</b>
- <span class="logtags"><span class="branchtag" title="stable">stable</span> </span>
+ <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="stable">stable</span> </span>
</a>
</td>
<td class="link" nowrap>
@@ -1612,7 +1612,7 @@ Overviews
<td>
<a class="list" href="/rev/a4f92ed23982?style=gitweb">
<b>Added tag 1.0 for changeset 2ef0ac749a14</b>
- <span class="logtags"><span class="branchtag" title="default">default</span> </span>
+ <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="default">default</span> </span>
</a>
</td>
<td class="link" nowrap>
@@ -1626,7 +1626,7 @@ Overviews
<td>
<a class="list" href="/rev/2ef0ac749a14?style=gitweb">
<b>base</b>
- <span class="logtags"><span class="tagtag" title="1.0">1.0</span> <span class="bookmarktag" title="anotherthing">anotherthing</span> </span>
+ <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="tagtag" title="1.0">1.0</span> <span class="bookmarktag" title="anotherthing">anotherthing</span> </span>
</a>
</td>
<td class="link" nowrap>
diff --git a/tests/test-hgweb-descend-empties.t b/tests/test-hgweb-descend-empties.t
--- a/tests/test-hgweb-descend-empties.t
+++ b/tests/test-hgweb-descend-empties.t
@@ -73,7 +73,7 @@ manifest with descending (paper)
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
directory / @ 0:<a href="/rev/c9f45f7a1659">c9f45f7a1659</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -193,7 +193,7 @@ manifest with descending (coal)
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
directory / @ 0:<a href="/rev/c9f45f7a1659?style=coal">c9f45f7a1659</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -317,7 +317,7 @@ manifest with descending (monoblue)
</ul>
<h2 class="no-link no-border">files</h2>
- <p class="files">/ <span class="logtags"><span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></p>
+ <p class="files">/ <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></p>
<table>
<tr class="parity0">
@@ -431,7 +431,7 @@ manifest with descending (gitweb)
</div>
</div>
- <div class="title">/ <span class="logtags"><span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></div>
+ <div class="title">/ <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></div>
<table cellspacing="0">
<tr class="parity0">
<td style="font-family:monospace">drwxr-xr-x</td>
diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t
--- a/tests/test-hgweb-diffs.t
+++ b/tests/test-hgweb-diffs.t
@@ -81,7 +81,7 @@ revision
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
-
+ <span class="phase">draft</span>
</h3>
@@ -254,7 +254,7 @@ diff removed file
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
diff b @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -359,7 +359,7 @@ revision
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
-
+ <span class="phase">draft</span>
</h3>
@@ -536,7 +536,7 @@ diff modified file
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
diff a @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -642,7 +642,7 @@ comparison new file
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
comparison a @ 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
-
+ <span class="phase">draft</span>
</h3>
@@ -772,7 +772,7 @@ comparison existing file
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
comparison a @ 2:<a href="/rev/d73db4d812ff">d73db4d812ff</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -904,7 +904,7 @@ comparison removed file
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
comparison a @ 3:<a href="/rev/20e80271eb7a">20e80271eb7a</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -1042,7 +1042,7 @@ comparison not-modified file
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
comparison e @ 5:<a href="/rev/41d9fc4a6ae1">41d9fc4a6ae1</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
diff --git a/tests/test-hgweb-filelog.t b/tests/test-hgweb-filelog.t
--- a/tests/test-hgweb-filelog.t
+++ b/tests/test-hgweb-filelog.t
@@ -189,7 +189,7 @@ tip - two revisions
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log a @ 4:<a href="/rev/3f41bc784e7e">3f41bc784e7e</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</h3>
@@ -220,7 +220,7 @@ tip - two revisions
<td class="author">test</td>
<td class="description">
<a href="/rev/3f41bc784e7e">second a</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
@@ -229,7 +229,7 @@ tip - two revisions
<td class="author">test</td>
<td class="description">
<a href="/rev/5ed941583260">first a</a>
- <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
+ <span class="phase">draft</span> <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
</td>
</tr>
@@ -312,7 +312,7 @@ second version - two revisions
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log a @ 4:<a href="/rev/3f41bc784e7e">3f41bc784e7e</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</h3>
@@ -343,7 +343,7 @@ second version - two revisions
<td class="author">test</td>
<td class="description">
<a href="/rev/3f41bc784e7e">second a</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
@@ -352,7 +352,7 @@ second version - two revisions
<td class="author">test</td>
<td class="description">
<a href="/rev/5ed941583260">first a</a>
- <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
+ <span class="phase">draft</span> <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
</td>
</tr>
@@ -435,7 +435,7 @@ first deleted - one revision
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log a @ 1:<a href="/rev/5ed941583260">5ed941583260</a>
- <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
+ <span class="phase">draft</span> <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
</h3>
@@ -466,7 +466,7 @@ first deleted - one revision
<td class="author">test</td>
<td class="description">
<a href="/rev/5ed941583260">first a</a>
- <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
+ <span class="phase">draft</span> <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
</td>
</tr>
@@ -549,7 +549,7 @@ first version - one revision
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log a @ 1:<a href="/rev/5ed941583260">5ed941583260</a>
- <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
+ <span class="phase">draft</span> <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
</h3>
@@ -580,7 +580,7 @@ first version - one revision
<td class="author">test</td>
<td class="description">
<a href="/rev/5ed941583260">first a</a>
- <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
+ <span class="phase">draft</span> <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
</td>
</tr>
@@ -740,7 +740,7 @@ before addition - error
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log c @ 7:<a href="/rev/46c1a66bd8fc">46c1a66bd8fc</a>
- <span class="branchhead">a-branch</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">a-branch</span> <span class="tag">tip</span>
(following lines 1:2 <a href="/log/tip/c">back to filelog</a>)
</h3>
@@ -771,7 +771,7 @@ before addition - error
<td class="author">test</td>
<td class="description">
<a href="/rev/46c1a66bd8fc">change c</a>
- <span class="branchhead">a-branch</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">a-branch</span> <span class="tag">tip</span>
</td>
</tr>
@@ -780,7 +780,7 @@ before addition - error
<td class="author">test</td>
<td class="description">
<a href="/rev/6563da9dcf87">b</a>
-
+ <span class="phase">draft</span>
</td>
</tr>
@@ -860,7 +860,7 @@ before addition - error
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log c @ 7:<a href="/rev/46c1a66bd8fc?revcount=1">46c1a66bd8fc</a>
- <span class="branchhead">a-branch</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">a-branch</span> <span class="tag">tip</span>
(following lines 1:2 <a href="/log/tip/c?revcount=1">back to filelog</a>)
</h3>
@@ -891,7 +891,7 @@ before addition - error
<td class="author">test</td>
<td class="description">
<a href="/rev/46c1a66bd8fc?revcount=1">change c</a>
- <span class="branchhead">a-branch</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">a-branch</span> <span class="tag">tip</span>
</td>
</tr>
@@ -1097,7 +1097,7 @@ filelog with patch
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log a @ 4:<a href="/rev/3f41bc784e7e">3f41bc784e7e</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</h3>
@@ -1128,7 +1128,7 @@ filelog with patch
<td class="author">test</td>
<td class="description">
<a href="/rev/3f41bc784e7e">second a</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
<tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
@@ -1141,7 +1141,7 @@ filelog with patch
<td class="author">test</td>
<td class="description">
<a href="/rev/5ed941583260">first a</a>
- <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
+ <span class="phase">draft</span> <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
</td>
</tr>
<tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
@@ -1379,7 +1379,7 @@ filelog with 'linerange' and 'patch'
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log c @ 12:<a href="/rev/6e4182052f7b">6e4182052f7b</a>
- <span class="branchhead">a-branch</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">a-branch</span> <span class="tag">tip</span>
(following lines 3:4 <a href="/log/tip/c">back to filelog</a>)
</h3>
@@ -1410,7 +1410,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/fb9bc322513a">touching beginning and end of c</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
<tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
@@ -1429,7 +1429,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/e95928d60479">touch beginning of c</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
<tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
@@ -1449,7 +1449,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/5c6574614c37">make c bigger and touch its beginning</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
<tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
@@ -1473,7 +1473,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/46c1a66bd8fc">change c</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
<tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
@@ -1487,7 +1487,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/6563da9dcf87">b</a>
-
+ <span class="phase">draft</span>
</td>
</tr>
<tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
@@ -1636,7 +1636,7 @@ filelog with 'linerange' and 'patch'
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
log c @ 8:<a href="/rev/5c6574614c37">5c6574614c37</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
(following lines 3:4, descending <a href="/log/8/c">back to filelog</a>)
</h3>
@@ -1667,7 +1667,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/5c6574614c37">make c bigger and touch its beginning</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
@@ -1676,7 +1676,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/e95928d60479">touch beginning of c</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
@@ -1685,7 +1685,7 @@ filelog with 'linerange' and 'patch'
<td class="author">test</td>
<td class="description">
<a href="/rev/fb9bc322513a">touching beginning and end of c</a>
- <span class="branchname">a-branch</span>
+ <span class="phase">draft</span> <span class="branchname">a-branch</span>
</td>
</tr>
diff --git a/tests/test-hgweb-removed.t b/tests/test-hgweb-removed.t
--- a/tests/test-hgweb-removed.t
+++ b/tests/test-hgweb-removed.t
@@ -62,7 +62,7 @@ revision
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
changeset 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -190,7 +190,7 @@ diff removed file
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
diff a @ 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
diff --git a/tests/test-hgweb.t b/tests/test-hgweb.t
--- a/tests/test-hgweb.t
+++ b/tests/test-hgweb.t
@@ -267,7 +267,7 @@ try bad style
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
directory / @ 0:<a href="/rev/2ef0ac749a14">2ef0ac749a14</a>
- <span class="branchhead">default</span> <span class="tag">tip</span> <span class="tag">@</span> <span class="tag">a b c</span> <span class="tag">d/e/f</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> <span class="tag">@</span> <span class="tag">a b c</span> <span class="tag">d/e/f</span>
</h3>
@@ -340,7 +340,7 @@ static file
$ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server
200 Script output follows
- content-length: 9044
+ content-length: 9151
content-type: text/css
body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; }
@@ -467,6 +467,10 @@ static file
background-color: #ffaaff;
border-color: #ffccff #ff00ee #ff00ee #ffccff;
}
+ span.logtags span.phasetag {
+ background-color: #dfafff;
+ border-color: #e2b8ff #ce48ff #ce48ff #e2b8ff;
+ }
span.logtags span.tagtag {
background-color: #ffffaa;
border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
diff --git a/tests/test-highlight.t b/tests/test-highlight.t
--- a/tests/test-highlight.t
+++ b/tests/test-highlight.t
@@ -113,7 +113,7 @@ hgweb filerevision, html
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
view primes.py @ 0:<a href="/rev/f4fca47b67e6">f4fca47b67e6</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
@@ -252,7 +252,7 @@ hgweb fileannotate, html
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>
annotate primes.py @ 0:<a href="/rev/f4fca47b67e6">f4fca47b67e6</a>
- <span class="branchhead">default</span> <span class="tag">tip</span>
+ <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span>
</h3>
More information about the Mercurial-devel
mailing list