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

include temp file for attachment change too

master
Joey Hess 2008-10-24 13:44:03 -04:00
parent dfef51e10e
commit 1a883b3c50
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
IkiWiki/Plugin/git.pm
View File

@ -619,7 +619,7 @@ sub rcs_receive () { #{{{
# Avoid chdir when running git here, because the changes
# are in the master git repo, not the srcdir repo.
# The pre-receive hook already puts us in the right place.
# The pre-recieve hook already puts us in the right place.
$no_chdir=1;
my @changes=git_commit_info($oldrev."..".$newrev);
$no_chdir=0;
@ -643,15 +643,6 @@ sub rcs_receive () { #{{{
elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
$action="add";
$mode=$detail->{'mode_to'};
if (! pagetype($file)) {
eval q{use File::Temp};
die $@ if $@;
my $fh;
($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
error("failed writing temp file");
}
}
}
elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
$action="remove";
@ -670,6 +661,18 @@ sub rcs_receive () { #{{{
error gettext("you are not allowed to change file modes");
}
}
# extract attachment to temp file
if (($action eq 'add' || $action eq 'change') &&
! pagetype($file)) {
eval q{use File::Temp};
die $@ if $@;
my $fh;
($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
error("failed writing temp file");
}
}
push @rets, {
file => $file,

2
IkiWiki/Receive.pm
View File

@ -45,7 +45,7 @@ sub test () { #{{{
$file=IkiWiki::possibly_foolish_untaint($file);
if (! defined $file || ! length $file ||
IkiWiki::file_pruned($file, $config{srcdir})) {
error(gettext("bad file name"));
error(gettext("bad file name %s"), $file);
}
my $type=pagetype($file);

4
doc/plugins/write.mdwn
View File

@ -837,8 +837,8 @@ files that were changed, in the form:
file => # name of file that was changed
action => # either "add", "change", or "remove"
path => # temp file containing the new file content, only
# needed for "add", and only if the file is an
# attachment, not a page
# needed for "add"/"change", and only if the file
# is an attachment, not a page
}
The list will then be checked to make sure that each change is one that