# 
# 
# patch "tester.cc"
#  from [81b805b2be147d30b89455b3825a65506405dfb4]
#    to [2a01916b7886c81318ab70c0cceb8ea8aa66e7c0]
# 
# patch "tester.lua"
#  from [e022bef407dd27b45cd0c42fd494a7559b91971a]
#    to [95b3e31ff1c496e153cf5fcef3ee0e4521b50242]
# 
# patch "tests/(minor)_add_own_db/__driver__.lua"
#  from [1fb176fe6f10cb4b9976a595536c715d2b904323]
#    to [2efcf1ebd1c8317d96e361364438a3d8ad9953c2]
# 
# patch "tests/(minor)_test_a_merge_3/__driver__.lua"
#  from [d0fe9f78d0d218a6a740031db33bac03b5063a1c]
#    to [f84d05f8d70913d42e06002383e2f310cd36e67a]
# 
# patch "tests/(minor)_test_a_merge_4/__driver__.lua"
#  from [7a01317489a6c5c99bbdbcf11531d1110f9ffdd3]
#    to [87751ae6a73cda17483736a7687a979d84c3fc9a]
# 
# patch "tests/(minor)_update_cleans_emptied_directories/__driver__.lua"
#  from [6d91c357804f5a45addd1df316ec080e958af5e9]
#    to [c6010182ca0b06e2f20bb0d91a31a2dcc00714a8]
# 
# patch "tests/(normal)_netsync_on_partially_unrelated_revisions/__driver__.lua"
#  from [356482e7999f737c6c59ed8da992b0c32e971b8c]
#    to [79d37ed87fa40ba7e6e4a00fd5662b45dbaf3531]
# 
# patch "tests/--confdir_option_and_get_confdir_lua_function_work/__driver__.lua"
#  from [5d267f0d0e7d1a52192c30ffa5a26f8fd09faeb8]
#    to [7c1df2ddb2b991352cff6d4d615d7b86ae257b9f]
# 
# patch "tests/--rcfile=-/__driver__.lua"
#  from [3d862d0597137e0beeb17b1eb0a36b6e9f355bf8]
#    to [2c1f914cc9565f8c76c5f45ef4645e2b139065b6]
# 
# patch "tests/--rcfile=directory/__driver__.lua"
#  from [bd0b57aa45e0fdefde34917ed6ce3908009c4543]
#    to [20ed24e06e34153036a2cf4e958cd1dd99618cc1]
# 
# patch "tests/_MTN_files_handled_correctly_in_aborted_commit/__driver__.lua"
#  from [466c9431afb7310fd266aeba783a22612919b755]
#    to [00f69b645b52e4dcf5166820144edc420d025c10]
# 
# patch "tests/a_tricky_cvs_repository_with_tags/__driver__.lua"
#  from [86561dd2f315e65a2a13a489c3a6bf2c28ed195d]
#    to [1c16395c12eb76dd0fd026222c1e9014d944a27f]
# 
# patch "tests/add_workspace_commit_in_another/__driver__.lua"
#  from [c15437969cd6f8c76c497cede0793c04d3a8ee8e]
#    to [a81224552103e58d81b3cbf94a4b1e780b6c846e]
# 
# patch "tests/annotate_file_added_on_different_forks/__driver__.lua"
#  from [7132c73a634f4177341e425e7e1cc3e5d0587cb6]
#    to [5235141f09843a6ff639917ad5782dd82a0bd688]
# 
# patch "tests/annotate_file_on_multirooted_branch/__driver__.lua"
#  from [bc707ef27d41d3772036e81d3d65c7688c4d3427]
#    to [6575dd6e1ecd2648403fe82cb62d333b847e737b]
# 
# patch "tests/annotate_file_whose_name_changed/__driver__.lua"
#  from [af2dddf5eeb4e8ba59c4860b8de03f92c217ce3b]
#    to [8998c67ca849dbc5a4839716cc15997c8308e38e]
# 
# patch "tests/annotate_where_line_splits/__driver__.lua"
#  from [c046225903e7f31d84fb5e554343d36cfaf5d2f1]
#    to [9e4e1a805973cec3a8a1c10ccc758fae561ca073]
# 
# patch "tests/annotate_where_lineage_depends_on_traversal/__driver__.lua"
#  from [53cd0f6f35b9494b6722d1351c283d982b4c1107]
#    to [42ab2e100ff887916530e10aa6cc818126102d6c]
# 
# patch "tests/annotate_where_one_parent_is_full_copy/__driver__.lua"
#  from [e9ba290d9c0024f58932e9235960e4a4fb3dc33a]
#    to [dad25bc74f825255803a4f96a56520e2da4ca4b7]
# 
# patch "tests/attr_init_functions/__driver__.lua"
#  from [506aba1a2b1799d9ad62c2d43df6bd0d9dc307bb]
#    to [e5fa7d2e14317799d9287c2bfa51526c57e9ab3a]
# 
# patch "tests/attr_set_get_commands/__driver__.lua"
#  from [5fa53a0df58c2faed1ba6d76646e39f6a62c0318]
#    to [e5473b58e745501b6697ad691536d228bf04f420]
# 
# patch "tests/automate_certs/__driver__.lua"
#  from [53f81a0517365da4a4ce52b6b581a23603c0175e]
#    to [344638c83e86d66ed5360e0850997994e25fdaba]
# 
# patch "tests/automate_get_manifest_of/__driver__.lua"
#  from [c3fcb95aae09cea5b3017ad98965b4fcf1b743cc]
#    to [8a6d9ce100cbe23fc236b8cf9d4a1e2a6901b713]
# 
# patch "tests/automate_get_revision/__driver__.lua"
#  from [b5cf65b106d39eba23690f7721ed12e1a1a4618c]
#    to [6d46ccc10217fe41ca36052d22c898b39ab18a05]
# 
# patch "tests/automate_stdio/__driver__.lua"
#  from [b6715d0c442e5080dffd611d0551ad01ff43994f]
#    to [56f4bbe463ab7f5f88ee45e3b7add9531fc6d732]
# 
# patch "tests/branch-based_checkout/__driver__.lua"
#  from [90dc840151263a46c883a9a489dfbb8ee279a16a]
#    to [384a294956c18d63bd7ff5cb19d9a72692d9c947]
# 
# patch "tests/calculation_of_other_unidiffs/__driver__.lua"
#  from [8ef9ea4938ad4817028e9193a82405b544eedcb7]
#    to [46b8608d9038ba9bedca0c8377885760b63a9f5c]
# 
# patch "tests/calculation_of_unidiffs/__driver__.lua"
#  from [c670daa765bad08b28e1c8b2fe6ae7b0159153a7]
#    to [cb4a71eb9198d07f3acf20121bed8c951a7e0140]
# 
# patch "tests/can_execute_things/__driver__.lua"
#  from [7e946cf7d485ac9ab5cb9d231a3d544a4a555292]
#    to [b679678b80b65e6c6ae604e8d00fba852d4ad071]
# 
# patch "tests/cat_-r_REV_PATH/__driver__.lua"
#  from [ff8cbb19e14aab453d2e9209ef30837b48d76b13]
#    to [1a7604541146055aabc8e19bfe8847515e8ae599]
# 
# patch "tests/check_automate_select/__driver__.lua"
#  from [4dc5db986595c5884649c0fd5891f3efe9d2e202]
#    to [8ad3f76b5621290471761b3ce407dd536bf4b7fa]
# 
# patch "tests/check_later_and_earlier_selectors/__driver__.lua"
#  from [f3d70f749d65fd0e10b3bd30f7e0740260bab6de]
#    to [2031d0dab707632b8d11460c7bde09f60df08b95]
# 
# patch "tests/check_same_db_contents_macro/__driver__.lua"
#  from [cec4d0b7f5781b8f6022176ec4be5a9f234a18dc]
#    to [cbfa38742506d1d4496327a2fabae6112858ea0a]
# 
# patch "tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua"
#  from [81d1c7a8f2c1344bf65b41964dbeb2337c0b1b0b]
#    to [993f961fc99620804e7fa9108831080c375dafa9]
# 
# patch "tests/checkout_creates__MTN_log/__driver__.lua"
#  from [fa6cdde15c67e65653df35d3ae90e68da70ff8ac]
#    to [92ef69d908f0871f2b2beb023044b386a677043f]
# 
# patch "tests/checkout_without_--branch_sets_branch/__driver__.lua"
#  from [55205d7fcc2a2c748f7ae9264dee34a0fb2e54e0]
#    to [cb9454891ca21ada23cd35827a873403eb81a99b]
# 
# patch "tests/commit_using__MTN_log/__driver__.lua"
#  from [c85f9af921ff17ea15565e628dc199fbd892700c]
#    to [22b336757f3ff27337c8e661e378d999d2bdc58e]
# 
# patch "tests/commit_using__MTN_log_and_--message/__driver__.lua"
#  from [110e07dd7fd06bf5141a84c31d573af8af512c2d]
#    to [f29c77197cf0ee4840b77d4c7a2bbc5e25507b5a]
# 
# patch "tests/commit_validation_lua_hook/__driver__.lua"
#  from [8d908341efb7b63c728bafb62d002157d01647dd]
#    to [0286ba5854ff51e8b9f89508376a4e3070822e45]
# 
# patch "tests/commit_with_--message-file/__driver__.lua"
#  from [d91fb65c3bb372749170c9c321d3bafb4c34de87]
#    to [c210f8a4955e2092e531db0ba677821410032583]
# 
# patch "tests/commit_writes_message_back_to__MTN_log/__driver__.lua"
#  from [3adbe4d65dff675b450922a3a49273c17126881a]
#    to [ee68603f211568c109e200616cc09f9c22926145]
# 
# patch "tests/common/netsync.lua"
#  from [f56b506a2c31f495a53090f29bcb7c44aeab98cf]
#    to [b027de95b84d694bea4eb0c5ae476ef6b4d12d51]
# 
# patch "tests/creating_a_bad_criss-cross_merge/__driver__.lua"
#  from [997c41fef50984e7609e886835e256ef3c8cca8a]
#    to [6eb3147403f2a71b057fd55be0a23474c2b7955a]
# 
# patch "tests/creating_a_fork_and_merging/__driver__.lua"
#  from [aabf962e9dd0ecff78c86288fdf3f2c57e231844]
#    to [1fa1ba4f5423b9257e70db51d8f4a8cfff9f965f]
# 
# patch "tests/creating_a_fork_and_updating/__driver__.lua"
#  from [213098c02d50942968283ae5a5bc10a1569ad651]
#    to [91fe706d84091844089ee3d7c77696d0986ca4ce]
# 
# patch "tests/creating_a_good_and_bad_test_result/__driver__.lua"
#  from [28c620730a25c24afa3ad4000ad74f2ba6e54c13]
#    to [8a63a3152efde458e234440796573b73f6aa7a23]
# 
# patch "tests/cvs_import,_deleted_file_invariant/__driver__.lua"
#  from [cd41da4b2edee3b1458d06624580624aff8ce54d]
#    to [9a74ac067c269956789effbb9caeffd10bf6ebad]
# 
# patch "tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua"
#  from [dce710af9d7414029aeef8690593f64fbfc5344e]
#    to [fc26f99ea5f7acbdad0f64bf86bcd4366e7f13f2]
# 
# patch "tests/cvs_import_with_file_added_on_a_branch/__driver__.lua"
#  from [f3b915b179ae6001411ef031129e1b3116bf25ee]
#    to [ada42479e819222ba0659a2e5d5876b1a9f89263]
# 
# patch "tests/database_check/__driver__.lua"
#  from [4d73c49472d143e5e414f793e50a336b5d1d3d24]
#    to [8eb9d94d3238156ef701594a3b8a4c1fa0993640]
# 
# patch "tests/database_check_for_normalization/__driver__.lua"
#  from [bc6bb094618990a3a1f38144ed81febadc860ce4]
#    to [58501c2796792748edb740e191e8049eb1d0c057]
# 
# patch "tests/db_data_format_checking/__driver__.lua"
#  from [03085676c219d57aba4fbc8c1d8f840632988a62]
#    to [a6a73d9bd74f7dae88a7093e0321bf958ea15b0d]
# 
# patch "tests/db_load_must_create_a_new_db/__driver__.lua"
#  from [bc64c2372001fc1e56dcb48b77ecea82e8483511]
#    to [34b3b8a14f37f21b1cfbbdd51a4e76fa4aacc9e0]
# 
# patch "tests/db_rosterify_preserves_renames/__driver__.lua"
#  from [2f92e22a54b4ed4f7f8b21b4482f96484ffa215f]
#    to [0fd41cfdd913969381975a3edcaa10bfa78d86f3]
# 
# patch "tests/delete_work_file_on_checkout/__driver__.lua"
#  from [82d14343e33b5119bf3d739e4ca89b446d2a9e06]
#    to [375bcc6241f69acbe6d11b2d0ffcb4d2c08e391d]
# 
# patch "tests/diff_--external/__driver__.lua"
#  from [411e14004692d964f3b8c5f170702e617cb55994]
#    to [92b47217766c1368bc6f1bae832310ec56efb605]
# 
# patch "tests/diff_a_binary_file/__driver__.lua"
#  from [503002e82542225d30db3f1d366dd02bfb84ea9d]
#    to [df125fd2f59b5e46c7b44eb1ba8cc5cc142bb883]
# 
# patch "tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua"
#  from [a1cb0c55b523bb0d7aad0ff7e011f8651ff8ca12]
#    to [37a11a3d4bfc9e8834027965eb7c17dfe9441ba6]
# 
# patch "tests/disallowing_persistence_of_passphrase/__driver__.lua"
#  from [97caa9c3d7ad9ea19bd32bc45b812e38a94b7917]
#    to [907d58d645f4844cd0b602b9f3a3cb22e6a6c6ed]
# 
# patch "tests/disapproving_of_a_revision/__driver__.lua"
#  from [45496133759ae45e279b3e4c45f5325597d59e0b]
#    to [467707301c2b95268a70b6cbc244ebe6abd45120]
# 
# patch "tests/drop_a_public_key/__driver__.lua"
#  from [64c38cebf336034965302baefa2efbb5ee3867f3]
#    to [2d4e44b8f06a77243c0e7cba55038e8e73af9ba5]
# 
# patch "tests/drop_missing_and_unknown_files/__driver__.lua"
#  from [6460ea6a3b90bbe432ef53dd9774c8d01dfbe0f2]
#    to [56107612c8f75868ae090a8bf379bde522026922]
# 
# patch "tests/empty_environment/__driver__.lua"
#  from [0bc59bbb2475e7185ce3f0f7eee7c6351b7871d3]
#    to [ca63a02b4add10e72aa3a1f29906bdfea72dae32]
# 
# patch "tests/exchanging_work_via_netsync/__driver__.lua"
#  from [c7d4ecc85f8658688f7951d96f48d28406aae07e]
#    to [5afb48c2c94cc548702e0b6272288bbc78147bfb]
# 
# patch "tests/explicit_merge/__driver__.lua"
#  from [bc1c384cd88f7947e9f53ddb646bf14eb71f388d]
#    to [1d7d3bfb6e486fa2e3ad56562e451ab2c6783563]
# 
# patch "tests/external_unit_test_of_the_line_merger/__driver__.lua"
#  from [b3273eb163740231020a773429034334f46a71a0]
#    to [1d1e80933029a6af448c15d85e24f5db9d1fe9ce]
# 
# patch "tests/files_with_non-utf8_data/__driver__.lua"
#  from [a3f8e37d1f760834a6c013ca9e65489a99538c00]
#    to [9368ad53f9d9dd08457c3132896b3999cd2c7a1a]
# 
# patch "tests/first_extent_normalization_pass/__driver__.lua"
#  from [aaceb1dcdedaf5d90ae9760f0743969f6336e528]
#    to [b273e5d30742f4d34352da0ac9ec3a25199aabc4]
# 
# patch "tests/get_netsync_read_permitted/__driver__.lua"
#  from [bea5d1cd297d4cdeb576b7f6fcd8bef73c10c111]
#    to [62c88f49d3fe843ce139897207017886a9bdf7c5]
# 
# patch "tests/importing_a_cvs_file_with_one_version/__driver__.lua"
#  from [15c3a5824d24a218b8a2037bad178f78d716149a]
#    to [1f1c361267d06b929bc431416d2d99f9385c8e9c]
# 
# patch "tests/importing_a_small,_real_cvs_repository/__driver__.lua"
#  from [831c69c344c54019c8e3f68b2b849878c62bcadf]
#    to [d272e9e3cfadd7fabaa87de4ff01f73db2185379]
# 
# patch "tests/importing_cvs_files/__driver__.lua"
#  from [c0f9e587b78a71661c20cca06e5ad198547e9e90]
#    to [c1cc5497c211389954cbd34e61559a76cbb40e11]
# 
# patch "tests/importing_cvs_files_with_identical_logs/__driver__.lua"
#  from [7f20e7723843c2ceaec23a4cc7d609fdddd86868]
#    to [217dd79b2ee06eb698287b01c822ad6f20ab7458]
# 
# patch "tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua"
#  from [9738d252a0f89a8870d9420ca1ba06f5048a25ff]
#    to [1ad697fe5be65db5a0f03a9624c2040796eb8890]
# 
# patch "tests/importing_files_with_non-english_names/__driver__.lua"
#  from [f1f07b8b1ccd758bb7274872aa19a760e55383f1]
#    to [ed1240654dad2a24ed0ff72c8b1103336eccf589]
# 
# patch "tests/include()_and_includedir()_lua_functions/__driver__.lua"
#  from [8a99da73447e7e10466652c3e38c3d93da7bfa1c]
#    to [e5771a17a8ee2d8c2d6c2033603fafc79ed769fc]
# 
# patch "tests/inodeprints/__driver__.lua"
#  from [dca8be709d7a7336fc4cfa1ef1b89e27bdabe0e1]
#    to [4851b2e8a82015cb048b829f551c74c6b730848d]
# 
# patch "tests/largish_file/__driver__.lua"
#  from [d879bd8f8dc04288cf3f6f88963f2ff1e725ce72]
#    to [ba9f7510fb05d00d3e720060dea1ca655a757037]
# 
# patch "tests/list_branches/__driver__.lua"
#  from [8e6f678eef70f9187fed601e25d14076ba67d17a]
#    to [c3bc816409cfc40dd63ff18a79de967ce4f4296b]
# 
# patch "tests/log_hides_deleted_renamed_files/__driver__.lua"
#  from [8d39a8271a09094ba2cdf4fc26fc031a03b7ae47]
#    to [6227dd0a922e1bf550feeaf9600225d85d6b1e3e]
# 
# patch "tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua"
#  from [6ebfa602fc03bcdfbe93676e791c5a6833f083e6]
#    to [a373fb9a5fa27a2ca5b65a30595978e4ac2c86ae]
# 
# patch "tests/lua_function_existsonpath/__driver__.lua"
#  from [9021eacf7602e1515221c3b439c9ae4381cf4929]
#    to [bbf1c433b0eb6cf2185365d4931c3918001f7d31]
# 
# patch "tests/manifest_restrictions/__driver__.lua"
#  from [831e7e7aa9020c666a549cb5a5619e835103cf5a]
#    to [2a61593429aa1b8f6a2af86b190a9a2597c4acfc]
# 
# patch "tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua"
#  from [b567ed88b67b06445deec99e9d3019123c8aebeb]
#    to [bb3d0ebcc57f1b0df75f1c58b0a54912c3f11830]
# 
# patch "tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua"
#  from [5460bea6c9e6ac125b2138d5a2747bcd346790ae]
#    to [098be15f8560f52b9701864d3e391d7d4af1e4ad]
# 
# patch "tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua"
#  from [0fbb2ea669d060ce7588816d64101ede8e567334]
#    to [baaeb528eaf48031cbae198f4cb2d133a6996540]
# 
# patch "tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua"
#  from [dac336dbf180056dbe184723f0504f861ea563bc]
#    to [1a72edadfc966221a7b4d2c88ee234a299256c4b]
# 
# patch "tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua"
#  from [ef0b509c5f7b1bc19b3c8060130647cc00a9fb36]
#    to [7fb698f24b8fd9a9580ca750682743eeb0972939]
# 
# patch "tests/merge((drop_a),_(drop_a,_add_a))/__driver__.lua"
#  from [69c464e4552692a45d837b745fcb0687ed2060e6]
#    to [a7a463c31f1d6e223fbfed77555044754f898823]
# 
# patch "tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua"
#  from [567651816fcf9dc5bde90899d2739f9703f836fd]
#    to [86bce67fd140cdcf1685ee694bfd9ed41c5d3dbd]
# 
# patch "tests/merge_manual_file/__driver__.lua"
#  from [0f88464cc74c9dc9631a81b607d86c3f830dd2cb]
#    to [6dcd95786b907552ed67b442d2ff6a5792df7c0f]
# 
# patch "tests/merge_normalization_edge_case/__driver__.lua"
#  from [540f5a97e67577161144a624a7b84717d0aef727]
#    to [a6f3ef66ca6fa276c6facc39ea5af901f2e487fc]
# 
# patch "tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua"
#  from [a43d6187d0ccfd94a6def14211b952c86a869473]
#    to [9064976208573bdc0000840dd25233812c8d5462]
# 
# patch "tests/merging_a_rename_twice/__driver__.lua"
#  from [31a1be043ecb8735f0c09ade850b5aed6540f694]
#    to [2601a6a79dcef1a1c85797637eb853d01d707edf]
# 
# patch "tests/merging_adds_in_unrelated_revisions/__driver__.lua"
#  from [22ec6f9238dfac16e2ea67361e90d142d38ada80]
#    to [1c368783de0067313a53b09df6cc9da2f743a385]
# 
# patch "tests/merging_data_in_unrelated_files/__driver__.lua"
#  from [c64d4c93b6212896eed7ba97fec668af843213de]
#    to [f889683cbeb372aa8d2812b071c723c053ca2823]
# 
# patch "tests/merging_data_in_unrelated_revisions/__driver__.lua"
#  from [2cf02eca460fb6f458c50396be7a8a4763acd578]
#    to [cbbc6054d02dbe98bf7dc4ad4790ce74a8c9aee5]
# 
# patch "tests/migrate_with_rosterify/__driver__.lua"
#  from [1ff3b4055bd96ae0e2760d6a3502f98f9611cc7a]
#    to [6d7de24d6e2475b4641ee4db9e97e97190983b7c]
# 
# patch "tests/mtn_add_dot/__driver__.lua"
#  from [74f5fb10c01664357f17c76e6ff2056dbb2bd5b5]
#    to [2f0a63f81197480e78b298ad1bf74496afd2924c]
# 
# patch "tests/multiple_version_committing/__driver__.lua"
#  from [dfdbbe5150d201036cb784160c3cfbfd721ff3ff]
#    to [96051cc6fa605ab2a5985e6253f35df7a47dcc7f]
# 
# patch "tests/netsync_client_absorbs_server_key/__driver__.lua"
#  from [dc8fff5b6909710b2f0dea1c2d0ee4be5d4ce1c4]
#    to [179a061d8eb5a4d5d2d3fb32d770fcf24b11c424]
# 
# patch "tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua"
#  from [b71a7986e2d0ae71548e335e91049fc703983a50]
#    to [4ec9d25eab337911fbab21281d28c945482a0ce6]
# 
# patch "tests/netsync_permissions/__driver__.lua"
#  from [2a9a12c8b7b2ad5ee4152db77bc6a3d5d18771d9]
#    to [b329a7343cee7e6a12f6aae20820834a357d47e2]
# 
# patch "tests/netsync_transfers_public_keys/__driver__.lua"
#  from [ad35ff87dffb8b24468db3dab113f4b79f425be5]
#    to [d560e525c469bcb3a581e28f26089de4a4a9dc1b]
# 
# patch "tests/netsync_with_globs/__driver__.lua"
#  from [8ec16aa6ff7e2be6959e78af1ae2c04251150dd9]
#    to [5008a811543f23ef8fa4e5cd54a411204ee93e9e]
# 
# patch "tests/persistence_of_passphrase/__driver__.lua"
#  from [0409770163b399bbf796bf2c7427111d07ef7f2b]
#    to [2a0d80e2ec0757d8b004ffd75b1987ae4ab2bf67]
# 
# patch "tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua"
#  from [d2462ce31147655c4d7b492a9f4c210277a4dde6]
#    to [efb2a05ac574eb9d9a6b59b965c4b8beb589a050]
# 
# patch "tests/propagate_an_ancestor/__driver__.lua"
#  from [9e3fc70664c1d7c917171fd9e2ddaf40e7e1a888]
#    to [cf6136627b498d48cd0c0e8d986ec47df4ca0f78]
# 
# patch "tests/read_and_convert_old_privkey_packet/__driver__.lua"
#  from [599cf327cc2832fcbcc2f39e51200084ba951ee2]
#    to [f4dcdc6403070b4880002ec7d14df34d8dcdb968]
# 
# patch "tests/rename_files_into_a_directory/__driver__.lua"
#  from [9080ecca27e1218caf9c7eef651357348a8dcc21]
#    to [b6594e77f04c1ecdfc10a23ec08740695cd0ec7e]
# 
# patch "tests/renaming_a_deleted_file/__driver__.lua"
#  from [501b87196920ba58a8a1f8899919d1a512c2e740]
#    to [b175facc6c89c70b26e112229221b03bb68212f3]
# 
# patch "tests/renaming_a_directory/__driver__.lua"
#  from [ff5e5566bd6d5aae450febf324ded5ed8f3065a7]
#    to [a33e62f4ff8c746c7a51fbaa19302ea76075c805]
# 
# patch "tests/renaming_a_file/__driver__.lua"
#  from [35d1d7058771cd2d329f33ee7fff869c4e203621]
#    to [d2f23e3f18ea304e68866ae554767d7296fd54cf]
# 
# patch "tests/renaming_a_patched_file/__driver__.lua"
#  from [f67c4c450d5d65e951d045e6547681341ec38d1e]
#    to [8fd738fcfcbdac05ca85563b46af53a976fe5672]
# 
# patch "tests/renaming_and_editing_a_file/__driver__.lua"
#  from [650e40f16b0106da5727988543b69617aefba61a]
#    to [0e8b972b0de53d89db21e0cab967bdfa39aed23b]
# 
# patch "tests/replace_dir_with_file/__driver__.lua"
#  from [b4071a8d33cbc1be522a83e64a082bb33092462e]
#    to [0f7d22d1bc8ffdb254f1b6ef2f8d48e38c7e8999]
# 
# patch "tests/restricted_commands_are_consistent/__driver__.lua"
#  from [19c97e07ddcb3f58553eb07e658ec1605287190c]
#    to [2c6ede6d31cda92507631e91a57de47240667bb9]
# 
# patch "tests/revert_file_to_base_revision/__driver__.lua"
#  from [3938aaef0d2b8aea9e80f164edd46b1d1b2f9786]
#    to [a7d7f3c626fde5c96373340d51bd365409b125bb]
# 
# patch "tests/revert_ignored_files/__driver__.lua"
#  from [52052045f5a5ad9be1b9126be33a51b9441356a6]
#    to [94d0ccaa383bcb0d3f1f3fb399f96aba5dd3885e]
# 
# patch "tests/revert_works_with_restrictions/__driver__.lua"
#  from [029948a123b9fc57318b084f9951a6a33e18614e]
#    to [7281c936230000500588888ad7b9a3fafb400360]
# 
# patch "tests/rosterify_--drop-attr/__driver__.lua"
#  from [00714d38d59159019cac8b5587417e5ecde89d66]
#    to [3834fe3b6c278fdacea0162e659b661f8212fa73]
# 
# patch "tests/rosterify_migrates_file_dir_attrs/__driver__.lua"
#  from [ae20dbdc1ff58e8dd3543c77789d5c158165c8ad]
#    to [ef4e75b34e5e5e2790f569dc38f8b096a3d74fd0]
# 
# patch "tests/rosterify_on_a_db_with_1_rev/__driver__.lua"
#  from [7d553a2f86f34e4c964aa76201f0f7f042646f07]
#    to [8049eb73dca82257e149da9ecc05e70ccfbd2407]
# 
# patch "tests/scanning_trees/__driver__.lua"
#  from [f98578fc16ef652ad5b5bbba5387ddc05a98795a]
#    to [b6fd56d8bd8fc5eeee6ed487172541d1e61af46a]
# 
# patch "tests/schema_migration/__driver__.lua"
#  from [bdfc5b96c09274e280f740759e412a595f77a560]
#    to [eb9b6997d6eec6d711915772b39b1b3525a0466d]
# 
# patch "tests/selecting_arbitrary_certs/__driver__.lua"
#  from [195927862f019a75ae9863e0b529c336c5157a3a]
#    to [544b55e39785bae7734b74cfcdeb4048429e7603]
# 
# patch "tests/setup_checkout_touch_new__MTN_options_only/__driver__.lua"
#  from [548c40cf997f2549d60cc55547a69abda3d83e7c]
#    to [98c2f1c859423898fa990c69333ebd521a2caf0f]
# 
# patch "tests/setup_on_existing_path/__driver__.lua"
#  from [1b50d361f9693ca080715d27eac680e8ab513072]
#    to [1ecc80aafde9b8410627cb08aad586dffe3721e0]
# 
# patch "tests/single_character_filename_support/__driver__.lua"
#  from [c7021579482c50f1b617fc60adbc308b7345e2f7]
#    to [45e9d332c9f379e34eed7687d25c6b0b4b5f8662]
# 
# patch "tests/tags_and_tagging_of_revisions/__driver__.lua"
#  from [8060d31138276d062042cd56a25d7a3947cf3b05]
#    to [bbde36d3389634ef6466a10233bd6eeddadd6ad4]
# 
# patch "tests/test_a_merge/__driver__.lua"
#  from [56aeb71615373818f2e6a3e01a07d8f3545c48d0]
#    to [105f2fadc44e0aec222acdbce11b883afa91b47a]
# 
# patch "tests/test_a_merge_2/__driver__.lua"
#  from [3f31d6570b3f7b7ab7fc26f373a1b1c31283fe6b]
#    to [f68098a1e99c89a8221e08cbed584c8433783e64]
# 
# patch "tests/test_a_merge_5/__driver__.lua"
#  from [2bb57fcc0cd287cb07a3b218504dda98525cf90b]
#    to [dcd581286d83d0f3af2fcf03aad804029eadab28]
# 
# patch "tests/test_a_merge_6/__driver__.lua"
#  from [367c8ce3f9506adb5f45a9c9dff9a766e182a598]
#    to [1052a6e2aaedc14c4b4a2bb8796dc91ba01023a4]
# 
# patch "tests/test_annotate_command/__driver__.lua"
#  from [21c71d956803b81d311de5620ae64f34361d0011]
#    to [01bb08f6b904a505c1bb7a5e50dc0418d15f74c3]
# 
# patch "tests/test_problematic_cvs_import/__driver__.lua"
#  from [f26942e465025f75e07acaea0e8ad77ea7880bc4]
#    to [2240b4ef2c2d551f54ee38470df88ae5d6f1b8c6]
# 
# patch "tests/things_in_.mtn-ignore_get_ignored/__driver__.lua"
#  from [e7b9b6ae892ff496fa72248c63a48520e6c8da64]
#    to [9062aa1fbd033cfc7de95fc5248b7ca50b01bf4e]
# 
# patch "tests/update_does_not_stomp_non-monotone_files/__driver__.lua"
#  from [3001c8acd928063b99fac8f01f54424d0e7ee630]
#    to [998d9d0514ec726e00ecaff6659cf276ae098a36]
# 
# patch "tests/updating_from_a_merge_which_adds_a_file/__driver__.lua"
#  from [9de36d12c49f6b36cb33978609f2c86412376199]
#    to [1d07fad8dd526be2813cc7d200056d3f50e2fcb6]
# 
# patch "tests/updating_to_a_given_revision/__driver__.lua"
#  from [2e9125c5c94c5c87a921ff6cb143918dcc8cd489]
#    to [ce5676214259bb94d642a9a3f829f88c5aac071e]
# 
# patch "tests/use_get_linesep_conv_hook/__driver__.lua"
#  from [795b37572ca781a06e6097b6d48ba82a921054c6]
#    to [d0344eca6c611d7501a91685c273f997a4f9f26d]
# 
# patch "tests/use_inodeprints_hook/__driver__.lua"
#  from [07ead3d63cfc585cae4a229f9b1103c0e501b7fc]
#    to [7b17e6a3aa29a0c798bcefe88c6a997bffe2b1f9]
# 
# patch "tests/workspace_inventory/__driver__.lua"
#  from [520d87edeeb2cca37c6e8e2a733a988edc738aa7]
#    to [b34fa607631cb6076e1e78879fb868095344ded3]
# 
# patch "testsuite.lua"
#  from [53909234852e15ede6b23373bf7275e90392ecd1]
#    to [1583c485e887b9b132e73086e51e3e1985539790]
# 
============================================================
--- tester.cc	81b805b2be147d30b89455b3825a65506405dfb4
+++ tester.cc	2a01916b7886c81318ab70c0cceb8ea8aa66e7c0
@@ -259,7 +259,7 @@
 void do_copy_recursive(fs::path const &from, fs::path const &to)
 {
   if (!fs::exists(from))
-    return;
+    throw fs::filesystem_error("Source for copy does not exist", from, 0);
   if (fs::exists(to))
     do_remove_recursive(to);
   if (fs::is_directory(from))
@@ -320,18 +320,38 @@
   static int
   remove_recursive(lua_State *L)
   {
-    fs::path dir(luaL_checkstring(L, -1));
-    do_remove_recursive(dir);
-    return 0;
+    try
+      {
+        fs::path dir(luaL_checkstring(L, -1));
+        do_remove_recursive(dir);
+        lua_pushboolean(L, true);
+        return 1;
+      }
+    catch(fs::filesystem_error & e)
+      {
+        lua_pushboolean(L, false);
+        lua_pushstring(L, e.what());
+        return 2;
+      }
   }
 
   static int
   copy_recursive(lua_State *L)
   {
-    fs::path from(luaL_checkstring(L, -2));
-    fs::path to(luaL_checkstring(L, -1));
-    do_copy_recursive(from, to);
-    return 0;
+    try
+      {
+        fs::path from(luaL_checkstring(L, -2));
+        fs::path to(luaL_checkstring(L, -1));
+        do_copy_recursive(from, to);
+        lua_pushboolean(L, true);
+        return 1;
+      }
+    catch(fs::filesystem_error & e)
+      {
+        lua_pushboolean(L, false);
+        lua_pushstring(L, e.what());
+        return 2;
+      }
   }
 
   static int
@@ -381,6 +401,23 @@
   }
 
   static int
