#
#
# patch "contrib/command/remote_export.lua"
#  from [4f3c4bf3a3bb1a958113d48e3bf6fcd167c8ab0a]
#    to [478ba09f2bb5bb497c1edf072301bf5611ad503e]
# 
# patch "contrib/monotone-cluster-push.lua"
#  from [f48299b1af2c12cf2a7c9c91d7d993f14e508568]
#    to [1edafe148801f5f98d6548ed9c5f43b79efe6b13]
# 
# patch "contrib/monotone-mail-notify.lua"
#  from [f7912c79e41bff48c12b54e25bad92a03d5bc031]
#    to [f1e26796711063ab59af9d65a96f2774dafad853]
# 
# patch "contrib/monotone-mirror.lua"
#  from [7f19a353622f716eec1c09aede740a6ac53b4737]
#    to [34f3c2cab7dd94839ae96500023d812e9aeb6de2]
# 
# patch "lua-testsuite.lua"
#  from [45836f8deeca054f2b5b2f0d4ac08375ec33b1ec]
#    to [03f907b92c416279dcb13f99907e259070b39518]
# 
# patch "std_hooks.lua"
#  from [6fb838946693648f5dc043c7b20bdc95604b92b3]
#    to [70b19548f8b92148147f8fb774e5f5d5c0ba8cc5]
# 
# patch "testlib.lua"
#  from [a019d00ccc1a886e692abd143d8d62416d7dbf8e]
#    to [27ec5ecea2cd80cb45f6a3d44f3cbae31b8dd360]
# 
# patch "tests/automate_tags/__driver__.lua"
#  from [604372f0b7249666d804da76d32bf3f27bc0f07e]
#    to [7c9619e8b9747d84cdfec2cfac6ca723646c25d9]
# 
# patch "tests/commit_default_editor/test_hooks.lua"
#  from [7c76aaca31bc9e1b61921cc32c687883ff051779]
#    to [bf4c9c22f206ed2ada4074eaac831948a36b6c87]
# 
# patch "tests/commit_use_workspace_keydir/__driver__.lua"
#  from [8b47f36be4add593ca4f7757385214f52f1f7eb0]
#    to [548f1d2719757e92b7617cc3d9ea695f25f60cd8]
# 
# patch "tests/common/netsync.lua"
#  from [fc5f1471dd9610885b0e681f41eab2c349ff482a]
#    to [85fc59f8cff3a9e95641c9ffcddcf265dea4ddfd]
# 
# patch "tests/creating_a_bad_criss-cross_merge/__driver__.lua"
#  from [db35e24bc6409793ee223bd8361c91d7ad9af18f]
#    to [1058b7dc4cefe4961109be8fd9a3458de9f2281b]
# 
# patch "tests/database_check/__driver__.lua"
#  from [9ca7b9aa95b6dc6f87f72956bc232805586839cc]
#    to [df786808256ee0be8fb4160db8d8ff0ae705029d]
# 
# patch "tests/db_execute/__driver__.lua"
#  from [077230cbf8856a312cb59b375e9fccbeaa3534c2]
#    to [b3fe19dd149e889b06dac768663a3f8df444f61b]
# 
# patch "tests/empty_environment/__driver__.lua"
#  from [e026ebed80d4543a4ada9b7e8453409866fc63dd]
#    to [d851773221f1354f11a8ba36dbd86e24f681329e]
# 
# patch "tests/netsync_negotiation/__driver__.lua"
#  from [eae888851d1a709fbc55f229b591d1be2a614bea]
#    to [dcad6342df86ae66ffd8fe6a1b34a11698129a9b]
# 
# patch "tests/non_workspace_keydir/__driver__.lua"
#  from [42fd41dbdf35be5288d60cb2e3ac589770cb83e9]
#    to [f419f410d4fd8154079354a42e7ca333230d415b]
# 
# patch "tests/short_options_work_correctly/__driver__.lua"
#  from [2ff2788145feea06d2e1336846ca22cdcc3fa37c]
#    to [0614ec5afa8cab4ccd888c5ee08d1d0154b93d52]
# 
# patch "tests/trust_hooks_and_trusted_command/__driver__.lua"
#  from [df0d568151e80faa78854e09ee4110d849057443]
#    to [2ac6428fb5a5564c4f376a4566e041324c8cd88c]
#
============================================================
--- contrib/command/remote_export.lua	4f3c4bf3a3bb1a958113d48e3bf6fcd167c8ab0a
+++ contrib/command/remote_export.lua	478ba09f2bb5bb497c1edf072301bf5611ad503e
@@ -53,7 +53,7 @@ function command_remote_export(host, sel
                             "--quiet",
                             "--remote-stdio-host="..host,
                             "--",
-                            unpack(arg))
+                            ...)
     end
 
     local splitlines = function(str)
