# HG changeset patch # User Aaron Jensen # Date 1397760343 25200 # Node ID 91eb605022f54f05288c2aa21f3c69166d3840f3 # Parent 30c60e28aa9b1ae84364ca15f8e7e09593cc3aa6 hgweb: adding branch names from inbranch template to atom feed diff -r 30c60e28aa9b -r 91eb605022f5 mercurial/templates/atom/changelogentry.tmpl --- 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 @@ - {branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty} + {inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty} {urlbase}{url|urlescape}#changeset-{node} @@ -13,13 +13,13 @@ changeset {node|short} - - - branch - {branches%"{name|escape}"} - - - bookmark + + + branch + {inbranch%"{name|escape}"}{branches%"{name|escape}"} + + + bookmark {bookmarks%"{name|escape}"} diff -r 30c60e28aa9b -r 91eb605022f5 tests/test-hgweb-commands.t --- 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 @@ changeset cad8025a2e87 - - - branch - unstable - - - bookmark + + + branch + unstable + + + bookmark something @@ -119,13 +119,13 @@ changeset 1d22e65f027e - - - branch - stable - - - bookmark + + + branch + stable + + + bookmark @@ -162,13 +162,13 @@ changeset a4f92ed23982 - - - branch - default - - - bookmark + + + branch + default + + + bookmark @@ -205,13 +205,13 @@ changeset 2ef0ac749a14 - - - branch - - - - bookmark + + + branch + + + + bookmark anotherthing @@ -262,13 +262,13 @@ changeset a4f92ed23982 - - - branch - default - - - bookmark + + + branch + default + + + bookmark @@ -305,13 +305,13 @@ changeset 2ef0ac749a14 - - - branch - - - - bookmark + + + branch + + + + bookmark anotherthing @@ -360,13 +360,13 @@ changeset 2ef0ac749a14 - - - branch - - - - bookmark + + + branch + + + + bookmark anotherthing diff -r 30c60e28aa9b -r 91eb605022f5 tests/test-hgweb-filelog.t --- 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 @@ changeset 01de2d66a28d - - - branch - - - - bookmark + + + branch + + + + bookmark @@ -809,13 +809,13 @@ changeset 5ed941583260 - - - branch - - - - bookmark + + + branch + + + + bookmark diff -r 30c60e28aa9b -r 91eb605022f5 tests/test-hgweb-no-path-info.t --- 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 @@ changeset 61c9426e69fe - - - branch - default - - - bookmark + + + branch + default + + + bookmark diff -r 30c60e28aa9b -r 91eb605022f5 tests/test-hgweb-no-request-uri.t --- 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 @@ changeset 61c9426e69fe - - - branch - default - - - bookmark + + + branch + default + + + bookmark diff -r 30c60e28aa9b -r 91eb605022f5 tests/test-hgwebdir.t --- 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 @@ changeset 8580ff50825a - - - branch - default - - - bookmark + + + branch + default + + + bookmark @@ -816,13 +816,13 @@ changeset 8580ff50825a - - - branch - default - - - bookmark + + + branch + default + + + bookmark