+  isdir(lua_State *L)
+  {
+    char const * name = luaL_checkstring(L, -1);
+    fs::path p;
+    try
+      {
+        p = fs::path(name, fs::native);
+        lua_pushboolean(L, fs::exists(p) && fs::is_directory(p));
+      }
+    catch(fs::filesystem_error & e)
+      {
+        lua_pushnil(L);
+      }
+    return 1;
+  }
+
+  static int
   get_source_dir(lua_State * L)
   {
     lua_pushstring(L, source_dir.native_file_string().c_str());
@@ -531,6 +568,7 @@
   lua_register(st, "remove_recursive", remove_recursive);
   lua_register(st, "copy_recursive", copy_recursive);
   lua_register(st, "exists", exists);
+  lua_register(st, "isdir", isdir);
   lua_register(st, "get_ostype", get_ostype);
   lua_register(st, "save_env", do_save_env);
   lua_register(st, "restore_env", do_restore_env);
============================================================
--- tester.lua	e022bef407dd27b45cd0c42fd494a7559b91971a
+++ tester.lua	95b3e31ff1c496e153cf5fcef3ee0e4521b50242
@@ -1,7 +1,6 @@
 tests = {} -- list of all tests, not visible when running tests
 test = {} -- table of per-test values
 
-
 -- misc global values
 
 -- where the main testsuite file is
@@ -93,30 +92,32 @@
   error(e, level)
 end
 
-old_mtime = mtime
-mtime = function(name)
-  local x = old_mtime(name)
-  L(locheader(), "mtime(", name, ") = ", tostring(x), "\n")
-  return x
-end
+do -- replace some builtings with logged versions
+  old_mtime = mtime
+  mtime = function(name)
+    local x = old_mtime(name)
+    L(locheader(), "mtime(", name, ") = ", tostring(x), "\n")
+    return x
+  end
 
-old_mkdir = mkdir
-mkdir = function(name)
-  L(locheader(), "mkdir ", name, "\n")
-  old_mkdir(name)
-end
+  old_mkdir = mkdir
+  mkdir = function(name)
+    L(locheader(), "mkdir ", name, "\n")
+    old_mkdir(name)
+  end
 
-old_existsonpath = existsonpath
-existsonpath = function(name)
-  local r = (old_existsonpath(name) == 0)
-  local what
-  if r then
-    what = "exists"
-  else
-    what = "does not exist"
+  old_existsonpath = existsonpath
+  existsonpath = function(name)
+    local r = (old_existsonpath(name) == 0)
+    local what
+    if r then
+      what = "exists"
+    else
+      what = "does not exist"
+    end
+    L(locheader(), name, " ", what, " on the path\n")
+    return r
   end
-  L(locheader(), name, " ", what, " on the path\n")
-  return r
 end
 
 function numlines(filename)
@@ -185,65 +186,72 @@
   end
 end
 
-function copyfile(from, to)
-  L(locheader(), "copyfile ", from, " ", to, "\n")
-  local infile = io.open(from, "rb")
-  if infile == nil then
-    L("Cannot open file " .. from)
-    return false
+do
+  unlogged_copy = copy_recursive
+  copy_recursive = nil
+  function copy(from, to)
+    L(locheader(), "copy ", from, " -> ", to, "\n")
+    local ok, res = unlogged_copy(from, to)
+    if not ok then
+      L(res, "\n")
+      return false
+    else
+      return true
+    end
   end
-  local outfile = io.open(to, "wb")
-  if outfile == nil then
-    infile:close()
-    L("Cannot open file " .. to)
-    return false
-  end
-  local size = 2^13
-  while true do
-    local block = infile:read(size)
-    if not block then break end
-    outfile:write(block)
-  end
-  infile:close()
-  outfile:close()
-  return true
 end
 
-function rename(from, to)
-  L(locheader(), "rename ", from, " ", to, "\n")
-  local ok,res = os.rename(from, to)
-  if ok == nil then
-    L(res, "\n")
-    return false
-  else
-    return true
+do
+  local os_rename = os.rename
+  os.rename = nil
+  os.remove = nil
+  function rename(from, to)
+    L(locheader(), "rename ", from, " ", to, "\n")
+    if exists(to) and not isdir(to) then
+      L("Destination ", to, " exists; removing...\n")
+      local ok, res = unlogged_remove(to)
+      if not ok then
+        L("Could not remove ", to, ": ", res, "\n")
+        return false
+      end
+    end
+    local ok,res = os_rename(from, to)
+    if not ok then
+      L(res, "\n")
+      return false
+    else
+      return true
+    end
   end
-end
-
-function remove(file)
-  L(locheader(), "remove ", file, "\n")
-  local ok,res = os.remove(file)
-  if ok == nil then
-    L(res, "\n")
-    return false
-  else
-    return true
+  function unlogged_rename(from, to)
+    if exists(to) and not isdir(to) then
+      unlogged_remove(to)
+    end
+    os_rename(from, to)
   end
+  unlogged_remove = remove_recursive
+  remove_recursive = nil
+  function remove(file)
+    L(locheader(), "remove ", file, "\n")
+    local ok,res = unlogged_remove(file)
+    if not ok then
+      L(res, "\n")
+      return false
+    else
+      return true
+    end
+  end
 end
 
-function rename_over(from, to)
-  remove(to)
-  return rename(from, to)
-end
 
-function getstdfile(name, as)
+function getstd(name, as)
   if as == nil then as = name end
-  copyfile(testdir .. "/" .. name, as)
+  return copy(testdir .. "/" .. name, as)
 end
 
-function getfile(name, as)
+function get(name, as)
   if as == nil then as = name end
-  getstdfile(test.name .. "/" .. name, as)
+  return getstd(test.name .. "/" .. name, as)
 end
 
 -- include from the main tests directory; there's no reason
@@ -256,12 +264,6 @@
   func()
 end
 
-function gettree(name, as)
-  if as == nil then as = name end
-  L(locheader(), "gettree(", name, ", ", as, ")\n")
-  copy_recursive(testdir.."/"..test.name.."/"..name, as)
-end
-
 function trim(str)
   return string.gsub(str, "^%s*(.-)%s*$", "%1")
 end
@@ -483,9 +485,9 @@
 function pre_cmd(stdin, ident)
   if ident == nil then ident = "ts-" end
   if stdin == true then
-    copyfile("stdin", ident .. "stdin")
+    unlogged_copy("stdin", ident .. "stdin")
   elseif type(stdin) == "table" then
-    copyfile(stdin[1], ident .. "stdin")
+    unlogged_copy(stdin[1], ident .. "stdin")
   else
     local infile = io.open(ident .. "stdin", "w")
     if stdin ~= nil and stdin ~= false then
@@ -524,8 +526,8 @@
       err("Check failed (stdout): doesn't match", 3)
     end
   elseif stdout == true then
-    os.remove("stdout")
-    os.rename(ident .. "stdout", "stdout")
+    unlogged_remove("stdout")
+    unlogged_rename(ident .. "stdout", "stdout")
   end
 
   if stderr == nil then
@@ -544,8 +546,8 @@
       err("Check failed (stderr): doesn't match", 3)
     end
   elseif stderr == true then
-    os.remove("stderr")
-    os.rename(ident .. "stderr", "stderr")
+    unlogged_remove("stderr")
+    unlogged_rename(ident .. "stderr", "stderr")
   end
 end
 
============================================================
--- tests/(minor)_add_own_db/__driver__.lua	1fb176fe6f10cb4b9976a595536c715d2b904323
+++ tests/(minor)_add_own_db/__driver__.lua	2efcf1ebd1c8317d96e361364438a3d8ad9953c2
@@ -16,7 +16,7 @@
 check(not qgrep("'test.db'", "stdout"))
 
 mkdir("subdir")
-copyfile("test.db", "subdir/test.db")
+copy("test.db", "subdir/test.db")
 
 check(mtn("--db=subdir/test.db", "add", "subdir/test.db"), 0, false, false)
 check(mtn("--db=subdir/test.db", "ls", "known"), 0, true, false)
============================================================
--- tests/(minor)_test_a_merge_3/__driver__.lua	d0fe9f78d0d218a6a740031db33bac03b5063a1c
+++ tests/(minor)_test_a_merge_3/__driver__.lua	f84d05f8d70913d42e06002383e2f310cd36e67a
@@ -6,9 +6,9 @@
 -- This is a real merge error -- it should be a clean merge, but it
 -- produces a conflict.
 
-getfile("ancestor")
-getfile("left")
-getfile("right")
+get("ancestor")
+get("left")
+get("right")
 
 anc = "4f7cfb26927467e9f2a37070edbb19785cbb2f2d"
 left = "adc1ca256e9313dd387448ffcd5cf7572eb58d8e"
@@ -18,14 +18,14 @@
 check(left == sha1("left"))
 check(right == sha1("right"))
 
-copyfile("ancestor", "stdin")
+copy("ancestor", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("left", "stdin")
+copy("left", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("right", "stdin")
+copy("right", "stdin")
 check(mtn("fload"), 0, false, false, true)
 
-getfile("merge.diff3")
+get("merge.diff3")
 
 xfail_if(true, mtn("fmerge", anc, left, right), 0, true, false)
 rename("stdout", "merge.monotone")
============================================================
--- tests/(minor)_test_a_merge_4/__driver__.lua	7a01317489a6c5c99bbdbcf11531d1110f9ffdd3
+++ tests/(minor)_test_a_merge_4/__driver__.lua	87751ae6a73cda17483736a7687a979d84c3fc9a
@@ -6,9 +6,9 @@
 -- This is a real merge error -- it should be a clean merge, but it
 -- produces a conflict.
 
-getfile("ancestor")
-getfile("left")
-getfile("right")
+get("ancestor")
+get("left")
+get("right")
 
 anc = "a2c50da63f01b242d8aaeb34d65e48edf0fef21b"
 left = "8d5a2273e0e3da4aa55ff731e7152a673b63f08a"
@@ -18,14 +18,14 @@
 check(left == sha1("left"))
 check(right == sha1("right"))
 
-copyfile("ancestor", "stdin")
+copy("ancestor", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("left", "stdin")
+copy("left", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("right", "stdin")
+copy("right", "stdin")
 check(mtn("fload"), 0, false, false, true)
 
-getfile("merge.diff3")
+get("merge.diff3")
 
 xfail_if(true, mtn("fmerge", anc, left, right), 0, true, false)
 rename("stdout", "merge.monotone")
============================================================
--- tests/(minor)_update_cleans_emptied_directories/__driver__.lua	6d91c357804f5a45addd1df316ec080e958af5e9
+++ tests/(minor)_update_cleans_emptied_directories/__driver__.lua	c6010182ca0b06e2f20bb0d91a31a2dcc00714a8
@@ -6,7 +6,7 @@
 commit()
 base = base_revision()
 
-remove_recursive("testdir")
+remove("testdir")
 check(mtn("drop", "testdir/foo", "testdir"), 0, false, false)
 commit()
 
============================================================
--- tests/(normal)_netsync_on_partially_unrelated_revisions/__driver__.lua	356482e7999f737c6c59ed8da992b0c32e971b8c
+++ tests/(normal)_netsync_on_partially_unrelated_revisions/__driver__.lua	79d37ed87fa40ba7e6e4a00fd5662b45dbaf3531
@@ -30,7 +30,7 @@
   check_same_stdout(mtn(unpack(i)), mtn2(unpack(i)))
 end
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("setup", "--branch=testbranch", "."), 0, false, false)
 
 addfile("testfile2", "This is test file 2")
============================================================
--- tests/--confdir_option_and_get_confdir_lua_function_work/__driver__.lua	5d267f0d0e7d1a52192c30ffa5a26f8fd09faeb8
+++ tests/--confdir_option_and_get_confdir_lua_function_work/__driver__.lua	7c1df2ddb2b991352cff6d4d615d7b86ae257b9f
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("myhooks")
+get("myhooks")
 mkdir("fooxyzzybar")
 check(mtn("--confdir=fooxyzzybar", "--rcfile=myhooks", "ls", "known"))
 check(exists("fooxyzzybar/checkfile"))
============================================================
--- tests/--rcfile=-/__driver__.lua	3d862d0597137e0beeb17b1eb0a36b6e9f355bf8
+++ tests/--rcfile=-/__driver__.lua	2c1f914cc9565f8c76c5f45ef4645e2b139065b6
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("foo.rc")
+get("foo.rc")
 
 addfile("testfile", "blah blah")
 check(mtn("--rcfile=-", "commit", "--message=foo", "--branch=testbranch"), 0, true, false, {"foo.rc"})
============================================================
--- tests/--rcfile=directory/__driver__.lua	bd0b57aa45e0fdefde34917ed6ce3908009c4543
+++ tests/--rcfile=directory/__driver__.lua	20ed24e06e34153036a2cf4e958cd1dd99618cc1
@@ -1,11 +1,11 @@
 
 mtn_setup()
 
 mkdir("gongolo")
 
 -- write two files and check that they will be invoked in alphabetic order
-getfile("aaa.rc", "gongolo/aaa.rc")
-getfile("bbb.rc", "gongolo/bbb.rc")
+get("aaa.rc", "gongolo/aaa.rc")
+get("bbb.rc", "gongolo/bbb.rc")
 
 -- note: rcfile is placed outside workdir
 check(mtn("setup", "--branch=testbranch", "alt_wrk"), 0, false, false)
@@ -13,6 +13,6 @@
 check(qgrep("BOOGA BOOGACICCA CICCA", "stdout"))
 
 -- write a third file: should be read beetween the two previous ones
-getfile("aba.rc", "gongolo/aba.rc")
+get("aba.rc", "gongolo/aba.rc")
 check(indir("alt_wrk", mtn("--root=.", "--rcfile=../gongolo", "status")), 0, true, false)
 check(qgrep("BOOGA BOOGAhu huCICCA CICCA", "stdout"))
============================================================
--- tests/_MTN_files_handled_correctly_in_aborted_commit/__driver__.lua	466c9431afb7310fd266aeba783a22612919b755
+++ tests/_MTN_files_handled_correctly_in_aborted_commit/__driver__.lua	00f69b645b52e4dcf5166820144edc420d025c10
@@ -10,11 +10,11 @@
 
 writefile("_MTN/log", "message message")
 
-copyfile("_MTN/log", "good_log")
-copyfile("_MTN/revision", "good_revision")
-copyfile("_MTN/work", "good_work")
+copy("_MTN/log", "good_log")
+copy("_MTN/revision", "good_revision")
+copy("_MTN/work", "good_work")
 
-getfile("bad_edit_comment.lua")
+get("bad_edit_comment.lua")
 
 check(mtn("commit", "--rcfile=bad_edit_comment.lua"), 1, false, false)
 
============================================================
--- tests/a_tricky_cvs_repository_with_tags/__driver__.lua	86561dd2f315e65a2a13a489c3a6bf2c28ed195d
+++ tests/a_tricky_cvs_repository_with_tags/__driver__.lua	1c16395c12eb76dd0fd026222c1e9014d944a27f
@@ -1,11 +1,11 @@
 
 mtn_setup()
 
-getfile("test.manifest")
+get("test.manifest")
 
-getfile("test.tags")
+get("test.tags")
 
-gettree("e")
+get("e")
 
 check(mtn("--branch=foo.bar", "cvs_import", "e"), 0, false, false)
 check(mtn("--branch=foo.bar", "co"))
============================================================
--- tests/add_workspace_commit_in_another/__driver__.lua	c15437969cd6f8c76c497cede0793c04d3a8ee8e
+++ tests/add_workspace_commit_in_another/__driver__.lua	a81224552103e58d81b3cbf94a4b1e780b6c846e
@@ -9,23 +9,23 @@
 
 writefile("initial", "some initial data")
 
-getfile("foo.alice")
+get("foo.alice")
 
-getfile("foo.bob")
+get("foo.bob")
 
 -- Alice does her add
 mkdir("alicewd")
-copyfile("initial", "alicewd/initial")
+copy("initial", "alicewd/initial")
 check(mtn("--branch=testbranch", "setup", "alicewd"), 0, false, false)
 check(indir("alicewd", mtn("--root=.", "add", "initial")), 0, false, false)
 check(indir("alicewd", mtn("--root=.", "commit", "-m", 'initial commit')), 0, false, false)
-copyfile("foo.alice", "alicewd/foo")
+copy("foo.alice", "alicewd/foo")
 check(indir("alicewd", mtn("add", "--root=.", "foo")), 0, false, false)
 -- Note, alice does not commit this add...
 
 -- Bob does add of same file, with edits, and commits
 check(mtn("--branch=testbranch", "checkout", "bobwd"), 0, false, false)
-copyfile("foo.bob", "bobwd/foo")
+copy("foo.bob", "bobwd/foo")
 check(indir("bobwd", mtn("--root=.", "add", "foo")), 0, false, false)
 check(indir("bobwd", mtn("--root=.", "commit", "-m", 'bob commit')), 0, false, false)
 rev = indir("bobwd", {base_revision})[1]()
============================================================
--- tests/annotate_file_added_on_different_forks/__driver__.lua	7132c73a634f4177341e425e7e1cc3e5d0587cb6
+++ tests/annotate_file_added_on_different_forks/__driver__.lua	5235141f09843a6ff639917ad5782dd82a0bd688
@@ -11,18 +11,18 @@
 base = base_revision()
 
 
-copyfile("foo.left", "foo")
+copy("foo.left", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 left = base_revision()
 
 revert_to(base)
-copyfile("foo.right", "foo")
+copy("foo.right", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 right = base_revision()
 
-getfile("merge2.lua")
+get("merge2.lua")
 
 xfail_if(true, mtn("--rcfile=merge2.lua", "merge"), 0, false, false)
 check(mtn("update"), 0, false, false)
============================================================
--- tests/annotate_file_on_multirooted_branch/__driver__.lua	bc707ef27d41d3772036e81d3d65c7688c4d3427
+++ tests/annotate_file_on_multirooted_branch/__driver__.lua	6575dd6e1ecd2648403fe82cb62d333b847e737b
@@ -13,21 +13,21 @@
 writefile("foo.left",  "z\na\nb\nx\n")
 writefile("foo.right", "z\nj\nk\nx\n")
 
-copyfile("foo.left", "foo")
+copy("foo.left", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 left = base_revision()
 
 remove("foo")
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("setup", "--branch=testbranch", "."))
 
-copyfile("foo.right", "foo")
+copy("foo.right", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 right = base_revision()
 
-getfile("merge2.lua")
+get("merge2.lua")
 
 xfail_if(true, mtn("--rcfile=merge2.lua", "merge"), 0, false, false)
 check(mtn("update"), 0, false, false)
============================================================
--- tests/annotate_file_whose_name_changed/__driver__.lua	af2dddf5eeb4e8ba59c4860b8de03f92c217ce3b
+++ tests/annotate_file_whose_name_changed/__driver__.lua	8998c67ca849dbc5a4839716cc15997c8308e38e
@@ -15,7 +15,7 @@
 revs.left = base_revision()
 
 revert_to(revs.base)
-copyfile("foo.rightnewname", "foo")
+copy("foo.rightnewname", "foo")
 check(mtn("rename", "-e", "foo", "foo.new"), 0, false, false)
 commit()
 revs.right = base_revision()
============================================================
--- tests/annotate_where_line_splits/__driver__.lua	c046225903e7f31d84fb5e554343d36cfaf5d2f1
+++ tests/annotate_where_line_splits/__driver__.lua	9e4e1a805973cec3a8a1c10ccc758fae561ca073
@@ -14,23 +14,23 @@
 -- ident
 -- d
 
-getfile("merge.lua")
+get("merge.lua")
 
 
-copyfile("foo.A", "foo")
+copy("foo.A", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 revs.a = base_revision()
 L("revs.a = ", revs.a, "\n")
 
-copyfile("foo.B", "foo")
+copy("foo.B", "foo")
 commit()
 revs.b = base_revision()
 L("revs.b = ", revs.b, "\n")
 
 revert_to(revs.a)
 
-copyfile("foo.C", "foo")
+copy("foo.C", "foo")
 commit()
 revs.c = base_revision()
 L("revs.c = ", revs.c, "\n")
============================================================
--- tests/annotate_where_lineage_depends_on_traversal/__driver__.lua	53cd0f6f35b9494b6722d1351c283d982b4c1107
+++ tests/annotate_where_lineage_depends_on_traversal/__driver__.lua	42ab2e100ff887916530e10aa6cc818126102d6c
@@ -13,23 +13,23 @@
 -- e
 -- added line
 
-getfile("merge.lua")
+get("merge.lua")
 
 
-copyfile("foo.A", "foo")
+copy("foo.A", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 revs.a = base_revision()
 L("revs.a = ", revs.a, "\n")
 
-copyfile("foo.B", "foo")
+copy("foo.B", "foo")
 commit()
 revs.b = base_revision()
 L("revs.b = ", revs.b, "\n")
 
 revert_to(revs.a)
 
-copyfile("foo.C", "foo")
+copy("foo.C", "foo")
 commit()
 revs.c = base_revision()
 L("revs.c = ", revs.c, "\n")
============================================================
--- tests/annotate_where_one_parent_is_full_copy/__driver__.lua	e9ba290d9c0024f58932e9235960e4a4fb3dc33a
+++ tests/annotate_where_one_parent_is_full_copy/__driver__.lua	dad25bc74f825255803a4f96a56520e2da4ca4b7
@@ -16,18 +16,18 @@
 -- C == A
 -- D == B
 
-copyfile("A", "foo")
+copy("A", "foo")
 addfile("initialfile", "foo\nfile\n")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 revs.a = base_revision()
 
-copyfile("B", "foo")
+copy("B", "foo")
 commit()
 revs.b = base_revision()
 
 revert_to(revs.a)
-copyfile("A", "initialfile")
+copy("A", "initialfile")
 commit()
 revs.c = base_revision()
 
============================================================
--- tests/attr_init_functions/__driver__.lua	506aba1a2b1799d9ad62c2d43df6bd0d9dc307bb
+++ tests/attr_init_functions/__driver__.lua	e5fa7d2e14317799d9287c2bfa51526c57e9ab3a
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("hook.lua")
+get("hook.lua")
 
 writefile("testfile", "foo")
 check(mtn("--rcfile=hook.lua", "add", "testfile"), 0, false, false)
============================================================
--- tests/attr_set_get_commands/__driver__.lua	5fa53a0df58c2faed1ba6d76646e39f6a62c0318
+++ tests/attr_set_get_commands/__driver__.lua	e5473b58e745501b6697ad691536d228bf04f420
@@ -18,13 +18,13 @@
 update_r_sha1 = base_revision()
 
 -- Check checkouts.
-remove_recursive("co-dir")
+remove("co-dir")
 check(mtn("checkout", "--revision", co_r_sha1, "co-dir"), 0, true)
 check(qgrep("test:test_attr:foo:true", "stdout"))
 check(qgrep("test:test_attr:a:1", "stdout"))
 
 -- Check updates.
-remove_recursive("co-dir")
+remove("co-dir")
 check(mtn("checkout", "--revision", update_r_sha1, "co-dir"), 0, true)
 check(not qgrep("test:test_attr:foo", "stdout"))
 check(qgrep("test:test_attr:a:2", "stdout"))
============================================================
--- tests/automate_certs/__driver__.lua	53f81a0517365da4a4ce52b6b581a23603c0175e
+++ tests/automate_certs/__driver__.lua	344638c83e86d66ed5360e0850997994e25fdaba
@@ -1,8 +1,8 @@
 
 mtn_setup()
 revs = {}
 
-getfile("expected")
+get("expected")
 
 writefile("empty", "")
 
============================================================
--- tests/automate_get_manifest_of/__driver__.lua	c3fcb95aae09cea5b3017ad98965b4fcf1b743cc
+++ tests/automate_get_manifest_of/__driver__.lua	8a6d9ce100cbe23fc236b8cf9d4a1e2a6901b713
@@ -1,8 +1,8 @@
 
 mtn_setup()
 
-getfile("expected")
-getfile("expected2")
+get("expected")
+get("expected2")
 
 addfile("foo", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
============================================================
--- tests/automate_get_revision/__driver__.lua	b5cf65b106d39eba23690f7721ed12e1a1a4618c
+++ tests/automate_get_revision/__driver__.lua	6d46ccc10217fe41ca36052d22c898b39ab18a05
@@ -1,8 +1,8 @@
 
 mtn_setup()
 
-getfile("expected")
-getfile("expected2")
+get("expected")
+get("expected2")
 
 addfile("foo", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
============================================================
--- tests/automate_stdio/__driver__.lua	b6715d0c442e5080dffd611d0551ad01ff43994f
+++ tests/automate_stdio/__driver__.lua	56f4bbe463ab7f5f88ee45e3b7add9531fc6d732
@@ -21,6 +21,6 @@
 
 check(mtn("automate", "inventory"), 0, true, false)
 canonicalize("stdout")
-rename_over("stdout", "output")
+rename("stdout", "output")
 check(mtn("automate", "stdio"), 0, true, false, "l9:inventorye")
 check(parse_stdio(readfile("stdout"), 0) == readfile("output"))
============================================================
--- tests/branch-based_checkout/__driver__.lua	90dc840151263a46c883a9a489dfbb8ee279a16a
+++ tests/branch-based_checkout/__driver__.lua	384a294956c18d63bd7ff5cb19d9a72692d9c947
@@ -1,14 +1,14 @@
 
 mtn_setup()
 
 writefile("foo.testbranch", "this is the testbranch version")
 writefile("foo.otherbranch", "this version goes in otherbranch")
 
-copyfile("foo.testbranch", "foo")
+copy("foo.testbranch", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 
-copyfile("foo.otherbranch", "foo")
+copy("foo.otherbranch", "foo")
 commit("otherbranch")
 
 check(mtn("--branch=testbranch", "checkout"), 0, false, false)
============================================================
--- tests/calculation_of_other_unidiffs/__driver__.lua	8ef9ea4938ad4817028e9193a82405b544eedcb7
+++ tests/calculation_of_other_unidiffs/__driver__.lua	46b8608d9038ba9bedca0c8377885760b63a9f5c
@@ -1,18 +1,18 @@
 
 mtn_setup()
 
 -- I don't get it. This seems to work, but WTF is that qgrep looking for?
 
 -- decode first file and commit to db
-getfile("firstfile", "testfile")
+get("firstfile", "testfile")
 addfile("testfile")
 commit()
-os.rename("testfile", "firstfile")
+rename("testfile", "firstfile")
 
 -- calculate diff to second file using monotone
-getfile("secondfile", "testfile")
+get("secondfile", "testfile")
 check(mtn("diff"), 0, true)
-os.rename("stdout", "monodiff")
+rename("stdout", "monodiff")
 
 -- look for a meaningless change
 check(not qgrep("^-$", "monodiff"))
============================================================
--- tests/calculation_of_unidiffs/__driver__.lua	c670daa765bad08b28e1c8b2fe6ae7b0159153a7
+++ tests/calculation_of_unidiffs/__driver__.lua	cb4a71eb9198d07f3acf20121bed8c951a7e0140
@@ -1,16 +1,16 @@
 
 skip_if(not existsonpath("patch"))
 
 mtn_setup()
 
 -- get first file and commit to db
-getfile("firstfile", "testfile")
+get("firstfile", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 rename("testfile", "firstfile")
 
 -- get second file
-getfile("secondfile", "testfile")
+get("secondfile", "testfile")
 
 -- calculate diff to second file using monotone
 check(mtn("diff"), 0, true)
============================================================
--- tests/can_execute_things/__driver__.lua	7e946cf7d485ac9ab5cb9d231a3d544a4a555292
+++ tests/can_execute_things/__driver__.lua	b679678b80b65e6c6ae604e8d00fba852d4ad071
@@ -1,11 +1,11 @@
 
 if existsonpath("cp") then
-  getfile("nix-cphook.lua", "cphook.lua")
+  get("nix-cphook.lua", "cphook.lua")
 elseif existsonpath("xcopy") then
   -- This actually copies it to testfile.copied/testfile,
   -- but that still makes testfile.copied exists. So it's
   -- not exactly the same as the other hook, but it works.
-  getfile("win-cphook.lua", "cphook.lua")
+  get("win-cphook.lua", "cphook.lua")
 else
   skip_if(true)
 end
============================================================
--- tests/cat_-r_REV_PATH/__driver__.lua	ff8cbb19e14aab453d2e9209ef30837b48d76b13
+++ tests/cat_-r_REV_PATH/__driver__.lua	1a7604541146055aabc8e19bfe8847515e8ae599
@@ -7,15 +7,15 @@
 writefile("r1testfile", "r1 test file")
 writefile("subfile", "data in subfile")
 
-copyfile("r0testfile", "testfile")
-copyfile("r0otherfile", "otherfile")
+copy("r0testfile", "testfile")
+copy("r0otherfile", "otherfile")
 mkdir("subdir")
-copyfile("subfile", "subdir/testfile")
+copy("subfile", "subdir/testfile")
 check(mtn("add", "testfile", "otherfile", "subdir/testfile"), 0, false, false)
 commit()
 revs[0] = base_revision()
 
-copyfile("r1testfile", "testfile")
+copy("r1testfile", "testfile")
 commit()
 revs[1] = base_revision()
 
@@ -34,7 +34,7 @@
 check(indir("subdir", mtn("cat", "-r", revs[0], "testfile")), 0, true, false)
 check(samefile("stdout", "subfile"))
 
-remove_recursive("_MTN")
+remove("_MTN")
 
 check(mtn("cat", "-r", revs[0], "testfile"), 0, true, false)
 check(samefile("stdout", "r0testfile"))
============================================================
--- tests/check_automate_select/__driver__.lua	4dc5db986595c5884649c0fd5891f3efe9d2e202
+++ tests/check_automate_select/__driver__.lua	8ad3f76b5621290471761b3ce407dd536bf4b7fa
@@ -1,19 +1,19 @@
 
 mtn_setup()
 revs = {}
 
 addfile("testfile", "this is just a file")
-copyfile("testfile", "testfile1")
+copy("testfile", "testfile1")
 commit()
 revs.first = base_revision()
 
 writefile("testfile", "Now, this is a different file")
-copyfile("testfile", "testfile2")
+copy("testfile", "testfile2")
 commit()
 revs.second = base_revision()
 
 writefile("testfile", "And we change it a third time")
-copyfile("testfile", "testfile3")
+copy("testfile", "testfile3")
 commit()
 
 check(mtn("cert", revs.first, "testcert", 'value=with=equal=signs'))
============================================================
--- tests/check_later_and_earlier_selectors/__driver__.lua	f3d70f749d65fd0e10b3bd30f7e0740260bab6de
+++ tests/check_later_and_earlier_selectors/__driver__.lua	2031d0dab707632b8d11460c7bde09f60df08b95
@@ -1,21 +1,21 @@
 
 mtn_setup()
 revs = {}
 
 addfile("testfile", "this is just a file")
-copyfile("testfile", "testfile1")
+copy("testfile", "testfile1")
 check(mtn("commit", "--date=2005-03-11T20:33:01", "--branch=foo",
           "--message=march"), 0, false, false)
 revs.first = base_revision()
 
 writefile("testfile", "Now, this is a different file")
-copyfile("testfile", "testfile2")
+copy("testfile", "testfile2")
 check(mtn("commit", "--date=2005-04-22T12:15:00", "--branch=foo",
           "--message=aprila"), 0, false, false)
 revs.second = base_revision()
 
 writefile("testfile", "And we change it a third time")
-copyfile("testfile", "testfile3")
+copy("testfile", "testfile3")
 check(mtn("commit", "--date=2005-04-24T07:44:39", "--branch=foo",
           "--message=aprilb"), 0, false, false)
 revs.third = base_revision()
============================================================
--- tests/check_same_db_contents_macro/__driver__.lua	cec4d0b7f5781b8f6022176ec4be5a9f234a18dc
+++ tests/check_same_db_contents_macro/__driver__.lua	cbfa38742506d1d4496327a2fabae6112858ea0a
@@ -10,7 +10,7 @@
 addfile("testfile2", "foo")
 commit("testbranch2")
 
-copyfile("test.db", "test2.db")
+copy("test.db", "test2.db")
 check_same_db_contents("test.db", "test2.db")
 
 addfile("testfile3", "pizza")
============================================================
--- tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua	81d1c7a8f2c1344bf65b41964dbeb2337c0b1b0b
+++ tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua	993f961fc99620804e7fa9108831080c375dafa9
@@ -28,6 +28,6 @@
 
 -- Check that -@ works with an argument file with no content
 check(raw_mtn("list"), 2, true, false)
-rename_over("stdout", "expout")
+rename("stdout", "expout")
 writefile("at_test.input")
 check(raw_mtn("list", "-@", "at_test.input"), 2, {"expout"}, false)
============================================================
--- tests/checkout_creates__MTN_log/__driver__.lua	fa6cdde15c67e65653df35d3ae90e68da70ff8ac
+++ tests/checkout_creates__MTN_log/__driver__.lua	92ef69d908f0871f2b2beb023044b386a677043f
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("commit_log.lua")
+get("commit_log.lua")
 
 writefile("_MTN/log", "Log entry")
 
============================================================
--- tests/checkout_without_--branch_sets_branch/__driver__.lua	55205d7fcc2a2c748f7ae9264dee34a0fb2e54e0
+++ tests/checkout_without_--branch_sets_branch/__driver__.lua	cb9454891ca21ada23cd35827a873403eb81a99b
@@ -15,7 +15,7 @@
 
 -- but, now we can't checkout without a --branch...
 -- need to make sure don't pick up branch from our local _MTN dir...
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("checkout", "--revision", rev, "codir2"), 1, false, false)
 check(mtn("checkout", "--revision", rev, "--branch=testbranch", "codir3"), 0, false, false)
 check(samefile("foo", "codir3/foo"))
============================================================
--- tests/commit_using__MTN_log/__driver__.lua	c85f9af921ff17ea15565e628dc199fbd892700c
+++ tests/commit_using__MTN_log/__driver__.lua	22b336757f3ff27337c8e661e378d999d2bdc58e
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("commit_log.lua")
+get("commit_log.lua")
 
 writefile("_MTN/log", "Log entry")
 
============================================================
--- tests/commit_using__MTN_log_and_--message/__driver__.lua	110e07dd7fd06bf5141a84c31d573af8af512c2d
+++ tests/commit_using__MTN_log_and_--message/__driver__.lua	f29c77197cf0ee4840b77d4c7a2bbc5e25507b5a
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("commit_log.lua")
+get("commit_log.lua")
 
 writefile("_MTN/log", "Log entry")
 
============================================================
--- tests/commit_validation_lua_hook/__driver__.lua	8d908341efb7b63c728bafb62d002157d01647dd
+++ tests/commit_validation_lua_hook/__driver__.lua	0286ba5854ff51e8b9f89508376a4e3070822e45
@@ -1,12 +1,12 @@
 
 mtn_setup()
 
-getfile("commit_validate.lua")
+get("commit_validate.lua")
 
 writefile("input.txt", "version 0 of the file")
 
 check(mtn("add", "input.txt"), 0, false, false)
-getfile("errmsg")
+get("errmsg")
 check(mtn("--branch=testbranch", "--rcfile=commit_validate.lua", "commit", "-m", "denyme"), 1, false, true)
 canonicalize("stderr")
 check(samefile("errmsg", "stderr"))
============================================================
--- tests/commit_with_--message-file/__driver__.lua	d91fb65c3bb372749170c9c321d3bafb4c34de87
+++ tests/commit_with_--message-file/__driver__.lua	c210f8a4955e2092e531db0ba677821410032583
@@ -52,7 +52,7 @@
 -- finally, --message-file and a filled _MTN/log should also fail
 -- --------------------
 
-getfile("commit_log.lua")
+get("commit_log.lua")
 
 writefile("_MTN/log", "Log entry")
 
============================================================
--- tests/commit_writes_message_back_to__MTN_log/__driver__.lua	3adbe4d65dff675b450922a3a49273c17126881a
+++ tests/commit_writes_message_back_to__MTN_log/__driver__.lua	ee68603f211568c109e200616cc09f9c22926145
@@ -9,13 +9,13 @@
 -- work?  Well, it did...)
 check({"chmod", "a-w", "test.db"})
 
-getfile("my_hook.lua")
+get("my_hook.lua")
 
 check(mtn("commit", "-btestbranch", "--rcfile=my_hook.lua"), 1, false, false)
 
 check(samelines("_MTN/log", {"foobar"}))
 
-remove_recursive("_MTN/log")
+remove("_MTN/log")
 writefile("_MTN/log", "")
 
 -- -m messages don't get written out to _MTN/log
============================================================
--- tests/common/netsync.lua	f56b506a2c31f495a53090f29bcb7c44aeab98cf
+++ tests/common/netsync.lua	b027de95b84d694bea4eb0c5ae476ef6b4d12d51
@@ -11,17 +11,17 @@
 netsync.internal = {}
 
 function netsync.setup()
-  copyfile("test.db", "test2.db")
-  copy_recursive("keys", "keys2")
-  copyfile("test.db", "test3.db")
-  copy_recursive("keys", "keys3")
-  getstdfile("common/netsync-hooks.lua", "netsync.lua")
+  copy("test.db", "test2.db")
+  copy("keys", "keys2")
+  copy("test.db", "test3.db")
+  copy("keys", "keys3")
+  check(getstd("common/netsync-hooks.lua", "netsync.lua"))
   math.randomseed(os.time())
 end
 
 function netsync.setup_with_notes()
   netsync.setup()
-  getstdfile("common/netsync-hooks_with_notes.lua", "netsync.lua")
+  check(getstd("common/netsync-hooks_with_notes.lua", "netsync.lua"))
 end
 
 function netsync.internal.client(srv, oper, pat, n, res)
============================================================
--- tests/creating_a_bad_criss-cross_merge/__driver__.lua	997c41fef50984e7609e886835e256ef3c8cca8a
+++ tests/creating_a_bad_criss-cross_merge/__driver__.lua	6eb3147403f2a71b057fd55be0a23474c2b7955a
@@ -26,8 +26,8 @@
 -- keys (bob and alice) that don't trust each other so that they can
 -- produce two different merge results
 
-getfile("bob.lua")
-getfile("alice.lua")
+get("bob.lua")
+get("alice.lua")
 
 function bob (...)
   return raw_mtn("--rcfile=test_hooks.lua", "--rcfile=bob.lua",
@@ -45,14 +45,14 @@
 
 
 -- construct ancestor
-copyfile("shared.anc", "shared")
+copy("shared.anc", "shared")
 addfile("shared")
 commit()
 root_r_sha = base_revision()
 root_f_sha = sha1("shared")
 
 -- construct left node
-copyfile("shared.left", "shared")
+copy("shared.left", "shared")
 addfile("specific.left")
 commit()
 left_r_sha = base_revision()
@@ -64,7 +64,7 @@
 revert_to(root_r_sha)
 
 -- construct right node
-copyfile("shared.right", "shared")
+copy("shared.right", "shared")
 addfile("specific.right")
 commit()
 right_r_sha = base_revision()
============================================================
--- tests/creating_a_fork_and_merging/__driver__.lua	aabf962e9dd0ecff78c86288fdf3f2c57e231844
+++ tests/creating_a_fork_and_merging/__driver__.lua	1fa1ba4f5423b9257e70db51d8f4a8cfff9f965f
@@ -6,13 +6,13 @@
 -- works in the context of the "merge" command, not just the "update"
 -- command.
 
-getfile("origfile", "testfile")
+get("origfile", "testfile")
 addfile("testfile")
 commit()
 root_r_sha = base_revision()
 root_f_sha = sha1("testfile")
 
-getfile("firstinsert", "testfile")
+get("firstinsert", "testfile")
 commit()
 left_r_sha = base_revision()
 left_f_sha = sha1("testfile")
@@ -21,7 +21,7 @@
 
 probe_node("testfile", root_r_sha, root_f_sha)
 
-getfile("secondinsert", "testfile")
+get("secondinsert", "testfile")
 commit()
 right_r_sha = base_revision()
 right_f_sha = sha1("testfile")
@@ -38,5 +38,5 @@
 check(not qgrep("empty", "stdout"))
 
 -- files should now be merged
-getfile("bothinsert", "probe")
+get("bothinsert", "probe")
 check(samefile("testfile", "probe"))
============================================================
--- tests/creating_a_fork_and_updating/__driver__.lua	213098c02d50942968283ae5a5bc10a1569ad651
+++ tests/creating_a_fork_and_updating/__driver__.lua	91fe706d84091844089ee3d7c77696d0986ca4ce
@@ -5,13 +5,13 @@
 -- the fork; instead, it updates, and (in theory) shifts from right to
 -- merged-with-left
 
-getfile("origfile", "testfile")
+get("origfile", "testfile")
 addfile("testfile")
 commit()
 root_r_sha = base_revision()
 root_f_sha = sha1("testfile")
 
-getfile("firstinsert", "testfile")
+get("firstinsert", "testfile")
 commit()
 left_r_sha = base_revision()
 left_f_sha = sha1("testfile")
@@ -21,12 +21,12 @@
 probe_node("testfile", root_r_sha, root_f_sha)
 
 
-getfile("secondinsert", "testfile")
+get("secondinsert", "testfile")
 
 check(mtn("update"), 0, false, false)
 
 -- files should now be merged
 
-getfile("bothinsert", "probe")
+get("bothinsert", "probe")
 
 check(samefile("testfile", "probe"))
============================================================
--- tests/creating_a_good_and_bad_test_result/__driver__.lua	28c620730a25c24afa3ad4000ad74f2ba6e54c13
+++ tests/creating_a_good_and_bad_test_result/__driver__.lua	8a63a3152efde458e234440796573b73f6aa7a23
@@ -1,20 +1,20 @@
 
 mtn_setup()
 
-getfile("root", "testfile")
+get("root", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 root_r_sha = base_revision()
 root_f_sha = sha1("testfile")
 
-getfile("good", "testfile")
+get("good", "testfile")
 commit()
 left_good_r_sha = base_revision()
 left_good_f_sha = sha1("testfile")
 check(left_good_r_sha ~= root_r_sha)
 check(left_good_f_sha ~= root_f_sha)
 
-getfile("bad", "testfile")
+get("bad", "testfile")
 commit()
 left_bad_r_sha = base_revision()
 left_bad_f_sha = sha1("testfile")
@@ -23,7 +23,7 @@
 
 probe_node("testfile", root_r_sha, root_f_sha)
 
-getfile("work", "testfile")
+get("work", "testfile")
 check(mtn("testresult", root_r_sha, "1"), 0, false, false)
 check(mtn("testresult", left_good_r_sha, "1"), 0, false, false)
 check(mtn("testresult", left_bad_r_sha, "0"), 0, false, false)
@@ -31,5 +31,5 @@
 
 -- files should now be merged
 
-getfile("final", "probe")
+get("final", "probe")
 check(samefile("testfile", "probe"))
============================================================
--- tests/cvs_import,_deleted_file_invariant/__driver__.lua	cd41da4b2edee3b1458d06624580624aff8ce54d
+++ tests/cvs_import,_deleted_file_invariant/__driver__.lua	9a74ac067c269956789effbb9caeffd10bf6ebad
@@ -1,10 +1,10 @@
 
 include("/common/cvs.lua")
 mtn_setup()
 
 cvs_setup()
 
-gettree("attest", cvsroot.."/attest")
+get("attest", cvsroot.."/attest")
 
 check(cvs("co", "-rABC_BASE", "attest"), 0, false, false)
 tsha0 = sha1("attest/afile")
============================================================
--- tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua	dce710af9d7414029aeef8690593f64fbfc5344e
+++ tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua	fc26f99ea5f7acbdad0f64bf86bcd4366e7f13f2
@@ -1,10 +1,10 @@
 
 include("/common/cvs.lua")
 mtn_setup()
 cvs_setup()
 
 mkdir(cvsroot.."/attest")
-getfile("cvsfile,v", cvsroot.."/attest/cvsfile,v")
+get("cvsfile,v", cvsroot.."/attest/cvsfile,v")
 
 check(cvs("co", "-rABC_BASE", "attest"), 0, false, false)
 tsha = sha1("attest/cvsfile")
============================================================
--- tests/cvs_import_with_file_added_on_a_branch/__driver__.lua	f3b915b179ae6001411ef031129e1b3116bf25ee
+++ tests/cvs_import_with_file_added_on_a_branch/__driver__.lua	ada42479e819222ba0659a2e5d5876b1a9f89263
@@ -11,7 +11,7 @@
 mkdir("src")
 writefile("src/foo", "foo")
 check(indir("src", cvs("import", "-m", "import", "mod", "vtag", "rtag")), 0, false, false)
-remove_recursive("src")
+remove("src")
 mkdir("src")
 check(indir("src", cvs("co", "mod")), 0, false, false)
 check(indir("src/mod", cvs("tag", "-b", "branch")), 0, false, false)
============================================================
--- tests/database_check/__driver__.lua	4d73c49472d143e5e414f793e50a336b5d1d3d24
+++ tests/database_check/__driver__.lua	8eb9d94d3238156ef701594a3b8a4c1fa0993640
@@ -53,7 +53,7 @@
 
 
 -- add an unreferenced file
-copyfile("fileX", "stdin")
+copy("fileX", "stdin")
 check(mtn("fload"), 0, false, false, true)
 -- create an unreferenced roster by deleting the revision. Note that this will increment
 -- the "missing revision" count by one for further checks
============================================================
--- tests/database_check_for_normalization/__driver__.lua	bc6bb094618990a3a1f38144ed81febadc860ce4
+++ tests/database_check_for_normalization/__driver__.lua	58501c2796792748edb740e191e8049eb1d0c057
@@ -15,7 +15,7 @@
 
 mtn_setup()
 
-getfile("bad.db")
+get("bad.db")
 
 check(mtn("db", "migrate", "-d", "bad.db"), 0, false, false)
 
============================================================
--- tests/db_data_format_checking/__driver__.lua	03085676c219d57aba4fbc8c1d8f840632988a62
+++ tests/db_data_format_checking/__driver__.lua	a6a73d9bd74f7dae88a7093e0321bf958ea15b0d
@@ -8,7 +8,7 @@
 -- be run.  This test makes sure that monotone exits with an error if
 -- given a db that appears to be very old.
 
-getfile("changesetify.db.dumped", "stdin")
+get("changesetify.db.dumped", "stdin")
 check(mtn("-d", "cs-modern.db", "db", "load"), 0, false, false, true)
 check(mtn("-d", "cs-modern.db", "db", "migrate"), 0, false, false)
 
@@ -16,7 +16,7 @@
 check(mtn("-d", "cs-modern.db", "serve", "--bind=127.0.0.1:63219", '*'), 1, false, false)
 
 
-getfile("rosterify.db.dumped", "stdin")
+get("rosterify.db.dumped", "stdin")
 check(mtn("-d", "ro-modern.db", "db", "load"), 0, false, false, true)
 check(mtn("-d", "ro-modern.db", "db", "migrate"), 0, false, false)
 
============================================================
--- tests/db_load_must_create_a_new_db/__driver__.lua	bc64c2372001fc1e56dcb48b77ecea82e8483511
+++ tests/db_load_must_create_a_new_db/__driver__.lua	34b3b8a14f37f21b1cfbbdd51a4e76fa4aacc9e0
@@ -7,13 +7,13 @@
 check(mtn("db", "dump"), 0, true, false)
 canonicalize("stdout")
 rename("stdout", "dump")
-copyfile("dump", "stdin")
+copy("dump", "stdin")
 check(mtn("--db=test2.db", "db", "load"), 0, false, false, true)
 
 mkdir("test3.db")
-copyfile("dump", "stdin")
+copy("dump", "stdin")
 check(mtn("--db=test3.db", "db", "load"), 1, false, false, true)
 
 check(mtn("--db=test4.db", "db", "init"), 0, false, false)
-copyfile("dump", "stdin")
+copy("dump", "stdin")
 check(mtn("--db=test4.db", "db", "load"), 1, false, false, true)
============================================================
--- tests/db_rosterify_preserves_renames/__driver__.lua	2f92e22a54b4ed4f7f8b21b4482f96484ffa215f
+++ tests/db_rosterify_preserves_renames/__driver__.lua	0fd41cfdd913969381975a3edcaa10bfa78d86f3
@@ -1,7 +1,7 @@
 
 mtn_setup()
 remove("test.db")
-getfile("test.db.dumped", "stdin")
+get("test.db.dumped", "stdin")
 check(mtn("db", "load"), 0, false, false, true)
 check(mtn("db", "migrate"), 0, false, false)
 check(mtn("db", "rosterify"), 0, false, false)
@@ -14,6 +14,6 @@
 end
 
 -- check the second revision
-getfile("expout")
+get("expout")
 check(mtn("automate", "get_revision", revs[2]), 0, true)
 check(samefile("stdout", "expout"))
============================================================
--- tests/delete_work_file_on_checkout/__driver__.lua	82d14343e33b5119bf3d739e4ca89b446d2a9e06
+++ tests/delete_work_file_on_checkout/__driver__.lua	375bcc6241f69acbe6d11b2d0ffcb4d2c08e391d
@@ -7,6 +7,6 @@
 v1 = base_revision()
 addfile("testfile1")
 check(exists("_MTN/work"))
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("checkout", "--revision", v1, "."), 0, false, false)
 check(not exists("_MTN/work"))
============================================================
--- tests/diff_--external/__driver__.lua	411e14004692d964f3b8c5f170702e617cb55994
+++ tests/diff_--external/__driver__.lua	92b47217766c1368bc6f1bae832310ec56efb605
@@ -1,15 +1,15 @@
 
 mtn_setup()
 
 addfile("testfile", "foo bar")
 commit()
 old = sha1("testfile")
-copyfile("testfile", "old_testfile")
+copy("testfile", "old_testfile")
 
 writefile("testfile", "stuff stuff")
 new = sha1("testfile")
 
-getfile("testhook.lua")
+get("testhook.lua")
 
 check(mtn("--rcfile=testhook.lua", "diff", "--external"), 0, true, false)
 canonicalize("stdout")
============================================================
--- tests/diff_a_binary_file/__driver__.lua	503002e82542225d30db3f1d366dd02bfb84ea9d
+++ tests/diff_a_binary_file/__driver__.lua	df125fd2f59b5e46c7b44eb1ba8cc5cc142bb883
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("binary")
+get("binary")
 
 check(mtn("add", "binary"), 0, false, false)
 check(mtn("status"), 0, false, false)
============================================================
--- tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua	a1cb0c55b523bb0d7aad0ff7e011f8651ff8ca12
+++ tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua	37a11a3d4bfc9e8834027965eb7c17dfe9441ba6
@@ -12,7 +12,7 @@
 commit()
 second = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("diff", "--revision", parent, "--revision", second), 0, false, false)
 -- check it works when specifying files
 check(mtn("diff", "--revision", parent, "--revision", second, "foo2"), 0, false, false)
============================================================
--- tests/disallowing_persistence_of_passphrase/__driver__.lua	97caa9c3d7ad9ea19bd32bc45b812e38a94b7917
+++ tests/disallowing_persistence_of_passphrase/__driver__.lua	907d58d645f4844cd0b602b9f3a3cb22e6a6c6ed
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("persist.lua")
+get("persist.lua")
 
 addfile("input.txt", "version 0 of the file")
 writefile("input.txt", "version 1 of the file")
============================================================
--- tests/disapproving_of_a_revision/__driver__.lua	45496133759ae45e279b3e4c45f5325597d59e0b
+++ tests/disapproving_of_a_revision/__driver__.lua	467707301c2b95268a70b6cbc244ebe6abd45120
@@ -1,20 +1,20 @@
 
 mtn_setup()
 
-getfile("rootfile", "testfile")
+get("rootfile", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 root_r_sha = base_revision()
 root_f_sha = sha1("testfile")
 
-getfile("goodfile", "testfile")
+get("goodfile", "testfile")
 commit()
 left_good_r_sha = base_revision()
 left_good_f_sha = sha1("testfile")
 check(left_good_r_sha ~= root_r_sha)
 check(left_good_f_sha ~= root_f_sha)
 
-getfile("badfile", "testfile")
+get("badfile", "testfile")
 commit()
 left_bad_r_sha = base_revision()
 left_bad_f_sha = sha1("testfile")
@@ -23,11 +23,11 @@
 
 probe_node("testfile", root_r_sha, root_f_sha)
 
-getfile("updatefile", "testfile")
+get("updatefile", "testfile")
 check(mtn("disapprove", left_bad_r_sha), 0, false, false)
 check(mtn("update"), 0, false, false)
 
 -- files should now be merged
 
-getfile("finalfile", "probe")
+get("finalfile", "probe")
 check(samefile("testfile", "probe"))
============================================================
--- tests/drop_a_public_key/__driver__.lua	64c38cebf336034965302baefa2efbb5ee3867f3
+++ tests/drop_a_public_key/__driver__.lua	2d4e44b8f06a77243c0e7cba55038e8e73af9ba5
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("pubkey.txt", "stdin")
+get("pubkey.txt", "stdin")
 
 check(mtn("read"), 0, false, false, true)
 
============================================================
--- tests/drop_missing_and_unknown_files/__driver__.lua	6460ea6a3b90bbe432ef53dd9774c8d01dfbe0f2
+++ tests/drop_missing_and_unknown_files/__driver__.lua	56107612c8f75868ae090a8bf379bde522026922
@@ -7,7 +7,7 @@
 addfile("places/cemetery", "the place file cemetery")
 commit()
 
-os.remove("maude")
+remove("maude")
 
 check(mtn("drop", "maude"), 0, false, true)
 check(qgrep('dropping maude from workspace manifest', "stderr"))
@@ -20,8 +20,8 @@
 check(mtn("drop", "foobar"), 0, false, true)
 check(qgrep("skipping foobar", "stderr"))
 
-os.remove("harold")
-os.remove("places/cemetery")
+remove("harold")
+remove("places/cemetery")
 
 check(mtn("drop", "--missing"), 0, false, true)
 check(qgrep('dropping harold from workspace manifest', "stderr"))
============================================================
--- tests/empty_environment/__driver__.lua	0bc59bbb2475e7185ce3f0f7eee7c6351b7871d3
+++ tests/empty_environment/__driver__.lua	ca63a02b4add10e72aa3a1f29906bdfea72dae32
@@ -9,8 +9,8 @@
 if os.getenv("OSTYPE") == "msys" then
   local iconv = getpathof("libiconv-2", ".dll")
   local zlib = getpathof("zlib1", ".dll")
-  copyfile(iconv, "libiconv-2.dll")
-  copyfile(zlib, "zlib1.dll")
+  copy(iconv, "libiconv-2.dll")
+  copy(zlib, "zlib1.dll")
 end
 
 check(noenv_mtn("--help"), 2, false, false)
============================================================
--- tests/exchanging_work_via_netsync/__driver__.lua	c7d4ecc85f8658688f7951d96f48d28406aae07e
+++ tests/exchanging_work_via_netsync/__driver__.lua	5afb48c2c94cc548702e0b6272288bbc78147bfb
@@ -27,7 +27,7 @@
 check(not qgrep("bad", "certs"))
 
 check(mtn2("ls", "certs", ver[1]), 0, true)
-rename_over("stdout", "certs")
+rename("stdout", "certs")
 check(qgrep("date", "certs"))
 check(qgrep("author", "certs"))
 check(qgrep("branch", "certs"))
============================================================
--- tests/explicit_merge/__driver__.lua	bc1c384cd88f7947e9f53ddb646bf14eb71f388d
+++ tests/explicit_merge/__driver__.lua	1d7d3bfb6e486fa2e3ad56562e451ab2c6783563
@@ -1,26 +1,26 @@
 
 mtn_setup()
 
-getfile("testfile")
+get("testfile")
 addfile("testfile")
 commit()
 anc = base_revision()
 
-getfile("dont_merge")
-getfile("left")
-getfile("right")
-getfile("merged")
+get("dont_merge")
+get("left")
+get("right")
+get("merged")
 
-copyfile("dont_merge", "testfile")
+copy("dont_merge", "testfile")
 commit()
 
 revert_to(anc)
-copyfile("left", "testfile")
+copy("left", "testfile")
 commit()
 left = base_revision()
 
 revert_to(anc)
-copyfile("right", "testfile")
+copy("right", "testfile")
 commit()
 right = base_revision()
 
============================================================
--- tests/external_unit_test_of_the_line_merger/__driver__.lua	b3273eb163740231020a773429034334f46a71a0
+++ tests/external_unit_test_of_the_line_merger/__driver__.lua	1d1e80933029a6af448c15d85e24f5db9d1fe9ce
@@ -1,11 +1,11 @@
 
 skip_if(not existsonpath("diff3"))
 
 mtn_setup()
 
-getfile("left")
-getfile("right")
-getfile("ancestor")
+get("left")
+get("right")
+get("ancestor")
 
 anc = "cec9ec2e479b700ea267e70feb5a4eb15155190d"
 left = "52f65363d555fecd3d2e887a207c3add0a949638"
@@ -19,11 +19,11 @@
 check(lver == left)
 check(rver == right)
 
-copyfile("ancestor", "stdin")
+copy("ancestor", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("left", "stdin")
+copy("left", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("right", "stdin")
+copy("right", "stdin")
 check(mtn("fload"), 0, false, false, true)
 
 check(mtn("fmerge", anc, left, right), 0, true, false)
============================================================
--- tests/files_with_non-utf8_data/__driver__.lua	a3f8e37d1f760834a6c013ca9e65489a99538c00
+++ tests/files_with_non-utf8_data/__driver__.lua	9368ad53f9d9dd08457c3132896b3999cd2c7a1a
@@ -1,13 +1,13 @@
 
 mtn_setup()
 
-getfile("ru-8859-5")
-getfile("ru-utf8")
-getfile("jp-euc")
-getfile("jp-utf8")
+get("ru-8859-5")
+get("ru-utf8")
+get("jp-euc")
+get("jp-utf8")
 
-getfile("8859-5.lua")
-getfile("euc.lua")
+get("8859-5.lua")
+get("euc.lua")
 
 -- Create a mock base revision to revert back to
 addfile("blah", "foo foo")
============================================================
--- tests/first_extent_normalization_pass/__driver__.lua	aaceb1dcdedaf5d90ae9760f0743969f6336e528
+++ tests/first_extent_normalization_pass/__driver__.lua	b273e5d30742f4d34352da0ac9ec3a25199aabc4
@@ -1,12 +1,12 @@
 
 mtn_setup()
 
-getfile("left")
-getfile("right")
+get("left")
+get("right")
 
-copyfile("left", "stdin")
+copy("left", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("right", "stdin")
+copy("right", "stdin")
 check(mtn("fload"), 0, false, false, true)
 left = sha1("left")
 right = sha1("right")
============================================================
--- tests/get_netsync_read_permitted/__driver__.lua	bea5d1cd297d4cdeb576b7f6fcd8bef73c10c111
+++ tests/get_netsync_read_permitted/__driver__.lua	62c88f49d3fe843ce139897207017886a9bdf7c5
@@ -24,7 +24,7 @@
 -- pulling exactly that should give revs B1, B2, B3; and only give
 -- branch certs on B1, B3.
 mkdir("perm")
-getfile("read-permissions", "perm/read-permissions")
+get("read-permissions", "perm/read-permissions")
 
 srv = netsync.start({"--confdir=perm", "branch*"}, nil, true)
 
============================================================
--- tests/importing_a_cvs_file_with_one_version/__driver__.lua	15c3a5824d24a218b8a2037bad178f78d716149a
+++ tests/importing_a_cvs_file_with_one_version/__driver__.lua	1f1c361267d06b929bc431416d2d99f9385c8e9c
@@ -14,7 +14,7 @@
 
 check(cvs("co", "."), 0, false, false)
 mkdir("testdir")
-os.rename("importme.0", "testdir/importme")
+rename("importme.0", "testdir/importme")
 check(cvs("add", "testdir"), 0, false, false)
 check(cvs("add", "testdir/importme"), 0, false, false)
 check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false)
============================================================
--- tests/importing_a_small,_real_cvs_repository/__driver__.lua	831c69c344c54019c8e3f68b2b849878c62bcadf
+++ tests/importing_a_small,_real_cvs_repository/__driver__.lua	d272e9e3cfadd7fabaa87de4ff01f73db2185379
@@ -1,9 +1,9 @@
 
 mtn_setup()
 
-getfile("test.manifest")
+get("test.manifest")
 
-gettree("e")
+get("e")
 
 check(mtn("--branch=foo.bar", "cvs_import", "e"), 0, false, false)
 check(mtn("--branch=foo.bar.disasm-branch", "co"))
============================================================
--- tests/importing_cvs_files/__driver__.lua	c0f9e587b78a71661c20cca06e5ad198547e9e90
+++ tests/importing_cvs_files/__driver__.lua	c1cc5497c211389954cbd34e61559a76cbb40e11
@@ -17,20 +17,20 @@
 cvs_setup()
 
 -- check out the workspace and make some commits
--- note that this has to use copyfile, rather than rename, to update
+-- note that this has to use copy, rather than rename, to update
 -- the file in cvs. Apparently, cvs uses timestamps or something to track
 -- file modifications.
 check(cvs("co", "."), 0, false, false)
 mkdir("testdir")
-copyfile("importme.0", "testdir/importme")
+copy("importme.0", "testdir/importme")
 check(cvs("add", "testdir"), 0, false, false)
 check(cvs("add", "testdir/importme"), 0, false, false)
 check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false)
-copyfile("importme.1", "testdir/importme")
+copy("importme.1", "testdir/importme")
 check(cvs("commit", "-m", 'commit 1', "testdir/importme"), 0, false, false)
-copyfile("importme.2", "testdir/importme")
+copy("importme.2", "testdir/importme")
 check(cvs("commit", "-m", 'commit 2', "testdir/importme"), 0, false, false)
-copyfile("importme.3", "testdir/importme")
+copy("importme.3", "testdir/importme")
 check(cvs("commit", "-m", 'commit 3', "testdir/importme"), 0, false, false)
 
 -- import into monotone and check presence of files
============================================================
--- tests/importing_cvs_files_with_identical_logs/__driver__.lua	7f20e7723843c2ceaec23a4cc7d609fdddd86868
+++ tests/importing_cvs_files_with_identical_logs/__driver__.lua	217dd79b2ee06eb698287b01c822ad6f20ab7458
@@ -20,15 +20,15 @@
 
 check(cvs("co", "."), 0, false, false)
 mkdir("testdir")
-copyfile("importme.0", "testdir/importme")
+copy("importme.0", "testdir/importme")
 check(cvs("add", "testdir"), 0, false, false)
 check(cvs("add", "testdir/importme"), 0, false, false)
 check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false)
-copyfile("importme.1", "testdir/importme")
+copy("importme.1", "testdir/importme")
 check(cvs("commit", "-m", 'commit same message', "testdir/importme"), 0, false, false)
-copyfile("importme.2", "testdir/importme")
+copy("importme.2", "testdir/importme")
 check(cvs("commit", "-m", 'commit same message', "testdir/importme"), 0, false, false)
-copyfile("importme.3", "testdir/importme")
+copy("importme.3", "testdir/importme")
 check(cvs("commit", "-m", 'commit 3', "testdir/importme"), 0, false, false)
 
 -- import into monotone and check presence of files
============================================================
--- tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	9738d252a0f89a8870d9420ca1ba06f5048a25ff
+++ tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	1ad697fe5be65db5a0f03a9624c2040796eb8890
@@ -23,15 +23,15 @@
 -- create the initial 3rd-party vendor import
 
 mkdir("importdir")
-copyfile("file1.0", "importdir/file1")
-copyfile("file2.0", "importdir/file2")
-copyfile("changelog.0", "importdir/changelog")
+copy("file1.0", "importdir/file1")
+copy("file2.0", "importdir/file2")
+copy("changelog.0", "importdir/changelog")
 check(indir("importdir", cvs("import", "-m", "Initial import of VENDORWARE 1", "testsrc", "VENDOR", "VENDOR_REL_1")), 0, false, false)
 
 -- now we alter some of the files.
 check(cvs("co", "testsrc"), 0, false, false)
-copyfile("file1.1", "testsrc/file1")
-copyfile("changelog.1", "testsrc/changelog")
+copy("file1.1", "testsrc/file1")
+copy("changelog.1", "testsrc/changelog")
 check(indir("testsrc", cvs ("commit", "-m", 'commit 0')), 0, false, false)
 
 -- now we create a branch
@@ -39,14 +39,14 @@
 check(indir("testsrc", cvs ("up", "-r", "branched")), 0, false, false)
 
 -- alter the files on the branch
-copyfile("file1.2", "testsrc/file1")
-copyfile("file2.1", "testsrc/file2")
-copyfile("changelog.3", "testsrc/changelog")
+copy("file1.2", "testsrc/file1")
+copy("file2.1", "testsrc/file2")
+copy("changelog.3", "testsrc/changelog")
 check(indir("testsrc", cvs ("commit", "-m", 'commit on branch')), 0, false, false)
 
 -- and create some mainline changes after the branch
 check(indir("testsrc", cvs ("up", "-A")), 0, false, false)
-copyfile("changelog.2", "testsrc/changelog")
+copy("changelog.2", "testsrc/changelog")
 check(indir("testsrc", cvs ("commit", "-m", 'commit on mainline after branch')), 0, false, false)
 
 -- import into monotone and check presence of files
============================================================
--- tests/importing_files_with_non-english_names/__driver__.lua	f1f07b8b1ccd758bb7274872aa19a760e55383f1
+++ tests/importing_files_with_non-english_names/__driver__.lua	ed1240654dad2a24ed0ff72c8b1103336eccf589
@@ -47,7 +47,7 @@
 set_env("CHARSET", "UTF-8")
 
 check(mtn("automate", "get_manifest_of"), 0, true)
-os.rename("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("funny", "manifest"))
 check(qgrep("spaces", "manifest"))
 check(qgrep(japanese_utf8, "manifest"))
@@ -78,7 +78,7 @@
 -- check the names showed up in our manifest
 
 check(mtn("automate", "get_manifest_of"), 0, true)
-rename_over("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("funny", "manifest"))
 check(qgrep("spaces", "manifest"))
 if ostype ~= "Darwin" then
@@ -105,7 +105,7 @@
 -- check the names showed up in our manifest
 
 check(mtn("automate", "get_manifest_of"), 0, true)
-rename_over("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("funny", "manifest"))
 check(qgrep("spaces", "manifest"))
 if ostype ~= "Darwin" then
============================================================
--- tests/include()_and_includedir()_lua_functions/__driver__.lua	8a99da73447e7e10466652c3e38c3d93da7bfa1c
+++ tests/include()_and_includedir()_lua_functions/__driver__.lua	e5771a17a8ee2d8c2d6c2033603fafc79ed769fc
@@ -8,8 +8,8 @@
 writefile("includedir.lua", 'includedir("../gongolo")')
 
 -- write two files and check that they will be invoked in alphabetic order
-getfile("aaa.rc", "gongolo/aaa.rc")
-getfile("bbb.zz", "gongolo/bbb.zz")
+get("aaa.rc", "gongolo/aaa.rc")
+get("bbb.zz", "gongolo/bbb.zz")
 
 -- setup a wrk dir
 check(mtn("setup", "--branch=testbranch", "alt_wrk"), 0, false, false)
@@ -23,6 +23,6 @@
 check(qgrep("BOOGA BOOGACICCA CICCA", "stdout"))
 
 -- write a third file: should be read between the two previous ones
-getfile("aba.rc", "gongolo/aba.rc")
+get("aba.rc", "gongolo/aba.rc")
 check(indir("alt_wrk", mtn("--root=.", "--rcfile=../includedir.lua", "status")), 0, true, false)
 check(qgrep("BOOGA BOOGAhu huCICCA CICCA", "stdout"))
============================================================
--- tests/inodeprints/__driver__.lua	dca8be709d7a7336fc4cfa1ef1b89e27bdabe0e1
+++ tests/inodeprints/__driver__.lua	4851b2e8a82015cb048b829f551c74c6b730848d
@@ -16,7 +16,7 @@
 
 -- Something should have been written to it
 check(fsize("_MTN/inodeprints") ~= 0)
-copyfile("_MTN/inodeprints", "ip1")
+copy("_MTN/inodeprints", "ip1")
 
 -- And stuff should still work
 check(mtn("diff"), 0, true, false)
============================================================
--- tests/largish_file/__driver__.lua	d879bd8f8dc04288cf3f6f88963f2ff1e725ce72
+++ tests/largish_file/__driver__.lua	ba9f7510fb05d00d3e720060dea1ca655a757037
@@ -23,7 +23,7 @@
 rename("largish", "largish.orig")
 
 check(cat("-", "largish.orig"), 0, true, false, "foo\n")
-rename_over("stdout", "largish")
+rename("stdout", "largish")
 append("largish", "bar\n")
 commit()
 mod = base_revision()
============================================================
--- tests/list_branches/__driver__.lua	8e6f678eef70f9187fed601e25d14076ba67d17a
+++ tests/list_branches/__driver__.lua	c3bc816409cfc40dd63ff18a79de967ce4f4296b
@@ -10,11 +10,11 @@
 writefile("foo.testbranch", "this is the testbranch version")
 writefile("foo.otherbranch", "this version goes in otherbranch")
 
-copyfile("foo.testbranch", "foo")
+copy("foo.testbranch", "foo")
 check(mtn("add", "foo"), 0, false, false)
 commit()
 
-copyfile("foo.otherbranch", "foo")
+copy("foo.otherbranch", "foo")
 commit("otherbranch")
 
 -- ls branches should list 2 branches now
@@ -28,10 +28,10 @@
 check(samelines("stdout", {"otherbranch"}))
 
 -- Create an ignore_branch hook to pass in
-getfile("ignore_branch.lua")
+get("ignore_branch.lua")
 
 -- if we make a change in the branch.to.be.ignored it should not turn up in the list
-copyfile("foo.testbranch", "in_ignored")
+copy("foo.testbranch", "in_ignored")
 check(mtn("--rcfile=ignore_branch.lua", "add", "in_ignored"), 0, false, false)
 commit("branch.to.be.ignored")
 check(mtn("--rcfile=ignore_branch.lua", "ls", "branches"),0,true,true)
============================================================
--- tests/log_hides_deleted_renamed_files/__driver__.lua	8d39a8271a09094ba2cdf4fc26fc031a03b7ae47
+++ tests/log_hides_deleted_renamed_files/__driver__.lua	6227dd0a922e1bf550feeaf9600225d85d6b1e3e
@@ -29,15 +29,15 @@
 check(mtn("log", "bar"), 0, true, false)
 rename("stdout", "log")
 check(grep("^Addition of [a-z][a-z][a-z].$", "log"), 0, true)
-getfile("first")
+get("first")
 canonicalize("first")
 canonicalize("stdout")
 check(samefile("stdout", "first"))
 
 check(mtn("log"), 0, true, false)
-rename_over("stdout", "log")
+rename("stdout", "log")
 check(grep("^Addition of [a-z][a-z][a-z].$", "log"), 0, true)
-getfile("second")
+get("second")
 canonicalize("second")
 canonicalize("stdout")
 check(samefile("stdout", "second"))
============================================================
--- tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua	6ebfa602fc03bcdfbe93676e791c5a6833f083e6
+++ tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua	a373fb9a5fa27a2ca5b65a30595978e4ac2c86ae
@@ -8,5 +8,5 @@
 commit()
 rev = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("log", "--revision", rev, "foo1"), 0, false, false)
============================================================
--- tests/lua_function_existsonpath/__driver__.lua	9021eacf7602e1515221c3b439c9ae4381cf4929
+++ tests/lua_function_existsonpath/__driver__.lua	bbf1c433b0eb6cf2185365d4931c3918001f7d31
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("test.lua")
+get("test.lua")
 check(mtn("setup", "--rcfile=test.lua", "--branch=testbranch", "subdir"), 0, true, false)
 check(qgrep("asdfghjkl", "stdout"))
 check(qgrep("qwertyuiop", "stdout"))
============================================================
--- tests/manifest_restrictions/__driver__.lua	831e7e7aa9020c666a549cb5a5619e835103cf5a
+++ tests/manifest_restrictions/__driver__.lua	2a61593429aa1b8f6a2af86b190a9a2597c4acfc
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("ignored.lua")
+get("ignored.lua")
 
 mkdir("work")
 mkdir("work/A")
@@ -48,7 +48,7 @@
 check(mtn("ls", "unknown", "work"), 0, true, false)
 check(qgrep("work/file4", "stdout"))
 
-os.rename("work/file2", "work/filex2")
+rename("work/file2", "work/filex2")
 
 check(mtn("ls", "missing"), 0, true, false)
 check(qgrep("work/file2", "stdout"))
@@ -56,7 +56,7 @@
 check(mtn("ls", "missing", "work/file2"), 0, true, false)
 check(qgrep("work/file2", "stdout"))
 
-os.rename("work/filex2", "work/file2")
+rename("work/filex2", "work/file2")
 
 check(mtn("ls", "ignored", "--rcfile=ignored.lua"), 0, true, false)
 check(qgrep("work/foo.o", "stdout"))
@@ -66,8 +66,8 @@
 
 -- create moved, dropped, and changed work to test status, diff, commit
 
-os.rename("work/fileX", "work/file1")
-os.remove("work/file2")
+rename("work/fileX", "work/file1")
+remove("work/file2")
 
 writefile("work/file3", "version 2 of file3 with some changes")
 writefile("work/A/fileA", "version 2 of fileA with some changes")
============================================================
--- tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua	b567ed88b67b06445deec99e9d3019123c8aebeb
+++ tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua	bb3d0ebcc57f1b0df75f1c58b0a54912c3f11830
@@ -8,7 +8,7 @@
 commit()
 base = base_revision()
 
-copyfile("v1", "testfile")
+copy("v1", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
@@ -16,7 +16,7 @@
 check(mtn("drop", "testfile"), 0, false, false)
 commit()
 
-copyfile("v2", "testfile")
+copy("v2", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
============================================================
--- tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua	5460bea6c9e6ac125b2138d5a2747bcd346790ae
+++ tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua	098be15f8560f52b9701864d3e391d7d4af1e4ad
@@ -9,18 +9,18 @@
 commit()
 base = base_revision()
 
-copyfile("v1a", "testfile")
+copy("v1a", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
-copyfile("v1b", "testfile")
+copy("v1b", "testfile")
 commit()
 
 remove("testfile")
 check(mtn("drop", "testfile"), 0, false, false)
 commit()
 
-copyfile("v2a", "testfile")
+copy("v2a", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
============================================================
--- tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua	0fbb2ea669d060ce7588816d64101ede8e567334
+++ tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua	baaeb528eaf48031cbae198f4cb2d133a6996540
@@ -5,7 +5,7 @@
 writefile("v1b", "bar blah")
 writefile("v2a", "baz blah")
 
-copyfile("v1a", "testfile")
+copy("v1a", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 addfile("renamefile", "this will be overwritten")
 check(mtn("add", "renamefile"), 0, false, false)
@@ -18,7 +18,7 @@
 rename("renamefile", "testfile")
 commit()
 
-copyfile("v2a", "testfile")
+copy("v2a", "testfile")
 commit()
 
 revert_to(base)
============================================================
--- tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua	dac336dbf180056dbe184723f0504f861ea563bc
+++ tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua	1a72edadfc966221a7b4d2c88ee234a299256c4b
@@ -5,19 +5,19 @@
 writefile("v1b", "bar blah")
 writefile("v2a", "baz blah")
 
-copyfile("v1a", "testfile")
+copy("v1a", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 base = base_revision()
 
-copyfile("v1b", "testfile")
+copy("v1b", "testfile")
 commit()
 
 remove("testfile")
 check(mtn("drop", "testfile"), 0, false, false)
 commit()
 
-copyfile("v2a", "testfile")
+copy("v2a", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
============================================================
--- tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua	ef0b509c5f7b1bc19b3c8060130647cc00a9fb36
+++ tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua	7fb698f24b8fd9a9580ca750682743eeb0972939
@@ -13,24 +13,24 @@
 commit()
 base = base_revision()
 
-copyfile("right_1_a", "testfile")
+copy("right_1_a", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
-copyfile("right_1_b", "testfile")
+copy("right_1_b", "testfile")
 commit()
 
 remove("testfile")
 check(mtn("drop", "testfile"), 0, false, false)
 commit()
 
-copyfile("right_2_a", "testfile")
+copy("right_2_a", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
 revert_to(base)
 
-copyfile("left", "testfile")
+copy("left", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
============================================================
--- tests/merge((drop_a),_(drop_a,_add_a))/__driver__.lua	69c464e4552692a45d837b745fcb0687ed2060e6
+++ tests/merge((drop_a),_(drop_a,_add_a))/__driver__.lua	a7a463c31f1d6e223fbfed77555044754f898823
@@ -5,7 +5,7 @@
 writefile("replaced", "the re-added file")
 writefile("nonce", "...nothing here...")
 
-copyfile("original", "testfile")
+copy("original", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 base = base_revision()
@@ -25,7 +25,7 @@
 
 -- ... and add the replacement
 -- on the other side of the fork, drop it
-copyfile("replaced", "testfile")
+copy("replaced", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
============================================================
--- tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua	567651816fcf9dc5bde90899d2739f9703f836fd
+++ tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua	86bce67fd140cdcf1685ee694bfd9ed41c5d3dbd
@@ -8,12 +8,12 @@
 writefile("left", "bar blah")
 writefile("new_right", "baz blah")
 
-copyfile("base", "testfile")
+copy("base", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 base = base_revision()
 
-copyfile("left", "testfile")
+copy("left", "testfile")
 commit()
 
 revert_to(base)
@@ -22,7 +22,7 @@
 check(mtn("drop", "testfile"), 0, false, false)
 commit()
 
-copyfile("new_right", "testfile")
+copy("new_right", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 
============================================================
--- tests/merge_manual_file/__driver__.lua	0f88464cc74c9dc9631a81b607d86c3f830dd2cb
+++ tests/merge_manual_file/__driver__.lua	6dcd95786b907552ed67b442d2ff6a5792df7c0f
@@ -5,64 +5,64 @@
 -- just because contains some strategically placed line feeds
 -- now is a test for the new attribute merge_manual and its effect on merging
 
-getfile("parent.bmp")
-getfile("left.bmp")
-getfile("right.bmp")
+get("parent.bmp")
+get("left.bmp")
+get("right.bmp")
 
 -- hook forces all files binary
-getfile("binary.lua")
+get("binary.lua")
 
 -- hook forces all files text
-getfile("text.lua")
+get("text.lua")
 
 -- --- first: auto add as binary 
-copyfile("parent.bmp", "binary.bmp")
+copy("parent.bmp", "binary.bmp")
 check(mtn("--rcfile=binary.lua", "add", "binary.bmp"), 0, false, false)
 commit("binbranch")
 parent = base_revision()
 
 check(mtn("attr", "get", "binary.bmp", "mtn:manual_merge"), 0, false, false)
 
-copyfile("left.bmp", "binary.bmp")
+copy("left.bmp", "binary.bmp")
 commit("binbranch")
 
 revert_to(parent)
 
-copyfile("right.bmp", "binary.bmp")
+copy("right.bmp", "binary.bmp")
 commit("binbranch")
 
 -- file marked binary: merge should fail
 check(mtn("--branch=binbranch", "merge"), 1, false, false)
 
 -- --- second: auto add as text
-copyfile("parent.bmp", "text.bmp")
+copy("parent.bmp", "text.bmp")
 check(mtn("--rcfile=text.lua", "add", "text.bmp"), 0, false, false)
 commit("textbranch")
 parent = base_revision()
 
-copyfile("left.bmp", "text.bmp")
+copy("left.bmp", "text.bmp")
 commit("textbranch")
 
 revert_to(parent)
 
-copyfile("right.bmp", "text.bmp")
+copy("right.bmp", "text.bmp")
 commit("textbranch")
 
 -- file marked text: merge should work!
 check(mtn("--branch=textbranch", "merge"), 0, false, false)
 
 -- --- third: manually make filename as binary
-copyfile("parent.bmp", "forcebin.bmp")
+copy("parent.bmp", "forcebin.bmp")
 check(mtn("--rcfile=text.lua", "add", "forcebin.bmp"), 0, false, false)
 commit("forcebinbranch")
 parent = base_revision()
 
-copyfile("left.bmp", "forcebin.bmp")
+copy("left.bmp", "forcebin.bmp")
 commit("forcebinbranch")
 
 revert_to(parent)
 
-copyfile("right.bmp", "forcebin.bmp")
+copy("right.bmp", "forcebin.bmp")
 
 -- set bin
 check(mtn("attr", "set", "forcebin.bmp", "mtn:manual_merge", "true"), 0, false, false)
@@ -72,18 +72,18 @@
 check(mtn("--branch=forcebinbranch", "merge"), 1, false, false)
 
 -- --- fourth: automatically make filename as binary, then force text
-copyfile("parent.bmp", "forcetext.bmp")
+copy("parent.bmp", "forcetext.bmp")
 check(mtn("--rcfile=binary.lua", "add", "forcetext.bmp"), 0, false, false)
 check(mtn("attr", "set", "forcetext.bmp", "mtn:manual_merge", "false"), 0, false, false)
 commit("forcetextbranch")
 parent = base_revision()
 
-copyfile("left.bmp", "forcetext.bmp")
+copy("left.bmp", "forcetext.bmp")
 commit("forcetextbranch")
 
 revert_to(parent)
 
-copyfile("right.bmp", "forcetext.bmp")
+copy("right.bmp", "forcetext.bmp")
 commit("forcetextbranch")
 
 -- file marked text: merge should work
============================================================
--- tests/merge_normalization_edge_case/__driver__.lua	540f5a97e67577161144a624a7b84717d0aef727
+++ tests/merge_normalization_edge_case/__driver__.lua	a6f3ef66ca6fa276c6facc39ea5af901f2e487fc
@@ -1,9 +1,9 @@
 
 mtn_setup()
 
-getfile("parent")
-getfile("left")
-getfile("right")
+get("parent")
+get("left")
+get("right")
 
 parent = "fe24df7edf04cb06161defc10b252c5fa32bf1f7"
 left = "f4657ce998dd0e39465a3f345f3540b689fd60ad"
@@ -13,11 +13,11 @@
 check(sha1("left") == left)
 check(sha1("right") == right)
 
-copyfile("parent", "stdin")
+copy("parent", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("left", "stdin")
+copy("left", "stdin")
 check(mtn("fload"), 0, false, false, true)
-copyfile("right", "stdin")
+copy("right", "stdin")
 check(mtn("fload"), 0, false, false, true)
 
 check(mtn("fmerge", parent, left, right), 0, true, false)
============================================================
--- tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua	a43d6187d0ccfd94a6def14211b952c86a869473
+++ tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua	9064976208573bdc0000840dd25233812c8d5462
@@ -65,7 +65,7 @@
 check(mtn("propagate", "branch.main", "branch.fork"), 0, false, false)
 
 -- check
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("--branch=branch.fork", "checkout", "."))
 
 check(mtn("automate", "get_manifest_of"), 0, true)
============================================================
--- tests/merging_a_rename_twice/__driver__.lua	31a1be043ecb8735f0c09ade850b5aed6540f694
+++ tests/merging_a_rename_twice/__driver__.lua	2601a6a79dcef1a1c85797637eb853d01d707edf
@@ -84,7 +84,7 @@
 check(mtn("--branch=branch.y", "update"), 0, false, false)
 
 check(mtn("automate", "get_manifest_of"), 0, true)
-os.rename("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep('"y"', "manifest"))
 check(not qgrep('"x"', "manifest"))
 check(exists("y"))
============================================================
--- tests/merging_adds_in_unrelated_revisions/__driver__.lua	22ec6f9238dfac16e2ea67361e90d142d38ada80
+++ tests/merging_adds_in_unrelated_revisions/__driver__.lua	1c368783de0067313a53b09df6cc9da2f743a385
@@ -8,7 +8,7 @@
 commit()
 left = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("setup", "--branch=testbranch", "."), 0, false, false)
 
 addfile("testfile2", "This is test file 2\n")
============================================================
--- tests/merging_data_in_unrelated_files/__driver__.lua	c64d4c93b6212896eed7ba97fec668af843213de
+++ tests/merging_data_in_unrelated_files/__driver__.lua	f889683cbeb372aa8d2812b071c723c053ca2823
@@ -7,14 +7,14 @@
 commit()
 anc = base_revision()
 
-getfile("left", "testfile")
+get("left", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 left = base_revision()
 
 revert_to(anc)
 
-getfile("right", "testfile")
+get("right", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 right = base_revision()
============================================================
--- tests/merging_data_in_unrelated_revisions/__driver__.lua	2cf02eca460fb6f458c50396be7a8a4763acd578
+++ tests/merging_data_in_unrelated_revisions/__driver__.lua	cbbc6054d02dbe98bf7dc4ad4790ce74a8c9aee5
@@ -1,17 +1,17 @@
 
 mtn_setup()
 
 -- This test relies on file-suturing
 
-getfile("left", "testfile")
+get("left", "testfile")
 addfile("testfile")
 commit()
 left = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("setup", "--branch=testbranch", "."), 0, false, false)
 
-getfile("right", "testfile")
+get("right", "testfile")
 addfile("testfile")
 commit()
 right = base_revision()
============================================================
--- tests/migrate_with_rosterify/__driver__.lua	1ff3b4055bd96ae0e2760d6a3502f98f9611cc7a
+++ tests/migrate_with_rosterify/__driver__.lua	6d7de24d6e2475b4641ee4db9e97e97190983b7c
@@ -19,11 +19,11 @@
 
 -- We don't want the standard db, we want full control ourselves
 remove("test.db")
-remove_recursive("keys")
+remove("keys")
 check(mtn("db", "init"))
 
 -- Put some random keys in, with and without corresponding private keys
-getfile("migrate_keys")
+get("migrate_keys")
 check(mtn("read"), 0, false, false, {"migrate_keys"})
 
 addfile("testfile1", "f1v1\n")
@@ -43,7 +43,7 @@
 addfile("testfile4", "f4v1\n")
 commit("testbranch1")
 
-getfile("old_revs_propagate_log")
+get("old_revs_propagate_log")
 check(mtn("propagate", "testbranch2", "testbranch1",
           "--message-file=old_revs_propagate_log"), 0, false, false)
 check(mtn("update"), 0, false, false)
@@ -57,7 +57,7 @@
 -- any problem, as long as it's replaced by code with the same effect.
 check(mtn("db", "execute", "DELETE FROM revision_certs WHERE name = 'date'"), 0, false, false)
 
-copyfile("test.db", "latest.mtn")
+copy("test.db", "latest.mtn")
 
 if debugging then
   check(mtn("--db=latest.mtn", "db", "dump"), 0, true, false)
@@ -73,7 +73,7 @@
 
 function check_migrate_from(id)
   -- id.dumped is a 'db dump' of a db with schema "id"
-  getfile(id..".mtn.dumped", "stdin")
+  get(id..".mtn.dumped", "stdin")
   check(mtn("--db="..id..".mtn", "db", "load"), 0, false, false, true)
   -- check that the version's correct
   check(mtn("--db="..id..".mtn", "db", "version"), 0, true, false)
============================================================
--- tests/mtn_add_dot/__driver__.lua	74f5fb10c01664357f17c76e6ff2056dbb2bd5b5
+++ tests/mtn_add_dot/__driver__.lua	2f0a63f81197480e78b298ad1bf74496afd2924c
@@ -21,7 +21,7 @@
 
 remove("subdir/testfile1")
 remove("subdir/testfile2")
-remove_recursive("subdir/testdir1")
+remove("subdir/testdir1")
 chdir("subdir")
 check(mtn("revert", "."), 0, false, false)
 chdir("..")
============================================================
--- tests/multiple_version_committing/__driver__.lua	dfdbbe5150d201036cb784160c3cfbfd721ff3ff
+++ tests/multiple_version_committing/__driver__.lua	96051cc6fa605ab2a5985e6253f35df7a47dcc7f
@@ -22,7 +22,7 @@
   check(mtn("automate", "get_file", fsha[i]), 0, true)
   canonicalize("stdout")
   check(samefile("stdout", "testfile"))
-  remove_recursive("_MTN")
+  remove("_MTN")
   check(mtn("checkout", "--revision", rsha[i], "."), 0, true)
   check(sha1("testfile") == fsha[i])
 end
============================================================
--- tests/netsync_client_absorbs_server_key/__driver__.lua	dc8fff5b6909710b2f0dea1c2d0ee4be5d4ce1c4
+++ tests/netsync_client_absorbs_server_key/__driver__.lua	179a061d8eb5a4d5d2d3fb32d770fcf24b11c424
@@ -9,7 +9,7 @@
 check(mtn("genkey", "address@hidden"), 0, false, false, "address@hidden@bar\n")
 check(mtn("pubkey", "address@hidden"), 0, true, false)
 canonicalize("stdout")
-copyfile("stdout", "foo_public")
+copy("stdout", "foo_public")
 
 srv = netsync.start({"address@hidden", "testbranch"})
 srv:pull("testbranch")
============================================================
--- tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua	b71a7986e2d0ae71548e335e91049fc703983a50
+++ tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua	4ec9d25eab337911fbab21281d28c945482a0ce6
@@ -9,7 +9,7 @@
 addfile("testfile", "some data")
 commit()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn2("setup", "--branch=testbranch", "."))
 writefile("otherfile", "some data")
 check(mtn2("add", "testfile"), 0, false, false)
============================================================
--- tests/netsync_permissions/__driver__.lua	2a9a12c8b7b2ad5ee4152db77bc6a3d5d18771d9
+++ tests/netsync_permissions/__driver__.lua	b329a7343cee7e6a12f6aae20820834a357d47e2
@@ -16,18 +16,18 @@
 netsync.setup()
 
 -- test with open security settings
-gettree("open")
+get("open")
 
 addfile("badfile", "badfile")
 commit("badbranch", "badfile")
 
-copyfile("test.db", "clean.db")
-copy_recursive("keys", "clean_keys")
+copy("test.db", "clean.db")
+copy("keys", "clean_keys")
 function clean(n)
   if n == nil or n == 1 then n = "" end
-  copyfile("clean.db", "test"..n..".db")
-  remove_recursive("keys"..n)
-  copy_recursive("clean_keys", "keys"..n)
+  copy("clean.db", "test"..n..".db")
+  remove("keys"..n)
+  copy("clean_keys", "keys"..n)
 end
 
 addfile("testfile", "testfile")
@@ -68,9 +68,9 @@
 
 -- push with default key
 
-copyfile("test.db", "test2.db")
-remove_recursive("keys2")
-copy_recursive("keys", "keys2")
+copy("test.db", "test2.db")
+remove("keys2")
+copy("keys", "keys2")
 revert_to(revs.base, mtn2)
 addfile("default", "default", mtn2)
 check(mtn2("commit", "--message", "default"), 0, false, false)
@@ -102,7 +102,7 @@
 
 
 -- test with closed security settings
-gettree("closed")
+get("closed")
 
 clean()
 writefile("_MTN/revision", "")
@@ -151,9 +151,9 @@
 
 -- push with default key
 
-copyfile("test.db", "test2.db")
-remove_recursive("keys2")
-copy_recursive("keys", "keys2")
+copy("test.db", "test2.db")
+remove("keys2")
+copy("keys", "keys2")
 revert_to(revs.base, mtn2)
 addfile("default", "default", mtn2)
 check(mtn2("commit", "--message", "default"), 0, false, false)
============================================================
--- tests/netsync_transfers_public_keys/__driver__.lua	ad35ff87dffb8b24468db3dab113f4b79f425be5
+++ tests/netsync_transfers_public_keys/__driver__.lua	d560e525c469bcb3a581e28f26089de4a4a9dc1b
@@ -6,7 +6,7 @@
 pubkey = "52f32ec62128ea3541ebdd9d17400e268cfcd3fe"
 privkey = "06b040c37796863b53f10dc23fcccf379cc2e259"
 
-getfile("newkeys.txt", "stdin")
+get("newkeys.txt", "stdin")
 check(mtn("read"), 0, false, false, true)
 
 -- First commit a version that doesn't use the new key, and make sure
============================================================
--- tests/netsync_with_globs/__driver__.lua	8ec16aa6ff7e2be6959e78af1ae2c04251150dd9
+++ tests/netsync_with_globs/__driver__.lua	5008a811543f23ef8fa4e5cd54a411204ee93e9e
@@ -8,13 +8,13 @@
 commit("1branch1")
 revs[11] = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("setup", "--branch=testbranch", "."))
 addfile("testfile", "bar")
 commit("1branch2")
 revs[12] = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("setup", "--branch=testbranch", "."))
 addfile("testfile", "baz")
 commit("2branch1")
============================================================
--- tests/persistence_of_passphrase/__driver__.lua	0409770163b399bbf796bf2c7427111d07ef7f2b
+++ tests/persistence_of_passphrase/__driver__.lua	2a0d80e2ec0757d8b004ffd75b1987ae4ab2bf67
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("persist.lua")
+get("persist.lua")
 
 writefile("input.txt", "version 0 of the file\n")
 
@@ -14,7 +14,7 @@
 tsha = base_revision()
 
 check(mtn("ls", "certs", tsha), 0, true)
-os.rename("stdout", "certs")
+rename("stdout", "certs")
 
 for i,name in pairs{"branch", "author", "date", "changelog"} do
   check(qgrep(name, "certs"))
============================================================
--- tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua	d2462ce31147655c4d7b492a9f4c210277a4dde6
+++ tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua	efb2a05ac574eb9d9a6b59b965c4b8beb589a050
@@ -10,7 +10,7 @@
 check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
 revs[1] = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn3("setup", "--branch=testbranch", "."), 0, false, false)
 writefile("otherfile", "baz quux")
 check(mtn3("add", "otherfile"), 0, false, false)
@@ -27,7 +27,7 @@
                     mtn3("automate", "get_revision", revs[n]))
   check_same_stdout(mtn2("ls", "certs", revs[n]),
                     mtn3("ls", "certs", revs[n]))
-  remove_recursive("somedir")
+  remove("somedir")
   check(co_mtn("checkout", "--revision", revs[n], "somedir"), 0, false, false)
 end
 
@@ -42,7 +42,7 @@
 check(mtn3("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
 revs[3] = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn2("checkout", "--revision", revs[1], "."), 0, false, false)
 writefile("testfile", "ptang")
 check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
============================================================
--- tests/propagate_an_ancestor/__driver__.lua	9e3fc70664c1d7c917171fd9e2ddaf40e7e1a888
+++ tests/propagate_an_ancestor/__driver__.lua	cf6136627b498d48cd0c0e8d986ec47df4ca0f78
@@ -23,13 +23,13 @@
 commit("b")
 heads.b = base_revision()
 
-copyfile("test.db", "test2.db")
+copy("test.db", "test2.db")
 check(mtn("propagate", "a", "b"), 0, false, false)
 
 check_same_db_contents("test.db", "test2.db")
 
 check(mtn("cert", heads.b, "branch", "c"), 0, false, false)
-copyfile("test.db", "test3.db")
+copy("test.db", "test3.db")
 check(mtn("propagate", "b", "c"), 0, false, false)
 
 check_same_db_contents("test.db", "test3.db")
============================================================
--- tests/read_and_convert_old_privkey_packet/__driver__.lua	599cf327cc2832fcbcc2f39e51200084ba951ee2
+++ tests/read_and_convert_old_privkey_packet/__driver__.lua	f4dcdc6403070b4880002ec7d14df34d8dcdb968
@@ -1,9 +1,9 @@
 
 mtn_setup()
 
 -- this is an old privkey generated with 0.23
 
-getfile("old_privkey", "pkt")
+get("old_privkey", "pkt")
 
 check(mtn("read", "pkt"), 0, false, true)
 check(qgrep("read 1 packet", "stderr"))
============================================================
--- tests/rename_files_into_a_directory/__driver__.lua	9080ecca27e1218caf9c7eef651357348a8dcc21
+++ tests/rename_files_into_a_directory/__driver__.lua	b6594e77f04c1ecdfc10a23ec08740695cd0ec7e
@@ -18,7 +18,7 @@
 
 -- checkout in a clean dir and cd there
 function co()
-  remove_recursive(test.root.."/checkout")
+  remove(test.root.."/checkout")
   check(mtn("checkout", "-b", "testbranch", test.root.."/checkout"),
         0, false, false)
 end
============================================================
--- tests/renaming_a_deleted_file/__driver__.lua	501b87196920ba58a8a1f8899919d1a512c2e740
+++ tests/renaming_a_deleted_file/__driver__.lua	b175facc6c89c70b26e112229221b03bb68212f3
@@ -13,12 +13,12 @@
 -- produce move edge
 check(mtn("add", "baz"), 0, false, false)
 check(mtn("rename", "foo", "bar"), 0, false, false)
-os.rename("foo", "bar")
+rename("foo", "bar")
 commit()
 
 -- revert to root
 probe_node("foo", root_r_sha, root_f_sha)
-os.remove("bar")
+remove("bar")
 
 -- make a delete edge on the move preimage
 check(mtn("drop", "foo"), 0, false, false)
@@ -30,7 +30,7 @@
 
 -- check that the delete landed on the renamed target
 check(mtn("automate", "get_manifest_of"), 0, true)
-os.rename("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("baz", "manifest"))
 check(not qgrep("bar", "manifest"))
 check(not qgrep("foo", "manifest"))
============================================================
--- tests/renaming_a_directory/__driver__.lua	ff5e5566bd6d5aae450febf324ded5ed8f3065a7
+++ tests/renaming_a_directory/__driver__.lua	a33e62f4ff8c746c7a51fbaa19302ea76075c805
@@ -14,12 +14,12 @@
 
 -- produce move edge
 check(mtn("rename", "foo", "bar"), 0, false, false)
-os.rename("foo", "bar")
+rename("foo", "bar")
 commit()
 
 -- revert to root
 probe_node("foo/foo", root_r_sha, root_f_sha)
-remove_recursive("bar")
+remove("bar")
 
 -- make an add *into the directory*
 addfile("foo/bar", "bar file")
@@ -29,7 +29,7 @@
 check(mtn("merge"), 0, false, false)
 check(mtn("update"), 0, false, false)
 check(mtn("automate", "get_manifest_of"), 0, true, false)
-os.rename("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("bar/bar", "manifest"))
 check(qgrep("bar/foo", "manifest"))
 check(not qgrep("foo/bar", "manifest"))
============================================================
--- tests/renaming_a_file/__driver__.lua	35d1d7058771cd2d329f33ee7fff869c4e203621
+++ tests/renaming_a_file/__driver__.lua	d2f23e3f18ea304e68866ae554767d7296fd54cf
@@ -12,12 +12,12 @@
 
 -- produce move edge
 check(mtn("rename", "foo", "bar"), 0, false, false)
-copyfile("foo", "bar")
+copy("foo", "bar")
 commit()
 
 -- revert to root
 probe_node("foo", root_r_sha, root_f_sha)
-os.remove("bar")
+remove("bar")
 
 -- make a simple add edge
 addfile("bleh")
@@ -27,7 +27,7 @@
 check(mtn("merge"), 0, false, false)
 check(mtn("update"), 0, false, false)
 check(mtn("automate", "get_manifest_of"), 0, true, false)
-os.rename("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("bar", "manifest"))
 check(qgrep("bleh", "manifest"))
 
@@ -46,16 +46,16 @@
 
 -- move file before renaming it
 check(mtn("status"), 0, false, false)
-os.rename("bar", "barfoo")
+rename("bar", "barfoo")
 check(mtn("rename", "bar", "barfoo"), 0, false, true)
 check(qgrep('renaming bar to barfoo in workspace manifest', "stderr"))
 check(mtn("status"), 0, false, false)
 
 -- move file to wrong place before renaming it
-os.rename("barfoo", "bar")
+rename("barfoo", "bar")
 check(mtn("revert", "."), 0, false, false)
 check(mtn("status"), 0, false, false)
-os.rename("bar", "barfoofoo")
+rename("bar", "barfoofoo")
 check(mtn("rename", "bar", "barfoo"), 0, false, true)
 check(qgrep('renaming bar to barfoo in workspace manifest', "stderr"))
 check(mtn("status"), 1, false, false)
============================================================
--- tests/renaming_a_patched_file/__driver__.lua	f67c4c450d5d65e951d045e6547681341ec38d1e
+++ tests/renaming_a_patched_file/__driver__.lua	8fd738fcfcbdac05ca85563b46af53a976fe5672
@@ -12,15 +12,15 @@
 
 -- produce move edge
 check(mtn("rename", "foo", "bar"), 0, false, false)
-os.rename("foo", "bar")
+rename("foo", "bar")
 commit()
 
 -- revert to root
 probe_node("foo", root_r_sha, root_f_sha)
-os.remove("bar")
+remove("bar")
 
 -- make a delta edge on the move preimage
-copyfile("bleh", "foo")
+copy("bleh", "foo")
 commit()
 
 -- merge the delta and the rename
@@ -29,8 +29,8 @@
 
 -- check that the delta landed on the renamed target
 check(mtn("automate", "get_manifest_of"), 0, true)
-os.rename("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("bar", "manifest"))
 check(not qgrep("foo", "manifest"))
 check(qgrep("bleh", "bar"))
+remove("bar")
-os.remove("bar")
============================================================
--- tests/renaming_and_editing_a_file/__driver__.lua	650e40f16b0106da5727988543b69617aefba61a
+++ tests/renaming_and_editing_a_file/__driver__.lua	0e8b972b0de53d89db21e0cab967bdfa39aed23b
@@ -8,24 +8,24 @@
 writefile("bleh", "bleh file")
 
 -- produce root
-os.rename("foo1", "foo")
+rename("foo1", "foo")
 check(mtn("add", "foo"), 0, false, false)
 check(mtn("--branch=testbranch", "commit", "--message=root"), 0, false, false)
 root_r_sha=base_revision()
 root_f_sha=sha1("foo")
 
 -- produce 4-step path with move in the middle
-rename_over("foo2", "foo")
+rename("foo2", "foo")
 check(mtn("commit", "--message=edit-foo"), 0, false, false)
 check(mtn("rename", "foo", "bar"), 0, false, false)
-rename_over("bar1", "bar")
+rename("bar1", "bar")
 check(mtn("commit", "--message=rename-to-bar"), 0, false, false)
-rename_over("bar2", "bar")
+rename("bar2", "bar")
 check(mtn("commit", "--message=edit-bar"), 0, false, false)
 
 -- revert to root
 probe_node("foo", root_r_sha, root_f_sha)
-os.remove("bar")
+remove("bar")
 
 -- make a simple add edge
 check(mtn("add", "bleh"), 0, false, false)
@@ -35,7 +35,7 @@
 check(mtn("merge"), 0, false, false)
 check(mtn("update"), 0, false, false)
 check(mtn("automate", "get_manifest_of"), 0, true, false)
-os.rename("stdout", "manifest")
+rename("stdout", "manifest")
 check(qgrep("bar", "manifest"))
 check(qgrep("bleh", "manifest"))
 check(not qgrep("foo", "manifest"))
@@ -44,4 +44,4 @@
 check(mtn("diff", "--revision", root_r_sha), 0, true, false)
 check(qgrep("rename", "stdout"))
 
+remove("bar")
-os.remove("bar")
============================================================
--- tests/replace_dir_with_file/__driver__.lua	b4071a8d33cbc1be522a83e64a082bb33092462e
+++ tests/replace_dir_with_file/__driver__.lua	0f7d22d1bc8ffdb254f1b6ef2f8d48e38c7e8999
@@ -5,7 +5,7 @@
 addfile("dir/file", "file")
 commit()
 
-remove_recursive("dir")
+remove("dir")
 writefile("dir", "this isn't a directory")
 
 check(mtn("status"), 1, false, false)
============================================================
--- tests/restricted_commands_are_consistent/__driver__.lua	19c97e07ddcb3f58553eb07e658ec1605287190c
+++ tests/restricted_commands_are_consistent/__driver__.lua	2c6ede6d31cda92507631e91a57de47240667bb9
@@ -102,7 +102,7 @@
 check(mtn("revert", "."), 0, false, false)
 
 -- ls ignored
-getfile("ignore.lua")
+get("ignore.lua")
 -- only unknown files are considered by ls ignored
 check(mtn("drop", unpack(allfiles)), 0, false, false)
 checkall({"ls", "ignored", "--rcfile=ignore.lua"}, "stdout")
============================================================
--- tests/revert_file_to_base_revision/__driver__.lua	3938aaef0d2b8aea9e80f164edd46b1d1b2f9786
+++ tests/revert_file_to_base_revision/__driver__.lua	a7d7f3c626fde5c96373340d51bd365409b125bb
@@ -88,7 +88,7 @@
 
 -- check reverting a missing file
 check(mtn("revert", "."), 0, false, false)
-os.remove("testfile0")
+remove("testfile0")
 check(mtn("status"), 1, false, false)
 check(mtn("revert", "testfile0"), 0, true, false)
 check(mtn("status"), 0, false, false)
@@ -98,8 +98,8 @@
 check(mtn("revert", "."), 0, false, false)
 check(mtn("status"), 0, true)
 
-copyfile("testfile0", "foofile0")
-copyfile("sub/testfile2", "sub/foofile2")
+copy("testfile0", "foofile0")
+copy("sub/testfile2", "sub/foofile2")
 
 check(mtn("rename", "testfile0", "foofile0"), 0, false, false)
 check(mtn("rename", "sub/testfile2", "sub/foofile2"), 0, false, false)
============================================================
--- tests/revert_ignored_files/__driver__.lua	52052045f5a5ad9be1b9126be33a51b9441356a6
+++ tests/revert_ignored_files/__driver__.lua	94d0ccaa383bcb0d3f1f3fb399f96aba5dd3885e
@@ -12,7 +12,7 @@
 writefile("bar.ignored", "bar.ignored")
 writefile("baz.ignored", "baz.ignored")
 
-getfile("ignore.lua")
+get("ignore.lua")
 
 commit()
 
============================================================
--- tests/revert_works_with_restrictions/__driver__.lua	029948a123b9fc57318b084f9951a6a33e18614e
+++ tests/revert_works_with_restrictions/__driver__.lua	7281c936230000500588888ad7b9a3fafb400360
@@ -8,17 +8,17 @@
 writefile("modified2", "this is different 2")
 writefile("modified3", "this is different 3")
 
-getfile("ignore_hook.lua")
+get("ignore_hook.lua")
 
-copyfile("origfile", "testfile")
-copyfile("orig.ignore", "file.ignore")
-copyfile("orig2", "file2")
+copy("origfile", "testfile")
+copy("orig.ignore", "file.ignore")
+copy("orig2", "file2")
 check(mtn("add", "testfile", "file.ignore", "file2"), 0, false, false)
 commit()
 
 -- modify the files, then revert the 'ignored' file
-copyfile("modified1", "testfile")
-copyfile("modified2", "file.ignore")
+copy("modified1", "testfile")
+copy("modified2", "file.ignore")
 
 check(mtn("--rcfile=ignore_hook.lua", "revert", "file.ignore"), 0, false, false)
 
@@ -28,9 +28,9 @@
 
 -- now run it again with two paths, one in the ignorehook list, the other normal
 check(mtn("revert", "."), 0, false, false)
-copyfile("modified1", "testfile")
-copyfile("modified2", "file.ignore")
-copyfile("modified3", "file2")
+copy("modified1", "testfile")
+copy("modified2", "file.ignore")
+copy("modified3", "file2")
 
 check(mtn("--rcfile=ignore_hook.lua", "revert", "file.ignore", "testfile"), 0, false, false)
 
@@ -42,8 +42,8 @@
 
 -- now try just reverting missing files
 
-copyfile("modified1", "testfile")
-copyfile("modified2", "file.ignore")
+copy("modified1", "testfile")
+copy("modified2", "file.ignore")
 remove("file2")
 
 check(mtn("--rcfile=ignore_hook.lua", "revert", "--missing", ".", "--debug"), 0, false, false)
@@ -56,9 +56,9 @@
 -- make sure that 'revert --missing' when there are no missing files doesn't
 -- revert existing changes
 
-copyfile("modified1", "testfile")
-copyfile("orig.ignore", "file.ignore")
-copyfile("orig2", "file2")
+copy("modified1", "testfile")
+copy("orig.ignore", "file.ignore")
+copy("orig2", "file2")
 
 check(mtn("--rcfile=ignore_hook.lua", "revert", "--missing", ".", "--debug"), 0, false, false)
 
============================================================
--- tests/rosterify_--drop-attr/__driver__.lua	00714d38d59159019cac8b5587417e5ecde89d66
+++ tests/rosterify_--drop-attr/__driver__.lua	3834fe3b6c278fdacea0162e659b661f8212fa73
@@ -15,7 +15,7 @@
 -- without the invariant, it would silently throw such revisions away.)
 
 remove("test.db")
-getfile("test.db.dumped", "stdin")
+get("test.db.dumped", "stdin")
 check(mtn("db", "load"), 0, false, false, true)
 check(mtn("db", "migrate"), 0, false, false)
 
@@ -29,6 +29,6 @@
   table.insert(revs, l)
 end
 
-getfile("manifest_good")
+get("manifest_good")
 check(mtn("automate", "get_manifest_of", revs[1]), 0, true)
 check(samefile("stdout", "manifest_good"))
============================================================
--- tests/rosterify_migrates_file_dir_attrs/__driver__.lua	ae20dbdc1ff58e8dd3543c77789d5c158165c8ad
+++ tests/rosterify_migrates_file_dir_attrs/__driver__.lua	ef4e75b34e5e5e2790f569dc38f8b096a3d74fd0
@@ -21,7 +21,7 @@
 -- are the only two attrs that get migrated directly...)
 
 remove("test.db")
-getfile("test.db.dumped", "stdin")
+get("test.db.dumped", "stdin")
 check(mtn("db", "load"), 0, false, false, true)
 
 check(mtn("db", "migrate"), 0, false, false)
@@ -34,11 +34,11 @@
   table.insert(revs, l)
 end
 -- check the first manifest
-getfile("first_manifest_good")
+get("first_manifest_good")
 check(mtn("automate", "get_manifest_of", revs[1]), 0, true)
 check(samefile("stdout", "first_manifest_good"))
 
 -- check the second manifest
-getfile("second_manifest_good")
+get("second_manifest_good")
 check(mtn("automate", "get_manifest_of", revs[2]), 0, true)
 check(samefile("stdout", "second_manifest_good"))
============================================================
--- tests/rosterify_on_a_db_with_1_rev/__driver__.lua	7d553a2f86f34e4c964aa76201f0f7f042646f07
+++ tests/rosterify_on_a_db_with_1_rev/__driver__.lua	8049eb73dca82257e149da9ecc05e70ccfbd2407
@@ -6,7 +6,7 @@
 
 remove("test.db")
 
-getfile("test.db.dumped", "stdin")
+get("test.db.dumped", "stdin")
 check(mtn("db", "load"), 0, false, false, true)
 check(mtn("db", "migrate"), 0, false, false)
 check(mtn("db", "rosterify"), 0, false, false)
@@ -18,6 +18,6 @@
   table.insert(revs, l)
 end
 
-getfile("manifest_good")
+get("manifest_good")
 check(mtn("automate", "get_manifest_of", revs[1]), 0, true)
 check(samefile("stdout", "manifest_good"))
============================================================
--- tests/scanning_trees/__driver__.lua	f98578fc16ef652ad5b5bbba5387ddc05a98795a
+++ tests/scanning_trees/__driver__.lua	b6fd56d8bd8fc5eeee6ed487172541d1e61af46a
@@ -6,7 +6,7 @@
 writefile("testfile0", "version 0 of first test file\n")
 writefile("foo/testfile1", "version 0 of second test file\n")
 writefile("foo/bar/testfile2", "version 0 of third test file\n")
-getfile("manifest")
+get("manifest")
 canonicalize("manifest")
 
 check(mtn("add", "testfile0", "foo"), 0, false, false)
============================================================
--- tests/schema_migration/__driver__.lua	bdfc5b96c09274e280f740759e412a595f77a560
+++ tests/schema_migration/__driver__.lua	eb9b6997d6eec6d711915772b39b1b3525a0466d
@@ -28,11 +28,11 @@
 mtn_setup()
 -- We don't want the standard db, we want full control ourselves
 remove("test.db")
-remove_recursive("keys")
+remove("keys")
 check(mtn("db", "init"))
 
 -- Put some random keys in, with and without corresponding private keys
-getfile("migrate_keys", "stdin")
+get("migrate_keys", "stdin")
 check(mtn("read"), 0, false, false, true)
 
 addfile("testfile1", "f1v1\n")
@@ -79,7 +79,7 @@
 
 function check_migrate_from(id)
   -- id.dumped is a 'db dump' of a db with schema "id"
-  getfile(id..".mtn.dumped", "stdin")
+  get(id..".mtn.dumped", "stdin")
   check(mtn("--db="..id..".mtn", "db", "load"), 0, false, false, true)
   -- check that the version's correct
   check(mtn("--db="..id..".mtn", "db", "version"), 0, true, false)
============================================================
--- tests/selecting_arbitrary_certs/__driver__.lua	195927862f019a75ae9863e0b529c336c5157a3a
+++ tests/selecting_arbitrary_certs/__driver__.lua	544b55e39785bae7734b74cfcdeb4048429e7603
@@ -1,19 +1,19 @@
 
 mtn_setup()
 revs = {}
 
 addfile("testfile", "this is just a file")
-copyfile("testfile", "testfile1")
+copy("testfile", "testfile1")
 commit()
 revs.first = base_revision()
 
 writefile("testfile", "Now, this is a different file")
-copyfile("testfile", "testfile2")
+copy("testfile", "testfile2")
 commit()
 revs.second = base_revision()
 
 writefile("testfile", "And we change it a third time")
-copyfile("testfile", "testfile3")
+copy("testfile", "testfile3")
 commit()
 
 check(mtn("cert", revs.first, "testcert", 'value=with=equal=signs'))
@@ -36,10 +36,10 @@
 check(grep('has multiple ambiguous expansions', "stderr"), 0, false)
 
 -- Check that exact value succeed...
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("co", "--revision=c:testcert=value", "."), 0, false, false)
 check(samefile("testfile", "testfile2"))
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("co", "--revision=c:testcert=value=with=equal=signs", "."), 0, false, false)
 check(samefile("testfile", "testfile1"))
============================================================
--- tests/setup_checkout_touch_new__MTN_options_only/__driver__.lua	548c40cf997f2549d60cc55547a69abda3d83e7c
+++ tests/setup_checkout_touch_new__MTN_options_only/__driver__.lua	98c2f1c859423898fa990c69333ebd521a2caf0f
@@ -24,5 +24,5 @@
 writefile("foo", "more more")
 check(mtn("commit", "--message=foo"), 0, false, false)
 check(mtn("automate", "heads", "testbranch"), 0, true, false)
-rename_over("stdout", "headsout")
+rename("stdout", "headsout")
 check(trim(readfile("headsout")) == base_revision())
============================================================
--- tests/setup_on_existing_path/__driver__.lua	1b50d361f9693ca080715d27eac680e8ab513072
+++ tests/setup_on_existing_path/__driver__.lua	1ecc80aafde9b8410627cb08aad586dffe3721e0
@@ -6,5 +6,5 @@
 mkdir("bar")
 check(mtn("setup", "--branch=testbranch", "bar"), 0, false, false)
 check(exists("bar/_MTN"))
-remove_recursive("bar/_MTN")
+remove("bar/_MTN")
 check(indir("bar", mtn("setup", "--branch=testbranch")), 0, false, false)
============================================================
--- tests/single_character_filename_support/__driver__.lua	c7021579482c50f1b617fc60adbc308b7345e2f7
+++ tests/single_character_filename_support/__driver__.lua	45e9d332c9f379e34eed7687d25c6b0b4b5f8662
@@ -7,7 +7,7 @@
 revs.a = base_revision()
 
 check(mtn("rename", "a", "b"), 0, false, false)
-os.rename("a", "b")
+rename("a", "b")
 commit()
 revs.b = base_revision()
 
@@ -19,9 +19,9 @@
 for _,x in pairs{{revs.a, true, false},
                  {revs.b, false, true},
                  {revs.null, false, false}} do
-  remove_recursive("_MTN")
+  remove("_MTN")
   check(mtn("checkout", "--revision", x[1], "co-dir"), 0, false, false)
   check(exists("co-dir/a") == x[2])
   check(exists("co-dir/b") == x[3])
-  remove_recursive("co-dir")
+  remove("co-dir")
 end
============================================================
--- tests/tags_and_tagging_of_revisions/__driver__.lua	8060d31138276d062042cd56a25d7a3947cf3b05
+++ tests/tags_and_tagging_of_revisions/__driver__.lua	bbde36d3389634ef6466a10233bd6eeddadd6ad4
@@ -41,7 +41,7 @@
 -- make sure 'ls tags' output is sorted
 if existsonpath("sort") then
   canonicalize("stdout")
-  copyfile("stdout", "stdin")
+  copy("stdout", "stdin")
   rename("stdout", "stdout-orig")
   check({"sort"}, 0, readfile("stdout-orig"), false, true)
 end
@@ -49,7 +49,7 @@
 for i,x in {{true, false, false},
             {true, true, false},
             {true, true, true}} do
-  remove_recursive("_MTN")
+  remove("_MTN")
   remove("file1")
   remove("file2")
   remove("file3")
============================================================
--- tests/test_a_merge/__driver__.lua	56aeb71615373818f2e6a3e01a07d8f3545c48d0
+++ tests/test_a_merge/__driver__.lua	105f2fadc44e0aec222acdbce11b883afa91b47a
@@ -9,22 +9,22 @@
 -- 'diff' and 'mtn diff' produce(d) different results when calculating
 -- diff(parent, left).
 
-getfile("parent")
-getfile("left")
-getfile("right")
-getfile("correct")
+get("parent")
+get("left")
+get("right")
+get("correct")
 
-copyfile("parent", "testfile")
+copy("parent", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit(testbranch)
 parent = base_revision()
 
-copyfile("left", "testfile")
+copy("left", "testfile")
 commit()
 
 revert_to(parent)
 
-copyfile("right", "testfile")
+copy("right", "testfile")
 commit()
 
 check(mtn("merge"), 0, false, false)
============================================================
--- tests/test_a_merge_2/__driver__.lua	3f31d6570b3f7b7ab7fc26f373a1b1c31283fe6b
+++ tests/test_a_merge_2/__driver__.lua	f68098a1e99c89a8221e08cbed584c8433783e64
@@ -19,22 +19,22 @@
 --    return false;
 --  }
 
-getfile("parent")
-getfile("left")
-getfile("right")
-getfile("correct")
+get("parent")
+get("left")
+get("right")
+get("correct")
 
-copyfile("parent", "testfile")
+copy("parent", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 parent = base_revision()
 
-copyfile("left", "testfile")
+copy("left", "testfile")
 commit()
 
 revert_to(parent)
 
-copyfile("right", "testfile")
+copy("right", "testfile")
 commit()
 
 check(mtn("merge"), 0, false, false)
============================================================
--- tests/test_a_merge_5/__driver__.lua	2bb57fcc0cd287cb07a3b218504dda98525cf90b
+++ tests/test_a_merge_5/__driver__.lua	dcd581286d83d0f3af2fcf03aad804029eadab28
@@ -30,22 +30,22 @@
 
 -- Since there's apparently no right way, we accept the conflict as a pass.
 
-getfile("parent")
-getfile("left")
-getfile("right")
-getfile("correct")
+get("parent")
+get("left")
+get("right")
+get("correct")
 
-copyfile("parent", "testfile")
+copy("parent", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 parent = base_revision()
 
-copyfile("left", "testfile")
+copy("left", "testfile")
 commit()
 
 revert_to(parent)
 
-copyfile("right", "testfile")
+copy("right", "testfile")
 commit()
 
 check(mtn("--branch=testbranch", "merge"), 1, false, false)
============================================================
--- tests/test_a_merge_6/__driver__.lua	367c8ce3f9506adb5f45a9c9dff9a766e182a598
+++ tests/test_a_merge_6/__driver__.lua	1052a6e2aaedc14c4b4a2bb8796dc91ba01023a4
@@ -20,22 +20,22 @@
 
 -- merge(1) can handle this merge correctly.
 
-getfile("parent")
-getfile("left")
-getfile("right")
-getfile("correct")
+get("parent")
+get("left")
+get("right")
+get("correct")
 
-copyfile("parent", "testfile")
+copy("parent", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 parent = base_revision()
 
-copyfile("left", "testfile")
+copy("left", "testfile")
 commit()
 
 revert_to(parent)
 
-copyfile("right", "testfile")
+copy("right", "testfile")
 commit()
 
 check(mtn("--branch=testbranch", "merge"), 0, false, false)
============================================================
--- tests/test_annotate_command/__driver__.lua	21c71d956803b81d311de5620ae64f34361d0011
+++ tests/test_annotate_command/__driver__.lua	01bb08f6b904a505c1bb7a5e50dc0418d15f74c3
@@ -12,15 +12,15 @@
 revs[0] = base_revision()
 
 addfile("bar0", "0\n1\n2\n")
-copyfile("foo1", "foo0")
+copy("foo1", "foo0")
 commit()
 revs[1] = base_revision()
 
-copyfile("bar1", "bar0")
+copy("bar1", "bar0")
 commit()
 revs[2] = base_revision()
 
-copyfile("bar2", "bar0")
+copy("bar2", "bar0")
 commit()
 revs[3] = base_revision()
 
@@ -91,7 +91,7 @@
 revs[6] = base_revision()
 
 -- Now make right side
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("co", "--revision", revs[4], "."), 0, false, false)
 writefile("bar0", "bar\non right side of fork\n")
 commit()
============================================================
--- tests/test_problematic_cvs_import/__driver__.lua	f26942e465025f75e07acaea0e8ad77ea7880bc4
+++ tests/test_problematic_cvs_import/__driver__.lua	2240b4ef2c2d551f54ee38470df88ae5d6f1b8c6
@@ -9,6 +9,6 @@
 
 -- This rcs file fails to be imported correctly by monotone
 mkdir("tmp")
-getfile("rcsfile,v", "tmp/rcsfile,v")
+get("rcsfile,v", "tmp/rcsfile,v")
 
 xfail_if(true, mtn("--branch=test", "cvs_import", "tmp"), 0, ignore, ignore)
============================================================
--- tests/things_in_.mtn-ignore_get_ignored/__driver__.lua	e7b9b6ae892ff496fa72248c63a48520e6c8da64
+++ tests/things_in_.mtn-ignore_get_ignored/__driver__.lua	9062aa1fbd033cfc7de95fc5248b7ca50b01bf4e
@@ -9,8 +9,8 @@
 writefile(".mtn-ignore", "bar\nbaz\n*.d\n")
 
 check(raw_mtn("ls", "unknown"), 0, true, true)
-copyfile("stdout", "unknown")
-copyfile("stderr", "unknownerr")
+copy("stdout", "unknown")
+copy("stderr", "unknownerr")
 
 check(qgrep("foo", "unknown"))
 check(not qgrep("bar", "unknown"))
@@ -19,8 +19,8 @@
 
 
 check(raw_mtn("ls", "ignored"), 0, true, true)
-copyfile("stdout", "ignored")
-copyfile("stderr", "ignorederr")
+copy("stdout", "ignored")
+copy("stderr", "ignorederr")
 
 check(not qgrep("foo", "ignored"))
 check(qgrep("bar", "ignored"))
============================================================
--- tests/update_does_not_stomp_non-monotone_files/__driver__.lua	3001c8acd928063b99fac8f01f54424d0e7ee630
+++ tests/update_does_not_stomp_non-monotone_files/__driver__.lua	998d9d0514ec726e00ecaff6659cf276ae098a36
@@ -17,15 +17,15 @@
 
 -- Alice make project, writes foo, but doesn't check it in
 mkdir("alicewd")
-copyfile("initial", "alicewd/initial")
+copy("initial", "alicewd/initial")
 check(mtn("--branch=testbranch", "setup", "alicewd"), 0, false, false)
 check(indir("alicewd", mtn("--root=.", "add", "initial")), 0, false, false)
 check(indir("alicewd", mtn("--branch=testbranch", "--root=.", "commit", "-m", 'initial commit')), 0, false, false)
-copyfile("foo.alice", "alicewd/foo")
+copy("foo.alice", "alicewd/foo")
 
 -- Bob does add of file foo, and commits
 check(mtn("--branch=testbranch", "checkout", "bobwd"), 0, false, false)
-copyfile("foo.bob", "bobwd/foo")
+copy("foo.bob", "bobwd/foo")
 check(indir("bobwd", mtn("--root=.", "add", "foo")), 0, false, false)
 check(indir("bobwd", mtn("--branch=testbranch", "--root=.", "commit", "-m", 'bob commit')), 0, false, false)
 rev = indir("bobwd", {base_revision})[1]()
============================================================
--- tests/updating_from_a_merge_which_adds_a_file/__driver__.lua	9de36d12c49f6b36cb33978609f2c86412376199
+++ tests/updating_from_a_merge_which_adds_a_file/__driver__.lua	1d07fad8dd526be2813cc7d200056d3f50e2fcb6
@@ -17,7 +17,7 @@
 
 probe_node("a", root_r_sha, root_f_sha)
 
-remove_recursive("b")
+remove("b")
 writefile("d")
 
 check(mtn("add", "d"), 0, false, false)
============================================================
--- tests/updating_to_a_given_revision/__driver__.lua	2e9125c5c94c5c87a921ff6cb143918dcc8cd489
+++ tests/updating_to_a_given_revision/__driver__.lua	ce5676214259bb94d642a9a3f829f88c5aac071e
@@ -1,28 +1,28 @@
 
 mtn_setup()
 
-getfile("root")
-getfile("middle")
-getfile("left-leaf")
-getfile("right-leaf")
-getfile("modified-left-leaf")
-getfile("modified-root")
+get("root")
+get("middle")
+get("left-leaf")
+get("right-leaf")
+get("modified-left-leaf")
+get("modified-root")
 
 revs = {}
 
 -- Create root revision.
-copyfile("root", "testfile")
+copy("root", "testfile")
 check(mtn("add", "testfile"), 0, false, false)
 commit()
 revs.root = base_revision()
 
 -- Create middle revision based off root.
-copyfile("middle", "testfile")
+copy("middle", "testfile")
 commit()
 revs.middle = base_revision()
 
 -- Create leaf revision based off middle.
-copyfile("left-leaf", "testfile")
+copy("left-leaf", "testfile")
 commit()
 revs.left = base_revision()
 
@@ -35,7 +35,7 @@
 check(samefile("testfile", "middle"))
 
 -- Create a fork from middle.
-copyfile("right-leaf", "testfile")
+copy("right-leaf", "testfile")
 commit()
 revs.right = base_revision()
 
@@ -44,6 +44,6 @@
 check(samefile("testfile", "left-leaf"))
 
 -- Test that workspace changes are kept while going backward.
-copyfile("modified-left-leaf", "testfile")
+copy("modified-left-leaf", "testfile")
 check(mtn("update", "--revision", revs.root), 0, false, false)
 check(samefile("testfile", "modified-root"))
============================================================
--- tests/use_get_linesep_conv_hook/__driver__.lua	795b37572ca781a06e6097b6d48ba82a921054c6
+++ tests/use_get_linesep_conv_hook/__driver__.lua	d0344eca6c611d7501a91685c273f997a4f9f26d
@@ -12,18 +12,18 @@
 writefile("foofoo.crlf", "foo\r\nfoo\r\n")
 writefile("foofoo.lf", "foo\nfoo\n")
 
-getfile("linesep.lua")
+get("linesep.lua")
 
-copyfile("foo.crlf", "foo")
+copy("foo.crlf", "foo")
 check(mtn("--rcfile=linesep.lua", "add", "foo"), 0, false, false)
 check(mtn("--rcfile=linesep.lua", "--branch=foo", "commit", "-m", "foo"), 0, false, false)
 revs.foo = base_revision()
 
-copyfile("foofoo.crlf", "foo")
+copy("foofoo.crlf", "foo")
 check(mtn("--rcfile=linesep.lua", "commit", "-m", "foofoo"), 0, false, false)
 revs.foofoo = base_revision()
 
-remove_recursive("_MTN")
+remove("_MTN")
 check(mtn("--rcfile=linesep.lua", "co", "--revision", revs.foo, "."), 0, false, false)
 check(samefile("foo", "foo.crlf"))
 
============================================================
--- tests/use_inodeprints_hook/__driver__.lua	07ead3d63cfc585cae4a229f9b1103c0e501b7fc
+++ tests/use_inodeprints_hook/__driver__.lua	7b17e6a3aa29a0c798bcefe88c6a997bffe2b1f9
@@ -1,8 +1,8 @@
 
 mtn_setup()
 
-getfile("on.lua")
-getfile("off.lua")
+get("on.lua")
+get("off.lua")
 
 check(not exists("_MTN/inodeprints"))
 addfile("testfile", "blah blah")
============================================================
--- tests/workspace_inventory/__driver__.lua	520d87edeeb2cca37c6e8e2a733a988edc738aa7
+++ tests/workspace_inventory/__driver__.lua	b34fa607631cb6076e1e78879fb868095344ded3
@@ -1,7 +1,7 @@
 
 mtn_setup()
 
-getfile("inventory_hooks.lua")
+get("inventory_hooks.lua")
 
 addfile("missing", "missing")
 addfile("dropped", "dropped")
============================================================
--- testsuite.lua	53909234852e15ede6b23373bf7275e90392ecd1
+++ testsuite.lua	1583c485e887b9b132e73086e51e3e1985539790
@@ -88,24 +88,24 @@
 end
 
 function probe_node(filename, rsha, fsha)
-  remove_recursive("_MTN.old")
-  os.rename("_MTN", "_MTN.old")
-  os.remove(filename)
+  remove("_MTN.old")
+  rename("_MTN", "_MTN.old")
+  remove(filename)
   check(mtn("checkout", "--revision", rsha, "."), 0, false)
-  os.rename("_MTN.old/options", "_MTN")
+  rename("_MTN.old/options", "_MTN")
   check(base_revision() == rsha)
   check(sha1(filename) == fsha)
 end
 
 function mtn_setup()
-  getstdfile("test_keys")
-  getstdfile("test_hooks.lua")
-  getstdfile("min_hooks.lua")
+  getstd("test_keys")
+  getstd("test_hooks.lua")
+  getstd("min_hooks.lua")
   
   check(mtn("db", "init"), 0, false, false)
   check(mtn("read", "test_keys"), 0, false, false)
   check(mtn("setup", "--branch=testbranch", "."), 0, false, false)
-  os.remove("test_keys")
+  remove("test_keys")
 end
 
 function base_revision()
@@ -130,8 +130,8 @@
     branch = nil
   end
   if mt == nil then mt = mtn end
-  remove_recursive("_MTN.old")
-  os.rename("_MTN", "_MTN.old")
+  remove("_MTN.old")
+  rename("_MTN", "_MTN.old")
   
   if branch == nil then
     check(mt("checkout", "--revision", rev, "."), 0, false)
@@ -161,7 +161,7 @@
                     mtn("--db", db2, "ls", "keys"))
   
   check(mtn("--db", db1, "complete", "revision", ""), 0, true, false)
-  rename_over("stdout", "revs")
+  rename("stdout", "revs")
   check(mtn("--db", db2, "complete", "revision", ""), 0, true, false)
   check(samefile("stdout", "revs"))
   for rev in io.lines("revs") do
@@ -175,7 +175,7 @@
   end
   
   check(mtn("--db", db1, "complete", "file", ""), 0, true, false)
-  rename_over("stdout", "files")
+  rename("stdout", "files")
   check(mtn("--db", db2, "complete", "file", ""), 0, true, false)
   check(samefile("stdout", "files"))
   for file in io.lines("files") do
@@ -188,16 +188,16 @@
 -- maybe these should go in tester.lua?
 function do_check_same_stdout(cmd1, cmd2)
   check(cmd1, 0, true, false)
-  rename_over("stdout", "stdout-first")
+  rename("stdout", "stdout-first")
   check(cmd2, 0, true, false)
-  rename_over("stdout", "stdout-second")
+  rename("stdout", "stdout-second")
   check(samefile("stdout-first", "stdout-second"))
 end
 function do_check_different_stdout(cmd1, cmd2)
   check(cmd1, 0, true, false)
-  rename_over("stdout", "stdout-first")
+  rename("stdout", "stdout-first")
   check(cmd2, 0, true, false)
-  rename_over("stdout", "stdout-second")
+  rename("stdout", "stdout-second")
   check(not samefile("stdout-first", "stdout-second"))
 end
 function check_same_stdout(a, b, c)