============================================================
--- contrib/monotone-cluster-push.lua	f48299b1af2c12cf2a7c9c91d7d993f14e508568
+++ contrib/monotone-cluster-push.lua	1edafe148801f5f98d6548ed9c5f43b79efe6b13
@@ -72,8 +72,7 @@ do
    local saved_note_netsync_start = note_netsync_start
    function note_netsync_start(nonce, ...)
       if saved_note_netsync_start then
-	 saved_note_netsync_start(nonce,
-				  unpack(arg))
+	 saved_note_netsync_start(nonce, ...)
       end
       if debug then
 	 io.stderr:write("note_netsync_start: initialise branches\n")
@@ -84,8 +83,7 @@ do
    local saved_note_netsync_cert_received = note_netsync_cert_received
    function note_netsync_cert_received(rev_id, key, name, value, nonce, ...)
       if saved_note_netsync_cert_received then
-	 saved_note_netsync_cert_received(rev_id, key, name, value, nonce,
-					  unpack(arg))
+	 saved_note_netsync_cert_received(rev_id, key, name, value, nonce, ...)
       end
       if debug then
 	 io.stderr:write("note_netsync_cert_received: cert ", name,
@@ -103,8 +101,7 @@ do
    local saved_note_netsync_revision_received = note_netsync_revision_received
    function note_netsync_revision_received(new_id, revision, certs, nonce, ...)
       if saved_note_netsync_revision_received then
-	 saved_note_netsync_revision_received(new_id, revision, certs, nonce,
-					      unpack(arg))
+	 saved_note_netsync_revision_received(new_id, revision, certs, nonce, ...)
       end
       for _, item in pairs(certs)
       do
@@ -135,7 +132,7 @@ do
 				certs_in, certs_out,
 				revs_in, revs_out,
 				keys_in, keys_out,
-				unpack(arg))
+				...)
       end
       if debug then
 	 io.stderr:write("note_netsync_end: ",
@@ -216,7 +213,7 @@ do
    local saved_note_mtn_startup = note_mtn_startup
    function note_mtn_startup(...)
       if saved_note_mtn_startup then
-	 saved_note_mtn_startup(unpack(arg))
+	 saved_note_mtn_startup(...)
       end
 
       if debug then
============================================================
--- contrib/monotone-mail-notify.lua	f7912c79e41bff48c12b54e25bad92a03d5bc031
+++ contrib/monotone-mail-notify.lua	f1e26796711063ab59af9d65a96f2774dafad853
@@ -105,7 +105,7 @@ do
                                 certs_in, certs_out,
                                 revs_in, revs_out,
                                 keys_in, keys_out,
-                                unpack(arg))
+                                ...)
       end
 
 
============================================================
--- contrib/monotone-mirror.lua	7f19a353622f716eec1c09aede740a6ac53b4737
+++ contrib/monotone-mirror.lua	34f3c2cab7dd94839ae96500023d812e9aeb6de2
@@ -87,7 +87,7 @@ do
 				certs_in, certs_out,
 				revs_in, revs_out,
 				keys_in, keys_out,
