# HG changeset patch # User Josef "Jeff" Sipek # Date 1180435960 14400 # Node ID faf2fa0f3fffd5e75448556540902640b77b3ec2 # Parent 0ed59f0076e0f765de6a5e2ce9dd5b7149471a16 gitweb: file diff: Display metadata in same order as changeset does 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/map b/templates/gitweb/map --- a/templates/gitweb/map +++ b/templates/gitweb/map @@ -43,9 +43,9 @@ branchentry = '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'