# HG changeset patch # User Anton Shestakov # Date 1442509587 -28800 # Node ID c450265b56115601cb7ce8aa4057dcbd9f640435 # Parent 436f5ab16079c62afe913f3dc089ed000bf257fc coal: reuse all templates from paper/map by %including the file Before, coal/map simply had all the templates copied and pasted from paper/map file. It was easy to make a change to paper that would get into coal only partially and just sit there until something like 399e970e35c8 happened. Let's remove this duplication from coal/map by using %include to reuse templates from paper/map directly. diff -r 436f5ab16079 -r c450265b5611 mercurial/templates/coal/map --- a/mercurial/templates/coal/map Fri Sep 04 05:40:52 2015 -0400 +++ b/mercurial/templates/coal/map Fri Sep 18 01:06:27 2015 +0800 @@ -1,7 +1,5 @@ -default = 'shortlog' +%include paper/map -mimetype = 'text/html; charset={encoding}' -header = header.tmpl footer = ../paper/footer.tmpl search = ../paper/search.tmpl @@ -13,23 +11,6 @@ help = ../paper/help.tmpl helptopics = ../paper/helptopics.tmpl -helpentry = ' - - - {topic|escape} - - - {summary|escape} - ' - -naventry = '{label|escape} ' -navshortentry = '{label|escape} ' -navgraphentry = '{label|escape} ' -filenaventry = '{label|escape} ' -filedifflink = '{file|escape} ' -filenodelink = '{file|escape} ' -filenolink = '{file|escape} ' -fileellipses = '...' diffstatlink = ../paper/diffstat.tmpl diffstatnolink = ../paper/diffstat.tmpl changelogentry = ../paper/shortlogentry.tmpl @@ -37,216 +18,17 @@ changeset = ../paper/changeset.tmpl manifest = ../paper/manifest.tmpl -nav = '{before%naventry} {after%naventry}' -navshort = '{before%navshortentry}{after%navshortentry}' -navgraph = '{before%navgraphentry}{after%navgraphentry}' -filenav = '{before%filenaventry}{after%filenaventry}' - -direntry = ' - - - - dir. {basename|escape}/ - - - {emptydirs|escape} - - - - drwxr-xr-x - ' - -fileentry = ' - - - - file {basename|escape} - - - {size} - {permissions|permissions} - ' - filerevision = ../paper/filerevision.tmpl fileannotate = ../paper/fileannotate.tmpl filediff = ../paper/filediff.tmpl filecomparison = ../paper/filecomparison.tmpl filelog = ../paper/filelog.tmpl -fileline = ' - {strip(line|escape, '\r\n')}' filelogentry = ../paper/filelogentry.tmpl -annotateline = ' - - - {author|user}@{rev} - - {linenumber} {line|escape} - ' - -diffblock = '
{lines}
' -difflineplus = ' - {strip(line|escape, '\r\n')}' -difflineminus = ' - {strip(line|escape, '\r\n')}' -difflineat = ' - {strip(line|escape, '\r\n')}' -diffline = ' - {strip(line|escape, '\r\n')}' - -comparisonblock =' - - {lines} - ' -comparisonline = ' - - {leftlinenumber} {leftline|escape} - {rightlinenumber} {rightline|escape} - ' - -changelogparent = ' - - parent {rev}: - {node|short} - ' - -changesetparent = '{node|short} ' - -changesetparentdiff = ' - {changesetparent} - {ifeq(node, basenode, '(current diff)', '({difffrom})')}' - -difffrom = 'diff' - -filerevparent = '{rename%filerename}{node|short} ' -filerevchild = '{node|short} ' +tags = ../paper/tags.tmpl +bookmarks = ../paper/bookmarks.tmpl +branches = ../paper/branches.tmpl -filerename = '{file|escape}@' -filelogrename = ' - - base - - {file|escape}@{node|short} - - ' -fileannotateparent = ' - - parent: - - - {rename%filerename}{node|short} - - - ' -changesetchild = ' {node|short}' -changelogchild = ' - - child - - - {node|short} - - - ' -fileannotatechild = ' - - child: - - - {node|short} - - - ' -tags = ../paper/tags.tmpl -tagentry = ' - - - - {tag|escape} - - - - - {node|short} - - - ' -bookmarks = ../paper/bookmarks.tmpl -bookmarkentry = ' - - - - {bookmark|escape} - - - - - {node|short} - - - ' -branches = ../paper/branches.tmpl -branchentry = ' - - - - {branch|escape} - - - - - {node|short} - - - ' -changelogtag = '{name|escape} ' -changesettag = '{tag|escape} ' -changesetbookmark = '{bookmark|escape} ' -changelogbranchhead = '{name|escape} ' -changelogbranchname = '{name|escape} ' - -filediffparent = ' - - parent {rev}: - {node|short} - ' -filelogparent = ' - - parent {rev}: - {node|short} - ' -filediffchild = ' - - child {rev}: - {node|short} - - ' -filelogchild = ' - - child {rev}: - {node|short} - ' - -indexentry = ' - - {name|escape} - {description} - {contact|obfuscate} - {lastchange|rfc822date} - {archives%indexarchiveentry} - \n' -indexarchiveentry = ' ↓{type|escape}' index = ../paper/index.tmpl -archiveentry = ' -
  • - {type|escape} -
  • ' notfound = ../paper/notfound.tmpl error = ../paper/error.tmpl -urlparameter = '{separator}{name}={value|urlescape}' -hiddenformentry = '' -breadcrumb = '> {name|escape} ' - -searchhint = 'Find changesets by keywords (author, files, the commit message), revision - number or hash, or revset expression.'