-				unpack(arg))
+				...)
       end
       if certs_in > 0 or revs_in > 0 or keys_in > 0 then
 	 spawn_redirected("/dev/null", MM_mirror_log, MM_mirror_errlog,
============================================================
--- lua-testsuite.lua	45836f8deeca054f2b5b2f0d4ac08375ec33b1ec
+++ lua-testsuite.lua	03f907b92c416279dcb13f99907e259070b39518
@@ -18,7 +18,7 @@ function safe_mtn(...)
     end
   end
   return {monotone_path, "--norc", "--root=" .. test.root,
-          "--confdir="..test.root, unpack(arg)}
+          "--confdir="..test.root, ...}
 end
 
 function mtn_ws_opts(...)
@@ -31,7 +31,7 @@ function mtn_ws_opts(...)
       err("'mtn' environment variable not set")
     end
   end
-  return {monotone_path, "--ssh-sign=no", "--no-default-confdir", "--norc", "--rcfile", test.root .. "/test_hooks.lua", unpack(arg)}
+  return {monotone_path, "--ssh-sign=no", "--no-default-confdir", "--norc", "--rcfile", test.root .. "/test_hooks.lua", ...}
 end
 
 function mtn_outside_ws(...)
@@ -50,7 +50,7 @@ function mtn_outside_ws(...)
          "--db=" .. test.root .. "/test.db",
          "--keydir", test.root .. "/keys",
          "address@hidden",
-          unpack(arg)}
+         ...}
 end
 
 -- function preexecute(x)
@@ -59,9 +59,9 @@ function raw_mtn(...)
 
 function raw_mtn(...)
   if preexecute ~= nil then
-    return preexecute(safe_mtn(unpack(arg)))
+    return preexecute(safe_mtn(...))
   else
-    return safe_mtn(unpack(arg))
+    return safe_mtn(...)
   end
 end
 
@@ -69,26 +69,26 @@ function mtn(...)
   return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
          "--db=" .. test.root .. "/test.db",
          "--keydir", test.root .. "/keys",
-         "address@hidden", unpack(arg))
+         "address@hidden", ...)
 end
 
 function nodb_mtn(...)
   return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
          "--keydir", test.root .. "/keys",
-         "address@hidden", unpack(arg))
+         "address@hidden", ...)
 end
 
 function nokey_mtn(...)
   return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
          "--db=" .. test.root .. "/test.db",
-         "--keydir", test.root .. "/keys", unpack(arg))
+         "--keydir", test.root .. "/keys", ...)
 end
 
 function minhooks_mtn(...)
   return raw_mtn("--db=" .. test.root .. "/test.db",
                  "--keydir", test.root .. "/keys",
                  "--rcfile", test.root .. "/min_hooks.lua",
-                 "address@hidden", unpack(arg))
+                 "address@hidden", ...)
 end
 
 function commit(branch, message, mt)
============================================================
--- std_hooks.lua	6fb838946693648f5dc043c7b20bdc95604b92b3
+++ std_hooks.lua	70b19548f8b92148147f8fb774e5f5d5c0ba8cc5
@@ -30,7 +30,7 @@ function execute(path, ...)
 function execute(path, ...)
    local pid
    local ret = -1
-   pid = spawn(path, unpack(arg))
+   pid = spawn(path, ...)
    if (pid ~= -1) then ret, pid = wait(pid) end
    return ret
 end
