Mercurial > hg
changeset 21056:d70703954a2a
hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries
| author | Aaron Jensen <ajensen@webmd.net> |
|---|---|
| date | Wed, 16 Apr 2014 09:31:37 -0700 |
| parents | dbff8c119cf6 |
| children | 19ee4923a2b6 |
| files | mercurial/templates/atom/changelogentry.tmpl mercurial/templates/atom/map tests/test-hgweb-commands.t tests/test-hgweb-filelog.t tests/test-hgweb-no-path-info.t tests/test-hgweb-no-request-uri.t tests/test-hgwebdir.t |
| diffstat | 7 files changed, 433 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/atom/changelogentry.tmpl Mon Apr 07 23:10:20 2014 +0200 +++ b/mercurial/templates/atom/changelogentry.tmpl Wed Apr 16 09:31:37 2014 -0700 @@ -1,5 +1,5 @@ <entry> - <title>{desc|strip|firstline|strip|escape|nonempty}</title> + <title>{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty}</title> <id>{urlbase}{url|urlescape}#changeset-{node}</id> <link href="{urlbase}{url|urlescape}rev/{node|short}"/> <author> @@ -9,8 +9,35 @@ <updated>{date|rfc3339date}</updated> <published>{date|rfc3339date}</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">{desc|escape|nonempty}</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>{node|short}</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>{branches%"{name|escape}"}</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>{bookmarks%"{name|escape}"}</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>{tags%"{name|escape}"}</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>{author|obfuscate}</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>{desc|strip|escape|addbreaks|nonempty}</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>{files}</td> + </tr> + </table> </content> </entry>
--- a/mercurial/templates/atom/map Mon Apr 07 23:10:20 2014 +0200 +++ b/mercurial/templates/atom/map Wed Apr 16 09:31:37 2014 -0700 @@ -13,3 +13,7 @@ branches = branches.tmpl branchentry = branchentry.tmpl error = error.tmpl +filedifflink = '{file|escape}<br />' +fileellipses = '{file|escape}<br />' +filenodelink = '{file|escape}<br />' +filenolink = '{file|escape}<br />'
--- a/tests/test-hgweb-commands.t Mon Apr 07 23:10:20 2014 +0200 +++ b/tests/test-hgweb-commands.t Wed Apr 16 09:31:37 2014 -0700 @@ -62,7 +62,7 @@ <updated>1970-01-01T00:00:00+00:00</updated> <entry> - <title>branch commit with null character: </title> + <title>[unstable] branch commit with null character: </title> <id>http://*:$HGPORT/#changeset-cad8025a2e87f88c06259790adfa15acb4080123</id> (glob) <link href="http://*:$HGPORT/rev/cad8025a2e87"/> (glob) <author> @@ -72,13 +72,40 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">branch commit with null character: </pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>cad8025a2e87</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>unstable</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>something</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>tip</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>branch commit with null character: </td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td></td> + </tr> + </table> </content> </entry> <entry> - <title>branch</title> + <title>[stable] branch</title> <id>http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id> (glob) <link href="http://*:$HGPORT/rev/1d22e65f027e"/> (glob) <author> @@ -88,13 +115,40 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">branch</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>1d22e65f027e</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>stable</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>branch</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>foo<br /></td> + </tr> + </table> </content> </entry> <entry> - <title>Added tag 1.0 for changeset 2ef0ac749a14</title> + <title>[default] Added tag 1.0 for changeset 2ef0ac749a14</title> <id>http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob) <link href="http://*:$HGPORT/rev/a4f92ed23982"/> (glob) <author> @@ -104,9 +158,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">Added tag 1.0 for changeset 2ef0ac749a14</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>a4f92ed23982</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>Added tag 1.0 for changeset 2ef0ac749a14</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>.hgtags<br /></td> + </tr> + </table> </content> </entry> <entry> @@ -120,9 +201,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">base</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>2ef0ac749a14</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>anotherthing</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>1.0</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>base</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>da/foo<br />foo<br /></td> + </tr> + </table> </content> </entry> @@ -140,7 +248,7 @@ <updated>1970-01-01T00:00:00+00:00</updated> <entry> - <title>Added tag 1.0 for changeset 2ef0ac749a14</title> + <title>[default] Added tag 1.0 for changeset 2ef0ac749a14</title> <id>http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id> (glob) <link href="http://*:$HGPORT/rev/a4f92ed23982"/> (glob) <author> @@ -150,9 +258,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">Added tag 1.0 for changeset 2ef0ac749a14</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>a4f92ed23982</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>Added tag 1.0 for changeset 2ef0ac749a14</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>.hgtags<br /></td> + </tr> + </table> </content> </entry> <entry> @@ -166,9 +301,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">base</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>2ef0ac749a14</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>anotherthing</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>1.0</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>base</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>da/foo<br />foo<br /></td> + </tr> + </table> </content> </entry> @@ -194,9 +356,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">base</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>2ef0ac749a14</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td>anotherthing</td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>1.0</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>base</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td></td> + </tr> + </table> </content> </entry>
--- a/tests/test-hgweb-filelog.t Mon Apr 07 23:10:20 2014 +0200 +++ b/tests/test-hgweb-filelog.t Wed Apr 16 09:31:37 2014 -0700 @@ -762,9 +762,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">second a</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>01de2d66a28d</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>second a</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td></td> + </tr> + </table> </content> </entry> <entry> @@ -778,9 +805,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">first a</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>5ed941583260</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>first a</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td></td> + </tr> + </table> </content> </entry>
--- a/tests/test-hgweb-no-path-info.t Mon Apr 07 23:10:20 2014 +0200 +++ b/tests/test-hgweb-no-path-info.t Wed Apr 16 09:31:37 2014 -0700 @@ -78,7 +78,7 @@ <updated>1970-01-01T00:00:00+00:00</updated> <entry> - <title>test</title> + <title>[default] test</title> <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/> <author> @@ -88,9 +88,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">test</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>61c9426e69fe</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>tip</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>bar<br /></td> + </tr> + </table> </content> </entry>
--- a/tests/test-hgweb-no-request-uri.t Mon Apr 07 23:10:20 2014 +0200 +++ b/tests/test-hgweb-no-request-uri.t Wed Apr 16 09:31:37 2014 -0700 @@ -89,7 +89,7 @@ <updated>1970-01-01T00:00:00+00:00</updated> <entry> - <title>test</title> + <title>[default] test</title> <id>http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> <link href="http://127.0.0.1:$HGPORT/rev/61c9426e69fe"/> <author> @@ -99,9 +99,36 @@ <updated>1970-01-01T00:00:00+00:00</updated> <published>1970-01-01T00:00:00+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">test</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>61c9426e69fe</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>tip</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>bar<br /></td> + </tr> + </table> </content> </entry>
--- a/tests/test-hgwebdir.t Mon Apr 07 23:10:20 2014 +0200 +++ b/tests/test-hgwebdir.t Wed Apr 16 09:31:37 2014 -0700 @@ -745,7 +745,7 @@ <updated>1970-01-01T00:00:01+00:00</updated> <entry> - <title>a</title> + <title>[default] a</title> <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob) <author> @@ -755,9 +755,36 @@ <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">a</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>8580ff50825a</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>tip</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>a</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>a<br /></td> + </tr> + </table> </content> </entry> @@ -775,7 +802,7 @@ <updated>1970-01-01T00:00:01+00:00</updated> <entry> - <title>a</title> + <title>[default] a</title> <id>http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> (glob) <link href="http://*:$HGPORT1/t/a/rev/8580ff50825a"/> (glob) <author> @@ -785,9 +812,36 @@ <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <pre xml:space="preserve">a</pre> - </div> + <table xmlns="http://www.w3.org/1999/xhtml"> + <tr> + <th style="text-align:left;">changeset</th> + <td>8580ff50825a</td> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>default</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">tag</th> + <td>tip</td> + </tr> + <tr> + <th style="text-align:left;">user</th> + <td>test</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">description</th> + <td>a</td> + </tr> + <tr> + <th style="text-align:left;vertical-align:top;">files</th> + <td>a<br /></td> + </tr> + </table> </content> </entry>