urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.

master
Joey Hess 2008-10-27 14:45:54 -04:00
parent 5e9f24bebc
commit 8530e827b0
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/Plugin/git.pm
View File

@ -95,7 +95,7 @@ sub getsetup () { #{{{
diffurl => { diffurl => {
type => "string", type => "string",
example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]", example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)", description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], [[sha1_commit]] and [[file]] substituted)",
safe => 1, safe => 1,
rebuild => 1, rebuild => 1,
}, },
@ -521,6 +521,7 @@ sub rcs_recentchanges ($) { #{{{
$diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go; $diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go; $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
$diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go; $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
$diffurl =~ s/\[\[sha1_commit\]\]/$sha1/go;
push @pages, { push @pages, {
page => pagename($file), page => pagename($file),

1
debian/changelog vendored
View File

@ -35,6 +35,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
of a second. of a second.
* Add support for checking pushes from untrusted git committers. This can be * Add support for checking pushes from untrusted git committers. This can be
used to set up anonymous git pushes, and other similar things. used to set up anonymous git pushes, and other similar things.
* git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
-- Joey Hess <joeyh@debian.org> Fri, 17 Oct 2008 20:11:02 -0400 -- Joey Hess <joeyh@debian.org> Fri, 17 Oct 2008 20:11:02 -0400

2
doc/todo/provide_sha1_for_git_diffurl.mdwn
View File

@ -19,3 +19,5 @@ diffurls of the following form:
$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go; $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
$diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go; $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
> [[done]], but I called it `sha1_commit` since I think that's what it's
> actually a sha1 of. --[[Joey]]

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-26 15:03-0400\n" "POT-Creation-Date: 2008-10-26 20:44-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"