# 
# 
# patch "ChangeLog"
#  from [7bdc127190e4de47bb77f9a8725c3be168be6834]
#    to [9e979b2e365eca2b931d8919f30d6fda7804f415]
# 
# patch "testsuite.at"
#  from [982827a78561aeba0a1f435469e211ee7db230cf]
#    to [3a7b5f37891005923350d01b0b65525b56a8ad27]
# 
============================================================
--- ChangeLog	7bdc127190e4de47bb77f9a8725c3be168be6834
+++ ChangeLog	9e979b2e365eca2b931d8919f30d6fda7804f415
@@ -1,5 +1,9 @@
 2006-03-29  Nathaniel Smith  <address@hidden>
 
+	* testsuite.at: Clean up the macros that call monotone a little.
+
+2006-03-29  Nathaniel Smith  <address@hidden>
+
 	* .mt-ignore: Rename to .mtn-ignore.
 
 2006-03-29  Nathaniel Smith  <address@hidden>
============================================================
--- testsuite.at	982827a78561aeba0a1f435469e211ee7db230cf
+++ testsuite.at	3a7b5f37891005923350d01b0b65525b56a8ad27
@@ -15,15 +15,18 @@
 # some command abbreviations to make life easier
 
 # Set PREEXECUTE in your environment to run monotone under, e.g., valgrind.
-m4_define([MTN], [$PREEXECUTE $_MTN_EXEC --rcfile=$_ROOT_DIR/test_hooks.lua --nostd --norc --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys address@hidden --root=$_ROOT_DIR])
-m4_define([RAW_MTN], [$PREEXECUTE $_MTN_EXEC --norc])
-m4_define([MINHOOKS_MTN], [$PREEXECUTE $_MTN_EXEC --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys --rcfile=$_ROOT_DIR/min_hooks.lua address@hidden --root=$_ROOT_DIR])
-m4_define([SHA1], [$_MTN_EXEC --norc identify $1])
+# --norc and --root are required for running mtn at all to be safe (they
+# both just shield us from user config)
+m4_define([SAFE_MTN], [$_MTN_EXEC --norc --root=$_ROOT_DIR])
+m4_define([RAW_MTN], [$PREEXECUTE SAFE_MTN])
+m4_define([MTN], [RAW_MTN --rcfile=$_ROOT_DIR/test_hooks.lua --nostd --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys address@hidden)
+m4_define([MINHOOKS_MTN], [RAW_MTN --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys --rcfile=$_ROOT_DIR/min_hooks.lua address@hidden)
+m4_define([SHA1], [SAFE_MTN identify $1])
 m4_define([BASE_REVISION], [cat _MTN/revision])
-m4_define([BASE_MANIFEST], [cat _MTN/revision | $_MTN_EXEC --norc automate get_manifest_of address@hidden | $_MTN_EXEC --norc identify])
-m4_define([WORKING_REVISION], [$_MTN_EXEC --norc automate get_revision | $_MTN_EXEC --norc identify])
-m4_define([WORKING_MANIFEST], [$_MTN_EXEC --norc automate get_manifest_of | $_MTN_EXEC --norc identify])
-m4_define([CERTVALUE], [$_MTN_EXEC automate certs $1 | sed -e '1,/name "$2"/d' | sed -e '/^$/,$d' | grep '^ *value' | sed -e 's/^m4_dquote([^"])*"//' -e 's/"m4_dquote([^"])*$//'])
+m4_define([BASE_MANIFEST], [cat _MTN/revision | SAFE_MTN automate get_manifest_of address@hidden | SAFE_MTN identify])
+m4_define([WORKING_REVISION], [SAFE_MTN automate get_revision | SAFE_MTN --norc identify])
+m4_define([WORKING_MANIFEST], [SAFE_MTN automate get_manifest_of | SAFE_MTN --norc identify])
+m4_define([CERTVALUE], [SAFE_MTN automate certs $1 | sed -e '1,/name "$2"/d' | sed -e '/^$/,$d' | grep '^ *value' | sed -e 's/^m4_dquote([^"])*"//' -e 's/"m4_dquote([^"])*$//'])
 m4_define([CANONICALISE], [
 if test "$OSTYPE" = "msys"; then
   dos2unix -q -o $1