# HG changeset patch # User Brendan Cully # Date 1160608751 25200 # Node ID 2edf53386d86c887cb5bcb70c2008dc4b50a6412 # Parent 04fa31a43b93d936e22560880bc22c2f6861c745 gitweb: add file diff view diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl +++ b/templates/gitweb/fileannotate.tmpl @@ -18,7 +18,9 @@ changeset | file | revisions | -annotate | raw
+annotate | +diff | +raw
#file|escape#
diff --git a/templates/gitweb/filediff.tmpl b/templates/gitweb/filediff.tmpl new file mode 100644 --- /dev/null +++ b/templates/gitweb/filediff.tmpl @@ -0,0 +1,47 @@ +{header} +{repo|escape}: diff {file|escape} + + + + +
+
Mercurial
{repo|escape} / annotate +
+ +
+summary | +shortlog | +changelog | +tags | +manifest | +changeset | +file | +revisions | +annotate | +diff | +raw
+
+ +
{file|escape}
+ + + + + + +{parent%filediffparent} +{child%filediffchild} + + + + +
changeset {rev}:{node|short}
manifest:{node|short}
+ +
+ +{diff} +
+
+ +{footer} diff --git a/templates/gitweb/filelog.tmpl b/templates/gitweb/filelog.tmpl --- a/templates/gitweb/filelog.tmpl +++ b/templates/gitweb/filelog.tmpl @@ -17,6 +17,7 @@ file | revisions | annotate | +diff | rss
diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl +++ b/templates/gitweb/filerevision.tmpl @@ -19,6 +19,7 @@ file | revisions | annotate | +diff | raw
diff --git a/templates/gitweb/map b/templates/gitweb/map --- a/templates/gitweb/map +++ b/templates/gitweb/map @@ -8,7 +8,7 @@ error = error.tmpl naventry = '#label|escape# ' navshortentry = '#label|escape# ' filedifflink = '#file|escape# ' -filenodelink = '#file|escape#file | annotate | revisions' +filenodelink = '#file|escape#file | annotate | diff | revisions' fileellipses = '...' changelogentry = changelogentry.tmpl searchentry = changelogentry.tmpl @@ -18,6 +18,7 @@ manifestdirentry = '#permissions|permissions##size##basename|escape#file | revisions | annotate' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl +filediff = filediff.tmpl filelog = filelog.tmpl fileline = '
   #linenumber# #line|escape#
' annotateline = '#author|obfuscate#@#rev#
#line|escape#
'