summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-21 16:55:13 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-21 16:55:13 +0000
commitc2c943bc25a83b5c4c3eab3b43a7b6e4c4f4ba33 (patch)
tree0851769d4e9b0fd1fdc768ecf97eca08c962e489
parent9ff9ea55f70a455a96fad3d34266343327528723 (diff)
monotone updates
-rw-r--r--IkiWiki/Rcs/monotone.pm7
-rw-r--r--doc/bugs/Monotone_rcs_support.mdwn36
2 files changed, 7 insertions, 36 deletions
diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index be6b36c66..992065931 100644
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -245,6 +245,9 @@ sub rcs_commit ($$$;$$) { #{{{
# 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;
if ($diff) {
@@ -314,8 +317,6 @@ sub rcs_commit ($$$;$$) { #{{{
"Please use the non-web interface to resolve the conflicts.");
}
- # suspend this revision because it has
- # conflict markers...
if (system("mtn", "--root=$config{mtnrootdir}",
"update", "-r", $mergeResult) != 0) {
debug("Unable to update to rev $mergeResult after conflict-enhanced merge on conflicted commit!");
@@ -363,7 +364,7 @@ sub rcs_add ($) { #{{{
check_config();
if (system("mtn", "--root=$config{mtnrootdir}", "add", "--quiet",
- "$config{srcdir}/$file") != 0) {
+ $file) != 0) {
error("Monotone add failed");
}
} #}}}
diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn
index fad95d155..9e20f0a7e 100644
--- a/doc/bugs/Monotone_rcs_support.mdwn
+++ b/doc/bugs/Monotone_rcs_support.mdwn
@@ -44,38 +44,7 @@ Note: This patch requires a rather recent Monotone perl module (18 August 2007 o
>>> and a bug in page adding.
>>> Here is a small patch for them:
- Index: IkiWiki/Rcs/monotone.pm
- ===================================================================
- --- IkiWiki/Rcs/monotone.pm (revision 4195)
- +++ IkiWiki/Rcs/monotone.pm (working copy)
- @@ -245,6 +245,9 @@
- # 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;
-
- if ($diff) {
- @@ -314,8 +317,6 @@
- "Please use the non-web interface to resolve the conflicts.");
- }
-
- - # suspend this revision because it has
- - # conflict markers...
- if (system("mtn", "--root=$config{mtnrootdir}",
- "update", "-r", $mergeResult) != 0) {
- debug("Unable to update to rev $mergeResult after conflict-enhanced merge on conflicted commit!");
- @@ -363,7 +364,7 @@
- check_config();
-
- if (system("mtn", "--root=$config{mtnrootdir}", "add", "--quiet",
- - "$config{srcdir}/$file") != 0) {
- + $file) != 0) {
- error("Monotone add failed");
- }
- } #}}}
+>>>> applied
>> BTW, will all the monotone output parsing work if LANG != C?
@@ -91,4 +60,5 @@ Note: This patch requires a rather recent Monotone perl module (18 August 2007 o
>>> calling Ikiwiki seems reasonable, but I've not written the
>>> Lua hook.
->> --[[Joey]]
+>>>> So the rcs_notify support is not just untested, but can't work
+>>>> at all w/o further development.