# # # patch "monotone.texi" # from [fd2c367ee743580b501a662fb7b7cc1a9b35cf2b] # to [664faca901f83ec81334a6ef225ac8c94253fb08] # # patch "tests/automate_netsync/__driver__.lua" # from [c23b58fb5b08d7df7a798f146697585fde9af2b4] # to [66628a01797d398e1975b28cb602763342bf7472] # ============================================================ --- monotone.texi fd2c367ee743580b501a662fb7b7cc1a9b35cf2b +++ monotone.texi 664faca901f83ec81334a6ef225ac8c94253fb08 @@ -5720,9 +5720,9 @@ @section Network @ftable @command @item mtn serve address@hidden:@var{port}]] address@hidden mtn pull [--[no-]set-default] address@hidden address@hidden mtn push [--[no-]set-default] address@hidden address@hidden address@hidden mtn sync [--[no-]set-default] address@hidden address@hidden address@hidden mtn pull [--[no-]set-default] [--dry-run] address@hidden address@hidden mtn push [--[no-]set-default] [--dry-run] address@hidden address@hidden address@hidden mtn sync [--[no-]set-default] [--dry-run] address@hidden address@hidden @itemx mtn pull [--[no-]set-default] address@hidden address@hidden [...] address@hidden @strong{deprecated} @itemx mtn push [--[no-]set-default] address@hidden address@hidden address@hidden [...] address@hidden @strong{deprecated} @itemx mtn sync [--[no-]set-default] address@hidden address@hidden address@hidden [...] address@hidden @strong{deprecated} @@ -5754,6 +5754,11 @@ @section Network The @var{uri-or-address} arguments given to @command{push}, @command{pull}, and @command{sync} can be of two possible forms. +If @option{--dry-run} is given, the connection is made, but no data is +transferred. Instead, a summary of what would be transferred is +output; the number of revisions, certs and keys that would be sent and +received. For sent revisions, the branch names are also output. + 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 ============================================================ --- tests/automate_netsync/__driver__.lua c23b58fb5b08d7df7a798f146697585fde9af2b4 +++ tests/automate_netsync/__driver__.lua 66628a01797d398e1975b28cb602763342bf7472 @@ -110,8 +110,8 @@ srv:stop() -- push and pull a key; test 3 and 6. Note that keys are not sent -- unless they are used to sign something; we sign another test cert; -- tests 5. Can't use 'genkey'; that gives a random key signature -get("john_key.packet") -get("jane_key.packet") +getstd("common/john_key.packet", "john_key.packet") +getstd("common/jane_key.packet", "jane_key.packet") check(mtn("read", "john_key.packet"), 0, nil, false) check(mtn2("read", "jane_key.packet"), 0, nil, false)