# HG changeset patch # User Thomas Arendsen Hein # Date 1180695627 -7200 # Node ID b593dcd963673062327304cdf9e309f3ce3cdf01 # Parent a73cf208b2a09d5f98134ef396a853150244bd65# Parent 8af65bc092b09d435f1eb70a761b20f30a7d9fc2 merge with crew diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -285,7 +285,8 @@ class hgweb(object): yield self.t('search', query=query, node=hex(cl.tip()), - entries=changelist) + entries=changelist, + archives=self.archivelist("tip")) def changeset(self, ctx): n = ctx.node() diff --git a/templates/gitweb/changeset.tmpl b/templates/gitweb/changeset.tmpl --- a/templates/gitweb/changeset.tmpl +++ b/templates/gitweb/changeset.tmpl @@ -21,7 +21,6 @@ author#author|obfuscate# #date|date# (#date|age# ago) changeset {rev}{node|short} -manifest#node|short# #parent%changesetparent# #child%changesetchild# #changesettag# diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl +++ b/templates/gitweb/fileannotate.tmpl @@ -26,24 +26,21 @@ annotate |
#file|escape#
- +
+ + + - - + + + + + #parent%fileannotateparent# #child%fileannotatechild# - - - - - - - - - - - + +
author#author|obfuscate#
changeset #rev#:#node|short#
#date|date# (#date|age# ago)
changeset {rev}#node|short#
manifest:#node|short#
author:#author|obfuscate#
date:#date|date# (#date|age# ago)
permissions:#permissions|permissions#
permissions#permissions|permissions#
diff --git a/templates/gitweb/filediff.tmpl b/templates/gitweb/filediff.tmpl --- a/templates/gitweb/filediff.tmpl +++ b/templates/gitweb/filediff.tmpl @@ -6,7 +6,7 @@
-
Mercurial
{repo|escape} / annotate +
Mercurial
{repo|escape} / diff
@@ -27,21 +27,16 @@ diff | - - - + + {parent%filediffparent} {child%filediffchild} - - - -
changeset {rev}:{node|short}
changeset {rev}{node|short}
manifest:{node|short}
+
+
- {diff} -
{footer} diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl +++ b/templates/gitweb/filerevision.tmpl @@ -26,24 +26,21 @@ file |
#file|escape#
- +
+ + + - - + + + + + #parent%filerevparent# #child%filerevchild# - - - - - - - - - - - + +
author#author|obfuscate#
changeset #rev#:#node|short#
#date|date# (#date|age# ago)
changeset {rev}#node|short#
manifest:#node|short#
author:#author|obfuscate#
date:#date|date# (#date|age# ago)
permissions:#permissions|permissions#
permissions#permissions|permissions#
diff --git a/templates/gitweb/map b/templates/gitweb/map --- a/templates/gitweb/map +++ b/templates/gitweb/map @@ -29,23 +29,23 @@ difflineat = '
parent #rev#:#node|short#' changesetparent = 'parent {rev}{node|short}' -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}' +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}' +filerevchild = 'child {rev}{node|short}' +fileannotatechild = 'child {rev}{node|short}' tags = tags.tmpl tagentry = '#date|age# ago#tag|escape#changeset | changelog | manifest' branchentry = '{date|age} ago{node|short}{branch|escape}changeset | changelog | manifest' diffblock = '
#lines#
' changelogtag = 'tag:#tag|escape#' changesettag = 'tag#tag|escape#' -filediffparent = 'parent {rev}:{node|short}' +filediffparent = 'parent {rev}{node|short}' filelogparent = 'parent #rev#: #node|short#' -filediffchild = 'child {rev}:{node|short}' +filediffchild = 'child {rev}{node|short}' filelogchild = 'child #rev#: #node|short#' shortlog = shortlog.tmpl shortlogentry = '#date|age# ago#author##desc|strip|firstline|escape#changeset | manifest' diff --git a/templates/gitweb/search.tmpl b/templates/gitweb/search.tmpl --- a/templates/gitweb/search.tmpl +++ b/templates/gitweb/search.tmpl @@ -1,27 +1,32 @@ #header# +#repo|escape#: Search + + + + +
+
Mercurial
#repo|escape# / search + +
+{sessionvars%hiddenformentry} +
+ +
+
+
+
summary | shortlog | changelog | tags | -manifest
+manifest#archives%archiveentry# +
-

searching for #query|escape#

- -
-{sessionvars%hiddenformentry} -search: - -
+
searching for #query|escape#
#entries# -
-{sessionvars%hiddenformentry} -search: - - -
- #footer# diff --git a/templates/gitweb/summary.tmpl b/templates/gitweb/summary.tmpl --- a/templates/gitweb/summary.tmpl +++ b/templates/gitweb/summary.tmpl @@ -7,7 +7,15 @@
Mercurial
#repo|escape# / summary + +
+{sessionvars%hiddenformentry} +
+
+
+
+
summary | shortlog |