# HG changeset patch # User Gregory Szorc # Date 1451520088 25200 # Node ID 8e8b3371bee14e880e52f5a929e4832898d4d3ed # Parent d35ff0b0d0da566b736c3e7526bc4a2921a896d7 templates: differentiate between partial and full topic name In order to support sub-topics, we need to support linking to a full topic name while displaying the base topic name. Change the {helpentry} template to grab the display name from an optional seperate variable (which will be defined in a future patch). diff -r d35ff0b0d0da -r 8e8b3371bee1 mercurial/templates/gitweb/map --- a/mercurial/templates/gitweb/map Wed Dec 30 17:12:59 2015 -0700 +++ b/mercurial/templates/gitweb/map Wed Dec 30 17:01:28 2015 -0700 @@ -14,7 +14,7 @@ helpentry = ' - {topic|escape} + {if(basename, '{basename|escape}', '{topic|escape}')} {summary|escape} diff -r d35ff0b0d0da -r 8e8b3371bee1 mercurial/templates/monoblue/map --- a/mercurial/templates/monoblue/map Wed Dec 30 17:12:59 2015 -0700 +++ b/mercurial/templates/monoblue/map Wed Dec 30 17:01:28 2015 -0700 @@ -14,7 +14,7 @@ helpentry = ' - {topic|escape} + {if(basename, '{basename|escape}', '{topic|escape}')} {summary|escape} diff -r d35ff0b0d0da -r 8e8b3371bee1 mercurial/templates/paper/map --- a/mercurial/templates/paper/map Wed Dec 30 17:12:59 2015 -0700 +++ b/mercurial/templates/paper/map Wed Dec 30 17:01:28 2015 -0700 @@ -15,7 +15,7 @@ helpentry = ' - {topic|escape} + {if(basename, '{basename|escape}', '{topic|escape}')} {summary|escape}