# HG changeset patch # User Aaron Jensen # Date 1397665897 25200 # Node ID d70703954a2a7dfe364ac5c317df9adaaafd397a # Parent dbff8c119cf6ab0659a9123381d77a2c0bd29947 hgweb: adding branch, tags, bookmarks, user, and file list to atom feed entries diff -r dbff8c119cf6 -r d70703954a2a mercurial/templates/atom/changelogentry.tmpl --- 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 @@ - {desc|strip|firstline|strip|escape|nonempty} + {branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape|nonempty} {urlbase}{url|urlescape}#changeset-{node} @@ -9,8 +9,35 @@ {date|rfc3339date} {date|rfc3339date} -
- 
{desc|escape|nonempty}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset{node|short}
branch{branches%"{name|escape}"}
bookmark{bookmarks%"{name|escape}"}
tag{tags%"{name|escape}"}
user{author|obfuscate}
description{desc|strip|escape|addbreaks|nonempty}
files{files}
 diff -r dbff8c119cf6 -r d70703954a2a mercurial/templates/atom/map --- 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}
' +fileellipses = '{file|escape}
' +filenodelink = '{file|escape}
' +filenolink = '{file|escape}
' diff -r dbff8c119cf6 -r d70703954a2a tests/test-hgweb-commands.t --- 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 @@ 1970-01-01T00:00:00+00:00 - branch commit with null character: + [unstable] branch commit with null character: http://*:$HGPORT/#changeset-cad8025a2e87f88c06259790adfa15acb4080123 (glob) (glob) @@ -72,13 +72,40 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
branch commit with null character:
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changesetcad8025a2e87
branchunstable
bookmarksomething
tagtip
usertest
descriptionbranch commit with null character:
files
 - branch + [stable] branch http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe (glob) (glob) @@ -88,13 +115,40 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
branch
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset1d22e65f027e
branchstable
bookmark
tag
usertest
descriptionbranch
filesfoo
 - Added tag 1.0 for changeset 2ef0ac749a14 + [default] Added tag 1.0 for changeset 2ef0ac749a14 http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de (glob) (glob) @@ -104,9 +158,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
Added tag 1.0 for changeset 2ef0ac749a14
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeseta4f92ed23982
branchdefault
bookmark
tag
usertest
descriptionAdded tag 1.0 for changeset 2ef0ac749a14
files.hgtags
 @@ -120,9 +201,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
base
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset2ef0ac749a14
branch
bookmarkanotherthing
tag1.0
usertest
descriptionbase
filesda/foo
foo
 @@ -140,7 +248,7 @@ 1970-01-01T00:00:00+00:00 - Added tag 1.0 for changeset 2ef0ac749a14 + [default] Added tag 1.0 for changeset 2ef0ac749a14 http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de (glob) (glob) @@ -150,9 +258,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
Added tag 1.0 for changeset 2ef0ac749a14
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeseta4f92ed23982
branchdefault
bookmark
tag
usertest
descriptionAdded tag 1.0 for changeset 2ef0ac749a14
files.hgtags
 @@ -166,9 +301,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
base
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset2ef0ac749a14
branch
bookmarkanotherthing
tag1.0
usertest
descriptionbase
filesda/foo
foo
 @@ -194,9 +356,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
base
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset2ef0ac749a14
branch
bookmarkanotherthing
tag1.0
usertest
descriptionbase
files
 diff -r dbff8c119cf6 -r d70703954a2a tests/test-hgweb-filelog.t --- 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 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
second a
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset01de2d66a28d
branch
bookmark
tag
usertest
descriptionsecond a
files
 @@ -778,9 +805,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
first a
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset5ed941583260
branch
bookmark
tag
usertest
descriptionfirst a
files
 diff -r dbff8c119cf6 -r d70703954a2a tests/test-hgweb-no-path-info.t --- 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 @@ 1970-01-01T00:00:00+00:00 - test + [default] test http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c @@ -88,9 +88,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
test
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset61c9426e69fe
branchdefault
bookmark
tagtip
usertest
descriptiontest
filesbar
 diff -r dbff8c119cf6 -r d70703954a2a tests/test-hgweb-no-request-uri.t --- 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 @@ 1970-01-01T00:00:00+00:00 - test + [default] test http://127.0.0.1:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c @@ -99,9 +99,36 @@ 1970-01-01T00:00:00+00:00 1970-01-01T00:00:00+00:00 -
- 
test
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset61c9426e69fe
branchdefault
bookmark
tagtip
usertest
descriptiontest
filesbar
 diff -r dbff8c119cf6 -r d70703954a2a tests/test-hgwebdir.t --- 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 @@ 1970-01-01T00:00:01+00:00 - a + [default] a http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab (glob) (glob) @@ -755,9 +755,36 @@ 1970-01-01T00:00:01+00:00 1970-01-01T00:00:01+00:00 -
- 
a
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset8580ff50825a
branchdefault
bookmark
tagtip
usertest
descriptiona
filesa
 @@ -775,7 +802,7 @@ 1970-01-01T00:00:01+00:00 - a + [default] a http://*:$HGPORT1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab (glob) (glob) @@ -785,9 +812,36 @@ 1970-01-01T00:00:01+00:00 1970-01-01T00:00:01+00:00 -
- 
a
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
changeset8580ff50825a
branchdefault
bookmark
tagtip
usertest
descriptiona
filesa