@@ -39,7 +39,7 @@ function execute_redirected(stdin, stdou
    local pid
    local ret = -1
    io.flush();
-   pid = spawn_redirected(stdin, stdout, stderr, path, unpack(arg))
+   pid = spawn_redirected(stdin, stdout, stderr, path, ...)
    if (pid ~= -1) then ret, pid = wait(pid) end
    return ret
 end
@@ -49,7 +49,7 @@ function execute_confirm(path, ...)
 -- This is needed to work around some brokenness with some merge tools
 -- (e.g. on OS X)
 function execute_confirm(path, ...)
-   ret = execute(path, unpack(arg))
+   ret = execute(path, ...)
 
    if (ret ~= 0)
    then
============================================================
--- testlib.lua	a019d00ccc1a886e692abd143d8d62416d7dbf8e
+++ testlib.lua	27ec5ecea2cd80cb45f6a3d44f3cbae31b8dd360
@@ -64,7 +64,7 @@ function L(...)
 end
 
 function L(...)
-  test.log:write(unpack(arg))
+  test.log:write(...)
   test.log:flush()
 end
 
@@ -360,16 +360,16 @@ do
   oldspawn = spawn
   function spawn(...)
    if redir == nil then
-     return oldspawn(unpack(arg))
+     return oldspawn(...)
    else
-     return spawn_redirected(redir.fin, redir.fout, redir.ferr, unpack(arg))
+     return spawn_redirected(redir.fin, redir.fout, redir.ferr, ...)
    end
   end
 end
 function execute(path, ...)
    local pid
    local ret = -1
-   pid = spawn(path, unpack(arg))
+   pid = spawn(path, ...)
    redir = nil
    if (pid ~= -1) then ret, pid = wait(pid) end
    return ret
@@ -504,7 +504,7 @@ function grep(...)
 end
 
 function grep(...)
-  local flags, what, where = unpack(arg)
+  local flags, what, where = ...
   local dogrep = function ()
                    if where == nil and string.sub(flags, 1, 1) ~= "-" then
                      where = what
@@ -557,7 +557,7 @@ function tail(...)
 end
 
 function tail(...)
-  local file, num = unpack(arg)
+  local file, num = ...
   local function dotail()
     if num == nil then num = 10 end
     local mylines = {}
@@ -803,7 +803,7 @@ function check(first, ...)
 
 function check(first, ...)
   if type(first) == "table" then
-    return runcheck(first, unpack(arg))
+    return runcheck(first, ...)
   elseif type(first) == "boolean" then
     if not first then err("Check failed: false", 2) end
   elseif type(first) == "number" then
@@ -823,7 +823,7 @@ function xfail_if(chk, ...)
 end
 
 function xfail_if(chk, ...)
-  local ok,res = pcall(check, unpack(arg))
+  local ok,res = pcall(check, ...)
   if ok == false then
     if chk then err(false, 2) else err(err, 2) end
   else
@@ -835,7 +835,7 @@ function xfail(...)
 end
 
 function xfail(...)
-   xfail_if(true, unpack(arg))
+   xfail_if(true, ...)
 end
 
 function log_error(e)
@@ -855,8 +855,8 @@ function run_tests(debugging, list_only,
   local run_all = true
 
   local function P(...)
-     progress(unpack(arg))
-     logfile:write(unpack(arg))
+     progress(...)
+     logfile:write(...)
   end
 
   -- NLS nuisances.
============================================================
--- tests/automate_tags/__driver__.lua	604372f0b7249666d804da76d32bf3f27bc0f07e
+++ tests/automate_tags/__driver__.lua	7c9619e8b9747d84cdfec2cfac6ca723646c25d9
@@ -23,7 +23,7 @@ function get_tag(tag, ...)
 
 -- helper function
 function get_tag(tag, ...)
-   check(mtn("automate", "tags", unpack(arg)), 0, true, false)
+   check(mtn("automate", "tags", ...), 0, true, false)
    local parsed = parse_basic_io(readfile("stdout"))
    local ltag
    for _,l in pairs(parsed) do
============================================================
--- tests/commit_default_editor/test_hooks.lua	7c76aaca31bc9e1b61921cc32c687883ff051779
+++ tests/commit_default_editor/test_hooks.lua	bf4c9c22f206ed2ada4074eaac831948a36b6c87
@@ -1,6 +1,6 @@ function execute(path,...) 
 
 function execute(path,...) 
-   tname, rest = unpack(arg)
+   tname, rest = ...
    if tname == nil then
       return 1
    end
============================================================
--- tests/commit_use_workspace_keydir/__driver__.lua	8b47f36be4add593ca4f7757385214f52f1f7eb0
+++ tests/commit_use_workspace_keydir/__driver__.lua	548f1d2719757e92b7617cc3d9ea695f25f60cd8
@@ -16,7 +16,7 @@ function mtn_default_keydir(...)
   return {monotone_path, "--no-default-confdir",
      "--norc", "--root=" .. test.root, "--db", "test.db",
   	  "--rcfile", test.root .. "/test_hooks.lua",
-          "address@hidden", unpack(arg)}
+          "address@hidden", ...}
 end
 
 addfile("randomfile", "random stuff")
============================================================
--- tests/common/netsync.lua	fc5f1471dd9610885b0e681f41eab2c349ff482a
+++ tests/common/netsync.lua	85fc59f8cff3a9e95641c9ffcddcf265dea4ddfd
@@ -4,11 +4,11 @@ function mtn2(...)
 skip_if(no_network_tests)
 
 function mtn2(...)
-  return mtn("--db=test2.db", "--keydir=keys2", unpack(arg))
+  return mtn("--db=test2.db", "--keydir=keys2", ...)
 end
 
 function mtn3(...)
-  return mtn("--db=test3.db", "--keydir=keys3", unpack(arg))
+  return mtn("--db=test3.db", "--keydir=keys3", ...)
 end
 
 netsync = {}
============================================================
--- tests/creating_a_bad_criss-cross_merge/__driver__.lua	db35e24bc6409793ee223bd8361c91d7ad9af18f
+++ tests/creating_a_bad_criss-cross_merge/__driver__.lua	1058b7dc4cefe4961109be8fd9a3458de9f2281b
@@ -32,12 +32,12 @@ function bob (...)
 function bob (...)
   return raw_mtn("--rcfile=test_hooks.lua", "--rcfile=bob.lua",
                  "--nostd", "--norc", "--db=test.db", "--key=bob",
-                 "--keydir=keys", unpack(arg))
+                 "--keydir=keys", ...)
 end
 function alice (...)
   return raw_mtn("--rcfile=test_hooks.lua", "--rcfile=alice.lua",
                  "--nostd", "--norc", "--db=test.db", "--key=alice",
-                 "--keydir=keys", unpack(arg))
+                 "--keydir=keys", ...)
 end
 
 check(bob("genkey", "bob"), 0, false, false, "bob\nbob\n")
