# # # patch "monotone.texi" # from [766accbccb43835d476db4c637212d68abcd17fa] # to [e83205dd4dde8bbc84a833daa623bb9d4478afee] # # patch "std_hooks.lua" # from [aad54241b7908af7dadd389a82cdaff2c31bbe12] # to [41336270995be9442b9be2b06a2ce1622f501da5] # ============================================================ --- monotone.texi 766accbccb43835d476db4c637212d68abcd17fa +++ monotone.texi e83205dd4dde8bbc84a833daa623bb9d4478afee @@ -5754,14 +5754,14 @@ @section Network The @var{uri-or-address} arguments given to @command{push}, @command{pull}, and @command{sync} can be of two possible forms. -If the argument is an URI, the Lua hook @code{get_netsync_connect_command} -may transform it into a connection command, which is later executed as -transport channel for netsync. The URI itself consists of a connection -scheme (defaults to @code{mtn}), an optional user (only used for address@hidden transports), a host with an optional port (which both -might be optional as well, f.e. for the @code{file} scheme), a path and -a query part, which denotes one or more branches and optionally also exclude -patterns for the exchange: +If the argument is an URI, the Lua hook address@hidden may transform it into a connection +command, which is later executed as transport channel for netsync. +The URI itself consists of a connection scheme, an optional user (only +used for @code{ssh}-related transports), a host with an optional port +(which both might be optional as well, f.e. for the @code{file} +scheme), a path and a query part, which denotes one or more branches +and optionally also exclude patterns for the exchange: @smallexample @group ============================================================ --- std_hooks.lua aad54241b7908af7dadd389a82cdaff2c31bbe12 +++ std_hooks.lua 41336270995be9442b9be2b06a2ce1622f501da5 @@ -1206,8 +1206,8 @@ function get_netsync_connect_command(uri table.insert(argv, "-") table.insert(argv, "UNIX-CONNECT:" .. uri["path"]) else - -- start remote monotone process if argv then + -- start remote monotone process table.insert(argv, get_mtn_command(uri["host"])) @@ -1223,6 +1223,8 @@ function get_netsync_connect_command(uri table.insert(argv, "--stdio") table.insert(argv, "--no-transport-auth") + -- else scheme does not require starting a new remote + -- process (ie mtn:) end end return argv