# 
# 
# patch "ChangeLog"
#  from [57cd41bd38f7418a78c0d2ad32fda45b9a90bca6]
#    to [391af203ed04d7c3e8310758530020952edef9c4]
# 
# patch "monotone.texi"
#  from [d83884e58124f96aba1407ae9fa444b29d4ada93]
#    to [5e640c9f63179c7c04845b442592ecaa2bf2ad5f]
# 
# patch "std_hooks.lua"
#  from [4865ef1cffe53cd529104488cd7adac8eaa30563]
#    to [cae9b1a8f02d17b2b356167cc3cf2b12abcc88c1]
# 
============================================================
--- ChangeLog	57cd41bd38f7418a78c0d2ad32fda45b9a90bca6
+++ ChangeLog	391af203ed04d7c3e8310758530020952edef9c4
@@ -1,3 +1,11 @@
+2006-06-18  Ethan Blanton  <address@hidden>
+
+	* std_hooks.lua: Call the lua function get_mtn_command(host)
+	from get_netsync_connect_command in order to determine the
+	monotone command on the remote host.
+	* monotone.texi: Document get_mtn_command, update the
+	get_netsync_connect_command definition to incorporate it.
+
 2006-06-17  Graydon Hoare  <address@hidden>
 
 	* Makefile.am: Permit building 'tester' with static boost.
============================================================
--- monotone.texi	d83884e58124f96aba1407ae9fa444b29d4ada93
+++ monotone.texi	5e640c9f63179c7c04845b442592ecaa2bf2ad5f
@@ -7181,7 +7181,7 @@
 
         if argv then
 
-                table.insert(argv, "mtn")
+                table.insert(argv, get_mtn_command(uri["host"]))
 
                 if args["debug"] then
                         table.insert(argv, "--debug")
@@ -7228,6 +7228,7 @@
 as the local and remote monotone processes will have mismatched
 authentication assumptions.
 
+
 @smallexample
 @group
 function use_transport_auth(uri)
@@ -7241,6 +7242,23 @@
 @end group
 @end smallexample
 
address@hidden get_mtn_command(@var{host})
+
+Returns a string containing the monotone command to be executed on
address@hidden when communicating over @command{ssh}.  The @var{host}
+argument is a string containing the name of the host to which
address@hidden is connecting, from the server URI.  This is useful when
+there are multiple monotone binaries on the remote host, or the
+monotone binary is not in the default path.
+
address@hidden
address@hidden
+function get_mtn_command(host)
+	return "mtn"
+end
address@hidden group
address@hidden smallexample
+
 @end ftable
 
 
============================================================
--- std_hooks.lua	4865ef1cffe53cd529104488cd7adac8eaa30563
+++ std_hooks.lua	cae9b1a8f02d17b2b356167cc3cf2b12abcc88c1
@@ -786,7 +786,7 @@
 
 	if argv then
 
-		table.insert(argv, "mtn")
+		table.insert(argv, get_mtn_command(uri["host"]))
 
 		if args["debug"] then
 			table.insert(argv, "--debug")
@@ -829,3 +829,7 @@
 		return true
 	end
 end
+
+function get_mtn_command(host)
+	return "mtn"
+end