# HG changeset patch # User Brendan Cully # Date 1160083634 25200 # Node ID 36fa5db79dd5c96546c5cb23da6d9aebb6564316 # Parent a7370503d800315a4693b367ea0e336bbe985d98 hgweb: convert gitweb to NWI diff --git a/templates/gitweb/changelog.tmpl b/templates/gitweb/changelog.tmpl --- a/templates/gitweb/changelog.tmpl +++ b/templates/gitweb/changelog.tmpl @@ -1,26 +1,24 @@ #header# #repo|escape#: Changelog + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / changelog +
Mercurial
#repo|escape# / changelog
-
+
- -
-summary | shortlog | changelog | tags | manifest#archives%archiveentry#
+summary | shortlog | changelog | tags | manifest#archives%archiveentry#

#changenav%naventry#
diff --git a/templates/gitweb/changelogentry.tmpl b/templates/gitweb/changelogentry.tmpl --- a/templates/gitweb/changelogentry.tmpl +++ b/templates/gitweb/changelogentry.tmpl @@ -1,9 +1,9 @@
-#date|age# ago#desc|strip|firstline|escape# +#date|age# ago#desc|strip|firstline|escape#
-changeset
+changeset
#author|obfuscate# [#date|rfc822date#] rev #rev#
diff --git a/templates/gitweb/changeset.tmpl b/templates/gitweb/changeset.tmpl --- a/templates/gitweb/changeset.tmpl +++ b/templates/gitweb/changeset.tmpl @@ -1,27 +1,27 @@ #header# #repo|escape#: Changeset + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / changeset +
Mercurial
#repo|escape# / changeset
-summary | shortlog | changelog | tags | manifest | changeset | raw #archives%archiveentry#
+summary | shortlog | changelog | tags | manifest | changeset | raw #archives%archiveentry#
-#desc|strip|escape|firstline# +#desc|strip|escape|firstline#
- + #parent%changesetparent# #child%changesetchild# #changesettag# diff --git a/templates/gitweb/error.tmpl b/templates/gitweb/error.tmpl --- a/templates/gitweb/error.tmpl +++ b/templates/gitweb/error.tmpl @@ -1,16 +1,16 @@ #header# #repo|escape#: Error + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / error +
Mercurial
#repo|escape# / error
-summary | shortlog | changelog | tags | manifest
+summary | shortlog | changelog | tags | manifest
diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl +++ b/templates/gitweb/fileannotate.tmpl @@ -1,16 +1,24 @@ #header# #repo|escape#: Annotate + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / annotate +
Mercurial
#repo|escape# / annotate
-summary | shortlog | changelog | tags | manifest | changeset | file | revisions | annotate | raw
+summary | +shortlog | +changelog | +tags | +manifest | +changeset | +file | +revisions | +annotate | raw
#file|escape#
@@ -18,13 +26,13 @@
author#author|obfuscate#
#date|date# (#date|age# ago)
changeset#node|short#
manifest#node|short#
manifest#node|short#
- + #rename%filerename# #parent%fileannotateparent# #child%fileannotatechild# - + diff --git a/templates/gitweb/filelog.tmpl b/templates/gitweb/filelog.tmpl --- a/templates/gitweb/filelog.tmpl +++ b/templates/gitweb/filelog.tmpl @@ -1,16 +1,23 @@ #header# #repo|escape#: File revisions + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / file revisions +
Mercurial
#repo|escape# / file revisions
-summary | shortlog | changelog | tags | file | revisions | annotate | rss
+summary | +shortlog | +changelog | +tags | +file | +revisions | +annotate | +rss
#file|urlescape#
diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl +++ b/templates/gitweb/filerevision.tmpl @@ -1,16 +1,25 @@ #header# #repo|escape#: File revision + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / file revision +
Mercurial
#repo|escape# / file revision
-summary | shortlog | changelog | tags | manifest | changeset | file | revisions | annotate | raw
+summary | +shortlog | +changelog | +tags | +manifest | +changeset | +file | +revisions | +annotate | +raw
#file|escape#
@@ -18,13 +27,13 @@
changeset #rev#:#node|short#
#node|short#
manifest:#node|short#
#node|short#
author: #author|obfuscate#
- + #rename%filerename# #parent%fileannotateparent# #child%fileannotatechild# - + diff --git a/templates/gitweb/footer.tmpl b/templates/gitweb/footer.tmpl --- a/templates/gitweb/footer.tmpl +++ b/templates/gitweb/footer.tmpl @@ -1,6 +1,6 @@
#repo|escape#
- +
diff --git a/templates/gitweb/header.tmpl b/templates/gitweb/header.tmpl --- a/templates/gitweb/header.tmpl +++ b/templates/gitweb/header.tmpl @@ -4,8 +4,8 @@ Content-type: text/html - + - + diff --git a/templates/gitweb/manifest.tmpl b/templates/gitweb/manifest.tmpl --- a/templates/gitweb/manifest.tmpl +++ b/templates/gitweb/manifest.tmpl @@ -1,16 +1,21 @@ #header# #repo|escape#: Manifest + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / manifest +
Mercurial
#repo|escape# / manifest
-summary | shortlog | changelog | tags | manifest | changeset #archives%archiveentry#
+summary | +shortlog | +changelog | +tags | +manifest | +changeset #archives%archiveentry#
#path|escape#
@@ -18,7 +23,7 @@
changeset #rev#:#node|short#
#node|short#
manifest:#node|short#
#node|short#
author: #author|obfuscate#
- + #dentries%manifestdirentry# diff --git a/templates/gitweb/search.tmpl b/templates/gitweb/search.tmpl --- a/templates/gitweb/search.tmpl +++ b/templates/gitweb/search.tmpl @@ -1,22 +1,24 @@ #header#
-summary | shortlog | changelog | tags | manifest
+summary | +shortlog | +changelog | +tags | +manifest

