apply monotone patch

[git.ikiwiki.info.git] / IkiWiki / Rcs / monotone.pm

diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index 992065931daf293acad0dda7814d05006d1f644a..5717e004342875e97259cc09fe22b77f7b981810 100644 (file)
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -239,17 +239,11 @@ sub rcs_commit ($$$;$$) { #{{{
 
                # Something has been committed, has this file changed?
                my ($out, $err);
 
                # 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.
                if ($diff) {
                        # Commit a revision with just this file changed off
                        # the old revision.