# HG changeset patch # User Martin Geisler # Date 2009-05-13 20:41:58 # Node ID a3c8b41fcc9ddd296d0ef7db0d612212b1d450dd # Parent 890a85b6722880015f3b03e2255602b0b20acf26 gitweb: break long lines in map file diff --git a/templates/gitweb/map b/templates/gitweb/map --- a/templates/gitweb/map +++ b/templates/gitweb/map @@ -12,55 +12,233 @@ navshortentry = '{label|escape} ' filenaventry = '{label|escape} ' filedifflink = '#file|escape# ' -filenodelink = '#file|escape#file | annotate | diff | revisions' -filenolink = '#file|escape#file | annotate | diff | revisions' +filenodelink = ' + + #file|escape# + + + file | + annotate | + diff | + revisions + + ' +filenolink = ' + + #file|escape# + + + file | + annotate | + diff | + revisions + + ' fileellipses = '...' changelogentry = changelogentry.tmpl searchentry = changelogentry.tmpl changeset = changeset.tmpl manifest = manifest.tmpl -direntry = 'drwxr-xr-x#basename|escape# #emptydirs|escape#files' -fileentry = '#permissions|permissions##date|isodate##size##basename|escape#file | revisions | annotate' +direntry = ' + + drwxr-xr-x + + + + #basename|escape# + #emptydirs|escape# + + + files + + ' +fileentry = ' + + #permissions|permissions# + #date|isodate# + #size# + + #basename|escape# + + + file | + revisions | + annotate + + ' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl fileline = '
#linenumber# #line|escape#
' -annotateline = '#author|user#@#rev#
#linenumber#
#line|escape#
' +annotateline = ' + + + #author|user#@#rev# + +
#linenumber#
+
#line|escape#
+ ' difflineplus = '#linenumber# #line|escape#' difflineminus = '#linenumber# #line|escape#' difflineat = '#linenumber# #line|escape#' diffline = '#linenumber# #line|escape#' -changelogparent = 'parent #rev#:#node|short#' +changelogparent = ' + + parent #rev#: + + #node|short# + + ' changesetbranch = 'branch{name}' -changesetparent = 'parent {rev}{node|short}' +changesetparent = ' + + parent {rev} + + {node|short} + + ' filerevbranch = 'branch{name}' -filerevparent = 'parent {rev}{rename%filerename}{node|short}' +filerevparent = ' + + parent {rev} + + + {rename%filerename}{node|short} + + + ' filerename = '{file|escape}@' filelogrename = '| base' -fileannotateparent = 'parent {rev}{rename%filerename}{node|short}' -changelogchild = 'child #rev#:#node|short#' -changesetchild = 'child {rev}{node|short}' -filerevchild = 'child {rev}{node|short}' -fileannotatechild = 'child {rev}{node|short}' +fileannotateparent = ' + + parent {rev} + + + {rename%filerename}{node|short} + + + ' +changelogchild = ' + + child #rev#: + #node|short# + ' +changesetchild = ' + + child {rev} + + {node|short} + + ' +filerevchild = ' + + child {rev} + + {node|short} + ' +fileannotatechild = ' + + child {rev} + + {node|short} + ' tags = tags.tmpl -tagentry = '#date|age# ago#tag|escape#changeset | changelog | files' +tagentry = ' + + #date|age# ago + #tag|escape# + + changeset | + changelog | + files + + ' branches = branches.tmpl -branchentry = '{date|age} ago{node|short}{branch|escape}changeset | changelog | files' +branchentry = ' + + {date|age} ago + {node|short} + {branch|escape} + + changeset | + changelog | + files + + ' diffblock = '
#lines#
' -filediffparent = 'parent {rev}{node|short}' -filelogparent = 'parent #rev#: #node|short#' -filediffchild = 'child {rev}{node|short}' -filelogchild = 'child #rev#: #node|short#' +filediffparent = ' + + parent {rev} + + + {node|short} + + + ' +filelogparent = ' + + parent #rev#:  + #node|short# + ' +filediffchild = ' + + child {rev} + + {node|short} + + ' +filelogchild = ' + + child #rev#:  + #node|short# + ' shortlog = shortlog.tmpl graph = graph.tmpl tagtag = '{name} ' branchtag = '{name} ' inbranchtag = '{name} ' -shortlogentry = '#date|age# ago#author|person##desc|strip|firstline|escape|nonempty# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}changeset | files' -filelogentry = '#date|age# ago#desc|strip|firstline|escape|nonempty#file | diff | annotate #rename%filelogrename#' +shortlogentry = ' + + #date|age# ago + #author|person# + + + #desc|strip|firstline|escape|nonempty# + {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} + + + + changeset | + files + + ' +filelogentry = ' + + #date|age# ago + + + #desc|strip|firstline|escape|nonempty# + + + + file | diff | annotate #rename%filelogrename# + ' archiveentry = ' | #type|escape# ' -indexentry = '{name|escape}{description}{contact|obfuscate}{lastchange|age} ago{archives%indexarchiveentry}\n' +indexentry = ' + + + + {name|escape} + + + {description} + {contact|obfuscate} + {lastchange|age} ago + {archives%indexarchiveentry} + + \n' indexarchiveentry = ' {type|escape} ' index = index.tmpl urlparameter = '#separator##name#=#value|urlescape#' diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out index ddc6784041c5e78e14b15445ec585a0f5129ae0f..d25fe897d40f628adc63cf9c5f0182f7db1d09a3 GIT binary patch literal 29098 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 G