============================================================
--- tests/database_check/__driver__.lua	9ca7b9aa95b6dc6f87f72956bc232805586839cc
+++ tests/database_check/__driver__.lua	df786808256ee0be8fb4160db8d8ff0ae705029d
@@ -14,7 +14,7 @@ function dbex(...)
 rosters = {}
 
 function dbex(...)
-  check(mtn("db", "execute", string.format(unpack(arg))), 0, false, false)
+  check(mtn("db", "execute", string.format(...)), 0, false, false)
 end
 
 check(mtn("add", "file1"), 0, false, false)
============================================================
--- tests/db_execute/__driver__.lua	077230cbf8856a312cb59b375e9fccbeaa3534c2
+++ tests/db_execute/__driver__.lua	b3fe19dd149e889b06dac768663a3f8df444f61b
@@ -5,7 +5,7 @@ function dbex(...)
 col1 = "id"
 
 function dbex(...)
-  check(mtn("db", "execute", string.format(unpack(arg))), 0, true, false)
+  check(mtn("db", "execute", string.format(...)), 0, true, false)
 end
 
 dbex("INSERT INTO %s VALUES ('key1', 'value1')", two_col_table)
============================================================
--- tests/empty_environment/__driver__.lua	e026ebed80d4543a4ada9b7e8453409866fc63dd
+++ tests/empty_environment/__driver__.lua	d851773221f1354f11a8ba36dbd86e24f681329e
@@ -10,10 +10,10 @@ function noenv_mtn(...)
   if save_LD_LIBRARY_PATH then
     return {"env", "-i",
             "LD_LIBRARY_PATH="..save_LD_LIBRARY_PATH,
-            unpack(mtn(unpack(arg)))}
+            unpack(mtn(...))}
   else
     return {"env", "-i",
-            unpack(mtn(unpack(arg)))}
+            unpack(mtn(...))}
   end
 end
 
