diff --git a/mercurial/templates/gitweb/changelogentry.tmpl b/mercurial/templates/gitweb/changelogentry.tmpl index 5cbbef8d2a57c880d5fbb76acea5b6fa1733d788_bWVyY3VyaWFsL3RlbXBsYXRlcy9naXR3ZWIvY2hhbmdlbG9nZW50cnkudG1wbA==..f9b23fa35cb332e69e926c6d4ab8395cb969e165_bWVyY3VyaWFsL3RlbXBsYXRlcy9naXR3ZWIvY2hhbmdlbG9nZW50cnkudG1wbA== 100644 --- a/mercurial/templates/gitweb/changelogentry.tmpl +++ b/mercurial/templates/gitweb/changelogentry.tmpl @@ -1,5 +1,9 @@ <div> -<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|rfc822date}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a> + <a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"> + <span class="age">{date|rfc822date}</span> + {desc|strip|firstline|escape|nonempty} + <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span> + </a> </div> <div class="title_text"> <div class="log_link"> diff --git a/mercurial/templates/gitweb/changeset.tmpl b/mercurial/templates/gitweb/changeset.tmpl index 5cbbef8d2a57c880d5fbb76acea5b6fa1733d788_bWVyY3VyaWFsL3RlbXBsYXRlcy9naXR3ZWIvY2hhbmdlc2V0LnRtcGw=..f9b23fa35cb332e69e926c6d4ab8395cb969e165_bWVyY3VyaWFsL3RlbXBsYXRlcy9naXR3ZWIvY2hhbmdlc2V0LnRtcGw= 100644 --- a/mercurial/templates/gitweb/changeset.tmpl +++ b/mercurial/templates/gitweb/changeset.tmpl @@ -30,7 +30,10 @@ </div> <div> -<a class="title" href="{url|urlescape}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a> + <a class="title" href="{url|urlescape}raw-rev/{node|short}"> + {desc|strip|escape|firstline|nonempty} + <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span> + </a> </div> <div class="title_text"> <table cellspacing="0"> diff --git a/mercurial/templates/monoblue/changelogentry.tmpl b/mercurial/templates/monoblue/changelogentry.tmpl index 5cbbef8d2a57c880d5fbb76acea5b6fa1733d788_bWVyY3VyaWFsL3RlbXBsYXRlcy9tb25vYmx1ZS9jaGFuZ2Vsb2dlbnRyeS50bXBs..f9b23fa35cb332e69e926c6d4ab8395cb969e165_bWVyY3VyaWFsL3RlbXBsYXRlcy9tb25vYmx1ZS9jaGFuZ2Vsb2dlbnRyeS50bXBs 100644 --- a/mercurial/templates/monoblue/changelogentry.tmpl +++ b/mercurial/templates/monoblue/changelogentry.tmpl @@ -1,4 +1,9 @@ -<h3 class="changelog"><a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3> +<h3 class="changelog"> + <a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"> + {desc|strip|firstline|escape|nonempty} + <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span> + </a> +</h3> <ul class="changelog-entry"> <li class="age">{date|rfc822date}</li> <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li> diff --git a/mercurial/templates/monoblue/changeset.tmpl b/mercurial/templates/monoblue/changeset.tmpl index 5cbbef8d2a57c880d5fbb76acea5b6fa1733d788_bWVyY3VyaWFsL3RlbXBsYXRlcy9tb25vYmx1ZS9jaGFuZ2VzZXQudG1wbA==..f9b23fa35cb332e69e926c6d4ab8395cb969e165_bWVyY3VyaWFsL3RlbXBsYXRlcy9tb25vYmx1ZS9jaGFuZ2VzZXQudG1wbA== 100644 --- a/mercurial/templates/monoblue/changeset.tmpl +++ b/mercurial/templates/monoblue/changeset.tmpl @@ -32,7 +32,12 @@ <h2 class="no-link no-border">changeset</h2> - <h3 class="changeset"><a href="{url|urlescape}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3> + <h3 class="changeset"> + <a href="{url|urlescape}raw-rev/{node|short}"> + {desc|strip|escape|firstline|nonempty} + <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span> + </a> + </h3> <p class="changeset-age"><span class="age">{date|rfc822date}</span></p> <dl class="overview"> diff --git a/tests/test-hgweb-symrev.t b/tests/test-hgweb-symrev.t index 5cbbef8d2a57c880d5fbb76acea5b6fa1733d788_dGVzdHMvdGVzdC1oZ3dlYi1zeW1yZXYudA==..f9b23fa35cb332e69e926c6d4ab8395cb969e165_dGVzdHMvdGVzdC1oZ3dlYi1zeW1yZXYudA== 100644 --- a/tests/test-hgweb-symrev.t +++ b/tests/test-hgweb-symrev.t @@ -468,5 +468,5 @@ <a href="/graph/tip?style=gitweb">graph</a> | <a href="/file/tip?style=gitweb">files</a> | <a href="/archive/tip.zip">zip</a> | <a href="/log/43c799df6e75?style=gitweb">(0)</a> <a href="/log/tip?style=gitweb">tip</a> <br/> - <a class="title" href="/rev/9d8c40cba617?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>third<span class="logtags"> <span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></a> + <a class="title" href="/rev/9d8c40cba617?style=gitweb"> <a href="/rev/9d8c40cba617?style=gitweb">changeset</a><br/> @@ -472,3 +472,3 @@ <a href="/rev/9d8c40cba617?style=gitweb">changeset</a><br/> - <a class="title" href="/rev/a7c1559b7bba?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>second<span class="logtags"> <span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a> + <a class="title" href="/rev/a7c1559b7bba?style=gitweb"> <a href="/rev/a7c1559b7bba?style=gitweb">changeset</a><br/> @@ -474,5 +474,5 @@ <a href="/rev/a7c1559b7bba?style=gitweb">changeset</a><br/> - <a class="title" href="/rev/43c799df6e75?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>first<span class="logtags"> </span></a> + <a class="title" href="/rev/43c799df6e75?style=gitweb"> <a href="/rev/43c799df6e75?style=gitweb">changeset</a><br/> <a href="/log/43c799df6e75?style=gitweb">(0)</a> <a href="/log/tip?style=gitweb">tip</a> <br/> @@ -518,5 +518,5 @@ $ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'shortlog?style=gitweb&rev=all()' | egrep $REVLINKS <a href="/file?style=gitweb">files</a> | <a href="/archive/tip.zip">zip</a> - <a class="title" href="/rev/9d8c40cba617?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>third<span class="logtags"> <span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></a> + <a class="title" href="/rev/9d8c40cba617?style=gitweb"> <a href="/rev/9d8c40cba617?style=gitweb">changeset</a><br/> @@ -522,3 +522,3 @@ <a href="/rev/9d8c40cba617?style=gitweb">changeset</a><br/> - <a class="title" href="/rev/a7c1559b7bba?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>second<span class="logtags"> <span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a> + <a class="title" href="/rev/a7c1559b7bba?style=gitweb"> <a href="/rev/a7c1559b7bba?style=gitweb">changeset</a><br/> @@ -524,5 +524,5 @@ <a href="/rev/a7c1559b7bba?style=gitweb">changeset</a><br/> - <a class="title" href="/rev/43c799df6e75?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>first<span class="logtags"> </span></a> + <a class="title" href="/rev/43c799df6e75?style=gitweb"> <a href="/rev/43c799df6e75?style=gitweb">changeset</a><br/> $ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'rev/xyzzy?style=gitweb' | egrep $REVLINKS @@ -531,7 +531,7 @@ <a href="/graph/xyzzy?style=gitweb">graph</a> | <a href="/file/xyzzy?style=gitweb">files</a> | <a href="/raw-rev/xyzzy">raw</a> | <a href="/archive/xyzzy.zip">zip</a> | - <a class="title" href="/raw-rev/a7c1559b7bba">second <span class="logtags"><span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a> + <a class="title" href="/raw-rev/a7c1559b7bba"> <td style="font-family:monospace"><a class="list" href="/rev/a7c1559b7bba?style=gitweb">a7c1559b7bba</a></td> <a class="list" href="/rev/43c799df6e75?style=gitweb">43c799df6e75</a> <a class="list" href="/rev/9d8c40cba617?style=gitweb">9d8c40cba617</a> @@ -560,5 +560,5 @@ <a href="/graph/xyzzy?style=gitweb">graph</a> | <a href="/file/xyzzy?style=gitweb">files</a> | <a href="/archive/xyzzy.zip">zip</a> | <a href="/log/43c799df6e75?style=gitweb">(0)</a> <a href="/log/tip?style=gitweb">tip</a> <br/> - <a class="title" href="/rev/a7c1559b7bba?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>second<span class="logtags"> <span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a> + <a class="title" href="/rev/a7c1559b7bba?style=gitweb"> <a href="/rev/a7c1559b7bba?style=gitweb">changeset</a><br/> @@ -564,5 +564,5 @@ <a href="/rev/a7c1559b7bba?style=gitweb">changeset</a><br/> - <a class="title" href="/rev/43c799df6e75?style=gitweb"><span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>first<span class="logtags"> </span></a> + <a class="title" href="/rev/43c799df6e75?style=gitweb"> <a href="/rev/43c799df6e75?style=gitweb">changeset</a><br/> <a href="/log/43c799df6e75?style=gitweb">(0)</a> <a href="/log/tip?style=gitweb">tip</a> <br/> @@ -709,9 +709,9 @@ <li><a href="/graph/tip?style=monoblue">graph</a></li> <li><a href="/file/tip?style=monoblue">files</a></li> <li><a href="/archive/tip.zip">zip</a></li> - <h3 class="changelog"><a class="title" href="/rev/9d8c40cba617?style=monoblue">third<span class="logtags"> <span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></a></h3> - <h3 class="changelog"><a class="title" href="/rev/a7c1559b7bba?style=monoblue">second<span class="logtags"> <span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a></h3> - <h3 class="changelog"><a class="title" href="/rev/43c799df6e75?style=monoblue">first<span class="logtags"> </span></a></h3> + <a class="title" href="/rev/9d8c40cba617?style=monoblue"> + <a class="title" href="/rev/a7c1559b7bba?style=monoblue"> + <a class="title" href="/rev/43c799df6e75?style=monoblue"> <a href="/log/43c799df6e75?style=monoblue">(0)</a> <a href="/log/tip?style=monoblue">tip</a> $ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'graph?style=monoblue' | egrep $REVLINKS @@ -753,12 +753,12 @@ $ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'shortlog?style=monoblue&rev=all()' | egrep $REVLINKS <li><a href="/archive/tip.zip">zip</a></li> - <h3 class="changelog"><a class="title" href="/rev/9d8c40cba617?style=monoblue">third<span class="logtags"> <span class="branchtag" title="default">default</span> <span class="tagtag" title="tip">tip</span> </span></a></h3> - <h3 class="changelog"><a class="title" href="/rev/a7c1559b7bba?style=monoblue">second<span class="logtags"> <span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a></h3> - <h3 class="changelog"><a class="title" href="/rev/43c799df6e75?style=monoblue">first<span class="logtags"> </span></a></h3> + <a class="title" href="/rev/9d8c40cba617?style=monoblue"> + <a class="title" href="/rev/a7c1559b7bba?style=monoblue"> + <a class="title" href="/rev/43c799df6e75?style=monoblue"> $ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'rev/xyzzy?style=monoblue' | egrep $REVLINKS <li><a href="/graph/xyzzy?style=monoblue">graph</a></li> <li><a href="/file/xyzzy?style=monoblue">files</a></li> <li><a href="/raw-rev/xyzzy">raw</a></li> <li><a href="/archive/xyzzy.zip">zip</a></li> @@ -759,10 +759,10 @@ $ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'rev/xyzzy?style=monoblue' | egrep $REVLINKS <li><a href="/graph/xyzzy?style=monoblue">graph</a></li> <li><a href="/file/xyzzy?style=monoblue">files</a></li> <li><a href="/raw-rev/xyzzy">raw</a></li> <li><a href="/archive/xyzzy.zip">zip</a></li> - <h3 class="changeset"><a href="/raw-rev/a7c1559b7bba">second <span class="logtags"><span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a></h3> + <a href="/raw-rev/a7c1559b7bba"> <dd><a href="/rev/a7c1559b7bba?style=monoblue">a7c1559b7bba</a></dd> <dd><a href="/rev/43c799df6e75?style=monoblue">43c799df6e75</a></dd> <dd><a href="/rev/9d8c40cba617?style=monoblue">9d8c40cba617</a></dd> @@ -789,8 +789,8 @@ <li><a href="/graph/xyzzy?style=monoblue">graph</a></li> <li><a href="/file/xyzzy?style=monoblue">files</a></li> <li><a href="/archive/xyzzy.zip">zip</a></li> - <h3 class="changelog"><a class="title" href="/rev/a7c1559b7bba?style=monoblue">second<span class="logtags"> <span class="bookmarktag" title="xyzzy">xyzzy</span> </span></a></h3> - <h3 class="changelog"><a class="title" href="/rev/43c799df6e75?style=monoblue">first<span class="logtags"> </span></a></h3> + <a class="title" href="/rev/a7c1559b7bba?style=monoblue"> + <a class="title" href="/rev/43c799df6e75?style=monoblue"> <a href="/log/43c799df6e75?style=monoblue">(0)</a> <a href="/log/tip?style=monoblue">tip</a> $ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'graph/xyzzy?style=monoblue' | egrep $REVLINKS