searching for #query|escape#

- + search: - #entries# - + search: - diff --git a/templates/gitweb/shortlog.tmpl b/templates/gitweb/shortlog.tmpl --- a/templates/gitweb/shortlog.tmpl +++ b/templates/gitweb/shortlog.tmpl @@ -1,25 +1,27 @@ #header# #repo|escape#: Shortlog + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / shortlog +
Mercurial
#repo|escape# / shortlog
- +
- -
-summary | shortlog | changelog | tags | manifest#archives%archiveentry#
+summary | +shortlog | +changelog | +tags | +manifest#archives%archiveentry#

#changenav%navshortentry#
diff --git a/templates/gitweb/summary.tmpl b/templates/gitweb/summary.tmpl --- a/templates/gitweb/summary.tmpl +++ b/templates/gitweb/summary.tmpl @@ -1,15 +1,19 @@ #header# #repo|escape#: Summary + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / summary +
Mercurial
#repo|escape# / summary
-summary | shortlog | changelog | tags | manifest#archives%archiveentry# +summary | +shortlog | +changelog | +tags | +manifest#archives%archiveentry#
@@ -20,16 +24,16 @@ summary | changes
+
changes
drwxr-xr-x[up][up]  
#shortlog# - +
...
...
-
tags
+
tags
#tags# - +
...
...
#footer# diff --git a/templates/gitweb/tags.tmpl b/templates/gitweb/tags.tmpl --- a/templates/gitweb/tags.tmpl +++ b/templates/gitweb/tags.tmpl @@ -1,16 +1,20 @@ #header# #repo|escape#: Tags + href="{url}rss-log" title="RSS feed for #repo|escape#">
-
Mercurial
#repo|escape# / tags +
Mercurial
#repo|escape# / tags
-summary | shortlog | changelog | tags | manifest +summary | +shortlog | +changelog | +tags | +manifest
diff --git a/templates/map-gitweb b/templates/map-gitweb --- a/templates/map-gitweb +++ b/templates/map-gitweb @@ -5,48 +5,48 @@ search = gitweb/search.tmpl changelog = gitweb/changelog.tmpl summary = gitweb/summary.tmpl error = gitweb/error.tmpl -naventry = '#label|escape# ' -navshortentry = '#label|escape# ' -filedifflink = '#file|escape# ' -filenodelink = '#file|escape#file | annotate | revisions' +naventry = '#label|escape# ' +navshortentry = '#label|escape# ' +filedifflink = '#file|escape# ' +filenodelink = '#file|escape#file | annotate | revisions' fileellipses = '...' changelogentry = gitweb/changelogentry.tmpl searchentry = gitweb/changelogentry.tmpl changeset = gitweb/changeset.tmpl manifest = gitweb/manifest.tmpl -manifestdirentry = 'drwxr-xr-x#basename|escape#/manifest' -manifestfileentry = '#permissions|permissions##basename|escape#file | revisions | annotate' +manifestdirentry = 'drwxr-xr-x#basename|escape#/manifest' +manifestfileentry = '#permissions|permissions##basename|escape#file | revisions | annotate' filerevision = gitweb/filerevision.tmpl fileannotate = gitweb/fileannotate.tmpl filelog = gitweb/filelog.tmpl fileline = '
   #linenumber# #line|escape#
' -annotateline = '#author|obfuscate#@#rev#
#line|escape#
' +annotateline = '#author|obfuscate#@#rev#
#line|escape#
' difflineplus = '
#line|escape#
' difflineminus = '
#line|escape#
' difflineat = '
#line|escape#
' diffline = '
#line|escape#
' -changelogparent = 'parent #rev#:#node|short#' -changesetparent = 'parent#node|short#' -filerevparent = 'parent:#node|short#' -filerename = 'parent:#file|escape#@#node|short#' -filelogrename = '| base' -fileannotateparent = 'parent:#node|short#' -changelogchild = 'child #rev#:#node|short#' -changesetchild = 'child#node|short#' -filerevchild = 'child:#node|short#' -fileannotatechild = 'child:#node|short#' +changelogparent = 'parent #rev#:#node|short#' +changesetparent = 'parent#node|short#' +filerevparent = 'parent:#node|short#' +filerename = 'parent:#file|escape#@#node|short#' +filelogrename = '| base' +fileannotateparent = 'parent:#node|short#' +changelogchild = 'child #rev#:#node|short#' +changesetchild = 'child#node|short#' +filerevchild = 'child:#node|short#' +fileannotatechild = 'child:#node|short#' tags = gitweb/tags.tmpl -tagentry = '#date|age# ago#tag|escape#changeset | changelog | manifest' +tagentry = '#date|age# ago#tag|escape#changeset | changelog | manifest' diffblock = '
#lines#
' changelogtag = 'tag:#tag|escape#' changesettag = 'tag#tag|escape#' -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 = gitweb/shortlog.tmpl -shortlogentry = '#date|age# ago#author##desc|strip|firstline|escape#changeset | manifest' -filelogentry = '#date|age# ago#desc|strip|firstline|escape#file | annotate #rename%filelogrename#' -archiveentry = ' | #type|escape# ' -indexentry = '#name|escape##description##contact|obfuscate##lastchange|age# ago #archives%archiveentry#' +shortlogentry = '#date|age# ago#author##desc|strip|firstline|escape#changeset | manifest' +filelogentry = '#date|age# ago#desc|strip|firstline|escape#file | annotate #rename%filelogrename#' +archiveentry = ' | #type|escape# ' +indexentry = '#name|escape##description##contact|obfuscate##lastchange|age# ago #archives%archiveentry#' index = gitweb/index.tmpl