============================================================
--- tests/netsync_negotiation/__driver__.lua	eae888851d1a709fbc55f229b591d1be2a614bea
+++ tests/netsync_negotiation/__driver__.lua	dcad6342df86ae66ffd8fe6a1b34a11698129a9b
@@ -22,7 +22,7 @@ function make_old(ver)
                     "address@hidden",
                     "--db=test"..ver..".mtn",
                     "--keydir=keys",
-                    unpack(arg)}
+                    ...}
               end
 
    check(getstd("test_keys"))
@@ -47,14 +47,13 @@ function make_fake(min_ver, max_ver)
 
 function make_fake(min_ver, max_ver)
    local fn = function (...)
-                 return mtn("--db=test"..max_ver..".mtn",
-                            unpack(arg))
+                 return mtn("--db=test"..max_ver..".mtn", ...)
               end
    local net_fn = function (...)
                      return mtn("--min-netsync-version="..min_ver,
                                 "--max-netsync-version="..max_ver,
                                 "--db=test"..max_ver..".mtn",
-                                unpack(arg))
+                                ...)
                   end
    return {fn = fn, net_fn = net_fn,
       reset = function ()
============================================================
--- tests/non_workspace_keydir/__driver__.lua	42fd41dbdf35be5288d60cb2e3ac589770cb83e9
+++ tests/non_workspace_keydir/__driver__.lua	f419f410d4fd8154079354a42e7ca333230d415b
@@ -8,7 +8,7 @@ function pure_mtn(...)
   end
   return {monotone_path, "--ssh-sign=no", "--norc",
 	  "--root=" .. test.root, "--db", "test.db",
-	  "--rcfile", test.root .. "/test_hooks.lua", unpack(arg)}
+	  "--rcfile", test.root .. "/test_hooks.lua", ...}
 end
 
 mtn_setup()
============================================================
--- tests/short_options_work_correctly/__driver__.lua	2ff2788145feea06d2e1336846ca22cdcc3fa37c
+++ tests/short_options_work_correctly/__driver__.lua	0614ec5afa8cab4ccd888c5ee08d1d0154b93d52
@@ -12,7 +12,7 @@ function short_mtn(...)
 function short_mtn(...)
   return raw_mtn("--rcfile", test.root.."/test_hooks.lua",
                  "--nostd", "--norc", "--root", test.root,
-                 "--keydir", test.root.."/keys", unpack(arg))
+                 "--keydir", test.root.."/keys", ...)
 end
 
 check(short_mtn("add", "maude"), 0, false, false)
============================================================
--- tests/trust_hooks_and_trusted_command/__driver__.lua	df0d568151e80faa78854e09ee4110d849057443
+++ tests/trust_hooks_and_trusted_command/__driver__.lua	2ac6428fb5a5564c4f376a4566e041324c8cd88c
@@ -2,7 +2,7 @@ function trusted(rev, name, value, ...) 
 mtn_setup()
 
 function trusted(rev, name, value, ...) -- ... is signers
-  check(mtn("trusted", rev, name, value, unpack(arg)), 0, true, false)
+  check(mtn("trusted", rev, name, value, ...), 0, true, false)
   local t = qgrep(" trusted", "stdout")
   local u = qgrep(" untrusted", "stdout") or qgrep(" UNtrusted", "stdout")
   check(t ~= u)