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