# HG changeset patch # User krauss # Date 1267625839 -3600 # Node ID 34fc7f0aca302c1db3d79a2a475b0832cfc62aa2 # Parent 342a448ae141b21d760df34fbf488dcd295497d6 updated patch for hgweb style: now applies to Mercurial 1.4.3 templates diff -r 342a448ae141 -r 34fc7f0aca30 Admin/Mercurial/isabelle-style.diff --- a/Admin/Mercurial/isabelle-style.diff Wed Mar 03 10:48:19 2010 +0100 +++ b/Admin/Mercurial/isabelle-style.diff Wed Mar 03 15:17:19 2010 +0100 @@ -1,34 +1,38 @@ -diff -r gitweb/changelogentry.tmpl isabelle/changelogentry.tmpl -2,8c2 -< #date|age# ago#desc|strip|firstline|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} -< -<
-< -< #author|obfuscate# [#date|rfc822date#] rev #rev#
---- -> #date|age# ago#author|obfuscate# [#date|rfc822date#] rev #rev# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} -12a7,9 ->
-> #files# ->
-diff -r gitweb/changeset.tmpl isabelle/changeset.tmpl -19c19 -< #desc|strip|escape|firstline# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} ---- -> #desc|strip|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} -diff -r gitweb/map isabelle/map -29c29 -< annotateline = '#author|user#@#rev#
#linenumber#
#line|escape#
' ---- -> annotateline = '#author|user#@#rev#
#linenumber#
#line|escape#
' -59,60c59,60 -< shortlogentry = '#date|age# ago#author|person##desc|strip|firstline|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}changeset | files' -< filelogentry = '#date|age# ago#desc|strip|firstline|escape#file | diff | annotate #rename%filelogrename#' ---- -> shortlogentry = '#date|age# ago#date|shortdate##author|person##desc|strip|escape# {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}changeset | files' -> filelogentry = '#date|age# ago#date|shortdate##author|person##desc|strip|escape#file | diff | annotate #rename%filelogrename#' -diff -r gitweb/summary.tmpl isabelle/summary.tmpl -34d33 -< owner#owner|obfuscate# +diff -u gitweb/changelogentry.tmpl isabelle/changelogentry.tmpl +--- gitweb/changelogentry.tmpl 2010-02-01 16:34:34.000000000 +0100 ++++ isabelle/changelogentry.tmpl 2010-03-03 15:12:12.000000000 +0100 +@@ -1,14 +1,12 @@ +
+-{date|age}{desc|strip|firstline|escape|nonempty} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} +-
+-
+- +-{author|obfuscate} [{date|rfc822date}] rev {rev}
++{date|age} ++{author|obfuscate} [{date|rfc822date}] rev {rev} {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} +
+
+ {desc|strip|escape|addbreaks|nonempty} +
++
++{files} ++
+
+
+diff -u gitweb/map isabelle/map +--- gitweb/map 2010-02-01 16:34:34.000000000 +0100 ++++ isabelle/map 2010-03-03 15:13:25.000000000 +0100 +@@ -206,9 +206,10 @@ + + {date|age} + {author|person} ++ {date|shortdate} + + +- {desc|strip|firstline|escape|nonempty} ++ {desc|strip|escape|nonempty} + {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag} + +