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

apply monotone patch

master
joey 2007-08-24 01:20:25 +00:00
parent 10ebaac390
commit a18d99c3fa
2 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IkiWiki/Rcs/monotone.pm
View File

@ -239,17 +239,11 @@ sub rcs_commit ($$$;$$) { #{{{
# Something has been committed, has this file changed? # Something has been committed, has this file changed?
my ($out, $err); my ($out, $err);
#$automator->setOpts("-r", $oldrev, "-r", $rev); $automator->setOpts("r", $oldrev, "r", $rev);
#my ($out, $err) = $automator->call("content_diff", $file); ($out, $err) = $automator->call("content_diff", $file);
#debug("Problem committing $file") if ($err ne ""); debug("Problem committing $file") if ($err ne "");
# FIXME: use of $file in these backticks is not wise from a my $diff = $out;
# security POV. Probably safe, but should be avoided
# anyway.
# At the moment the backticks are used because the above call using the automate
# interface was failing. When that bug in monotone is fixed, we should switch
# back.
my $diff = `mtn --root=$config{mtnrootdir} au content_diff -r $oldrev -r $rev $file`; # was just $out;
if ($diff) { if ($diff) {
# Commit a revision with just this file changed off # Commit a revision with just this file changed off
# the old revision. # the old revision.

29
doc/bugs/Monotone_rcs_support.mdwn
View File

@ -50,34 +50,7 @@ Here is another patch. It fixes a FIXME you added. I was using $file within ba
I was getting an error trying to do it right. I've figured out the error, and now do it right. This I was getting an error trying to do it right. I've figured out the error, and now do it right. This
should also speed things up (very slightly) should also speed things up (very slightly)
Index: IkiWiki/Rcs/monotone.pm > applied
===================================================================
--- IkiWiki/Rcs/monotone.pm (revision 4234)
+++ IkiWiki/Rcs/monotone.pm (working copy)
@@ -239,17 +239,11 @@
# Something has been committed, has this file changed?
my ($out, $err);
- #$automator->setOpts("-r", $oldrev, "-r", $rev);
- #my ($out, $err) = $automator->call("content_diff", $file);
- #debug("Problem committing $file") if ($err ne "");
- # FIXME: use of $file in these backticks is not wise from a
- # security POV. Probably safe, but should be avoided
- # anyway.
- # At the moment the backticks are used because the above call using the automate
- # interface was failing. When that bug in monotone is fixed, we should switch
- # back.
- my $diff = `mtn --root=$config{mtnrootdir} au content_diff -r $oldrev -r $rev $file`; # was just $out;
-
+ $automator->setOpts("r", $oldrev, "r", $rev);
+ ($out, $err) = $automator->call("content_diff", $file);
+ debug("Problem committing $file") if ($err ne "");
+ my $diff = $out;
+
if ($diff) {
# Commit a revision with just this file changed off
# the old revision.
>> BTW, will all the monotone output parsing work if LANG != C? >> BTW, will all the monotone output parsing work if LANG != C?