Mercurial > hg
changeset 21117:91eb605022f5
hgweb: adding branch names from inbranch template to atom feed
| author | Aaron Jensen <ajensen@webmd.net> |
|---|---|
| date | Thu, 17 Apr 2014 11:45:43 -0700 |
| parents | 30c60e28aa9b |
| children | e1a3898a8bb8 |
| files | mercurial/templates/atom/changelogentry.tmpl 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 | 6 files changed, 99 insertions(+), 99 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/atom/changelogentry.tmpl Thu Oct 03 18:01:21 2013 +0200 +++ b/mercurial/templates/atom/changelogentry.tmpl Thu Apr 17 11:45:43 2014 -0700 @@ -1,5 +1,5 @@ <entry> - <title>{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty}</title> + <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{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> @@ -13,13 +13,13 @@ <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> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td>{inbranch%"{name|escape}"}{branches%"{name|escape}"}</td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> <td>{bookmarks%"{name|escape}"}</td> </tr> <tr>
--- a/tests/test-hgweb-commands.t Thu Oct 03 18:01:21 2013 +0200 +++ b/tests/test-hgweb-commands.t Thu Apr 17 11:45:43 2014 -0700 @@ -76,13 +76,13 @@ <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> + </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> @@ -119,13 +119,13 @@ <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> + </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> @@ -162,13 +162,13 @@ <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> + </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> @@ -205,13 +205,13 @@ <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> + </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> @@ -262,13 +262,13 @@ <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> + </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> @@ -305,13 +305,13 @@ <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> + </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> @@ -360,13 +360,13 @@ <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> + </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>
--- a/tests/test-hgweb-filelog.t Thu Oct 03 18:01:21 2013 +0200 +++ b/tests/test-hgweb-filelog.t Thu Apr 17 11:45:43 2014 -0700 @@ -766,13 +766,13 @@ <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> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> <td></td> </tr> <tr> @@ -809,13 +809,13 @@ <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> + </tr> + <tr> + <th style="text-align:left;">branch</th> + <td></td> + </tr> + <tr> + <th style="text-align:left;">bookmark</th> <td></td> </tr> <tr>
--- a/tests/test-hgweb-no-path-info.t Thu Oct 03 18:01:21 2013 +0200 +++ b/tests/test-hgweb-no-path-info.t Thu Apr 17 11:45:43 2014 -0700 @@ -92,13 +92,13 @@ <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> + </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>
--- a/tests/test-hgweb-no-request-uri.t Thu Oct 03 18:01:21 2013 +0200 +++ b/tests/test-hgweb-no-request-uri.t Thu Apr 17 11:45:43 2014 -0700 @@ -103,13 +103,13 @@ <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> + </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>
--- a/tests/test-hgwebdir.t Thu Oct 03 18:01:21 2013 +0200 +++ b/tests/test-hgwebdir.t Thu Apr 17 11:45:43 2014 -0700 @@ -759,13 +759,13 @@ <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> + </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> @@ -816,13 +816,13 @@ <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> + </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>