# 
# 
# patch "ChangeLog"
#  from [4fcc16737085a943bacbd6f0f02573ec58b39942]
#    to [d20c728310e2f5299c3584fec67c6cd002dd65ba]
# 
# patch "monotone.cc"
#  from [a3a95dbf2d6f1c643d30d18e4d42f328cd651d0b]
#    to [2315ed4bf94f286c54bd635e1f2d8bede8e7afd9]
# 
# patch "tests/t_commit_validate.at"
#  from [2f4192fe019edbafca186c66f0061500c0d3869a]
#    to [df5fcc2ffba079429b55993a998097661311c9af]
# 
# patch "tests/t_log_to_file.at"
#  from [02824ce8f36a6ac5fbbc0eb15f12ab54d2d135b6]
#    to [40ad76ff1645c2b414b69f092de162a56a2a239b]
# 
============================================================
--- ChangeLog	4fcc16737085a943bacbd6f0f02573ec58b39942
+++ ChangeLog	d20c728310e2f5299c3584fec67c6cd002dd65ba
@@ -1,5 +1,14 @@
 2006-04-05  Richard Levitte  <address@hidden>
 
+	* monotone.cc: Make sure prog_name gets the basename of the
+	program from argv[0], not the whole absolute path to it.
+
+	* tests/t_commit_validate.at, tests/t_log_to_file.at: The monotone
+	logs are prefixed with the program name ('mtn'), not with
+	'monotone' any longer.
+
+2006-04-05  Richard Levitte  <address@hidden>
+
 	* mt_version.cc (get_version): Close the parenthesis.
 
 	* po/sv.po: Fix a few fuzzy strings and translate a new one.
============================================================
--- monotone.cc	a3a95dbf2d6f1c643d30d18e4d42f328cd651d0b
+++ monotone.cc	2315ed4bf94f286c54bd635e1f2d8bede8e7afd9
@@ -17,6 +17,8 @@
 
 #include <stdlib.h>
 
+#include <libgen.h>
+
 #include "botan/botan.h"
 
 #include "i18n.h"
@@ -288,7 +290,7 @@
   save_initial_path();
   utf8_argv uv(argc, argv);
 
-  utf8 prog_name(uv.argv[0]);
+  utf8 prog_name(basename(uv.argv[0]));
 
   // prepare for arg parsing
 
============================================================
--- tests/t_commit_validate.at	2f4192fe019edbafca186c66f0061500c0d3869a
+++ tests/t_commit_validate.at	df5fcc2ffba079429b55993a998097661311c9af
@@ -23,8 +23,8 @@
 
 AT_CHECK(MTN add input.txt, [], [ignore], [ignore])
 
-AT_CHECK(MTN --branch=testbranch --rcfile=commit_validate.lua commit -m "denyme", 1, [ignore], [monotone: beginning commit on branch 'testbranch'
-monotone: misuse: log message rejected: input.txt
+AT_CHECK(MTN --branch=testbranch --rcfile=commit_validate.lua commit -m "denyme", 1, [ignore], [mtn: beginning commit on branch 'testbranch'
+mtn: misuse: log message rejected: input.txt
 ])
 AT_CHECK(MTN --branch=testbranch --rcfile=commit_validate.lua commit -m "allowme", 0, ignore, ignore)
 
============================================================
--- tests/t_log_to_file.at	02824ce8f36a6ac5fbbc0eb15f12ab54d2d135b6
+++ tests/t_log_to_file.at	40ad76ff1645c2b414b69f092de162a56a2a239b
@@ -11,7 +11,7 @@
 
 AT_CHECK(MTN --branch=testbranch --log=log.log commit -m "test", [], [stdout], [ignore])
 
-AT_CHECK(QGREP('^monotone:' stdout), [1])
-AT_CHECK(QGREP('^monotone:' log.log), [0])
+AT_CHECK(QGREP('^mtn:' stdout), [1])
+AT_CHECK(QGREP('^mtn:' log.log), [0])
 
 AT_CLEANUP