diff --git a/templates/paper/map b/templates/paper/map --- a/templates/paper/map +++ b/templates/paper/map @@ -23,8 +23,30 @@ searchentry = shortlogentry.tmpl changeset = changeset.tmpl manifest = manifest.tmpl -direntry = 'dir. {basename|escape}/ {emptydirs|escape}drwxr-xr-x' -fileentry = 'file {basename|escape}{size}{permissions|permissions}' +direntry = ' + + + + dir. {basename|escape}/ + + + {emptydirs|escape} + + + + drwxr-xr-x + ' + +fileentry = ' + + + + file {basename|escape} + + + {size} + {permissions|permissions} + ' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl @@ -33,7 +55,14 @@ filelog = filelog.tmpl fileline = '
{linenumber} {line|escape}
' filelogentry = filelogentry.tmpl -annotateline = '{author|user}@{rev}{linenumber} {line|escape}' +annotateline = ' + + + {author|user}@{rev} + + {linenumber} {line|escape} + ' diffblock = '
{lines}
' difflineplus = '{linenumber} {line|escape}' @@ -41,7 +70,11 @@ difflineminus = '{linenumber} {line|escape}' diffline = '{linenumber} {line|escape}' -changelogparent = 'parent {rev}:{node|short}' +changelogparent = ' + + parent {rev}: + {node|short} + ' changesetparent = '{node|short} ' @@ -49,27 +82,108 @@ filerevparent = '{node|short} ' filerename = '{file|escape}@' -filelogrename = 'base:{file|escape}@{node|short}' -fileannotateparent = 'parent:{rename%filerename}{node|short}' +filelogrename = ' + + base: + + + {file|escape}@{node|short} + + + ' +fileannotateparent = ' + + parent: + + + {rename%filerename}{node|short} + + + ' changesetchild = ' {node|short}' -changelogchild = 'child{node|short}' -fileannotatechild = 'child:{node|short}' +changelogchild = ' + + child + + + {node|short} + + + ' +fileannotatechild = ' + + child: + + + {node|short} + + + ' tags = tags.tmpl -tagentry = '{tag|escape}{node|short}' +tagentry = ' + + + + {tag|escape} + + + + {node|short} + + ' branches = branches.tmpl -branchentry = '{branch|escape}{node|short}' +branchentry = ' + + + + {branch|escape} + + + + {node|short} + + ' changelogtag = '{name|escape} ' changesettag = '{tag|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|age} ago{archives%indexarchiveentry}\n' + +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|age} ago + {archives%indexarchiveentry} + \n' indexarchiveentry = ' ↓{type|escape}' index = index.tmpl -archiveentry = '
  • {type|escape}
  • ' +archiveentry = ' +
  • + {type|escape} +
  • ' notfound = notfound.tmpl error = error.tmpl urlparameter = '{separator}{name}={value|urlescape}' diff --git a/tests/test-hgweb-descend-empties.out b/tests/test-hgweb-descend-empties.out --- a/tests/test-hgweb-descend-empties.out +++ b/tests/test-hgweb-descend-empties.out @@ -61,7 +61,43 @@ files, or words in the commit message drwxr-xr-x -dir. a1/ a2/a3/a4drwxr-xr-xdir. b1/ b2drwxr-xr-xdir. d1/ d2drwxr-xr-x + + + + +dir. a1/ + + +a2/a3/a4 + + + +drwxr-xr-x + + + + +dir. b1/ + + +b2 + + + +drwxr-xr-x + + + + +dir. d1/ + + +d2 + + + +drwxr-xr-x + diff --git a/tests/test-hgwebdir.out b/tests/test-hgwebdir.out --- a/tests/test-hgwebdir.out +++ b/tests/test-hgwebdir.out @@ -70,17 +70,94 @@ 200 Script output follows Last change   - bunknownFoo Bar <foo.bar@example.com>seconds ago -coll/aunknownFoo Bar <foo.bar@example.com>seconds ago -coll/a/.hg/patchesunknownFoo Bar <foo.bar@example.com>seconds ago -coll/bunknownFoo Bar <foo.bar@example.com>seconds ago -coll/cunknownFoo Bar <foo.bar@example.com>seconds ago -rcoll/aunknownFoo Bar <foo.bar@example.com>seconds ago -rcoll/a/.hg/patchesunknownFoo Bar <foo.bar@example.com>seconds ago -rcoll/bunknownFoo Bar <foo.bar@example.com>seconds ago -rcoll/b/dunknownFoo Bar <foo.bar@example.com>seconds ago -rcoll/cunknownFoo Bar <foo.bar@example.com>seconds ago -t/aunknownFoo Bar <foo.bar@example.com>seconds ago + + +b +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +coll/a +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +coll/a/.hg/patches +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +coll/b +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +coll/c +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +rcoll/a +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +rcoll/a/.hg/patches +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +rcoll/b +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +rcoll/b/d +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +rcoll/c +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + + + +t/a +unknown +Foo Bar <foo.bar@example.com> +seconds ago + + @@ -129,7 +206,14 @@ 200 Script output follows Last change   - aunknownFoo Bar <foo.bar@example.com>seconds ago + + +a +unknown +Foo Bar <foo.bar@example.com> +seconds ago + +