# # # patch "ChangeLog" # from [1372e5441be2306ffbb2a5d802d2779568526622] # to [544b27445cc09ce4d141847f0977944d54979d45] # # patch "tests/README" # from [a8afa6b4c99c7b1fe17721b6c8ecdb3062b60e6a] # to [76d708d4fb952bb644fb947d89d171f1920eb031] # # patch "tests/t_add.at" # from [899b1081891c52a86be286d16af8df0bf5f2d457] # to [d4d8b57976ea08bcc1167c9229dad035ece38a06] # # patch "tests/t_add_dot.at" # from [39fd728b6928219f57a29721dcb562678b268806] # to [fe8a2f3cca7082972c4e448a1c59c6e333a3212f] # # patch "tests/t_add_drop_add.at" # from [3cf0849f956315056eab889db537899ca88ffb67] # to [1a28514320d949d9694f952915dd21de6449dd79] # # patch "tests/t_add_edge.at" # from [b62f4ca4e76068ab4a50a61f14b19e9f03c96168] # to [0f872335425b49dc6eefd911da48182837ec5f75] # # patch "tests/t_add_executable.at" # from [070973ab2e1129c20c04c48679ca5cd9e4a417aa] # to [1730d2a6a512abcd37cea06f7fa1f4fbdd55bb35] # # patch "tests/t_add_inside__MTN.at" # from [00e567e757fc46c5fad511d711fa5054df6f24c9] # to [d03f209f39f09699a2fa6b2cab954309e999b31f] # # patch "tests/t_add_intermediate__MTN_path.at" # from [d51569d27ae7c8ff8045553c5d778f05d9c369b7] # to [7f975eca93cb377d2d0eb5ba216f508814f4a928] # # patch "tests/t_add_owndb.at" # from [74dcb2ff61d7a8cb9c787ddabcbd74aa10ea2eb8] # to [17ac32dd2ff9ac2cfee8d0555f1ac429268ce573] # # patch "tests/t_add_patch_drop_add.at" # from [e717c2c7dd84d56dac2d944f2198bd516a2fd601] # to [625d6c7083dcb7c04f855089b2c32aec3794cfc4] # # patch "tests/t_add_stomp_file.at" # from [1e74d89b26c8f9b81662ecda31737f65e9f97223] # to [0e276fa556aa92cbe8f3003656b00cb6e0861a0a] # # patch "tests/t_add_vs_commit.at" # from [854fb99182fa82f283d2a26b089e770909461fa5] # to [13d4dbdb3ef806ed928d43ebb74e6e0285696c48] # # patch "tests/t_ambig_update.at" # from [5d0c04ee2f70686bd873ce3a40dca77cd8e545b9] # to [6c007618ef2fad7d728e547434fe7ba1639f687c] # # patch "tests/t_ambiguous_tags.at" # from [a4d848c1c5af6a888d0f5cb8798e73c476e03c4d] # to [60be714286f29e797d43dd2e8d1472606cbb654b] # # patch "tests/t_annotate.at" # from [1ba28d0a9e3166399d5fa56839655a0f7f03cc0f] # to [d3aa446ce87ede39db51ee26af7c5f1f8009c0a2] # # patch "tests/t_annotate_add_collision.at" # from [c4b22026515ae9e412a19dec5455679a9cc49d2c] # to [157b9d2982fe617917b9ee6656f88e6fa55c71d5] # # patch "tests/t_annotate_branch_collision.at" # from [844405fcd8b1ba3f12727568688da83e0b67b5c7] # to [4c46e23d674e8f6e5a17cff141466db4ed320e6e] # # patch "tests/t_annotate_copy_all.at" # from [18142f64b79ab569a6717bf8743e3bfbd88722ba] # to [1bc59599afa6f40e85ad987aeb3b56ba6dd5157c] # # patch "tests/t_annotate_lineage_dependent.at" # from [43ba9ce786c6d70078e023be6ea97e86e9da3d69] # to [839669e7cf6ccc2fa7028d92d9bf79964defdd20] # # patch "tests/t_annotate_no_rev.at" # from [d4c01d35d64dd0203b3dfa2d3484e08b84493ade] # to [cc829aa492a432fd111f974d5e391979fa875184] # # patch "tests/t_annotate_renames.at" # from [d87797cbda3513789cc18f756eb61ff8b79eb1c5] # to [c0ba01e5bdeb334c0d6b768bbfa66b05a75b336c] # # patch "tests/t_annotate_split_line.at" # from [5386b60f613a9e97f92a02cd9fd0b38d7c58d253] # to [24df45951cc02ddfd3a645c1147c54bfe0a28bf1] # # patch "tests/t_at_sign.at" # from [b389ebe5349370531ef4e84019053f136aad6a62] # to [7125964542274ddcda133e636385ab13afe42a14] # # patch "tests/t_attr.at" # from [0d210db46b63bccaed104ad8f7255f9dd1231783] # to [e922a3f8278af3780c6d50a9dfa05ce38b636ca4] # # patch "tests/t_attr_drop.at" # from [8c55f61a0dd7cf5008f44e50bfab04d94b001f43] # to [f001046329b2c34b10a2468c5d9851e61a4d02d6] # # patch "tests/t_attr_init.at" # from [fc2caec18c322cfab3b2f02504598cbfbfebb893] # to [f08116e369afcb15d21f73c4ba6e00f1b22025d9] # # patch "tests/t_attributes.at" # from [c622276ba9f86173d892fc177ff0395680670e95] # to [c4d560b1dcb601f36920de74971ac14d54458bb3] # # patch "tests/t_automate_ancestors.at" # from [3c5baf5757a08e4fe41d17acf8d2a1956319fc9e] # to [eeab2f4c2db46c54d3ba909231c02381010e9b92] # # patch "tests/t_automate_ancestry_difference.at" # from [428481e350da7d79172baca9a8e7810c60fae000] # to [225557ff68879c3a1bbf2ffe453db7640fa07082] # # patch "tests/t_automate_attributes.at" # from [06fcfbc15fb0a02778f4ce7fb2c130923fe60262] # to [054416b5d189f4639a9c34354c65dd7b268a78b4] # # patch "tests/t_automate_certs.at" # from [b750df1376ac9d54effb29ecef821f329222e8bb] # to [216c47ba114c6a4ce24d49ca3b978a0a46b73f3c] # # patch "tests/t_automate_descendents.at" # from [162d5cdd9973925caef2834f3e6138bf02b48f61] # to [3723c3ce9666e306e74d34b1a266feab95160a62] # # patch "tests/t_automate_erase_ancestors.at" # from [e0de2ef77df88f6f95254bea6967ff4401ac0c5c] # to [fc977baa100ab3ce7dac763b72f2c128eacd60fc] # # patch "tests/t_automate_get_file.at" # from [57d34789ad2ede0a5233cdc4f06d0674bb2f3816] # to [3aa285a542c79eb814e0443cffc4a99611bb2f02] # # patch "tests/t_automate_get_manifest_of.at" # from [9c486b3d5af93c8854826aeabc9f01d42422eef1] # to [8ae58a66be39889d6db59a6d13c7e0233ce448f6] # # patch "tests/t_automate_get_revision.at" # from [a4b00aef251b5341e523b6973ac6c07030a04691] # to [b71d2a0dc244061521c4d781105ff4f06a800d62] # # patch "tests/t_automate_graph.at" # from [4f4ea120d3eccd2d6f5edf21cdaf3ce8d2f92f2c] # to [94864fca63fd08adf6df953129fc7ec96b2c0e5e] # # patch "tests/t_automate_heads.at" # from [7f7f54a5b2003ee87db7266b7979a98163df0891] # to [3cb733c7bf080453f31f0dc7d5d1c6d4dc30aaa2] # # patch "tests/t_automate_inventory.at" # from [1a9fcca95a722a81cf5fe49a6dd7025900c4e311] # to [c178579a16b3ef84d0dc8d1395e3dc9fe28e0595] # # patch "tests/t_automate_keys.at" # from [4961f4066fa69d5078c851af044aefec58450254] # to [f661e9d68ba4f436b0a95acf66bce7d441b8e5d8] # # patch "tests/t_automate_leaves.at" # from [b4d59268051ba6d3d679c72a105b7e1232960236] # to [6e45e75d327607509b6177f4f3b94f950dbb23e5] # # patch "tests/t_automate_select.at" # from [ff4e0d429619813b10bdb2c819525cf29341fe51] # to [5980a8f0b8b692cb7141b82202880931f4d6f261] # # patch "tests/t_automate_stdio.at" # from [cd903319c8292bea39e0d71633cc7dec5b525b73] # to [1fc22c973d8b2d578c2d0bd3d7590b24a654466d] # # patch "tests/t_automate_toposort.at" # from [9f2692f64cb2b54f4e63c1c9c53f2dd4876ad542] # to [9ad1d9a0724ce801182b4a678723dd32871e32a5] # # patch "tests/t_automate_version.at" # from [0122d082b47e45e5bd47b7af4e0d5531d4f5f131] # to [8e10d9e1548f180f95a1feebd5ff00aca8b3537a] # # patch "tests/t_bad_packets.at" # from [2ab2b87f1b55c89f0132a7942a62f2d70c92c313] # to [a869bc5d94694ee25700e2dbc66870c2614c163c] # # patch "tests/t_branch_checkout.at" # from [db10f5a8f0dbed7aa57472eb4b306c37dffae9c1] # to [3d486602e6c48aebf29b68e46463a4f7f9be622d] # # patch "tests/t_can_execute.at" # from [d7890c13644741a774b11d14f99dc626620543cd] # to [c0873ceb909a6f6d8a5cc0652ec3e0fb38485a95] # # patch "tests/t_cat_file_by_name.at" # from [ad4272e1a30154bf67970b75cd5bca27b5a20a5a] # to [2f30047e3b3b9241f03ab3a7e62fe6e98ce5508a] # # patch "tests/t_cdiff.at" # from [384e323274036b8dc62927cb6bf0096ad716b538] # to [f5043d2d83d08948587c38bd1541d531bdf7d658] # # patch "tests/t_change_empty_file.at" # from [cef81a90be79584d5a6fb7fa2d505e5792751845] # to [6a82c1b966975e9d410654c55d4302c40734a60f] # # patch "tests/t_check_db_format.at" # from [4ea08f24426ca4b52f79bb2b9046d822c7548c9f] # to [1505ee7bbc55b4fa31bdcd5b94bee5f48c9dd28c] # # patch "tests/t_check_same_db_contents.at" # from [bb2ecb6e674b7f89797948db5cf6f5d6d042bb82] # to [715147930ebea5d259acdc7ce4b50d54d7f69707] # # patch "tests/t_checkout_creates_log.at" # from [a486e085ecd1ddf55dba3dfd63cc3c056117325c] # to [ab38ec5c2d15cc1196a07f47b5c6ab70bfcacdfc] # # patch "tests/t_checkout_dir.at" # from [f300f105573d0ec40486eaeae660a6a782442961] # to [7a3cb3bdef9819e99179378d09a79da392f842c9] # # patch "tests/t_checkout_id_sets_branch.at" # from [702d18e6aa83cfaa4ce94e27752c051ef4090c53] # to [207ace1b5517e791b6bbf32752f1555d04674a57] # # patch "tests/t_checkout_noop_on_fail.at" # from [93a999e1a23a24adf8b94409af078ed564656aa4] # to [45f1506851e9cece794b436c26136ab239c42432] # # patch "tests/t_checkout_options.at" # from [24eeba0a23944dc0b0593d1dadfcb4dfc8868166] # to [410c5f195e14eac5fa947402842899a97eb47580] # # patch "tests/t_chkeypass.at" # from [4a3b8cb2f6e7417cd27938b2e7f9aa12b1f116a4] # to [313ce501c61c4843429850005c712fa7fc093623] # # patch "tests/t_cleanup_empty_dir.at" # from [f6eee06d301b5a27ac38effc7226026f01b001be] # to [72b6b8bb01c8c42950e5222758067b322806fad9] # # patch "tests/t_cmdline_options.at" # from [a63163efe23eddeed9d7ae79efed99df0cdf07fa] # to [c8ae048fea25863a98a6fc27c4ff7450e7b7de07] # # patch "tests/t_command_completion.at" # from [393928d1b2c2a3d5e4da685676f8b91102b73550] # to [2da0730c7bced87f4753ecbc8a8fd75359130e6f] # # patch "tests/t_commit_cancelled.at" # from [6bc3250c034ad7d70100775dbcc56582ce475bbd] # to [460ecf891825e4df20b9bf94ddbfad3e3a611a65] # # patch "tests/t_commit_log_1.at" # from [d1d63ad1f1c2d3067d11edab3cf3b34c41754a90] # to [79a986d85506faf958003b9881549be49ed31cec] # # patch "tests/t_commit_log_2.at" # from [7b2c34e61c1b915006e335baaa65a95c675bd5c3] # to [9f933653de7f731c9f15094b0905a3ba3b5e9730] # # patch "tests/t_commit_log_3.at" # from [0683464b8b1bcfc2c40959accad8d22a17f69691] # to [fc72bb975a90adb07fa04640188ac399b3e46e94] # # patch "tests/t_commit_log_writeback.at" # from [5904bab9a698da393511233261e1d26b6a151fcf] # to [5e6a65c59b7e0a7ac5a5b10a4711d6560c386a59] # # patch "tests/t_commit_message_file.at" # from [9083f8d8c0f6a978c6421c4f9f352acd2652a95c] # to [7a6d3e111009f22a88427d27515bc98e83704fe4] # # patch "tests/t_commit_validate.at" # from [2d6e25f801aa61c96d7c063bd1c7e7d1224b55c3] # to [2f4192fe019edbafca186c66f0061500c0d3869a] # # patch "tests/t_config_confdir.at" # from [0436211514ef07656dae6576dfb25edf9f6df3d4] # to [fe24031e9eb856190dd2ff991e3e6f5129ac447f] # # patch "tests/t_crlf.at" # from [0fb9adb97227215e51748da4b19fe01ea6e53196] # to [236a75e0d93a570ef39ff7baf6690dd3bf33f626] # # patch "tests/t_cross.at" # from [b6ec5c1e0b1b0609996133cd9d004bc0e63bd71e] # to [09e047ae7b5bd444f561128f0f62c03e2d00ca28] # # patch "tests/t_cvsimport.at" # from [72f1079d6cb4ac5810d17e8ecf709e97cec1460b] # to [ca4ae111a3b2ec66a9b4309b3adbe71e78cb3885] # # patch "tests/t_cvsimport2.at" # from [a149cb06fc8e5edc8ad655187e92c2082b050564] # to [4e6064c0f7c8db19c59229399b49f677b3157807] # # patch "tests/t_cvsimport3.at" # from [f986d11da315b23a88364d9ed55b2e702fc21dc5] # to [07e1c01a8be8e2a29631486a04a7d9b4f9cea1d0] # # patch "tests/t_cvsimport_branch.at" # from [d5bcc9ee933be0f2711d9e81f005dfbd8d1ca3e8] # to [bbc7bdc1acb7226c6ebd72f649350403feba72ca] # # patch "tests/t_cvsimport_deleted_invar.at" # from [c01438bad0867f343040ad9c9f76f0f6803957a0] # to [e0ce988dbc1d649fe43cdd5eb3b684068266e3e7] # # patch "tests/t_cvsimport_drepper.at" # from [66e784892e504858f6bdfac5cd508d51d0b3e573] # to [c580ceec6721671d902dca25e64c8e047e0b8fd4] # # patch "tests/t_cvsimport_drepper2.at" # from [f3f24e3418c95a73a972f7fbf56da446e279fdc6] # to [2c62f3c4c35b4539eabc3c7b044081bf173ef9e6] # # patch "tests/t_cvsimport_manifest_cycle.at" # from [367b143477d97f31b5fe948cbc3b3b4960424aac] # to [48c4583cf075b5f0a784fb723916559a39ebb7d1] # # patch "tests/t_cvsimport_samelog.at" # from [ad82fe334cab4c3cf15409c91498ab99a413cf96] # to [07f685a305b96e6364b471314fcfc116eef2fd1d] # # patch "tests/t_cwork.at" # from [4c46c95e3ad1871a06fce9c5f94a00fc97930014] # to [58d1e8cef425450df9d3a57273c1a6142749990d] # # patch "tests/t_database_check.at" # from [78904ea3f51596f3a21b6aea39af1e6621ac7966] # to [55b37f4807bd66e41da83a751de23d58e5a6ce33] # # patch "tests/t_database_check_minor.at" # from [66b3b2c1654b8610edf4152c84342c70992004cb] # to [174ffc42e448efb64d29bbdce5df49e6035c7c14] # # patch "tests/t_database_check_normalized.at" # from [d89c3d1d57ac11406b965a7d1f7ba69f1bb21381] # to [9b74d6d061d5fc12b1da83685fe38ea4d57c5383] # # patch "tests/t_database_sig_cleanup.at" # from [931a30f59821cd4244a3d005a688002e88cd01bf] # to [7b4f9a436b3b6719589c884fbf5e264e774ae728] # # patch "tests/t_db_execute.at" # from [8d4eb06517101eb8b46af0d7e71649beda8c2e4b] # to [809c2e5d24fa38ebb2106c2cf42ec69b36c2435b] # # patch "tests/t_db_kill_branch_certs_locally.at" # from [4b77eb010e0fad546869da1d6af69d0a1a81d36d] # to [8fbc87053c066f5a863165e220955ec415d76c8e] # # patch "tests/t_db_kill_rev_locally.at" # from [dba54fa06f40b817e7123cd375b78b96f62a4d43] # to [48afae9e966512f16e4248d7e6af4515e8923eae] # # patch "tests/t_db_kill_rev_locally_2.at" # from [296391166304e8c739fcc7968ae5f58a36b91265] # to [e33f20750d5d6fbd8f49c79612ebbaad0270b524] # # patch "tests/t_db_missing.at" # from [9b3298dc6e907cb663c4b165f03d7df19940e7ef] # to [72799aa3e7926a756451b7113f5e2f59227625ad] # # patch "tests/t_db_with_dots.at" # from [b54df6de2ea3fa178dca93aa6003c7273871206d] # to [ae26b2b72d88f8ebe4c5602e21c9d6c89e4969c3] # # patch "tests/t_delete_dir.at" # from [734aaade26826b6fb8b2a9d56d63276d98803a48] # to [f61986308bf22e63086c550fc5ff8eb94f7ce145] # # patch "tests/t_delete_dir_patch.at" # from [c5e0a8c0919eb30be885c086894ea908cf0a99ce] # to [0f2bb9b4de62ca4ed2b6a831908e7a68f70e9f86] # # patch "tests/t_diff_added_file.at" # from [15a6bb14272964260cefa7a960bbe009288f499f] # to [2e42020e5ac8d43b569eee0c42093dede83037a0] # # patch "tests/t_diff_binary.at" # from [de45d9dca34e5765bd998968752d25368c8238e1] # to [f9afc7691fedd9d36c21a38e57c64f50cde1e9d1] # # patch "tests/t_diff_currev.at" # from [ee9a2d74b230a17a54292a4b2301f650330bf3ea] # to [637917ca09ebe0f27a10588bab8198f9405fd3b6] # # patch "tests/t_diff_external.at" # from [f44d899d4e359fce55e22de6bd4c3752d1d18770] # to [e30e936aa2a8bcc6b7b6b1e9d2b14773957265a4] # # patch "tests/t_diff_first_rev.at" # from [6ae8976a600c70b0ddaba8ed4e399037685fe968] # to [666fa98de7fc6a27bdae7e687196003e8a32187b] # # patch "tests/t_diff_outside_workspace.at" # from [933f39d768ce47a78389a31fd6a05d15dc6f29b8] # to [b3bd424fb389a92f70e2d3198e033fed011cc2d6] # # patch "tests/t_diff_restrict.at" # from [ee27d0b0ec717a1ca9a88009ace00ecd56e75370] # to [0131d18d3c2dca24c98a4eb0770c6bb5599ac04c] # # patch "tests/t_disapprove.at" # from [b2dafed395b370536eece985e7065d8b0ad857c3] # to [62c405ce53b552b8eaf679472adde7e906bf3aba] # # patch "tests/t_disapprove_branch.at" # from [11ee7293fd1dbc7436988f9eb852d75200cb1640] # to [fc92c29cf9a754b60e36b2a8ad0eaf7b7b86e2ee] # # patch "tests/t_drop.at" # from [395480063e73803977951ec4ae36de074be71eec] # to [97ba8b4dec3ff63c46f1228f9e601742169b7c59] # # patch "tests/t_drop_attr.at" # from [4e21c338cd341b16e2052050ff111b61bd27a630] # to [029a37e7fd3c2e5cc630b2b827018522f981efd1] # # patch "tests/t_drop_execute.at" # from [d9a492fa85d4765c1e62a4bf40806cb22f20816e] # to [14bc7f6b35a26301d17b2e7a836015c13203579c] # # patch "tests/t_drop_missing.at" # from [7d7b49bf0e6aee2bb8a7bf96202f464367673274] # to [a783214a8143bb6d39978dee5c033cf7fe80774d] # # patch "tests/t_drop_rename_patch.at" # from [7e1c2a82a696a1d8e753cdf967badb906cdd8caf] # to [0a3b4f48cdece61785cbd47edc707c021b6ef3c6] # # patch "tests/t_drop_vs_dropadd.at" # from [ca2bd0804f09260fff1d6b1c714a1f4cd1c5ea52] # to [66d8bed66aabb638ba55de8e97d18be734f92343] # # patch "tests/t_drop_vs_patch_rename.at" # from [1a6aca7fa842b2ea2bdac643970e5b4b652fe57d] # to [de1ac02505668fc5064775d8349c7cde5be9006e] # # patch "tests/t_dropkey_1.at" # from [87e5a23e7ed8df5db283b295648832ef72b0f5f7] # to [ee9116a8d23d4c22713d6389006db33069d2c95b] # # patch "tests/t_dropkey_2.at" # from [1a15229900da781d07f0f6776f942dc0ff2d0b38] # to [85a956ca0ba559c0e2003ed72e515325149c5737] # # patch "tests/t_dump_load.at" # from [3157fe22c921e85c3329ff500c8e199c34c480aa] # to [d5cf76d37b7ff9d125843679f6253f966181d292] # # patch "tests/t_empty_env.at" # from [8478ee958c97601d85cf9129efd85674e34442cf] # to [b101bf28b4d6cb3b13f25b349f459092280c8f7e] # # patch "tests/t_empty_id_completion.at" # from [d7e0f49748fa33fcfa33f847b82308a84d1965bd] # to [5cc36081d397e3a476e69e1f3eb7cd215f5f1502] # # patch "tests/t_empty_path.at" # from [69085e1806dff5b9884401f0c64e02477f5a8b14] # to [22991f378c51a00865a1103b7213b6b1f9bcaaa1] # # patch "tests/t_epoch.at" # from [ca05184712f3e0dddae019c3fb9b7ee810dd1ebd] # to [44ab70155ed6404cca0a0bbcee271f7d800dc120] # # patch "tests/t_epoch_server.at" # from [3bec20643e247f132891a020227fff58ab6f257d] # to [365af3452ee44321be6376e7d1044b668a2ec8a0] # # patch "tests/t_epoch_unidirectional.at" # from [f03f544695c15425f879c7534003c29e82634e21] # to [158343a9589a61414a48e52f984f3e9bff5ad3e3] # # patch "tests/t_erename.at" # from [9426aa15f5054436ca30dcd2af753af591e22f8a] # to [ed13f77bc466ca2affe82cb7ff634f7d30484f64] # # patch "tests/t_existsonpath.at" # from [984ebe7ce8dbd63cb065fc1fd5f17c16df3c9fb6] # to [cba0599cc1d6c37d54523009f257891a9b7ff763] # # patch "tests/t_explicit_merge.at" # from [4893463579f2b6ee44df28818a593811dc3cdf87] # to [d4e0440b50d24402c6ca562eb1deb8b7a5559b98] # # patch "tests/t_explicit_merge_with_anc.at" # from [fab2b7ccbc32dace4b439ce1ac30b6141cc6c182] # to [2f314e8198b4d2c17d26b37b0aceb41e700468cf] # # patch "tests/t_final_space.at" # from [c4f8416180990cf8978a492785366149c3d05689] # to [028912235a59dd5139fd0cac1d32d376612be356] # # patch "tests/t_fmerge.at" # from [05780baeb97e02d1d841f3f89ecf268d2d34fd23] # to [0b2399e97ba58a109d13d75510d9556751c296bd] # # patch "tests/t_fmerge_normalize.at" # from [2728973dd75376ef8a100f530098cd2657612303] # to [75fce424723eeb952876e2d8f4676e09ddfbdd9c] # # patch "tests/t_fork.at" # from [90ea9035a2dd6904667dd749dfbea6af3c545363] # to [f0bb1f93ccb804ea4b1adbe098d6960a0c36d2a4] # # patch "tests/t_genkey.at" # from [d130247d78765f58a06db900908980724a853615] # to [1f03cd89b88621e1a2eefbd1eebc6751b52b7724] # # patch "tests/t_heads.at" # from [de84bc0854989c38fb5d424a87eef0f9964c4cab] # to [a8683a901d411bc56c2a1a68c3a27a5ca4b78ab5] # # patch "tests/t_heads_discontinuous_branch.at" # from [c76e752a9c3d9bff30e7a0eb511de7f50eab9f07] # to [6d4815e40870edc5fe813cd0d821062081816688] # # patch "tests/t_i18n_changelog.at" # from [0f1124ec202ac48aaedc929af71e6cfa8bed4d41] # to [f6d0a8cd0d0d37c2f5857c6911edbf9628cc12fa] # # patch "tests/t_i18n_file.at" # from [4e73d28b709e5322946e121b22be841f15a4ec3a] # to [48a187645680877f7cb49a965547d9e40eb798d4] # # patch "tests/t_i18n_file_data.at" # from [b46606674381d2c1fc085155c79a1d1a827c5612] # to [58c5fe8753974a8b5c0e42929ab27103b3b3588c] # # patch "tests/t_import.at" # from [acd29dd84259e7d8d08e79c2567a66b78928c430] # to [9694bbd73381d23824b9ce866bb486aa7740d79a] # # patch "tests/t_inodeprints.at" # from [0a0246b22800058dfde20a03e8998bd18547682c] # to [300e2d1ac57e8f601613a8581ec647cd6345e71b] # # patch "tests/t_inodeprints_hook.at" # from [8dc6552d5c04b58070614afda831083b0c1c31c9] # to [f685bfda157660412f4c0005cefa132a2869513b] # # patch "tests/t_inodeprints_update.at" # from [b027c6458bbe47cef06d3c34a4d96594c956e6e7] # to [84fb462846325c622c8b91988f718f931cbeee90] # # patch "tests/t_key_management_without_db.at" # from [8f06a4ebf0903b0bda059a0ac1b259698767be86] # to [89dbce7b086ca4460e3c89acdc52451a8ff30bfd] # # patch "tests/t_kill_tag_locally.at" # from [62be6ee4e44142ec69963f446c196ade4a71174c] # to [80f429d59189a1b11a05ee88bc3691937e568f7b] # # patch "tests/t_largish_file.at" # from [2b4f87a4a94c0e4ffca9976b7692904cac81a3d4] # to [3bc14369a987579c5778f9523143e337351dcee8] # # patch "tests/t_lca_1.at" # from [8f541b3037a339b0eb6d74af8defe1baa5056b8a] # to [ea16e81e215646ae4f83d5c5eb5907c99f9ca831] # # patch "tests/t_lf_crlf.at" # from [917077851f1c5d077f81251c60648e0ca4d1237d] # to [58169c35e75e437d54f898aed20c0071b50bd025] # # patch "tests/t_load_into_existing.at" # from [3bcc045c0d2e2d495f248b55101aba74605a764c] # to [5e7b91dbf6de873d42b7c7d35123caa8bbd04f2b] # # patch "tests/t_log_brief.at" # from [659ab85957e702aba713117d071bea86bd74aebf] # to [ba1ff91532913be22cf5ec30cbeecf9afec95d51] # # patch "tests/t_log_depth_single.at" # from [98a2f3d7517c097dafa83024dc6b3b5d2303242c] # to [1eb3cf85837488fe797d471e752d82f6c299c4c9] # # patch "tests/t_log_dir.at" # from [f965de2bd1db78e029424b04221edf6505862c0c] # to [558f951c51a142ec83d5819ab1b404f5252621a4] # # patch "tests/t_log_last_next.at" # from [b90e1c651ecda4499cd37ce76444701b55c43c09] # to [095e60c66f4d82770c78eca6b362cacc5c3795b0] # # patch "tests/t_log_nofiles_nomerges.at" # from [dedc7b333ac5e779f29464a1f62285ec787b6dd4] # to [a45e4fde4ebda64dc6362ef9775866917b0c0ee7] # # patch "tests/t_log_nonexistent.at" # from [ddc08aa0bfe6cf5093cdea61ccfbc51225bb998a] # to [1436c802d340a93d03401a5f03531d936bba5130] # # patch "tests/t_log_outside_workspace.at" # from [1e54ecc7b774f1f2b485b79b0f931718cb175ec4] # to [564008c0ac7530e34b086410f62319b0ec484c8a] # # patch "tests/t_log_selectors.at" # from [3d000a79a2acdff3df5c7a8a804d2e38aa035dc5] # to [74ecf53acd6dde71e30ec6f53554248f565016cc] # # patch "tests/t_log_to_file.at" # from [4a9ad6b478915e87c07d13d7d15b8bdb6ae0a92c] # to [02824ce8f36a6ac5fbbc0eb15f12ab54d2d135b6] # # patch "tests/t_ls_branches.at" # from [5fb5cf84c420e5c7143a80b5c2b4e87356568615] # to [31a8e65c7c54f965b6ae75546dd5f69d5140b168] # # patch "tests/t_ls_changed.at" # from [1fc5edbd5d67ff60df161f44864efced6c08670a] # to [e23b32c0175bc7ff41da43813339a3ade35297ea] # # patch "tests/t_ls_known.at" # from [6c871d99df8c34c37190d281ca538aa5c90e37a4] # to [6cbab836bd4b50ade59f0db616fab7df5cd729a4] # # patch "tests/t_ls_missing.at" # from [f6c5d42b460194a850e4411d2eb571f03a921ed2] # to [1a74c54efffbe4fa8c8a9575992b90e6ebd669c0] # # patch "tests/t_lua_includedir.at" # from [cfb180197cc358a2d4bf71385fa0fdc1b53058ed] # to [944c14ad90d62efe40057371968e99cf152b007e] # # patch "tests/t_merge.at" # from [2a28c7fb2dd8a521f25dbff2a2e0e799ee4b9e36] # to [63768660a5f0db8ba9d3a3cfb957c9d087c9905c] # # patch "tests/t_merge2_add.at" # from [70f7393bb7f12def5cc60fdaa6ae26185bcf84fd] # to [f16291fdf2bf30bd5a60cf7a916fc938900bc07f] # # patch "tests/t_merge2_add_drop_add.at" # from [c7f4977982cf74db0653b9761a13d42badeee5a4] # to [d8365c982c1237a6f1085bf6768d25bfe01f89a4] # # patch "tests/t_merge2_data.at" # from [f1adea0b23478d158fec1e945af77f4d497cc2e7] # to [33b65f4a838dde73b81373a8e44c5972b1884975] # # patch "tests/t_merge_1.at" # from [8175f5de22920cdb8c4198903612346c5709b29a] # to [aa050bf721e1f9ef0f2c45949b46bb31b6db8c0b] # # patch "tests/t_merge_2.at" # from [4951a02f2b4fb8ef8c51ee7328592dea72a75c7b] # to [41cc617c2fb2291e693f2624fdf6f53e955830e5] # # patch "tests/t_merge_3.at" # from [4e8319848f65376efc55b275998d2598980222aa] # to [d33d3f4bfe8e7a500eb318593611d6b299b18721] # # patch "tests/t_merge_4.at" # from [c6a34d01423db92ef3383080b395a1bc25a0a0b8] # to [f9548f9fbf98bdcc270b6c5c008a85006a924487] # # patch "tests/t_merge_5.at" # from [d5fd116da68faae3715fdc2c6d0a37befad1d4df] # to [30d78efe8c23d39e8e81095586cf635fc656c2d1] # # patch "tests/t_merge_6.at" # from [477e2620ce0ac0a34a428d5e0ba384427c0c4848] # to [52a2e666d1b342ffd0932dabb1a6899a5ea37ed6] # # patch "tests/t_merge_add.at" # from [d53a3bd26bf21c68ac7f8e83d9efe0f4730d00ec] # to [ea9225519e811dc8d0db855b457f0f8e64d7ee08] # # patch "tests/t_merge_add_del.at" # from [70b04bd09907bcec19b64bfd3b7488d50d849ea2] # to [46062d16854dcb68f93991216bd47c6358ba7acf] # # patch "tests/t_merge_add_rename_add.at" # from [65aee8363a38ca7e1ba54d2d691725867c0e46e4] # to [75c115a20c1027a6bd97c6c538e183b0ae3a5ddd] # # patch "tests/t_merge_ancestor.at" # from [1a675c4e1b3fab0c18741d03c8716f64409be64d] # to [b372cf21f319a1262f87f183b0ca6b6582c56e84] # # patch "tests/t_merge_binary.at" # from [4cdc96fa85206b0b6d7488886045f1d541a55131] # to [a970e93664ce038ee2f7ce4e0868187831190825] # # patch "tests/t_merge_into_dir.at" # from [326175a419b2bb85df4dcf273cbae7b9d4e9ce9b] # to [d8548e97b0caade7288b243f7479cbe60d07fa37] # # patch "tests/t_merge_lca.at" # from [51497aebefb43f940038decb61132f2a60ee9789] # to [fdaef4c3722a1d3c3bfba25588baaf34d363c367] # # patch "tests/t_merge_manual.at" # from [fe047ad7e648c30b17daefb7e7e3d5af19dc7900] # to [9927fc3cc31197cc11563983e499addcdc8b7b71] # # patch "tests/t_merge_normalization_edge_case.at" # from [878221e1b8160bc69121f1948555364da3690262] # to [aad89437f29ee4c21a02c44238e028fdb227b299] # # patch "tests/t_merge_rename_file_and_rename_dir.at" # from [01406b0becea1ee2ede9cc93f1f5134537ddfb62] # to [71b4bece2c0ca083ed470038fbabba1f13940c01] # # patch "tests/t_migrate_broken_schema.at" # from [330c2d86dbacfc63b6491e1265cf9c252074196d] # to [6698a15d66c2d8364ba8a4ea09b58774a841bb7d] # # patch "tests/t_migrate_rosterify.at" # from [a60a01a88870babcb57bfbc1851fc2563b96ea81] # to [89206437afc2957cb4f73cf00d2300a9cf4fab47] # # patch "tests/t_migrate_schema.at" # from [e5b24dd9ccc44e36b20d1b1dc89509f0e99896fd] # to [953fbfc66ecf0c783d0f8698c0b08fbcd4f12365] # # patch "tests/t_mixed_case_pwd.at" # from [ff1815a6a91f6e658418e7b6456f6ad578a02a12] # to [d8aa7302338aa83124e08afb2c55e3c343808c5f] # # patch "tests/t_monotone_agent.at" # from [6bd1959902d38d1fd27d1f77d3e5595e6cec1f60] # to [5aef3c88b1b9777c1f7efa7967352ce5389a47ff] # # patch "tests/t_monotone_up.at" # from [b17d746daae707b1d2a5194ff39e9d0e439de643] # to [f6bdc88b7e755729b9c853724eaeb7b290147d2d] # # patch "tests/t_movedel.at" # from [aca376523828cd1fd40fe70e0a3ec72066852b2d] # to [df0c15f63123991cb33fa2b3dce187edc74b70b2] # # patch "tests/t_movepatch.at" # from [eedc17bcf8554389d642db6f83674663b496d70f] # to [eccf0ab5c306a58bbb110d5423fc572d832496a6] # # patch "tests/t_mt_ignore.at" # from [c1be4b41d6032d7c488ec44a0ccc402be82e15f7] # to [3d4606633315af1837c5377d57152b6cd014e837] # # patch "tests/t_multiple_heads_msg.at" # from [e18276c0c4588a1bac33d4db0f84921eee8419a1] # to [9e61cdfd3c747e8773754bf09e38cc6c55787eb2] # # patch "tests/t_need_mt_revision.at" # from [cc930f17f155b0549b153fd11673d126081993a3] # to [c53b0108a217e92a220f2a4f267f0b71c25ed82c] # # patch "tests/t_netsync.at" # from [31e8c678b935b657624d1ca98391efc8dbf921ad] # to [94ec5c81b61edb56ef6954c60ba6810c00360b5e] # # patch "tests/t_netsync_absorbs.at" # from [c34ed5130b13ac65b31983549c7a7c8882acbcba] # to [7fc9331c47ec05b6617b0ba0d545956d1491db00] # # patch "tests/t_netsync_checks_server_key.at" # from [f6b78875f5320727e7fb6e81f0a496790f56b69d] # to [6565e609950c477f97c500207f2880d52f9b9a82] # # patch "tests/t_netsync_defaults.at" # from [ad699c5f7470abec2b97ac1b4d0f71250d134d25] # to [d36b14f0bca378135633d5cfb955524eaa9278d7] # # patch "tests/t_netsync_diffbranch.at" # from [6a2a4e9b6dada24dea2ad88bd0c3d0caf8d180bc] # to [01e026d5b49106ef7fa2fe51d1b9182890cd0f8c] # # patch "tests/t_netsync_error.at" # from [8188034644f18ea9b5da26a66a87d66bf2e345d0] # to [9d3851eea12518eaa0829fa08defdacf583432d1] # # patch "tests/t_netsync_exclude.at" # from [afecaf386c96643f94ded258073b119b940b27d6] # to [1ddcb155746357568e2b67ea32b6dfa7c9964355] # # patch "tests/t_netsync_exclude_default.at" # from [e60e806f5ae6a160048081dccff8ce46c74b8551] # to [cc9fa9672ec0ce88755689341e6e9e3541e14226] # # patch "tests/t_netsync_globs.at" # from [553b6e8d18f08e907e1d84324326ec879820842b] # to [ea3d2489c154f76d652ac6e5f1532cb04c7e93ba] # # patch "tests/t_netsync_largish_file.at" # from [378eb7ed343ad9a0e8caef98f96779d7ce2dc682] # to [1aa5a70db58b28dd4a337925f8196c1be7e42686] # # patch "tests/t_netsync_nocerts.at" # from [a46961c621de2d5ffe721d3cbc7b6561b7964a1b] # to [066f76cb779ec77c72a408b4f31d52fb84925a15] # # patch "tests/t_netsync_notes.at" # from [c96e414dbd2fdb33dfec014c9dad04d11e1278f6] # to [6ea106066863e7a513a28385daa291e3fcf6d804] # # patch "tests/t_netsync_permissions.at" # from [fde3b03429da042b17d3f25769f1e08f77c58733] # to [710da2e0fc052cb1dfad079b01280880a3b334b5] # # patch "tests/t_netsync_pubkey.at" # from [331073b6faf1b43e2ff5ba2d3b557842e3ac28c8] # to [502507bbb68033fc9410fe13be3757c08edbf2e1] # # patch "tests/t_netsync_read_permissions.at" # from [636a868f85cea9fa8b306cb87f7aabf1091e161e] # to [328e9033c85d59916cb65b3b9901c6994aeb26e9] # # patch "tests/t_netsync_repeated.at" # from [4f34357f0c0d1975e79c0f51ce5595c750f399a1] # to [8ab741020bb356d7b120c06315935cf314bef991] # # patch "tests/t_netsync_set_defaults.at" # from [7298147ca6098306734be9dee46e1ada45e4d9b2] # to [6d232107cb36d46e10cad30fe83d2a8238d99a04] # # patch "tests/t_netsync_sigpipe.at" # from [9d0d5c7840b296c26ac941a42df5c8e4056407bb] # to [2b27ec8ea4bdb75876b020f8f4585a418f543b95] # # patch "tests/t_netsync_single.at" # from [62381331e93d7aca1f92dcbd673144d40a86f1f4] # to [64377667551ec311097f3a186fa815eb3e069724] # # patch "tests/t_netsync_unrelated.at" # from [ea99531edefc30bb3c7ff7ea6f82c3adb946b1f8] # to [33a589006b933016fbe2104e0c8a74983dc7509f] # # patch "tests/t_no_change_deltas.at" # from [3f44bcd2b864ef0d1294d6609d0880b61dfd4de7] # to [e4baa3ec67e387773a70917462d794b257ed52df] # # patch "tests/t_no_persist_phrase.at" # from [4c25100bf7d7c11892124eaaebeb2b32d671e134] # to [891008cf95bc811e4f2adde9e6498b456fa392dc] # # patch "tests/t_no_rename_overwrite.at" # from [1f1e1481d40d08fbd33eae39850f79fd4804b4a7] # to [03ae1108ba3aedc54b60058af5bcf7482c47f207] # # patch "tests/t_normalized_filenames.at" # from [5623c494f751cd5da81aefd949514b360b1be284] # to [e40d93ee3bd53ed670e5860e8159804d22d0b21e] # # patch "tests/t_null.at" # from [ee8e51f95fe7e5251910e8bf35be45c5383094eb] # to [4b3cad0674c2d1102384428cd69fcfa126d3273e] # # patch "tests/t_options.at" # from [8f287e1d95ccac3832b53bf93723c6727fa6b5f5] # to [aa71cac15b1affde445203959db15df98e27cf1d] # # patch "tests/t_override_author_date.at" # from [28f11d05555f865105d40e0ec0b3454043082750] # to [70dbb55f4fe6485fe51523de0e7c05a3d93f2ab0] # # patch "tests/t_parents_children.at" # from [3834a2ec99dff28eb1dfa20edd22c04c964ec9c5] # to [c587eabba48f6dd3ee8cfbbb8b8efaeaa7af8d01] # # patch "tests/t_patch_drop_add.at" # from [545ad9bb3c34da728a5893133e0b2cc3239d7e5f] # to [067e9edfbbe8d383b27d6af1ba242887d3e5cc21] # # patch "tests/t_patch_vs_drop_add.at" # from [35ae384649b4fb96b3d32e7c1f28909ecdf84652] # to [0369943f376a5830852e4b1fd46241f39bfd5ce7] # # patch "tests/t_persist_phrase.at" # from [1b42aa46cbae9afdeae5ab98ef2aa9a3e90065d0] # to [e436768b88c695cf5c628d60b69ead7a8f3bbfc9] # # patch "tests/t_persistent_server_keys.at" # from [3b2ee5cc35e8e124a22a00d334a5c9bcfeac4101] # to [ab2016c8cb8ac05fceab707b842b7daef5dbc302] # # patch "tests/t_persistent_server_keys_2.at" # from [aabf8cfcd040e7f3290819ed90e46c7c6b6cc074] # to [30370fb020ab17784a08d36be3b65b0e028aee01] # # patch "tests/t_persistent_server_revision.at" # from [e18db2016f652c705292ae8a15514cd5a2fdfecb] # to [7669778ba2c9092094db57fc8a4f95694f304677] # # patch "tests/t_pivot_root.at" # from [316bd971b0c94e9c7794b658fb26e3de8ae209b6] # to [1aee54c95a3e269fa931b3a961bfe354fb1c7bc0] # # patch "tests/t_pivot_root_revert.at" # from [6bf97ef33b132ce9b52006a56c7c58d8cf5cd7f6] # to [3c8a74299539037df9453336021d2b74f0d2332f] # # patch "tests/t_pivot_root_update.at" # from [c0b52066a67d15ed6fff40972de7707af5f6fbde] # to [580ac1aa51349f7e17e8c83116ef780522c9f273] # # patch "tests/t_propagate_anc.at" # from [3067399caab17f6f0768cbffba7f4c6a1ab36a85] # to [6a1b5e6d8fbe43673e41239eb34cf4fb50f47c81] # # patch "tests/t_propagate_desc.at" # from [b03a137a514b121a1ba4ae31b63b86ee37f2cdb8] # to [ea340cb5fe0d6ab15d653f9722da33c2555b7df0] # # patch "tests/t_rcfile_dir.at" # from [f9aa64b4b4df88b80587b24a87f1d77408a7b576] # to [32c8b1e6a24b7c6c0e0573f041e4460975bfd718] # # patch "tests/t_rcfile_required.at" # from [00e9a1027a39508c944565768b86961b49f9cdf0] # to [4b2670d59558c59908432266c05620f152c1c0cf] # # patch "tests/t_rcfile_stdin.at" # from [09db80cb7bee886ced4c2cb8afbf1be24e04f699] # to [86d3092ac770339b7c227e6d2c53d453e184c27b] # # patch "tests/t_rcs_import.at" # from [a77bf74fb559cc91d3167022f6595e2fb471bac4] # to [41bf13b5d554675a71909a6c1fe7422898f5788b] # # patch "tests/t_read_from_file.at" # from [0608337d7a71893cbcfa3befad75d4cbf207cfb2] # to [559074bb73fb905f98199127e6e9467cbd27dcfa] # # patch "tests/t_read_privkey.at" # from [d03aae665c6a20fb4434dc2004a7ca37171027d5] # to [a96894993ff4d8563d382bf843bd466585cc2acc] # # patch "tests/t_refresh_inodeprints.at" # from [4a52c531307debc050c3f4fa55186141e5d3d68c] # to [c68ae08b2a795bd9caab6c988bcfe1a40ae45582] # # patch "tests/t_related_merge2_data.at" # from [9c17bfbe8a5babc3944229c8b57c293f6143376f] # to [e2966b2d7b3ac5c809dee453afaaa16d3cb82340] # # patch "tests/t_remerge.at" # from [a77e22b1a429843b91a9c8810c0c359162c91040] # to [1975b6f3a572f40f4b839a83ceaa54c7d56e318b] # # patch "tests/t_rename.at" # from [db57e180eba5fbf1ab8234c68f5af389d00f42c4] # to [0acd4c33b35c3576b131ceda42d97d7bf4b0a107] # # patch "tests/t_rename_added_in_rename.at" # from [986d6f8c484b4cd73df3e6df7c67ad61f3bd1a2d] # to [f47f876338378bbb57230a07173af4b5f555145f] # # patch "tests/t_rename_attr.at" # from [45118187a514afa2d945b3c9a98b8b2c0580d7a2] # to [1cdfbc94b56b189e57f55b765f77c58858c3ec67] # # patch "tests/t_rename_conflict.at" # from [2b20920ba1f699e4d609457bd83703baac7144ad] # to [313a7ca0ff8a527b4f73a581be77f2d10a4da06c] # # patch "tests/t_rename_destdir.at" # from [8e16b441f52d44260f34fa9edd99ca92c3b5863a] # to [47c94ebe2a1adecb069fc4c865f1c4470194a9e3] # # patch "tests/t_rename_diff_names.at" # from [6bf74dfd0239f9cd781fae7a7871f490f9bc82f3] # to [fefdeb0fe53a6cfb68f3d0aa66125541aeec58ae] # # patch "tests/t_rename_dir_add_dir_with_old_name.at" # from [20a0beb813e9b6231c13fada0408b1e876db7a3a] # to [611601dcd075b5c27d82a988f2304ec252c36475] # # patch "tests/t_rename_dir_cross_level.at" # from [400f1b82f0f9594a2c6592c420a9728a9b75f250] # to [e27892fc6963f95aa5554bbc2adcaa4aeb280a87] # # patch "tests/t_rename_dir_patch.at" # from [3a8a56c1deb3cc7ebc2158ab7b3b9b2403ab1ea0] # to [cf4737e4c501c0e24e36ad934f0c7cffc3d01ead] # # patch "tests/t_rename_execute.at" # from [691eb8c88e9c604222199bd7d229fd916cafde3d] # to [dc2ad16d08ce135647787d9401ca02062f26d6e6] # # patch "tests/t_rename_file_to_dir.at" # from [2c57a749942a915191f822db0d390e4c9940cd88] # to [cb24e3c2ee9c4b02bfee44e9f4451de09363f63f] # # patch "tests/t_renamed.at" # from [bb95c0a19d39188374eaa64ee10651cf6bc312cb] # to [917a6a39e99006f0d14586584e764d144e6dfeef] # # patch "tests/t_replace_dir_with_file.at" # from [8e6eccb9b9e04de4a9601fa4a1d3d0c8ce61ece3] # to [17bf7bc70bc45c822e0499698a1f8033fbdd2dae] # # patch "tests/t_replace_file_with_dir.at" # from [8cdc795662782f9609d8e5620e9ce9db00103a96] # to [de21f722d01626bc2d752926be268012c024490f] # # patch "tests/t_restricted_commands_consistent.at" # from [e11f8aafa55195d6350e35bd53e9fc0e11b0d1d6] # to [353aef2051932de6ab4bc5248e652221ee4a572e] # # patch "tests/t_restricted_commit_with_inodeprints.at" # from [0761808634d3e002cf9bd48b83e8a9a4ef088d9a] # to [e58a07fda8ad6d5ce61825f024d188644775fe34] # # patch "tests/t_restricted_diff_unchanged.at" # from [aa1b5c9d50296b24e69a619088806821993b7c1a] # to [dc2f5623a3d5ea956e85ab337e93a518dd2a4184] # # patch "tests/t_restriction_excludes_parent.at" # from [47287111c7d5732ff50a467e6514ad0c99c00a41] # to [14383c7d022554d07f4e1e618c46293f8639c4ee] # # patch "tests/t_restriction_with_exclude.at" # from [d356460f153f0a8c64052b530d07c6e3da6b8bf5] # to [d26edc65c12d59094abb5e396c1fc81c301527c0] # # patch "tests/t_restriction_with_exclude_iprint.at" # from [9eeb53c39d2dc0fe57457a538e4765ad15dfe1ee] # to [64920c090989d93b7c8bcd5026d539dcc39b45b5] # # patch "tests/t_restrictions.at" # from [765a23ae21d3034f6a94899cc919b7962e2ed239] # to [0afe18c3c6fb8ede3414612e9f380f648266dab7] # # patch "tests/t_restrictions_warn_on_unknown.at" # from [b834d346d6cc5f559f9bbc6707128edc0b87c0ab] # to [b9c525fc21221480da412bd6c7fbdfdeeb3a5b98] # # patch "tests/t_revert.at" # from [b7a13168d70cb6b35d4967cda0a8af2b0f85ba5f] # to [84792f4ca2448135cc5361e9068de9b934fbabbf] # # patch "tests/t_revert_dirs.at" # from [4c393d42ee07377fd36db5e53b53f67666c30a10] # to [d78cec431ce995d093f008cc449b1dc59f2d2c45] # # patch "tests/t_revert_ignored.at" # from [f7822d7bc0dfffe69d75685219978cec9b76889c] # to [3d02d5e6fb6e94f51745f78fc21d97387b0eb756] # # patch "tests/t_revert_move_to_renamed_dir.at" # from [2a3f2a7fcb58451604add5cbd2461de6c8de5d7b] # to [4cfa1559e876f34bba6896963571c6896640c8bb] # # patch "tests/t_revert_new_project.at" # from [364fa3c8e677fec2303aee44d3caa3197b0dc982] # to [df9475d3fd0a11f4a8ca30d37a8588be020da8fd] # # patch "tests/t_revert_rename.at" # from [18dd10d856fa1fd660a460a9cb6b03b2f2605849] # to [c32e38ba66c28b7c1d1c432e18ee29ab98f773b8] # # patch "tests/t_revert_restrict.at" # from [388d1de8c7a2d50910c1316b052a4fcbb5ae25e1] # to [42779e9522bd083c9287d35e2af526fbe2b3351e] # # patch "tests/t_revert_unchanged.at" # from [c34af77a744fa19ecc23abae754488d9ba4b4a12] # to [f64d0151ab4084b02d546ac092e3d802c96dc5c9] # # patch "tests/t_rosterify_attrs.at" # from [8cbfbe3e77406349916b0f1dfb13d3a9b8683b94] # to [766a19f967c6a453901ce203d232e1f08e93c288] # # patch "tests/t_rosterify_drop_attrs.at" # from [f61d5a48ec42d5f34ae66b1664f6c862237c221a] # to [be8790afd74a04eb4f680abc7a466182f5781599] # # patch "tests/t_rosterify_on_rosterified_db.at" # from [9ea6c0c44d0388445a7b9c72a4d4c74fdff09d9c] # to [792912987616c747bdb07dd9aede0b89ed5cac8c] # # patch "tests/t_rosterify_one_rev.at" # from [e8f2d7a0c019a13cd90dca77649ea5f7d1266592] # to [f1aced84f137509e9820437fe8aa1f98c69c5f84] # # patch "tests/t_rosterify_rename.at" # from [c7442cf1ceef0d2ddcfc6bc098e86d6a30b40193] # to [25841662405631bc1d8375700625ab3ede0ba493] # # patch "tests/t_rosterify_root_suture.at" # from [ff625956c64676b2b33f9ccc9f9a45b7b7587318] # to [e37f2ebc488c564fb184e036b451349d510772f2] # # patch "tests/t_scan.at" # from [b27c459a9e7b8e0892cd531dd452acd69321c130] # to [4368d5002f40b8f9ef58f34ac677078c4b7d3c86] # # patch "tests/t_select_cert.at" # from [524a836a7ce677e089bbc9ad89f8c84599fa688f] # to [90896ee81d4af67f053188fe5b4b2b84360b7dc5] # # patch "tests/t_selector_globbing.at" # from [ddb658e8f3a3bdbf8a8c10e0d2a8e90bd2b1565e] # to [f38c34b7cc902b9159eec99ef034370a048e42f4] # # patch "tests/t_selector_later_earlier.at" # from [ee9880a80a4d63392f2ae2e92163118ae1f97e51] # to [0cd18dedd244e697816a29a3fb582f83926dfeaf] # # patch "tests/t_selectors_b_h.at" # from [f9d2243fcc6c3f4d63b6c5e14e8b3ac76896ca86] # to [e372d0f020ed0256495647cd90f14888e7834f2a] # # patch "tests/t_serve_ignores_mt_options.at" # from [c7318436382fa91a8a3d0d67aaee1049b11b1def] # to [8da5965c17cd49996caa689913957a5ba2acdff5] # # patch "tests/t_set_default.at" # from [4869ee5e5dee61a59e25a34facb6f5834696651d] # to [cd94be70831b23b7c0fd56d7463fffadacf27621] # # patch "tests/t_setup_checkout_modify_new_dir.at" # from [69ea1cf9eebce9fcc86928d50e456eb37e0c29a0] # to [dca394f3ac7c60c2f0ed701eac8849cc6567245d] # # patch "tests/t_setup_creates_log.at" # from [e3c84e44d0c83997ff6b5cba8242a4de1a712e99] # to [3ac3d06fa6e843d71340c630869566549cb61188] # # patch "tests/t_setup_existing_path.at" # from [7b4b33c2ed726cbf00a4e38fbd7696baa8038b58] # to [c3cca6b687a342f882bc96697e2cde5eef065f5f] # # patch "tests/t_short_opts.at" # from [1457b0b8dc5ff7391d34f4c09eaa70f75a56a3e4] # to [ad994cdb1da39e3b6330838529833f0684da6fb4] # # patch "tests/t_show_conflicts.at" # from [22f141eceecb8fa87d0c8e46ccd165e4d9aae7d7] # to [7d1d04fdb276ac4664a75a9eec6e365787e220d8] # # patch "tests/t_single_char_filenames.at" # from [aeeaf4693e0414db9c0f512a3ec07888ab5d04e8] # to [f4389e3ed6da72440b531c236668f368da16cb7a] # # patch "tests/t_singlecvs.at" # from [32bf2cf13d8cb1e5e93e04a979d2202f3172a24a] # to [7bf742f69e55e280c4dcfc9d9887f1f06357da2b] # # patch "tests/t_sink_has_extra_epochs.at" # from [1476ccf22fb668341183462217d355e0b075d35f] # to [38fd5d4099848e042971b25213de4142e1201f94] # # patch "tests/t_sql_gunzip.at" # from [1e43988cec90fe9e16a51379b7b832cfc609d122] # to [76a0b4b82555007524bc58297b5210b109cb6ac8] # # patch "tests/t_status.at" # from [13e9e62d33cf4e02f5970d5d92131db1caadb34a] # to [3f5c78f1a98d7860cfb0f78a93d4ac98f9f426e5] # # patch "tests/t_status_missing.at" # from [7f9d094be78574103bd56735a502e162ac836f03] # to [179fbc279634225ca1395ee17eb0989592f7344e] # # patch "tests/t_sticky_branch.at" # from [232b47d5ba86cd863dae9d2ecdf92f477114d51d] # to [6b86f04baa6f6ec1158becba2bd3f26e9e7ff233] # # patch "tests/t_subdir_add.at" # from [45791575b75fc561844d7cdabe9f8847c68ce259] # to [413569b9d605818267a5fb437976a27b28565e88] # # patch "tests/t_subdir_attr.at" # from [3a4b2b01e39e48f9686b4442f1b57877de30b06d] # to [716e179f39e9aede60227886ab345df87351c02b] # # patch "tests/t_subdir_drop.at" # from [96d6401411920ea2e1a6ac380f662699b8362c22] # to [afa2ede8e1dd01a0e0305ad1c6e9571138462b4b] # # patch "tests/t_subdir_rename.at" # from [194e7566c73d1cb59ab603130cb332919cd68015] # to [d23edfa0136220f41049cb6b3b4f0468ec7da3bf] # # patch "tests/t_subdir_revert.at" # from [56188db5e096ea2186a0e03f8df858e1acb45bd4] # to [0624939545238eacaca348e3324353c0f29aa14c] # # patch "tests/t_subdirs.at" # from [c4f829c5b8bbdf0ed27d534bf13a1b8fd9672c6a] # to [4af0c0ebc95ad50843a1b318d8831994430b7e61] # # patch "tests/t_tags.at" # from [f8ebf7132751a4bf8d4ae4ed58384095e30d9cae] # to [6b7316069ad15cf36945ca1db09422c3fb2bc82c] # # patch "tests/t_testresult.at" # from [9175533207adda8067129f2646b05c9f89fa7079] # to [95cb68b34df4cdebf4564e45448145c0818d0422] # # patch "tests/t_trusted.at" # from [2ba3de4eef581c8da540326f851df50232d744c2] # to [3055a711fb8c60cfa665cfdea3f7c40c9002c639] # # patch "tests/t_unidiff.at" # from [0d9f22a79b11ab73828ab936ad229e3bf72684d5] # to [95f7dce4462369e0b5e9227dc44463685654d918] # # patch "tests/t_unidiff2.at" # from [c2a19f74432f8422e1bfbdfc730c2ee974633cf0] # to [6c4561cac70ea16755e2470dcbe02941b6d87dcc] # # patch "tests/t_unidiff3.at" # from [0dd1c36bed7368620ef9bfacff424ddc6b6b5e63] # to [d2a1e7ae546152afc9a0e85117370d3bbb35e57d] # # patch "tests/t_unreadable__MTN.at" # from [1b4a381cf098a344f3a81ec1aefec35580afb7f8] # to [9b9146b3a360ec0be8396f382648fdd5740a7001] # # patch "tests/t_unreadable_db.at" # from [68fd851c690ee94af78fc71b4ab44dbcffe5bd65] # to [5363ad9a59c98dbd5e1880aefe87c3bf8f472506] # # patch "tests/t_update.at" # from [d25cbe1b2bb51859fe0b15c0996f23ee31f920d6] # to [c676a76258b05ddd31172ae069efb9c593c6305b] # # patch "tests/t_update_1.at" # from [a8ec618111f576a24bd3f1b21ac6d1051aa13647] # to [4890762d109d4c428fbb5046de5a953869bcf75b] # # patch "tests/t_update_2.at" # from [3d8bbfbedd3078a69e860b05270b0a08e5f9a105] # to [d235e7551ad39fe5a6adf55f33f0a02e84fddbaf] # # patch "tests/t_update_branch.at" # from [33934ce6e4ef6bde1c5ccce8417cc1e7fe750224] # to [9261937ba3797e8f6202d65e410f032ec130ba40] # # patch "tests/t_update_inodeprints.at" # from [7918726b22ac7cac356448a1a9df80dd4afbe597] # to [c7878b9d7949a8e97dc2cb4a615c23c4ca228557] # # patch "tests/t_update_missing.at" # from [9fe6a573758f9e4659a018284aacb77ea3b0805b] # to [deed29897d9730e73a7873f7c7982fc2763785bd] # # patch "tests/t_update_nonexistent.at" # from [045eadf406dd46aa126cc91b318006098e76002e] # to [586d3ce0745f8272a11071390b0f0eb355e7229e] # # patch "tests/t_update_null_revision.at" # from [a76d17125e67f334c1162fb21081dc941ba8da18] # to [a6dee25bdaccec3cce51d4dc6087482c60968980] # # patch "tests/t_update_off_branch.at" # from [b9d36236416ad78ec83e04ad96bb342839ffff8b] # to [f4621ad8f41fe39c125e95b0b6dc7a03b9d700f8] # # patch "tests/t_update_switch_branch.at" # from [4dc9c4e7562dded128cca9b56ffb72398c4b6e42] # to [3111cf9ba565b0a17f6e76bb0f6725ebf71b1f2f] # # patch "tests/t_update_to_revision.at" # from [5c67e05438436f0e76bbb4b535481cb4b0f5a27d] # to [639e16755408f4a76726d342dd17940b365193c0] # # patch "tests/t_update_with_blocked_rename.at" # from [ec11f3c0fdf105effa16659c990631bbab76cc18] # to [8e8653ef7d4cff4af2ea1486ae3ffb136fc65ca8] # # patch "tests/t_update_with_pending_add.at" # from [191a9bb03fe47fd446be8475be0b38c076b23851] # to [e67df3f0047517d043c4539c6d8ecdef48a0ae8f] # # patch "tests/t_update_with_pending_drop.at" # from [74cf8a3d47adaf7a50ed7b2488b39f0ae8039268] # to [38d410ed41a70dc505222a65d8628a6de89080f0] # # patch "tests/t_update_with_pending_rename.at" # from [da0deb279259309a94cd9838544b92ba8457b3df] # to [49686db2530c8a2de840058a5ea4c5e1be791f29] # # patch "tests/t_vars.at" # from [4ec56a21dec7294597890e4f9106aa70bfe312b9] # to [2ebfeaa3f4d8fdc22fdc79a3124e7671ae3cf294] # # patch "tests/t_vcheck.at" # from [8656291fbb8e643e82f3bfb8ffa5616346388cb6] # to [869a50c06a18a25f5cc53af70cd380e4c52d2ef6] # # patch "tests/t_versions.at" # from [dad3fbfa60f5c9ae1f74fc7aac7913c655903a54] # to [d50341aa7dc9b0cd02e0f52ba9218576496ce36f] # # patch "testsuite.at" # from [590bff43e1c17bee568fc3339531e7cff1c072d2] # to [452e8fb6a61f93c811af62863cd201f36d3dc39c] # ============================================================ --- ChangeLog 1372e5441be2306ffbb2a5d802d2779568526622 +++ ChangeLog 544b27445cc09ce4d141847f0977944d54979d45 @@ -1,5 +1,11 @@ 2006-03-28 Nathaniel Smith + * tests/README, testsuite.at, tests/*.at: First pass at updating + tests for s/monotone/mtn/. NB: new tests should use MTN_SETUP and + MTN macros. + +2006-03-28 Nathaniel Smith + * Makefile.am: Build "mtn", not "monotone". * monotone.1: Rename to... * mtn.1: ...this. ============================================================ --- tests/README a8afa6b4c99c7b1fe17721b6c8ecdb3062b60e6a +++ tests/README 76d708d4fb952bb644fb947d89d171f1920eb031 @@ -26,7 +26,7 @@ Template for a test (name tests/t_.at: ------------------------------------------------ AT_SETUP([brief test description goes here]) -MONOTONE_SETUP +MTN_SETUP #the next lines (including AT_XFAIL_IF) state that the test is #expected to fail as this is still a bug. Remove if it should pass! @@ -41,7 +41,7 @@ #see autoconf tutorials #e.g. http://www.gnu.org/software/autoconf/manual/autoconf-2.57/ # html_node/autoconf_167.html for further information. -AT_CHECK(MONOTONE import foo, [], ignore, ignore) +AT_CHECK(MTN import foo, [], ignore, ignore) ... ... ... ============================================================ --- tests/t_add.at 899b1081891c52a86be286d16af8df0bf5f2d457 +++ tests/t_add.at d4d8b57976ea08bcc1167c9229dad035ece38a06 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([addition of files and directories]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir dir) AT_DATA(file0, [file 0 @@ -14,35 +14,35 @@ # adding a non-existent file should fail -AT_CHECK(monotone add foobar, [1], [ignore], [ignore]) +AT_CHECK(MTN add foobar, [1], [ignore], [ignore]) # newly added files should appear as such -AT_CHECK(MONOTONE add file0, [], [ignore], [stderr]) +AT_CHECK(MTN add file0, [], [ignore], [stderr]) AT_CHECK(grep 'adding file0' stderr, [0], [ignore]) -AT_CHECK(MONOTONE add dir, [], [ignore], [stderr]) +AT_CHECK(MTN add dir, [], [ignore], [stderr]) AT_CHECK(grep 'adding dir/file1' stderr, [0], [ignore]) AT_CHECK(grep 'adding dir/file2' stderr, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep file0 stdout, [0], [ignore]) AT_CHECK(grep file1 stdout, [0], [ignore]) AT_CHECK(grep file2 stdout, [0], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message 'add files', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message 'add files', [], [ignore], [ignore]) # redundant additions should not appear # (i.e. they should be ignored) -AT_CHECK(MONOTONE add file0, [], [ignore], [stderr]) +AT_CHECK(MTN add file0, [], [ignore], [stderr]) AT_CHECK(grep 'skipping file0' stderr, [0], [ignore]) -AT_CHECK(MONOTONE add dir, [], [ignore], [stderr]) +AT_CHECK(MTN add dir, [], [ignore], [stderr]) AT_CHECK(grep 'skipping dir/file1' stderr, [0], [ignore]) AT_CHECK(grep 'skipping dir/file2' stderr, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep file0 stdout, [1], [ignore]) AT_CHECK(grep file1 stdout, [1], [ignore]) AT_CHECK(grep file2 stdout, [1], [ignore]) @@ -63,9 +63,9 @@ #AT_DATA(.mt-ignore, [.*\.ignore$ #]) -#AT_CHECK(RAW_MONOTONE ls unkown, [], [stdout], [ignore]) +#AT_CHECK(RAW_MTN ls unkown, [], [stdout], [ignore]) -AT_CHECK(MONOTONE add --unknown, [], [ignore], [stderr]) +AT_CHECK(MTN add --unknown, [], [ignore], [stderr]) AT_CHECK(grep 'adding file3' stderr, [0], [ignore]) #AT_CHECK(grep 'adding file4.ignore' stderr, [1], [ignore]) AT_CHECK(grep 'adding dir/file5' stderr, [0], [ignore]) @@ -75,7 +75,7 @@ AT_CHECK(grep 'skipping dir2/file7' stderr, [1], [ignore]) AT_CHECK(grep 'adding test_hooks.lua' stderr, [1], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep file0 stdout, [1], [ignore]) AT_CHECK(grep file1 stdout, [1], [ignore]) AT_CHECK(grep file2 stdout, [1], [ignore]) @@ -84,9 +84,9 @@ AT_CHECK(grep file5 stdout, [0], [ignore]) #AT_CHECK(grep file6 stdout, [1], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message 'add second set of files', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message 'add second set of files', [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep file0 stdout, [1], [ignore]) AT_CHECK(grep file1 stdout, [1], [ignore]) AT_CHECK(grep file2 stdout, [1], [ignore]) ============================================================ --- tests/t_add_dot.at 39fd728b6928219f57a29721dcb562678b268806 +++ tests/t_add_dot.at fe8a2f3cca7082972c4e448a1c59c6e333a3212f @@ -1,5 +1,5 @@ -AT_SETUP([monotone add .]) -MONOTONE_SETUP +AT_SETUP([mtn add .]) +MTN_SETUP AT_CHECK(mkdir subdir) @@ -13,18 +13,18 @@ AT_DATA(subdir/testdir1/subfile2, [quux ]) -AT_CHECK(MONOTONE setup --branch=testbranch subdir, [], [ignore], [ignore]) +AT_CHECK(MTN setup --branch=testbranch subdir, [], [ignore], [ignore]) # Make sure that "add ." works, even at the root of the tree -AT_CHECK(cd subdir && MONOTONE add ., [], [ignore], [ignore]) +AT_CHECK(cd subdir && MTN add ., [], [ignore], [ignore]) # Make sure that it took -AT_CHECK(cd subdir && MONOTONE commit --message="foo", [], [ignore], [ignore]) +AT_CHECK(cd subdir && MTN commit --message="foo", [], [ignore], [ignore]) AT_CHECK(rm subdir/testfile1) AT_CHECK(rm subdir/testfile2) AT_CHECK(rm -r subdir/testdir1) -AT_CHECK(cd subdir && MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(cd subdir && MTN revert ., [], [ignore], [ignore]) AT_CHECK(test -f subdir/testfile1) AT_CHECK(test -f subdir/testfile2) ============================================================ --- tests/t_add_drop_add.at 3cf0849f956315056eab889db537899ca88ffb67 +++ tests/t_add_drop_add.at 1a28514320d949d9694f952915dd21de6449dd79 @@ -1,6 +1,6 @@ AT_SETUP([merge(<>, )]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(v1, [foo blah ]) @@ -13,15 +13,15 @@ BASE_R_SHA=`BASE_REVISION` AT_CHECK(cp v1 testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(rm -f testfile) -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp v2 testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) REVERT_TO($BASE_R_SHA) @@ -30,8 +30,8 @@ ]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile v2, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_add_edge.at b62f4ca4e76068ab4a50a61f14b19e9f03c96168 +++ tests/t_add_edge.at 0f872335425b49dc6eefd911da48182837ec5f75 @@ -1,5 +1,5 @@ AT_SETUP([merging an add edge]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -30,12 +30,12 @@ COMMIT(testbranch) -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) MERGED=`BASE_REVISION` -AT_CHECK(MONOTONE automate get_revision $MERGED, [], [stdout]) +AT_CHECK(MTN automate get_revision $MERGED, [], [stdout]) AT_CHECK(mv stdout rev) AT_CHECK(grep add_file rev, [1], [ignore]) ============================================================ --- tests/t_add_executable.at 070973ab2e1129c20c04c48679ca5cd9e4a417aa +++ tests/t_add_executable.at 1730d2a6a512abcd37cea06f7fa1f4fbdd55bb35 @@ -1,17 +1,17 @@ AT_SETUP([add executable]) -MONOTONE_SETUP +MTN_SETUP NOT_ON_WIN32 AT_DATA(foo, [blah blah ]) AT_CHECK(chmod 755 foo) -# Have to use RAW_MONOTONE, because we're testing the standard hooks... -AT_CHECK(RAW_MONOTONE --rcfile=test_hooks.lua add foo, [], [ignore], [ignore]) +# Have to use RAW_MTN, because we're testing the standard hooks... +AT_CHECK(RAW_MTN --rcfile=test_hooks.lua add foo, [], [ignore], [ignore]) COMMIT(testbranch) -# Have to use RAW_MONOTONE, because we're testing the standard hooks... -AT_CHECK(RAW_MONOTONE --rcfile=test_hooks.lua checkout --branch=testbranch codir, [], [ignore], [ignore]) +# Have to use RAW_MTN, because we're testing the standard hooks... +AT_CHECK(RAW_MTN --rcfile=test_hooks.lua checkout --branch=testbranch codir, [], [ignore], [ignore]) AT_CHECK(test -x codir/foo) AT_CLEANUP ============================================================ --- tests/t_add_inside__MTN.at 00e567e757fc46c5fad511d711fa5054df6f24c9 +++ tests/t_add_inside__MTN.at d03f209f39f09699a2fa6b2cab954309e999b31f @@ -1,12 +1,12 @@ AT_SETUP([add inside _MTN/]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(testfile1, [blah blah ]) AT_DATA(_MTN/testfile2, [blah blah ]) -AT_CHECK(cd _MTN && MONOTONE add testfile2, [1], [ignore], [ignore]) -AT_CHECK(cd _MTN && MONOTONE add ../testfile1, [], [ignore], [ignore]) +AT_CHECK(cd _MTN && MTN add testfile2, [1], [ignore], [ignore]) +AT_CHECK(cd _MTN && MTN add ../testfile1, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_add_intermediate__MTN_path.at d51569d27ae7c8ff8045553c5d778f05d9c369b7 +++ tests/t_add_intermediate__MTN_path.at 7f975eca93cb377d2d0eb5ba216f508814f4a928 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([files with intermediate _MTN path elements]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir -p dir1/_MTN) AT_CHECK(mkdir -p dir2) @@ -13,8 +13,8 @@ ]) AT_DATA(dir2/_MTN, [_MTN file 1 ]) -AT_CHECK(MONOTONE add dir1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add dir2, [], [ignore], [ignore]) +AT_CHECK(MTN add dir1, [], [ignore], [ignore]) +AT_CHECK(MTN add dir2, [], [ignore], [ignore]) COMMIT(testbranch) # ...and explicit add. @@ -22,11 +22,11 @@ ]) AT_DATA(dir3/_MTN, [_MTN file 2 ]) -AT_CHECK(MONOTONE add dir1/_MTN/testfile2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add dir3/_MTN, [], [ignore], [ignore]) +AT_CHECK(MTN add dir1/_MTN/testfile2, [], [ignore], [ignore]) +AT_CHECK(MTN add dir3/_MTN, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE checkout outdir1, [], [ignore], [ignore]) +AT_CHECK(MTN checkout outdir1, [], [ignore], [ignore]) AT_CHECK(cmp dir1/_MTN/testfile1 outdir1/dir1/_MTN/testfile1) AT_CHECK(cmp dir1/_MTN/testfile2 outdir1/dir1/_MTN/testfile2) AT_CHECK(cmp dir2/_MTN outdir1/dir2/_MTN) @@ -38,12 +38,12 @@ AT_CHECK(mv dir2/_MTN dir2/TM) AT_CHECK(mv dir3 dir3x) -AT_CHECK(MONOTONE rename dir1/_MTN/testfile1 dir1/_MTN/testfile1x, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename dir2/_MTN dir2/TM, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename dir3 dir3x, [], [ignore], [ignore]) +AT_CHECK(MTN rename dir1/_MTN/testfile1 dir1/_MTN/testfile1x, [], [ignore], [ignore]) +AT_CHECK(MTN rename dir2/_MTN dir2/TM, [], [ignore], [ignore]) +AT_CHECK(MTN rename dir3 dir3x, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE checkout outdir2, [], [ignore], [ignore]) +AT_CHECK(MTN checkout outdir2, [], [ignore], [ignore]) AT_CHECK(cmp dir1/_MTN/testfile1x outdir2/dir1/_MTN/testfile1x) AT_CHECK(cmp dir1/_MTN/testfile2 outdir2/dir1/_MTN/testfile2) AT_CHECK(cmp dir2/TM outdir2/dir2/TM) @@ -51,19 +51,19 @@ # explicit drop -AT_CHECK(MONOTONE drop dir1/_MTN/testfile2, [], [ignore], [ignore]) +AT_CHECK(MTN drop dir1/_MTN/testfile2, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE checkout outdir3, [], [ignore], [ignore]) +AT_CHECK(MTN checkout outdir3, [], [ignore], [ignore]) AT_CHECK(cmp dir1/_MTN/testfile1x outdir2/dir1/_MTN/testfile1x) AT_CHECK(test ! -e outdir3/dir1/_MTN/testfile2) # recursive drop -AT_CHECK(MONOTONE drop --recursive dir1, [], [ignore], [ignore]) +AT_CHECK(MTN drop --recursive dir1, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE checkout outdir4, [], [ignore], [ignore]) +AT_CHECK(MTN checkout outdir4, [], [ignore], [ignore]) AT_CHECK(test ! -e outdir4/dir1/_MTN/testfile1x) AT_CHECK(test ! -e outdir4/dir1/_MTN/testfile2) AT_CHECK(test ! -e outdir4/dir1/_MTN) ============================================================ --- tests/t_add_owndb.at 74dcb2ff61d7a8cb9c787ddabcbd74aa10ea2eb8 +++ tests/t_add_owndb.at 17ac32dd2ff9ac2cfee8d0555f1ac429268ce573 @@ -1,5 +1,5 @@ AT_SETUP([(minor) add own db]) -MONOTONE_SETUP +MTN_SETUP #Adding the current in-use DB should fail # ...It *really* seems like adding the db to the db is something that should be caught and an error message thrown... @@ -7,24 +7,24 @@ # ... # and add a note in a comment that "revert" is the case that really moves this # from being "stupid user tricks" to "something we should protect users from" :-) -AT_CHECK(MONOTONE add test.db, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known, [], [stdout], [ignore]) +AT_CHECK(MTN add test.db, [], [ignore], [ignore]) +AT_CHECK(MTN ls known, [], [stdout], [ignore]) AT_CHECK(grep 'test.db' stdout, [1], [ignore]) -AT_CHECK(MONOTONE add ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known, [], [stdout], [ignore]) +AT_CHECK(MTN add ., [], [ignore], [ignore]) +AT_CHECK(MTN ls known, [], [stdout], [ignore]) AT_CHECK(grep 'test.db' stdout, [1], [ignore]) AT_CHECK(mkdir subdir) AT_CHECK(cp test.db subdir) -AT_CHECK(MONOTONE --db=subdir/test.db add subdir/test.db, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --db=subdir/test.db ls known, [], [stdout], [ignore]) +AT_CHECK(MTN --db=subdir/test.db add subdir/test.db, [], [ignore], [ignore]) +AT_CHECK(MTN --db=subdir/test.db ls known, [], [stdout], [ignore]) AT_CHECK(grep 'subdir/test.db' stdout, [1], [ignore]) # If it's not an in-use DB, it should work, though -AT_CHECK(MONOTONE add subdir/test.db, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known, [], [stdout], [ignore]) +AT_CHECK(MTN add subdir/test.db, [], [ignore], [ignore]) +AT_CHECK(MTN ls known, [], [stdout], [ignore]) AT_CHECK(grep 'subdir/test.db' stdout, [0], [ignore]) AT_CLEANUP ============================================================ --- tests/t_add_patch_drop_add.at e717c2c7dd84d56dac2d944f2198bd516a2fd601 +++ tests/t_add_patch_drop_add.at 625d6c7083dcb7c04f855089b2c32aec3794cfc4 @@ -1,6 +1,6 @@ AT_SETUP([merge(<>, )]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(v1a, [foo blah ]) @@ -15,18 +15,18 @@ BASE_R_SHA=`BASE_REVISION` AT_CHECK(cp v1a testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp v1b testfile) COMMIT(testbranch) AT_CHECK(rm -f testfile) -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp v2a testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) REVERT_TO($BASE_R_SHA) @@ -35,8 +35,8 @@ ]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile v2a, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_add_stomp_file.at 1e74d89b26c8f9b81662ecda31737f65e9f97223 +++ tests/t_add_stomp_file.at 0e276fa556aa92cbe8f3003656b00cb6e0861a0a @@ -1,5 +1,5 @@ AT_SETUP([update does not stomp non-monotone files]) -MONOTONE_SETUP +MTN_SETUP # This test is a bug report AT_XFAIL_IF(true) @@ -25,20 +25,20 @@ # Alice make project, writes foo, but doesn't check it in AT_CHECK(mkdir alicewd) AT_CHECK(cp initial alicewd/initial) -AT_CHECK(MONOTONE --branch=testbranch setup alicewd, [], [ignore], [ignore]) -AT_CHECK( (cd alicewd; MONOTONE --root=. add initial), [], [ignore], [ignore]) -AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. commit -m 'initial commit'), [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch setup alicewd, [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN --root=. add initial), [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN --branch=testbranch --root=. commit -m 'initial commit'), [], [ignore], [ignore]) AT_CHECK(cp foo.alice alicewd/foo) # Bob does add of file foo, and commits -AT_CHECK(MONOTONE --branch=testbranch checkout bobwd, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch checkout bobwd, [], [ignore], [ignore]) AT_CHECK(cp foo.bob bobwd/foo) -AT_CHECK( (cd bobwd; MONOTONE --root=. add foo), [], [ignore], [ignore]) -AT_CHECK( (cd bobwd; MONOTONE --branch=testbranch --root=. commit -m 'bob commit'), [], [ignore], [ignore]) +AT_CHECK( (cd bobwd; MTN --root=. add foo), [], [ignore], [ignore]) +AT_CHECK( (cd bobwd; MTN --branch=testbranch --root=. commit -m 'bob commit'), [], [ignore], [ignore]) REV=`cd bobwd; BASE_REVISION` # Alice does her update, discovers foo has been stomped! -AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. update --revision=$REV), [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN --branch=testbranch --root=. update --revision=$REV), [], [ignore], [ignore]) AT_CHECK(cmp foo.alice alicewd/foo) AT_CLEANUP ============================================================ --- tests/t_add_vs_commit.at 854fb99182fa82f283d2a26b089e770909461fa5 +++ tests/t_add_vs_commit.at 13d4dbdb3ef806ed928d43ebb74e6e0285696c48 @@ -1,5 +1,5 @@ AT_SETUP([add workspace commit in another]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -24,22 +24,22 @@ # Alice does her add AT_CHECK(mkdir alicewd) AT_CHECK(cp initial alicewd/initial) -AT_CHECK(MONOTONE --branch=testbranch setup alicewd, [], [ignore], [ignore]) -AT_CHECK( (cd alicewd; MONOTONE --root=. add initial), [], [ignore], [ignore]) -AT_CHECK( (cd alicewd; MONOTONE --root=. commit -m 'initial commit'), [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch setup alicewd, [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN --root=. add initial), [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN --root=. commit -m 'initial commit'), [], [ignore], [ignore]) AT_CHECK(cp foo.alice alicewd/foo) -AT_CHECK( (cd alicewd; MONOTONE add --root=. foo), [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN add --root=. foo), [], [ignore], [ignore]) # Note, alice does not commit this add... # Bob does add of same file, with edits, and commits -AT_CHECK(MONOTONE --branch=testbranch checkout bobwd, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch checkout bobwd, [], [ignore], [ignore]) AT_CHECK(cp foo.bob bobwd/foo) -AT_CHECK( (cd bobwd; MONOTONE --root=. add foo), [], [ignore], [ignore]) -AT_CHECK( (cd bobwd; MONOTONE --root=. commit -m 'bob commit'), [], [ignore], [ignore]) +AT_CHECK( (cd bobwd; MTN --root=. add foo), [], [ignore], [ignore]) +AT_CHECK( (cd bobwd; MTN --root=. commit -m 'bob commit'), [], [ignore], [ignore]) REV=`cd bobwd; BASE_REVISION` # Alice does her update, then attempts, eg., a diff -AT_CHECK( (cd alicewd; MONOTONE --root=. update --revision=$REV), [], [ignore], [ignore]) -AT_CHECK( (cd alicewd; MONOTONE --root=. diff), [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN --root=. update --revision=$REV), [], [ignore], [ignore]) +AT_CHECK( (cd alicewd; MTN --root=. diff), [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_ambig_update.at 5d0c04ee2f70686bd873ce3a40dca77cd8e545b9 +++ tests/t_ambig_update.at 6c007618ef2fad7d728e547434fe7ba1639f687c @@ -1,5 +1,5 @@ AT_SETUP([update with multiple candidates]) -MONOTONE_SETUP +MTN_SETUP # Make sure that when there are multiple plausible heads, update # fails, and prints some informative message listing the heads. @@ -25,7 +25,7 @@ # There are two possible candidates, so our update should fail. AT_CHECK(rm -f file1) -AT_CHECK(MONOTONE update, [1], [ignore], [stderr]) +AT_CHECK(MTN update, [1], [ignore], [stderr]) AT_CHECK(test ! -e file1) # Make sure that the failure message listed the possibilities AT_CHECK(QGREP($LEFT stderr), []) @@ -42,7 +42,7 @@ REVERT_TO($ANC) AT_CHECK(rm -f file1) AT_CHECK(rm -f file2) -AT_CHECK(MONOTONE update, [1], [ignore], [stderr]) +AT_CHECK(MTN update, [1], [ignore], [stderr]) AT_CHECK(test ! -e file1) AT_CHECK(test ! -e file2) # Make sure that the failure message listed the possibilities ============================================================ --- tests/t_ambiguous_tags.at a4d848c1c5af6a888d0f5cb8798e73c476e03c4d +++ tests/t_ambiguous_tags.at 60be714286f29e797d43dd2e8d1472606cbb654b @@ -1,5 +1,5 @@ AT_SETUP([ls tags with ambiguous tags]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -11,10 +11,10 @@ COMMIT(testbranch) R2=`BASE_REVISION` -AT_CHECK(MONOTONE tag $R1 ambig_tag, [], [ignore], [ignore]) -AT_CHECK(MONOTONE tag $R2 ambig_tag, [], [ignore], [ignore]) +AT_CHECK(MTN tag $R1 ambig_tag, [], [ignore], [ignore]) +AT_CHECK(MTN tag $R2 ambig_tag, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls tags, [], [stdout], [ignore]) +AT_CHECK(MTN ls tags, [], [stdout], [ignore]) AT_CHECK(QGREP($R1 stdout)) AT_CHECK(QGREP($R2 stdout)) ============================================================ --- tests/t_annotate.at 1ba28d0a9e3166399d5fa56839655a0f7f03cc0f +++ tests/t_annotate.at d3aa446ce87ede39db51ee26af7c5f1f8009c0a2 @@ -1,5 +1,5 @@ AT_SETUP([test annotate command]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo1, [z a @@ -51,7 +51,7 @@ # REV0: b # REV1: x -AT_CHECK(MONOTONE annotate foo0, [], [stdout], [ignore]) +AT_CHECK(MTN annotate foo0, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REV1, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore]) @@ -61,7 +61,7 @@ # # unchanged should have all (3) lines from REV0 # -AT_CHECK(MONOTONE annotate unchanged, [], [stdout], [ignore]) +AT_CHECK(MTN annotate unchanged, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REV0, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore]) @@ -72,7 +72,7 @@ # REV2: 11 # REV3: 22 -AT_CHECK(MONOTONE annotate bar0, [], [stdout], [ignore]) +AT_CHECK(MTN annotate bar0, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REV1, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV2, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REV3, [0], [ignore], [ignore]) @@ -81,9 +81,9 @@ # # OK, now try some renames # -AT_CHECK(MONOTONE rename foo0 tmp, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename bar0 foo0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename tmp bar0, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo0 tmp, [], [ignore], [ignore]) +AT_CHECK(MTN rename bar0 foo0, [], [ignore], [ignore]) +AT_CHECK(MTN rename tmp bar0, [], [ignore], [ignore]) AT_CHECK(mv foo0 tmp) AT_CHECK(mv bar0 foo0) AT_CHECK(mv tmp bar0) @@ -93,13 +93,13 @@ # # Now the previous annotate results should be reversed # -AT_CHECK(MONOTONE annotate bar0, [], [stdout], [ignore]) +AT_CHECK(MTN annotate bar0, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REV1, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore]) AT_CHECK(head -n 4 stdout | TAIL(1) | grep $REV1, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE annotate foo0, [], [stdout], [ignore]) +AT_CHECK(MTN annotate foo0, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REV1, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV2, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REV3, [0], [ignore], [ignore]) @@ -122,7 +122,7 @@ # Now make right side rm -rf _MTN -AT_CHECK(MONOTONE co --revision=$REV4 ., [], [ignore], [ignore]) +AT_CHECK(MTN co --revision=$REV4 ., [], [ignore], [ignore]) AT_DATA(bar0, [bar on right side of fork ]) @@ -141,7 +141,7 @@ COMMIT(testbranch) REV9=`BASE_REVISION` -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) #REV10=`BASE_REVISION` # how does commit create this? # @@ -150,7 +150,7 @@ # REV9: changed on the # REV8: right fork -AT_CHECK(MONOTONE annotate forkfile, [], [stdout], [ignore]) +AT_CHECK(MTN annotate forkfile, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REV8, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV9, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REV8, [0], [ignore], [ignore]) ============================================================ --- tests/t_annotate_add_collision.at c4b22026515ae9e412a19dec5455679a9cc49d2c +++ tests/t_annotate_add_collision.at 157b9d2982fe617917b9ee6656f88e6fa55c71d5 @@ -1,5 +1,5 @@ AT_SETUP([annotate file added on different forks]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -25,13 +25,13 @@ AT_CHECK(cp foo.left foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) REVL=`BASE_REVISION` REVERT_TO($REV0) AT_CHECK(cp foo.right foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) REVR=`BASE_REVISION` @@ -42,8 +42,8 @@ end ]) -AT_CHECK(MONOTONE --rcfile=merge2.lua merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=merge2.lua merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV1=`BASE_REVISION` # @@ -55,7 +55,7 @@ # # where REVC (choice) is either REVL or REVR -AT_CHECK(MONOTONE annotate foo, [], [stdout], [ignore]) +AT_CHECK(MTN annotate foo, [], [stdout], [ignore]) #AT_CHECK(head -n 1 stdout | grep $REV1, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REVL, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REVR, [0], [ignore], [ignore]) ============================================================ --- tests/t_annotate_branch_collision.at 844405fcd8b1ba3f12727568688da83e0b67b5c7 +++ tests/t_annotate_branch_collision.at 4c46e23d674e8f6e5a17cff141466db4ed320e6e @@ -1,5 +1,5 @@ AT_SETUP([annotate file on multirooted branch]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -24,15 +24,15 @@ ]) AT_CHECK(cp foo.left foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) REVL=`BASE_REVISION` AT_CHECK(rm -r -f _MTN foo) -AT_CHECK(MONOTONE setup --branch=testbranch .) +AT_CHECK(MTN setup --branch=testbranch .) AT_CHECK(cp foo.right foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) REVR=`BASE_REVISION` @@ -43,8 +43,8 @@ end ]) -AT_CHECK(MONOTONE --rcfile=merge2.lua merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=merge2.lua merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REVM=`BASE_REVISION` # @@ -56,7 +56,7 @@ # # where REVC (choice) is either REVL or REVR -AT_CHECK(MONOTONE annotate foo, [], [stdout], [ignore]) +AT_CHECK(MTN annotate foo, [], [stdout], [ignore]) #AT_CHECK(head -n 1 stdout | grep $REV1, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REVL, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REVR, [0], [ignore], [ignore]) ============================================================ --- tests/t_annotate_copy_all.at 18142f64b79ab569a6717bf8743e3bfbd88722ba +++ tests/t_annotate_copy_all.at 1bc59599afa6f40e85ad987aeb3b56ba6dd5157c @@ -1,5 +1,5 @@ AT_SETUP([annotate where one parent is full copy]) -MONOTONE_SETUP +MTN_SETUP # # A Where B -> D is no change, but @@ -28,7 +28,7 @@ ADD_FILE(initialfile, [foo file ]) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) REVA=`BASE_REVISION` @@ -44,8 +44,8 @@ REVC=`BASE_REVISION` -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REVD=`BASE_REVISION` # @@ -57,7 +57,7 @@ # REVA: c # -AT_CHECK(MONOTONE annotate foo, [], [stdout], [ignore]) +AT_CHECK(MTN annotate foo, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REVA, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REVA, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REVB, [0], [ignore], [ignore]) ============================================================ --- tests/t_annotate_lineage_dependent.at 43ba9ce786c6d70078e023be6ea97e86e9da3d69 +++ tests/t_annotate_lineage_dependent.at 839669e7cf6ccc2fa7028d92d9bf79964defdd20 @@ -1,5 +1,5 @@ AT_SETUP([annotate where lineage depends on traversal]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo.A, [a b @@ -39,7 +39,7 @@ AT_CHECK(cp foo.A foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) REVA=`BASE_REVISION` echo rev letter A $REVA @@ -56,8 +56,8 @@ REVC=`BASE_REVISION` echo rev letter C $REVC -AT_CHECK(MONOTONE --rcfile=./merge.lua merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=./merge.lua merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REVD=`BASE_REVISION` echo rev letter D $REVD @@ -71,7 +71,7 @@ # REVD: added line # -AT_CHECK(MONOTONE --debug annotate foo, [], [stdout], [stderr]) +AT_CHECK(MTN --debug annotate foo, [], [stdout], [stderr]) AT_CHECK(head -n 1 stdout | grep $REVA, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REVA, [0], [ignore], [ignore]) ============================================================ --- tests/t_annotate_no_rev.at d4c01d35d64dd0203b3dfa2d3484e08b84493ade +++ tests/t_annotate_no_rev.at cc829aa492a432fd111f974d5e391979fa875184 @@ -1,9 +1,9 @@ AT_SETUP([annotate with no revs]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) -AT_CHECK(MONOTONE annotate testfile, [1], [ignore], [ignore]) +AT_CHECK(MTN annotate testfile, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_annotate_renames.at d87797cbda3513789cc18f756eb61ff8b79eb1c5 +++ tests/t_annotate_renames.at c0ba01e5bdeb334c0d6b768bbfa66b05a75b336c @@ -1,5 +1,5 @@ AT_SETUP([annotate file whose name changed]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [a b @@ -24,13 +24,13 @@ REVERT_TO($REV0) AT_CHECK(cp foo.rightnewname foo) -AT_CHECK(MONOTONE rename -e foo foo.new, [], [ignore], [ignore]) +AT_CHECK(MTN rename -e foo foo.new, [], [ignore], [ignore]) COMMIT(testbranch) REVR=`BASE_REVISION` -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV1=`BASE_REVISION` # @@ -40,7 +40,7 @@ # REVR: x # -AT_CHECK(MONOTONE annotate foo.new, [], [stdout], [ignore]) +AT_CHECK(MTN annotate foo.new, [], [stdout], [ignore]) AT_CHECK(head -n 1 stdout | grep $REV0, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore]) AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REVR, [0], [ignore], [ignore]) ============================================================ --- tests/t_annotate_split_line.at 5386b60f613a9e97f92a02cd9fd0b38d7c58d253 +++ tests/t_annotate_split_line.at 24df45951cc02ddfd3a645c1147c54bfe0a28bf1 @@ -1,5 +1,5 @@ AT_SETUP([annotate where line splits]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo.A, [a ident @@ -33,7 +33,7 @@ AT_CHECK(cp foo.A foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) REVA=`BASE_REVISION` echo rev letter A $REVA @@ -50,8 +50,8 @@ REVC=`BASE_REVISION` echo rev letter C $REVC -AT_CHECK(MONOTONE --rcfile=./merge.lua merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=./merge.lua merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REVD=`BASE_REVISION` echo rev letter D $REVD @@ -65,7 +65,7 @@ # REVD: d # -AT_CHECK(MONOTONE --debug annotate foo, [], [stdout], [stderr]) +AT_CHECK(MTN --debug annotate foo, [], [stdout], [stderr]) AT_CHECK(head -n 1 stdout | grep $REVA, [0], [ignore], [ignore]) AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REVA, [0], [ignore], [ignore]) ============================================================ --- tests/t_at_sign.at b389ebe5349370531ef4e84019053f136aad6a62 +++ tests/t_at_sign.at 7125964542274ddcda133e636385ab13afe42a14 @@ -1,39 +1,39 @@ AT_SETUP([check that --xargs / -@ behave correctly]) # Generate the general expected output, as we're testing using the # output of 'list --help' -AT_CHECK(RAW_MONOTONE list --help, [2], [stdout], [ignore], [:], [:]) +AT_CHECK(RAW_MTN list --help, [2], [stdout], [ignore], [:], [:]) mv stdout expout # Check that --xargs works at all AT_DATA([at_test.input], [--help ]) -AT_CHECK(RAW_MONOTONE list --xargs=at_test.input, [2], [expout], [ignore]) +AT_CHECK(RAW_MTN list --xargs=at_test.input, [2], [expout], [ignore]) # The rest of the checks use the short form, -@ # Check that -@ works at all AT_DATA([at_test.input], [--help ]) -AT_CHECK(RAW_MONOTONE list -@ at_test.input, [2], [expout], [ignore]) +AT_CHECK(RAW_MTN list -@ at_test.input, [2], [expout], [ignore]) # Check that -@ works when injected in the middle of the arguments # (i.e. that it's prepended correctly) AT_DATA([at_test.input], [list ]) -AT_CHECK(RAW_MONOTONE -@ at_test.input --help, [2], [expout], [ignore]) +AT_CHECK(RAW_MTN -@ at_test.input --help, [2], [expout], [ignore]) # Check that -@ works when used more than once AT_DATA([at_test.input1], [list ]) AT_DATA([at_test.input2], [--help ]) -AT_CHECK(RAW_MONOTONE -@ at_test.input1 -@ at_test.input2, [2], [expout], [ignore]) +AT_CHECK(RAW_MTN -@ at_test.input1 -@ at_test.input2, [2], [expout], [ignore]) # Check that -@ works with an argument file with no content -AT_CHECK(RAW_MONOTONE list, [2], [stdout], [ignore], [:], [:]) +AT_CHECK(RAW_MTN list, [2], [stdout], [ignore], [:], [:]) mv stdout expout AT_DATA([at_test.input], []) -AT_CHECK(RAW_MONOTONE list -@ at_test.input, [2], [expout], [ignore]) +AT_CHECK(RAW_MTN list -@ at_test.input, [2], [expout], [ignore]) AT_CLEANUP ============================================================ --- tests/t_attr.at 0d210db46b63bccaed104ad8f7255f9dd1231783 +++ tests/t_attr.at e922a3f8278af3780c6d50a9dfa05ce38b636ca4 @@ -1,13 +1,13 @@ AT_SETUP([attr set/attr get]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo bar ]) -AT_CHECK(MONOTONE attr set testfile test:unique_key unique_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr set testfile test:unique_key unique_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(test:unique_key stdout)) AT_CHECK(QGREP(unique_value stdout)) -AT_CHECK(MONOTONE attr get testfile test:unique_key, [], [stdout], [ignore]) +AT_CHECK(MTN attr get testfile test:unique_key, [], [stdout], [ignore]) AT_CHECK(QGREP(unique_value stdout)) COMMIT(testbranch) ============================================================ --- tests/t_attr_drop.at 8c55f61a0dd7cf5008f44e50bfab04d94b001f43 +++ tests/t_attr_drop.at f001046329b2c34b10a2468c5d9851e61a4d02d6 @@ -1,23 +1,23 @@ AT_SETUP([attr drop]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo bar ]) -AT_CHECK(MONOTONE attr set testfile test:first_key first_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr set testfile test:second_key second_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr set testfile test:first_key first_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr set testfile test:second_key second_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(test:first_key stdout)) AT_CHECK(QGREP(first_value stdout)) AT_CHECK(QGREP(test:second_key stdout)) AT_CHECK(QGREP(second_value stdout)) -AT_CHECK(MONOTONE attr drop testfile test:first_key, [], [stdout], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr drop testfile test:first_key, [], [stdout], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(test:first_key stdout), [1]) AT_CHECK(QGREP(first_value stdout), [1]) AT_CHECK(QGREP(test:second_key stdout)) AT_CHECK(QGREP(second_value stdout)) -AT_CHECK(MONOTONE attr drop testfile, [], [stdout], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr drop testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(test:first_key stdout), [1]) AT_CHECK(QGREP(first_value stdout), [1]) AT_CHECK(QGREP(test:second_key stdout), [1]) ============================================================ --- tests/t_attr_init.at fc2caec18c322cfab3b2f02504598cbfbfebb893 +++ tests/t_attr_init.at f08116e369afcb15d21f73c4ba6e00f1b22025d9 @@ -1,5 +1,5 @@ AT_SETUP([attr init functions]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(hook.lua, [ if (attr_init_functions == nil) then @@ -17,16 +17,16 @@ AT_DATA(testfile, [foo ]) -AT_CHECK(MONOTONE --rcfile=hook.lua add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=hook.lua add testfile, [], [ignore], [ignore]) AT_DATA(magic, [stuff ]) -AT_CHECK(MONOTONE --rcfile=hook.lua add magic, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=hook.lua add magic, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(test:test_attr stdout), [1]) AT_CHECK(QGREP(bob stdout), [1]) -AT_CHECK(MONOTONE attr get magic, [], [stdout], [ignore]) +AT_CHECK(MTN attr get magic, [], [stdout], [ignore]) AT_CHECK(QGREP(test:test_attr stdout), []) AT_CHECK(QGREP(bob stdout), []) ============================================================ --- tests/t_attributes.at c622276ba9f86173d892fc177ff0395680670e95 +++ tests/t_attributes.at c4d560b1dcb601f36920de74971ac14d54458bb3 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([attr set/get commands]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo, [some data ]) @@ -10,31 +10,31 @@ AT_DATA(a, [some data ]) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add a, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr set foo test:test_attr true, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr set a test:test_attr 1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add a, [], [ignore], [ignore]) +AT_CHECK(MTN attr set foo test:test_attr true, [], [ignore], [ignore]) +AT_CHECK(MTN attr set a test:test_attr 1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) CO_R_SHA1=`BASE_REVISION` -AT_CHECK(MONOTONE attr drop foo test:test_attr, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr set a test:test_attr 2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN attr drop foo test:test_attr, [], [ignore], [ignore]) +AT_CHECK(MTN attr set a test:test_attr 2, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) UPDATE_R_SHA1=`BASE_REVISION` # Check checkouts. AT_CHECK(rm -rf co-dir) -AT_CHECK(MONOTONE checkout --revision=$CO_R_SHA1 co-dir, [], [stdout]) +AT_CHECK(MTN checkout --revision=$CO_R_SHA1 co-dir, [], [stdout]) AT_CHECK(grep "test:test_attr:foo:true" stdout, [], [ignore]) AT_CHECK(grep "test:test_attr:a:1" stdout, [], [ignore]) # Check updates. AT_CHECK(rm -rf co-dir) -AT_CHECK(MONOTONE checkout --revision=$UPDATE_R_SHA1 co-dir, [], [stdout]) +AT_CHECK(MTN checkout --revision=$UPDATE_R_SHA1 co-dir, [], [stdout]) AT_CHECK(grep "test:test_attr:foo" stdout, [1], [ignore]) AT_CHECK(grep "test:test_attr:a:2" stdout, [], [ignore]) # check that files must exist to have attributes set -AT_CHECK(MONOTONE attr set missing mtn:execute, [1], [ignore], [ignore]) +AT_CHECK(MTN attr set missing mtn:execute, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_automate_ancestors.at 3c5baf5757a08e4fe41d17acf8d2a1956319fc9e +++ tests/t_automate_ancestors.at eeab2f4c2db46c54d3ba909231c02381010e9b92 @@ -1,7 +1,7 @@ AT_SETUP([automate ancestors]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE automate ancestors c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) +AT_CHECK(MTN automate ancestors c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) # A # / \ @@ -40,8 +40,8 @@ COMMIT(testbranch) REV_E=`BASE_REVISION` -AT_CHECK(MONOTONE explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV_F=`BASE_REVISION` AT_CHECK(test $REV_F != $REV_D) @@ -49,14 +49,14 @@ # Now do some checks -AT_CHECK(MONOTONE automate ancestors $REV_A, [], [], [ignore]) +AT_CHECK(MTN automate ancestors $REV_A, [], [], [ignore]) -AT_CHECK(MONOTONE automate ancestors $REV_B, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestors $REV_B, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_A > tmp) AT_CHECK(cmp tmp stdout) -AT_CHECK(MONOTONE automate ancestors $REV_E, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestors $REV_E, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_C > tmp) AT_CHECK(echo $REV_A >> tmp) @@ -68,7 +68,7 @@ AT_CHECK(echo $REV_C >> tmp) AT_CHECK(echo $REV_E >> tmp) AT_CHECK(sort tmp > tmp2) -AT_CHECK(MONOTONE automate ancestors $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestors $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp2 stdout) @@ -77,11 +77,11 @@ AT_CHECK(echo $REV_C >> tmp) AT_CHECK(echo $REV_E >> tmp) AT_CHECK(sort tmp > tmp2) -AT_CHECK(MONOTONE automate ancestors $REV_D $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestors $REV_D $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp2 stdout) -AT_CHECK(MONOTONE automate ancestors $REV_A $REV_B $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestors $REV_A $REV_B $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_A > tmp) AT_CHECK(cmp tmp stdout) ============================================================ --- tests/t_automate_ancestry_difference.at 428481e350da7d79172baca9a8e7810c60fae000 +++ tests/t_automate_ancestry_difference.at 225557ff68879c3a1bbf2ffe453db7640fa07082 @@ -1,5 +1,5 @@ AT_SETUP([automate ancestry_difference]) -MONOTONE_SETUP +MTN_SETUP # A # / \ @@ -38,8 +38,8 @@ COMMIT(testbranch) REV_E=`BASE_REVISION` -AT_CHECK(MONOTONE explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV_F=`BASE_REVISION` AT_CHECK(test $REV_F != $REV_D) @@ -47,34 +47,34 @@ # Now do some checks -AT_CHECK(MONOTONE automate ancestry_difference c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE automate ancestry_difference $REV_A c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) +AT_CHECK(MTN automate ancestry_difference c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_A c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE automate ancestry_difference $REV_A, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_A, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_A) -AT_CHECK(MONOTONE automate ancestry_difference $REV_A $REV_A, [], [], [ignore]) -AT_CHECK(MONOTONE automate ancestry_difference $REV_A $REV_B, [], [], [ignore]) -AT_CHECK(MONOTONE automate ancestry_difference $REV_A $REV_F, [], [], [ignore]) -AT_CHECK(MONOTONE automate ancestry_difference $REV_F $REV_F, [], [], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_A $REV_A, [], [], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_A $REV_B, [], [], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_A $REV_F, [], [], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_F $REV_F, [], [], [ignore]) -AT_CHECK(MONOTONE automate ancestry_difference $REV_B $REV_A, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_B $REV_A, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_B) AT_CHECK(echo $REV_A > ab) AT_CHECK(echo $REV_B >> ab) -AT_CHECK(MONOTONE automate ancestry_difference $REV_B, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_B, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat ab) -AT_CHECK(MONOTONE automate ancestry_difference $REV_F $REV_D $REV_E, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_F $REV_D $REV_E, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_F) AT_CHECK(echo $REV_D > df) AT_CHECK(echo $REV_F >> df) -AT_CHECK(MONOTONE automate ancestry_difference $REV_F $REV_E, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_F $REV_E, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat df) @@ -88,11 +88,11 @@ AT_CHECK(echo $REV_E >> acedf) AT_CHECK(echo $REV_D >> acedf) AT_CHECK(echo $REV_F >> acedf) -AT_CHECK(MONOTONE automate ancestry_difference $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout acdef || cmp stdout acedf, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate ancestry_difference $REV_B $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate ancestry_difference $REV_B $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_B) ============================================================ --- tests/t_automate_attributes.at 06fcfbc15fb0a02778f4ce7fb2c130923fe60262 +++ tests/t_automate_attributes.at 054416b5d189f4639a9c34354c65dd7b268a78b4 @@ -1,12 +1,12 @@ AT_SETUP([automate attributes]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo bar ]) -AT_CHECK(MONOTONE attr set testfile unique_key unique_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate attributes testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr set testfile unique_key unique_value, [], [ignore], [ignore]) +AT_CHECK(MTN automate attributes testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(unique_key stdout)) -AT_CHECK(MONOTONE automate attributes, [], [stdout], [ignore]) +AT_CHECK(MTN automate attributes, [], [stdout], [ignore]) AT_CHECK(QGREP(testfile stdout)) AT_CLEANUP ============================================================ --- tests/t_automate_certs.at b750df1376ac9d54effb29ecef821f329222e8bb +++ tests/t_automate_certs.at 216c47ba114c6a4ce24d49ca3b978a0a46b73f3c @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([automate certs]) NEED_UNB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(expected, [ key "address@hidden" signature "ok" @@ -33,24 +33,24 @@ ADD_FILE(foo, [blah ]) -AT_CHECK(MONOTONE commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) BASE_R=`BASE_REVISION` # check that a correct usage produces correctly formatted output -AT_CHECK(MONOTONE automate certs $BASE_R, [], [stdout], [ignore]) +AT_CHECK(MTN automate certs $BASE_R, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp expected stdout) # ensure that missing revisions fail NOSUCHREV=0000000000000000000000000000000000000000 -AT_CHECK(MONOTONE automate certs $NOSUCHREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate certs $NOSUCHREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) # ensure that revisions are not being completed # (the above commit will have created rev 306c506078df4b58470f75c845ccd11c2ea8cb26) TRUNCATEDREV=306c506078df4b58470f75c845ccd1 -AT_CHECK(MONOTONE automate certs $TRUNCATEDREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate certs $TRUNCATEDREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) ============================================================ --- tests/t_automate_descendents.at 162d5cdd9973925caef2834f3e6138bf02b48f61 +++ tests/t_automate_descendents.at 3723c3ce9666e306e74d34b1a266feab95160a62 @@ -1,7 +1,7 @@ AT_SETUP([automate descendents]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE automate descendents c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) +AT_CHECK(MTN automate descendents c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) # A # / \ @@ -40,8 +40,8 @@ COMMIT(testbranch) REV_E=`BASE_REVISION` -AT_CHECK(MONOTONE explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV_F=`BASE_REVISION` AT_CHECK(test $REV_F != $REV_D) @@ -49,15 +49,15 @@ # Now do some checks -AT_CHECK(MONOTONE automate descendents $REV_B, [], [], [ignore]) -AT_CHECK(MONOTONE automate descendents $REV_F, [], [], [ignore]) +AT_CHECK(MTN automate descendents $REV_B, [], [], [ignore]) +AT_CHECK(MTN automate descendents $REV_F, [], [], [ignore]) -AT_CHECK(MONOTONE automate descendents $REV_D, [], [stdout], [ignore]) +AT_CHECK(MTN automate descendents $REV_D, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_F > d_descendents) AT_CHECK(cmp d_descendents stdout) -AT_CHECK(MONOTONE automate descendents $REV_E, [], [stdout], [ignore]) +AT_CHECK(MTN automate descendents $REV_E, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_F > e_descendents) AT_CHECK(cmp e_descendents stdout) @@ -66,7 +66,7 @@ AT_CHECK(echo $REV_E >> c_descendents) AT_CHECK(echo $REV_F >> c_descendents) AT_CHECK(sort c_descendents > cd) -AT_CHECK(MONOTONE automate descendents $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate descendents $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp cd stdout) @@ -76,21 +76,21 @@ AT_CHECK(echo $REV_C >> a_descendents) AT_CHECK(echo $REV_B >> a_descendents) AT_CHECK(sort a_descendents > ad) -AT_CHECK(MONOTONE automate descendents $REV_A, [], [stdout], [ignore]) +AT_CHECK(MTN automate descendents $REV_A, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp ad stdout) -AT_CHECK(MONOTONE automate descendents $REV_D $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate descendents $REV_D $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_F > d_f_descendents) AT_CHECK(cmp d_f_descendents stdout) -AT_CHECK(MONOTONE automate descendents $REV_D $REV_E $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate descendents $REV_D $REV_E $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_F > d_e_f_descendents) AT_CHECK(cmp d_e_f_descendents stdout) -AT_CHECK(MONOTONE automate descendents $REV_B $REV_D $REV_E $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate descendents $REV_B $REV_D $REV_E $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_F > b_d_e_f_descendents) AT_CHECK(cmp b_d_e_f_descendents stdout) ============================================================ --- tests/t_automate_erase_ancestors.at e0de2ef77df88f6f95254bea6967ff4401ac0c5c +++ tests/t_automate_erase_ancestors.at fc977baa100ab3ce7dac763b72f2c128eacd60fc @@ -1,5 +1,5 @@ AT_SETUP([automate erase_ancestors]) -MONOTONE_SETUP +MTN_SETUP # A # / \ @@ -38,8 +38,8 @@ COMMIT(testbranch) REV_E=`BASE_REVISION` -AT_CHECK(MONOTONE explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV_F=`BASE_REVISION` AT_CHECK(test $REV_F != $REV_D) @@ -47,61 +47,61 @@ # Now do some checks -AT_CHECK(MONOTONE automate erase_ancestors c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) +AT_CHECK(MTN automate erase_ancestors c7539264e83c5d6af4c792f079b5d46e9c128665, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE automate erase_ancestors, [], [], [ignore]) +AT_CHECK(MTN automate erase_ancestors, [], [], [ignore]) -AT_CHECK(MONOTONE automate erase_ancestors $REV_A, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_A, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_A) -AT_CHECK(MONOTONE automate erase_ancestors $REV_B, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_B, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_B) -AT_CHECK(MONOTONE automate erase_ancestors $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_C) -AT_CHECK(MONOTONE automate erase_ancestors $REV_D, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_D, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_D) -AT_CHECK(MONOTONE automate erase_ancestors $REV_E, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_E, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_E) -AT_CHECK(MONOTONE automate erase_ancestors $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_F) -AT_CHECK(MONOTONE automate erase_ancestors $REV_A $REV_B, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_A $REV_B, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_B) -AT_CHECK(MONOTONE automate erase_ancestors $REV_A $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_A $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_C) -AT_CHECK(MONOTONE automate erase_ancestors $REV_A $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_A $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_F) AT_CHECK(echo $REV_B > b_c) AT_CHECK(echo $REV_C >> b_c) -AT_CHECK(MONOTONE automate erase_ancestors $REV_B $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_B $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, sort < b_c) AT_CHECK(echo $REV_B > a_b_c) AT_CHECK(echo $REV_C >> a_b_c) -AT_CHECK(MONOTONE automate erase_ancestors $REV_A $REV_B $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_A $REV_B $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, sort < a_b_c) AT_CHECK(echo $REV_B > b_f) AT_CHECK(echo $REV_F >> b_f) -AT_CHECK(MONOTONE automate erase_ancestors $REV_B $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_B $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, sort < b_f) AT_CHECK(echo $REV_B > a_b_f) AT_CHECK(echo $REV_F >> a_b_f) -AT_CHECK(MONOTONE automate erase_ancestors $REV_A $REV_B $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate erase_ancestors $REV_A $REV_B $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, sort < a_b_f) ============================================================ --- tests/t_automate_get_file.at 57d34789ad2ede0a5233cdc4f06d0674bb2f3816 +++ tests/t_automate_get_file.at 3aa285a542c79eb814e0443cffc4a99611bb2f02 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([automate get_file]) NEED_UNB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(expected, [blah ]) @@ -11,24 +11,24 @@ ADD_FILE(foo, [blah ]) -AT_CHECK(MONOTONE commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) BASE_R=`BASE_REVISION` FILE_R=4cbd040533a2f43fc6691d773d510cda70f4126a # check that a correct usage produces correctly formatted output -AT_CHECK(MONOTONE automate get_file $FILE_R, [], [stdout], [ignore]) +AT_CHECK(MTN automate get_file $FILE_R, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp expected stdout) # ensure that missing revisions fail NOSUCHREV=0000000000000000000000000000000000000000 -AT_CHECK(MONOTONE automate get_file $NOSUCHREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate get_file $NOSUCHREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) # ensure that revisions are not being completed TRUNCATEDREV=4cbd040533a2f43fc6691d773d510c -AT_CHECK(MONOTONE automate get_file $TRUNCATEDREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate get_file $TRUNCATEDREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) ============================================================ --- tests/t_automate_get_manifest_of.at 9c486b3d5af93c8854826aeabc9f01d42422eef1 +++ tests/t_automate_get_manifest_of.at 8ae58a66be39889d6db59a6d13c7e0233ce448f6 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([automate get_manifest_of]) NEED_UNB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(expected, [format_version "1" @@ -16,29 +16,29 @@ ADD_FILE(foo, [blah ]) -AT_CHECK(MONOTONE commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) BASE_R=`BASE_REVISION` # check that a correct usage produces correctly formatted output -AT_CHECK(MONOTONE automate get_manifest_of $BASE_R, [], [stdout], [ignore]) +AT_CHECK(MTN automate get_manifest_of $BASE_R, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp expected stdout) # should work even if we don't specify the manifest ID -AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout], [ignore]) +AT_CHECK(MTN automate get_manifest_of, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp expected stdout) # ensure that missing revisions fail NOSUCHREV=0000000000000000000000000000000000000000 -AT_CHECK(MONOTONE automate get_manifest_of $NOSUCHREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate get_manifest_of $NOSUCHREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) # ensure that revisions are not being completed # (the above commit will have created rev 3cf83369cfadbf5ba4ea3a50796fba18ec245489) TRUNCATEDREV=3cf83369cfadbf5ba4ea3a50796fba18ec2454 -AT_CHECK(MONOTONE automate get_revision $TRUNCATEDREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate get_revision $TRUNCATEDREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) ============================================================ --- tests/t_automate_get_revision.at a4b00aef251b5341e523b6973ac6c07030a04691 +++ tests/t_automate_get_revision.at b71d2a0dc244061521c4d781105ff4f06a800d62 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([automate get_revision]) NEED_UNB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(expected, [format_version "1" @@ -27,29 +27,29 @@ ADD_FILE(foo, [blah ]) -AT_CHECK(MONOTONE commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --date=2005-05-21T12:30:51 --branch=testbranch --message=blah-blah, [], [ignore], [ignore]) BASE_R=`BASE_REVISION` # check that a correct usage produces correctly formatted output -AT_CHECK(MONOTONE automate get_revision $BASE_R, [], [stdout], [ignore]) +AT_CHECK(MTN automate get_revision $BASE_R, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp expected stdout) # should work even if we don't specify the revision -AT_CHECK(MONOTONE automate get_revision, [], [stdout], [ignore]) +AT_CHECK(MTN automate get_revision, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp expected2 stdout) # ensure that missing revisions fail NOSUCHREV=0000000000000000000000000000000000000000 -AT_CHECK(MONOTONE automate get_file $NOSUCHREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate get_file $NOSUCHREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) # ensure that revisions are not being completed # (the above commit will have created rev 306c506078df4b58470f75c845ccd11c2ea8cb26) TRUNCATEDREV=095e136cd6e47e3519869fb0f07dcc -AT_CHECK(MONOTONE automate get_file $TRUNCATEDREV, [1], [stdout], [ignore]) +AT_CHECK(MTN automate get_file $TRUNCATEDREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) ============================================================ --- tests/t_automate_graph.at 4f4ea120d3eccd2d6f5edf21cdaf3ce8d2f92f2c +++ tests/t_automate_graph.at 94864fca63fd08adf6df953129fc7ec96b2c0e5e @@ -1,7 +1,7 @@ AT_SETUP([automate graph]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE automate graph, [], [], [ignore]) +AT_CHECK(MTN automate graph, [], [], [ignore]) # A # / \ @@ -40,8 +40,8 @@ COMMIT(testbranch) REV_E=`BASE_REVISION` -AT_CHECK(MONOTONE explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $REV_D $REV_E testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV_F=`BASE_REVISION` AT_CHECK(test $REV_F != $REV_D) @@ -49,7 +49,7 @@ # Now do some checks -AT_CHECK(MONOTONE automate graph, [], [stdout], [ignore]) +AT_CHECK(MTN automate graph, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(echo $REV_A >>graph) ============================================================ --- tests/t_automate_heads.at 7f7f54a5b2003ee87db7266b7979a98163df0891 +++ tests/t_automate_heads.at 3cb733c7bf080453f31f0dc7d5d1c6d4dc30aaa2 @@ -1,5 +1,5 @@ AT_SETUP([automate heads]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [blah ]) @@ -36,11 +36,11 @@ AT_CHECK(sort wanted_heads_unsorted >wanted_heads) -AT_CHECK(MONOTONE automate heads testbranch, [], [stdout], [ignore]) +AT_CHECK(MTN automate heads testbranch, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp wanted_heads stdout) -AT_CHECK(MONOTONE automate heads nosuchbranch, [], [stdout], [ignore]) +AT_CHECK(MTN automate heads nosuchbranch, [], [stdout], [ignore]) AT_DATA(empty, []) AT_CHECK(cmp empty stdout) ============================================================ --- tests/t_automate_inventory.at 1a9fcca95a722a81cf5fe49a6dd7025900c4e311 +++ tests/t_automate_inventory.at c178579a16b3ef84d0dc8d1395e3dc9fe28e0595 @@ -1,5 +1,5 @@ AT_SETUP([workspace inventory]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(inventory_hooks.lua, [ @@ -38,11 +38,11 @@ AT_DATA(patched, [something has changed ]) -AT_CHECK(MONOTONE add added, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename original renamed, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop dropped, [], [ignore], [ignore]) +AT_CHECK(MTN add added, [], [ignore], [ignore]) +AT_CHECK(MTN rename original renamed, [], [ignore], [ignore]) +AT_CHECK(MTN drop dropped, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^ M 0 0 missing$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^ A 0 0 added$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^D 0 0 dropped$' stdout, [], [ignore], [ignore]) @@ -55,13 +55,13 @@ # swapped but not moved -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename unchanged temporary, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename original unchanged, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename temporary original, [], [ignore], [ignore]) +AT_CHECK(MTN rename unchanged temporary, [], [ignore], [ignore]) +AT_CHECK(MTN rename original unchanged, [], [ignore], [ignore]) +AT_CHECK(MTN rename temporary original, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^RRP 1 2 original$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^RRP 2 1 unchanged$' stdout, [], [ignore], [ignore]) @@ -71,18 +71,18 @@ AT_CHECK(mv original unchanged) AT_CHECK(mv temporary original) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^RR 1 2 original$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^RR 2 1 unchanged$' stdout, [], [ignore], [ignore]) # rename foo bar; add foo -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename original renamed, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add original, [], [ignore], [ignore]) +AT_CHECK(MTN rename original renamed, [], [ignore], [ignore]) +AT_CHECK(MTN add original, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^RA 1 0 original$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^ R 0 1 renamed$' stdout, [], [ignore], [ignore]) @@ -90,14 +90,14 @@ # - note that things are listed and numbered in path collating order # dropped -> missing -> original -> dropped -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename original temporary, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename missing original, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename dropped missing, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename temporary dropped, [], [ignore], [ignore]) +AT_CHECK(MTN rename original temporary, [], [ignore], [ignore]) +AT_CHECK(MTN rename missing original, [], [ignore], [ignore]) +AT_CHECK(MTN rename dropped missing, [], [ignore], [ignore]) +AT_CHECK(MTN rename temporary dropped, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^RRP 1 3 dropped$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^RRP 2 1 missing$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^RRP 3 2 original$' stdout, [], [ignore], [ignore]) @@ -109,61 +109,61 @@ AT_CHECK(mv dropped missing) AT_CHECK(mv temporary dropped) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^RR 1 3 dropped$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^RR 2 1 missing$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^RR 3 2 original$' stdout, [], [ignore], [ignore]) # dropped but not removed and thus unknown -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop dropped, [], [ignore], [ignore]) +AT_CHECK(MTN drop dropped, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^D U 0 0 dropped$' stdout, [], [ignore], [ignore]) # added but removed and thus missing -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE add added, [], [ignore], [ignore]) +AT_CHECK(MTN add added, [], [ignore], [ignore]) AT_CHECK(rm added, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^ AM 0 0 added$' stdout, [], [ignore], [ignore]) # renamed but not moved and thus unknown source and missing target -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_CHECK(rm renamed) -AT_CHECK(MONOTONE rename original renamed, [], [ignore], [ignore]) +AT_CHECK(MTN rename original renamed, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^R U 1 0 original$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^ RM 0 1 renamed$' stdout, [], [ignore], [ignore]) # moved but not renamed and thus missing source and unknown target -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_CHECK(mv original renamed, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^ M 0 0 original$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^ U 0 0 renamed$' stdout, [], [ignore], [ignore]) # renamed and patched -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_DATA(renamed, [renamed and patched ]) AT_CHECK(rm original, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename original renamed, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) +AT_CHECK(MTN rename original renamed, [], [ignore], [ignore]) +AT_CHECK(MTN automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) AT_CHECK(grep '^R 1 0 original$' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^ RP 0 1 renamed$' stdout, [], [ignore], [ignore]) ============================================================ --- tests/t_automate_keys.at 4961f4066fa69d5078c851af044aefec58450254 +++ tests/t_automate_keys.at f661e9d68ba4f436b0a95acf66bce7d441b8e5d8 @@ -1,18 +1,18 @@ AT_SETUP([automate keys]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo bar ]) -AT_CHECK(MONOTONE ci -m foobar, [], [ignore], [ignore]) -AT_CHECK((echo address@hidden; echo address@hidden) | MONOTONE genkey address@hidden, [], [ignore], [ignore]) -AT_CHECK((echo address@hidden; echo address@hidden) | MONOTONE genkey address@hidden, [], [ignore], [ignore]) -AT_CHECK(MONOTONE pubkey address@hidden > baz) -AT_CHECK(MONOTONE dropkey address@hidden, [], [ignore], [ignore]) -AT_CHECK(MONOTONE read < baz, [], [ignore], [ignore]) +AT_CHECK(MTN ci -m foobar, [], [ignore], [ignore]) +AT_CHECK((echo address@hidden; echo address@hidden) | MTN genkey address@hidden, [], [ignore], [ignore]) +AT_CHECK((echo address@hidden; echo address@hidden) | MTN genkey address@hidden, [], [ignore], [ignore]) +AT_CHECK(MTN pubkey address@hidden > baz) +AT_CHECK(MTN dropkey address@hidden, [], [ignore], [ignore]) +AT_CHECK(MTN read < baz, [], [ignore], [ignore]) # we now have address@hidden in the keystore, address@hidden in both keystore # and database, and address@hidden in only the database -AT_CHECK(MONOTONE automate keys, [], [stdout], [ignore]) +AT_CHECK(MTN automate keys, [], [stdout], [ignore]) AT_CHECK(cp stdout output) AT_CHECK([sed -ne '/address@hidden/,/^$/p' output > foobar]) ============================================================ --- tests/t_automate_leaves.at b4d59268051ba6d3d679c72a105b7e1232960236 +++ tests/t_automate_leaves.at 6e45e75d327607509b6177f4f3b94f950dbb23e5 @@ -1,5 +1,5 @@ AT_SETUP([automate leaves]) -MONOTONE_SETUP +MTN_SETUP # A # |\ @@ -9,14 +9,14 @@ # ^testbranch # ^otherbranch -AT_CHECK(MONOTONE automate leaves, [], [], [ignore]) +AT_CHECK(MTN automate leaves, [], [], [ignore]) ADD_FILE(testfile, [blah blah ]) COMMIT(testbranch) REV_A=`BASE_REVISION` -AT_CHECK(MONOTONE automate leaves, [], [stdout], [ignore]) +AT_CHECK(MTN automate leaves, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_A) @@ -25,7 +25,7 @@ COMMIT(testbranch) REV_B=`BASE_REVISION` -AT_CHECK(MONOTONE automate leaves, [], [stdout], [ignore]) +AT_CHECK(MTN automate leaves, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, echo $REV_B) @@ -38,18 +38,18 @@ AT_CHECK(echo $REV_B > bc) AT_CHECK(echo $REV_C >> bc) -AT_CHECK(MONOTONE automate leaves, [], [stdout], [ignore]) +AT_CHECK(MTN automate leaves, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, sort < bc) -AT_CHECK(MONOTONE propagate testbranch otherbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN propagate testbranch otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) REV_D=`BASE_REVISION` AT_CHECK(test $REV_D != $REV_B) AT_CHECK(test $REV_D != $REV_C) -CHECK_SAME_STDOUT(MONOTONE automate leaves, MONOTONE automate heads otherbranch) -CHECK_DIFFERENT_STDOUT(MONOTONE automate leaves, MONOTONE automate heads testbranch) +CHECK_SAME_STDOUT(MTN automate leaves, MTN automate heads otherbranch) +CHECK_DIFFERENT_STDOUT(MTN automate leaves, MTN automate heads testbranch) AT_CLEANUP ============================================================ --- tests/t_automate_select.at ff4e0d429619813b10bdb2c819525cf29341fe51 +++ tests/t_automate_select.at 5980a8f0b8b692cb7141b82202880931f4d6f261 @@ -1,5 +1,5 @@ AT_SETUP([check automate select]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [this is just a file ]) @@ -18,27 +18,27 @@ AT_CHECK(cp testfile testfile3) COMMIT(testbranch) -AT_CHECK(MONOTONE cert $FIRST testcert 'value=with=equal=signs') -AT_CHECK(MONOTONE cert $SECOND testcert 'value') +AT_CHECK(MTN cert $FIRST testcert 'value=with=equal=signs') +AT_CHECK(MTN cert $SECOND testcert 'value') # Check that inexact values fail... -AT_CHECK(MONOTONE automate select 'c:testcert=value=', [], [stdout], [ignore]) +AT_CHECK(MTN automate select 'c:testcert=value=', [], [stdout], [ignore]) AT_CHECK(mv stdout a_s) AT_CHECK(test 0 -eq "`wc -l ab) AT_CHECK(echo $REV_B >> ab) -AT_CHECK(MONOTONE automate toposort $REV_A $REV_B, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_A $REV_B, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat ab) -AT_CHECK(MONOTONE automate toposort $REV_B $REV_A, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_B $REV_A, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat ab) AT_CHECK(echo $REV_A > af) AT_CHECK(echo $REV_F >> af) -AT_CHECK(MONOTONE automate toposort $REV_A $REV_F, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_A $REV_F, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat af) -AT_CHECK(MONOTONE automate toposort $REV_F $REV_A, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_F $REV_A, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat af) @@ -98,16 +98,16 @@ AT_CHECK(echo $REV_C >> acef) AT_CHECK(echo $REV_E >> acef) AT_CHECK(echo $REV_F >> acef) -AT_CHECK(MONOTONE automate toposort $REV_A $REV_C $REV_E $REV_F, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_A $REV_C $REV_E $REV_F, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat acef) -AT_CHECK(MONOTONE automate toposort $REV_C $REV_A $REV_E $REV_F, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_C $REV_A $REV_E $REV_F, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat acef) -AT_CHECK(MONOTONE automate toposort $REV_F $REV_C $REV_A $REV_E, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_F $REV_C $REV_A $REV_E, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat acef) -AT_CHECK(MONOTONE automate toposort $REV_F $REV_E $REV_C $REV_A, [], [stdout], []) +AT_CHECK(MTN automate toposort $REV_F $REV_E $REV_C $REV_A, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) CHECK_SAME_STDOUT(cat stdout, cat acef) @@ -119,7 +119,7 @@ AT_CHECK(echo $REV_E >> cedf) AT_CHECK(echo $REV_D >> cedf) AT_CHECK(echo $REV_F >> cedf) -AT_CHECK(MONOTONE automate toposort $REV_C $REV_D $REV_E $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate toposort $REV_C $REV_D $REV_E $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout cdef || cmp stdout cedf, [], [ignore], [ignore]) ============================================================ --- tests/t_automate_version.at 0122d082b47e45e5bd47b7af4e0d5531d4f5f131 +++ tests/t_automate_version.at 8e10d9e1548f180f95a1feebd5ff00aca8b3537a @@ -1,7 +1,7 @@ AT_SETUP([automate automate_version]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE automate interface_version, [], [stdout], [ignore]) +AT_CHECK(MTN automate interface_version, [], [stdout], [ignore]) AT_CHECK(mv stdout a_v) # MinGW's wc produces " 1" as output. Arithmetic comparison works, string comparison doesn't ============================================================ --- tests/t_bad_packets.at 2ab2b87f1b55c89f0132a7942a62f2d70c92c313 +++ tests/t_bad_packets.at a869bc5d94694ee25700e2dbc66870c2614c163c @@ -1,13 +1,13 @@ AT_SETUP([bad packet args]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE automate packet_for_fdelta 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f 6c704fbd4ef58f2447fd1a3e76911b2ebe97dc77, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE automate packet_for_fdata 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE automate packet_for_rdata 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE pubkey address@hidden, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE privkey address@hidden, [1], [ignore], [ignore]) +AT_CHECK(MTN automate packet_for_fdelta 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f 6c704fbd4ef58f2447fd1a3e76911b2ebe97dc77, [1], [ignore], [ignore]) +AT_CHECK(MTN automate packet_for_fdata 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) +AT_CHECK(MTN automate packet_for_rdata 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) +AT_CHECK(MTN pubkey address@hidden, [1], [ignore], [ignore]) +AT_CHECK(MTN privkey address@hidden, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE automate packets_for_certs 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db check, [], [ignore], [ignore]) +AT_CHECK(MTN automate packets_for_certs 73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) +AT_CHECK(MTN db check, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_branch_checkout.at db10f5a8f0dbed7aa57472eb4b306c37dffae9c1 +++ tests/t_branch_checkout.at 3d486602e6c48aebf29b68e46463a4f7f9be622d @@ -1,5 +1,5 @@ AT_SETUP([branch-based checkout]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo.testbranch, [this is the testbranch version ]) @@ -7,13 +7,13 @@ ]) AT_CHECK(cp foo.testbranch foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp -f foo.otherbranch foo) COMMIT(otherbranch) -AT_CHECK(MONOTONE --branch=testbranch checkout, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch checkout, [], [ignore], [ignore]) AT_CHECK(cmp testbranch/foo foo.testbranch) AT_CLEANUP ============================================================ --- tests/t_can_execute.at d7890c13644741a774b11d14f99dc626620543cd +++ tests/t_can_execute.at c0873ceb909a6f6d8a5cc0652ec3e0fb38485a95 @@ -1,5 +1,5 @@ AT_SETUP([can execute things]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(testfile, [blah blah ]) @@ -14,8 +14,8 @@ ret, pid = wait(pid) end ]) -AT_CHECK(MONOTONE add cphook.lua, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch --rcfile=cphook.lua commit --message 'test', [], [ignore], [ignore]) +AT_CHECK(MTN add cphook.lua, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch --rcfile=cphook.lua commit --message 'test', [], [ignore], [ignore]) AT_CHECK(test -f testfile.copied, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_cat_file_by_name.at ad4272e1a30154bf67970b75cd5bca27b5a20a5a +++ tests/t_cat_file_by_name.at 2f30047e3b3b9241f03ab3a7e62fe6e98ce5508a @@ -1,5 +1,5 @@ AT_SETUP([cat -r REV PATH]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(r0testfile, [r0 test file ]) @@ -14,7 +14,7 @@ AT_CHECK(cp r0otherfile otherfile) AT_CHECK(mkdir subdir) AT_CHECK(cp subfile subdir/testfile) -AT_CHECK(MONOTONE add testfile otherfile subdir/testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile otherfile subdir/testfile, [], [ignore], [ignore]) COMMIT(testbranch) R0=`BASE_REVISION` @@ -22,25 +22,25 @@ COMMIT(testbranch) R1=`BASE_REVISION` -AT_CHECK(MONOTONE cat -r $R0 testfile, [], [stdout], [ignore]) +AT_CHECK(MTN cat -r $R0 testfile, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout r0testfile, [], [ignore]) -AT_CHECK(MONOTONE cat -r $R0 otherfile, [], [stdout], [ignore]) +AT_CHECK(MTN cat -r $R0 otherfile, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout r0otherfile, [], [ignore]) -AT_CHECK(MONOTONE cat -r $R1 testfile, [], [stdout], [ignore]) +AT_CHECK(MTN cat -r $R1 testfile, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout r1testfile, [], [ignore]) -CHECK_SAME_CANONICALISED_STDOUT(cd subdir && MONOTONE cat -r $R0 testfile, cat subfile) +CHECK_SAME_CANONICALISED_STDOUT(cd subdir && MTN cat -r $R0 testfile, cat subfile) AT_CHECK(rm -rf _MTN) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE cat -r $R0 testfile, cat r0testfile) +CHECK_SAME_CANONICALISED_STDOUT(MTN cat -r $R0 testfile, cat r0testfile) -AT_CHECK(MONOTONE cat -r $R0 no_such_file, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE cat -r $R0 "", [1], [ignore], [ignore]) +AT_CHECK(MTN cat -r $R0 no_such_file, [1], [ignore], [ignore]) +AT_CHECK(MTN cat -r $R0 "", [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_cdiff.at 384e323274036b8dc62927cb6bf0096ad716b538 +++ tests/t_cdiff.at f5043d2d83d08948587c38bd1541d531bdf7d658 @@ -1,5 +1,5 @@ AT_SETUP([(minor) context diff]) -MONOTONE_SETUP +MTN_SETUP # This test is a bug report. AT_XFAIL_IF(true) ============================================================ --- tests/t_change_empty_file.at cef81a90be79584d5a6fb7fa2d505e5792751845 +++ tests/t_change_empty_file.at 6a82c1b966975e9d410654c55d4302c40734a60f @@ -1,19 +1,19 @@ # -*- Autoconf -*- AT_SETUP([modification of an empty file]) -MONOTONE_SETUP +MTN_SETUP # First of all, add an empty file. AT_DATA(foo1, []) -AT_CHECK(MONOTONE add foo1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah, +AT_CHECK(MTN add foo1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah, [], [ignore], [ignore]) # Add some contents to the previously added file. AT_DATA(foo1, [Some contents. ]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah, +AT_CHECK(MTN --branch=testbranch commit --message blah, [], [ignore], [ignore]) REV=`BASE_REVISION` @@ -21,7 +21,7 @@ # Verify that the latest revision contains a patch, rather than a delete/add # sequence (as reported in bug #9964). -AT_CHECK(MONOTONE automate get_revision $REV, +AT_CHECK(MTN automate get_revision $REV, [], [stdout], [ignore]) AT_CHECK(grep '^patch "foo1"$' stdout, [], [ignore], [ignore]) ============================================================ --- tests/t_check_db_format.at 4ea08f24426ca4b52f79bb2b9046d822c7548c9f +++ tests/t_check_db_format.at 1505ee7bbc55b4fa31bdcd5b94bee5f48c9dd28c @@ -1,5 +1,5 @@ AT_SETUP([db data format checking]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 # A few times in our history we've had to do data migration beyond @@ -37,11 +37,11 @@ ]) UNGZB64(changesetify.db.dump.gz.b64, changesetify.db.dump) -AT_CHECK(MONOTONE -d cs-modern.db db load < changesetify.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE -d cs-modern.db db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN -d cs-modern.db db load < changesetify.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN -d cs-modern.db db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE -d cs-modern.db ls keys, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE -d cs-modern.db serve --bind=127.0.0.1:63219 '*', [1], [ignore], [ignore]) +AT_CHECK(MTN -d cs-modern.db ls keys, [1], [ignore], [ignore]) +AT_CHECK(MTN -d cs-modern.db serve --bind=127.0.0.1:63219 '*', [1], [ignore], [ignore]) AT_DATA([rosterify.db.dump.gz.b64], [H4sICFVTz0MCA3Jvc3RlcmlmeS5kYi5kdW1wAO1XW4+i2BZ+Ln4F6ZeujjUtcmcmnQwqKoqo 4P3kpLKBza3kIqCAv342WmVVq1Wna84k5+WYaFD3un3rW2uv1ZS6sopLy5Yy0+W59AfW0iRx @@ -90,10 +90,10 @@ ]) UNGZB64(rosterify.db.dump.gz.b64, rosterify.db.dump) -AT_CHECK(MONOTONE -d ro-modern.db db load < rosterify.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE -d ro-modern.db db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN -d ro-modern.db db load < rosterify.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN -d ro-modern.db db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE -d ro-modern.db ls keys, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE -d ro-modern.db serve --bind=127.0.0.1:63219 '*', [1], [ignore], [ignore]) +AT_CHECK(MTN -d ro-modern.db ls keys, [1], [ignore], [ignore]) +AT_CHECK(MTN -d ro-modern.db serve --bind=127.0.0.1:63219 '*', [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_check_same_db_contents.at bb2ecb6e674b7f89797948db5cf6f5d6d042bb82 +++ tests/t_check_same_db_contents.at 715147930ebea5d259acdc7ce4b50d54d7f69707 @@ -1,5 +1,5 @@ AT_SETUP([check_same_db_contents macro]) -MONOTONE_SETUP +MTN_SETUP # this test just tests that the testsuite macro CHECK_SAME_DB_CONTENTS works, # because other tests depend on that. ============================================================ --- tests/t_checkout_creates_log.at a486e085ecd1ddf55dba3dfd63cc3c056117325c +++ tests/t_checkout_creates_log.at ab38ec5c2d15cc1196a07f47b5c6ab70bfcacdfc @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([checkout creates _MTN/log]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(commit_log.lua, [ function edit_comment(summary, user_log_file) @@ -16,11 +16,11 @@ AT_DATA(input.txt, [version 0 of the file ]) -AT_CHECK(MONOTONE add input.txt, [], [ignore], [ignore]) +AT_CHECK(MTN add input.txt, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_log.lua commit, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch --rcfile=commit_log.lua commit, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch co testbranch) +AT_CHECK(MTN --branch=testbranch co testbranch) AT_CHECK(test -f testbranch/_MTN/log -a ! -s _MTN/log) ============================================================ --- tests/t_checkout_dir.at f300f105573d0ec40486eaeae660a6a782442961 +++ tests/t_checkout_dir.at 7a3cb3bdef9819e99179378d09a79da392f842c9 @@ -1,29 +1,29 @@ AT_SETUP([checkout validates target directory]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo ]) COMMIT(testbranch) -AT_CHECK(MONOTONE --branch=testbranch checkout test_dir1, +AT_CHECK(MTN --branch=testbranch checkout test_dir1, [0], [ignore], [ignore]) echo >test_dir2 -AT_CHECK(MONOTONE --branch=testbranch checkout test_dir2, +AT_CHECK(MTN --branch=testbranch checkout test_dir2, [1], [ignore], [ignore]) mkdir test_dir3 -AT_CHECK(MONOTONE --branch=testbranch checkout test_dir3, +AT_CHECK(MTN --branch=testbranch checkout test_dir3, [1], [ignore], [ignore]) mkdir test_dir4 chmod 444 test_dir4 # XFAIL if run as root (hi Gentoo!) AT_XFAIL_IF(test -O /) -AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4, +AT_CHECK(MTN --branch=testbranch checkout test_dir4, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir, +AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir, [1], [ignore], [ignore]) # Reset the permissions so Autotest can correctly clean up our # temporary directory. @@ -33,6 +33,6 @@ # but as a special case, we allow "checkout ." mkdir test_dir5 -AT_CHECK(cd test_dir5 && MONOTONE --branch=testbranch checkout ., [], [ignore], [ignore]) +AT_CHECK(cd test_dir5 && MTN --branch=testbranch checkout ., [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_checkout_id_sets_branch.at 702d18e6aa83cfaa4ce94e27752c051ef4090c53 +++ tests/t_checkout_id_sets_branch.at 207ace1b5517e791b6bbf32752f1555d04674a57 @@ -1,27 +1,27 @@ AT_SETUP([checkout without --branch sets branch]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [blah blah ]) COMMIT(testbranch) REV=`BASE_REVISION` -AT_CHECK(MONOTONE checkout --revision=$REV codir1, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV codir1, [], [ignore], [ignore]) AT_CHECK(cmp foo codir1/foo) AT_DATA(codir1/foo, [hi maude ]) # verify that no branch is needed for commit -AT_CHECK(cd codir1 && MONOTONE commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd codir1 && MTN commit --message=foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE cert $REV branch otherbranch) +AT_CHECK(MTN cert $REV branch otherbranch) # but, now we can't checkout without a --branch... # need to make sure don't pick up branch from our local _MTN dir... AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE checkout --revision=$REV codir2, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout --revision=$REV --branch=testbranch codir3, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV codir2, [1], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV --branch=testbranch codir3, [], [ignore], [ignore]) AT_CHECK(cmp foo codir3/foo) -AT_CHECK(MONOTONE checkout --revision=$REV --branch=otherbranch codir4, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV --branch=otherbranch codir4, [], [ignore], [ignore]) AT_CHECK(cmp foo codir4/foo) AT_CLEANUP ============================================================ --- tests/t_checkout_noop_on_fail.at 93a999e1a23a24adf8b94409af078ed564656aa4 +++ tests/t_checkout_noop_on_fail.at 45f1506851e9cece794b436c26136ab239c42432 @@ -1,14 +1,14 @@ AT_SETUP([failed checkout is a no-op]) -MONOTONE_SETUP +MTN_SETUP # If a checkout fails, no target directory should be created, and if # the checkout directory already exists, no _MTN/ directory should be # created. -AT_CHECK(MONOTONE checkout --revision=bogus-id outdir, [1], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=bogus-id outdir, [1], [ignore], [ignore]) AT_CHECK(test ! -e outdir) AT_CHECK(mkdir outdir) -AT_CHECK( (cd outdir && MONOTONE checkout --revision=bogus-id .), [1], [ignore], [ignore]) +AT_CHECK( (cd outdir && MTN checkout --revision=bogus-id .), [1], [ignore], [ignore]) AT_CHECK(test ! -e outdir/_MTN) AT_CLEANUP ============================================================ --- tests/t_checkout_options.at 24eeba0a23944dc0b0593d1dadfcb4dfc8868166 +++ tests/t_checkout_options.at 410c5f195e14eac5fa947402842899a97eb47580 @@ -1,30 +1,30 @@ AT_SETUP([checkout creates right _MTN/options]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo ]) COMMIT(testbranch) REV=`BASE_REVISION` -# We use RAW_MONOTONE because it used to be that passing --db= (as -# MONOTONE does) would hide a bug in this functionality... +# We use RAW_MTN because it used to be that passing --db= (as +# MTN does) would hide a bug in this functionality... # all of these inherit options settings from the current _MTN dir # unless they override them on the command line -AT_CHECK(RAW_MONOTONE checkout test_dir1, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE --db=test.db checkout test_dir2, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE --db=test.db --branch=testbranch checkout test_dir3, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE --branch=testbranch checkout test_dir4, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE --db=test.db --branch=testbranch checkout --revision=$REV test_dir5, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE --branch=testbranch checkout --revision=$REV test_dir6, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE --db=test.db checkout --revision=$REV test_dir7, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE checkout --revision=$REV test_dir8, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN checkout test_dir1, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --db=test.db checkout test_dir2, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --db=test.db --branch=testbranch checkout test_dir3, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --branch=testbranch checkout test_dir4, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --db=test.db --branch=testbranch checkout --revision=$REV test_dir5, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --branch=testbranch checkout --revision=$REV test_dir6, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --db=test.db checkout --revision=$REV test_dir7, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN checkout --revision=$REV test_dir8, [], [ignore], [ignore]) # checkout fails if the specified revision is not a member of the specified branch -AT_CHECK(RAW_MONOTONE --branch=foobar checkout --revision=$REV test_dir9, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE cert $REV branch foobar, [], [ignore], [ignore]) -AT_CHECK(RAW_MONOTONE --branch=foobar checkout --revision=$REV test_dir10, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --branch=foobar checkout --revision=$REV test_dir9, [1], [ignore], [ignore]) +AT_CHECK(MTN cert $REV branch foobar, [], [ignore], [ignore]) +AT_CHECK(RAW_MTN --branch=foobar checkout --revision=$REV test_dir10, [], [ignore], [ignore]) for DIR in test_dir@<:@12345678@:>@; do ============================================================ --- tests/t_chkeypass.at 4a3b8cb2f6e7417cd27938b2e7f9aa12b1f116a4 +++ tests/t_chkeypass.at 313ce501c61c4843429850005c712fa7fc093623 @@ -1,27 +1,27 @@ # -*- Autoconf -*- AT_SETUP([changing passphrase of a private key]) -MONOTONE_SETUP +MTN_SETUP address@hidden # generate a new key -AT_CHECK((echo $TKEY; echo $TKEY) | MONOTONE genkey $TKEY, [], [ignore], [ignore]) +AT_CHECK((echo $TKEY; echo $TKEY) | MTN genkey $TKEY, [], [ignore], [ignore]) # fail to enter any passphrase -AT_CHECK(MONOTONE chkeypass $TKEY # -# $ monotone commit -m 'foo' +# $ mtn commit -m 'foo' # error, _MTN/log non-empty and -m specified -AT_CHECK(MONOTONE commit -btestbranch -m "blah blah", [1], [ignore], [ignore]) +AT_CHECK(MTN commit -btestbranch -m "blah blah", [1], [ignore], [ignore]) # So _MTN/log should still be empty AT_CHECK(test -s _MTN/log, [1]) ============================================================ --- tests/t_commit_message_file.at 9083f8d8c0f6a978c6421c4f9f352acd2652a95c +++ tests/t_commit_message_file.at 7a6d3e111009f22a88427d27515bc98e83704fe4 @@ -1,6 +1,6 @@ AT_SETUP([commit with --message-file]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(rm -f _MTN/log) @@ -11,21 +11,21 @@ AT_DATA(input.txt, [version 0 of the file ]) -AT_CHECK(MONOTONE add input.txt, [], [ignore], [ignore]) +AT_CHECK(MTN add input.txt, [], [ignore], [ignore]) AT_DATA(msgfile.txt, [this commit uses the --message-file option ]) -AT_CHECK(MONOTONE --branch=testbranch commit --message-file=msgfile.txt, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message-file=msgfile.txt, [], [ignore], [ignore]) TSHA=`BASE_REVISION` -AT_CHECK(MONOTONE ls certs $TSHA, [], [stdout], [ignore]) +AT_CHECK(MTN ls certs $TSHA, [], [stdout], [ignore]) AT_CHECK(QGREP('this commit uses the --message-file option' stdout), []) #-------------------- #also with a file coming outside the workspace #-------------------- -AT_CHECK(MONOTONE setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) +AT_CHECK(MTN setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) AT_DATA(alt_wrk/input1.txt, [files... files... ]) @@ -33,12 +33,12 @@ AT_DATA(message-out-of-copy.txt, [out out out ]) -AT_CHECK(cd alt_wrk && MONOTONE add input1.txt, [], [ignore], [ignore]) +AT_CHECK(cd alt_wrk && MTN add input1.txt, [], [ignore], [ignore]) -AT_CHECK(cd alt_wrk && MONOTONE --branch=outbranch commit --message-file=../message-out-of-copy.txt, [], [ignore], [ignore]) +AT_CHECK(cd alt_wrk && MTN --branch=outbranch commit --message-file=../message-out-of-copy.txt, [], [ignore], [ignore]) TSHA=`cd alt_wrk && BASE_REVISION` -AT_CHECK(cd alt_wrk && MONOTONE ls certs $TSHA, [], [stdout], [ignore]) +AT_CHECK(cd alt_wrk && MTN ls certs $TSHA, [], [stdout], [ignore]) AT_CHECK(QGREP('out out out' stdout), []) #-------------------- @@ -47,15 +47,15 @@ AT_DATA(input2.txt, [another file ]) -AT_CHECK(MONOTONE add input2.txt, [], [ignore], [ignore]) +AT_CHECK(MTN add input2.txt, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message-file=to-be-or-not-to-be.txt, [1], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message-file=to-be-or-not-to-be.txt, [1], [ignore], [ignore]) #-------------------- #then verify that --message and --message-file together cause an error #-------------------- -AT_CHECK(MONOTONE --branch=testbranch commit --message-file=msgfile.txt --message="also a message", [1], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message-file=msgfile.txt --message="also a message", [1], [ignore], [ignore]) # -------------------- # finally, --message-file and a filled _MTN/log should also fail @@ -70,6 +70,6 @@ AT_DATA(_MTN/log, [Log entry ]) -AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_log.lua commit --message-file=msgfile.txt, [1], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch --rcfile=commit_log.lua commit --message-file=msgfile.txt, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_commit_validate.at 2d6e25f801aa61c96d7c063bd1c7e7d1224b55c3 +++ tests/t_commit_validate.at 2f4192fe019edbafca186c66f0061500c0d3869a @@ -1,9 +1,9 @@ # -*- Autoconf -*- # vim: tw=0 AT_SETUP([commit validation lua hook]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(commit_validate.lua, [ function validate_commit_message(message, info) @@ -21,11 +21,11 @@ AT_DATA(input.txt, [version 0 of the file ]) -AT_CHECK(MONOTONE add input.txt, [], [ignore], [ignore]) +AT_CHECK(MTN add input.txt, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_validate.lua commit -m "denyme", 1, [ignore], [monotone: beginning commit on branch 'testbranch' +AT_CHECK(MTN --branch=testbranch --rcfile=commit_validate.lua commit -m "denyme", 1, [ignore], [monotone: beginning commit on branch 'testbranch' monotone: misuse: log message rejected: input.txt ]) -AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_validate.lua commit -m "allowme", 0, ignore, ignore) +AT_CHECK(MTN --branch=testbranch --rcfile=commit_validate.lua commit -m "allowme", 0, ignore, ignore) AT_CLEANUP ============================================================ --- tests/t_config_confdir.at 0436211514ef07656dae6576dfb25edf9f6df3d4 +++ tests/t_config_confdir.at fe24031e9eb856190dd2ff991e3e6f5129ac447f @@ -1,5 +1,5 @@ AT_SETUP([--confdir option and get_confdir lua function work]) -MONOTONE_SETUP +MTN_SETUP AT_DATA([myhooks],[-- lua script to check that --condfir works dir = get_confdir() @@ -10,6 +10,6 @@ end ]) AT_CHECK(mkdir fooxyzzybar) -AT_CHECK(MONOTONE --confdir=fooxyzzybar --rcfile=myhooks ls known) +AT_CHECK(MTN --confdir=fooxyzzybar --rcfile=myhooks ls known) AT_CHECK(cat fooxyzzybar/checkfile, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_crlf.at 0fb9adb97227215e51748da4b19fe01ea6e53196 +++ tests/t_crlf.at 236a75e0d93a570ef39ff7baf6690dd3bf33f626 @@ -1,16 +1,16 @@ AT_SETUP([CRLF line normalization]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(printf "a\r\nb\r\nc\r\nd\r\n", [], [stdout]) AT_CHECK(cp stdout test.crlf) -AT_CHECK(MONOTONE add test.crlf, [], [ignore], [ignore]) +AT_CHECK(MTN add test.crlf, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(printf "a\r\nb\r\nnew line!\r\nc\r\nd\r\n", [], [stdout]) AT_CHECK(cp stdout test.crlf) -AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(MTN diff, [], [stdout], [ignore]) LINES=`wc -l _MTN/revision) # remove another file too -AT_CHECK(MONOTONE db execute "delete from files where id='$FILE3'", [], [ignore], [ignore]) +AT_CHECK(MTN db execute "delete from files where id='$FILE3'", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) AT_CHECK(grep '1 unreferenced file' stderr, [0], [ignore], [ignore]) AT_CHECK(grep '1 unreferenced roster' stderr, [0], [ignore], [ignore]) AT_CHECK(grep '2 missing files' stderr, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "delete from revision_ancestry", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db execute "delete from revision_ancestry", [], [ignore], [ignore]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) AT_CHECK(grep '2 mismatched parent' stderr, [0], [ignore], [ignore]) AT_CHECK(grep '2 mismatched child' stderr, [0], [ignore], [ignore]) @@ -78,36 +78,36 @@ XDELTA_CC="877cfe29db0f60dec63439857fe78673b9d55346" XDELTA_HH="68d15dc01398c7bb375b1a90fbb420bebef1bac7" -AT_CHECK(MONOTONE db execute "insert into revision_ancestry values('$XDELTA_CC', '$XDELTA_HH')", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db execute "insert into revision_ancestry values('$XDELTA_CC', '$XDELTA_HH')", [], [ignore], [ignore]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) AT_CHECK(grep '3 mismatched parent' stderr, [0], [ignore], [ignore]) AT_CHECK(grep '3 mismatched child' stderr, [0], [ignore], [ignore]) AT_CHECK(grep '3 missing revision' stderr, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "delete from roster_deltas where id='$ROST1'", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db execute "delete from roster_deltas where id='$ROST1'", [], [ignore], [ignore]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) # ROSTER TODO: need check_sane_history equivalent in db check #AT_CHECK(grep '3 revisions with bad history' stderr, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "delete from revisions where id='$REV1'", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db execute "delete from revisions where id='$REV1'", [], [ignore], [ignore]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) AT_CHECK(grep '4 missing revision' stderr, [0], [ignore], [ignore]) # ROSTER TODO #AT_CHECK(grep '2 revisions with bad history' stderr, [0], [ignore], [ignore]) echo "$REV2:comment:this is a test:address@hidden:bogus sig" | sha1sum | read HASH -AT_CHECK(MONOTONE db execute "insert into revision_certs values ('$HASH', '$REV2', 'comment', 'this is a test', 'address@hidden', 'bogus sig')", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db execute "insert into revision_certs values ('$HASH', '$REV2', 'comment', 'this is a test', 'address@hidden', 'bogus sig')", [], [ignore], [ignore]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) AT_CHECK(grep '1 bad sig' stderr, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "delete from revision_certs where name = 'date'", [], [ignore], [stderr]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db execute "delete from revision_certs where name = 'date'", [], [ignore], [stderr]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) AT_CHECK(grep '2 missing certs' stderr, [0], [ignore], [ignore]) AT_CHECK(grep '4 mismatched certs' stderr, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "delete from public_keys", [], [ignore], [stderr]) -AT_CHECK(MONOTONE db check --ticker=dot, [1], [ignore], [stderr]) +AT_CHECK(MTN db execute "delete from public_keys", [], [ignore], [stderr]) +AT_CHECK(MTN db check --ticker=dot, [1], [ignore], [stderr]) AT_CHECK(grep '1 missing key' stderr, [0], [ignore], [ignore]) AT_CHECK(grep '13 unchecked signatures' stderr, [0], [ignore], [ignore]) ============================================================ --- tests/t_database_check_minor.at 66b3b2c1654b8610edf4152c84342c70992004cb +++ tests/t_database_check_minor.at 174ffc42e448efb64d29bbdce5df49e6035c7c14 @@ -1,5 +1,5 @@ AT_SETUP([db check and non-serious errors]) -MONOTONE_SETUP +MTN_SETUP # Make sure that db check detects minor problems, but doesn't complain # about them too loudly (and doesn't exit with error status). @@ -14,23 +14,23 @@ COMMIT(testbranch) REV=`BASE_REVISION` -AT_CHECK(MONOTONE cert $REV author extra_author, [], [ignore], [ignore]) +AT_CHECK(MTN cert $REV author extra_author, [], [ignore], [ignore]) # if we drop the file, we'll have a roster that doesn't # reference its own revision. # we can then remove the revision to end up with a clean unreferenced roster. -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit -m "goingaway", [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN commit -m "goingaway", [], [ignore], [ignore]) DEL_REV=`BASE_REVISION` -AT_CHECK(MONOTONE db execute "delete from revisions where id = '$DEL_REV'", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "delete from revision_certs where id = '$DEL_REV'", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "delete from revision_ancestry where child = '$DEL_REV'", [], [ignore], [ignore]) +AT_CHECK(MTN db execute "delete from revisions where id = '$DEL_REV'", [], [ignore], [ignore]) +AT_CHECK(MTN db execute "delete from revision_certs where id = '$DEL_REV'", [], [ignore], [ignore]) +AT_CHECK(MTN db execute "delete from revision_ancestry where child = '$DEL_REV'", [], [ignore], [ignore]) # and also a few unused files shall float about -AT_CHECK(MONOTONE fload < fileX, [], [ignore], [ignore]) -AT_CHECK(MONOTONE fload < fileY, [], [ignore], [ignore]) +AT_CHECK(MTN fload < fileX, [], [ignore], [ignore]) +AT_CHECK(MTN fload < fileY, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check, [], [ignore], [stderr]) +AT_CHECK(MTN db check, [], [ignore], [stderr]) AT_CHECK(QGREP('problems detected: 5' stderr)) AT_CHECK(QGREP('0 serious' stderr)) ============================================================ --- tests/t_database_check_normalized.at d89c3d1d57ac11406b965a7d1f7ba69f1bb21381 +++ tests/t_database_check_normalized.at 9b74d6d061d5fc12b1da83685fe38ea4d57c5383 @@ -17,7 +17,7 @@ #add_file "./file" -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 AT_DATA(bad.db.gz.b64,[ @@ -115,9 +115,9 @@ ]) UNGZB64(bad.db.gz.b64, bad.db) -AT_CHECK(MONOTONE db migrate -d bad.db, [0], [ignore], [ignore]) +AT_CHECK(MTN db migrate -d bad.db, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE db check -d bad.db, [1], [ignore], [stderr]) +AT_CHECK(MTN db check -d bad.db, [1], [ignore], [stderr]) AT_CHECK(grep 'revisions not parseable' stderr, [], [ignore], [ignore]) ============================================================ --- tests/t_database_sig_cleanup.at 931a30f59821cd4244a3d005a688002e88cd01bf +++ tests/t_database_sig_cleanup.at 7b4f9a436b3b6719589c884fbf5e264e774ae728 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([database is closed on signal exit]) -MONOTONE_SETUP +MTN_SETUP # SIGTERM and SIGINT can't really be handled on Win32: # http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_CRT_signal.asp @@ -15,7 +15,7 @@ AT_DATA(testfile, [stuff ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) # a hack to make the monotone process hang around with the database locked. @@ -25,7 +25,7 @@ # SIGTERM first -AT_CHECK(MONOTONE --rcfile=wait.lua --branch=testbranch commit --message=blah-blah & echo $! > monotone_commit.pid, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=wait.lua --branch=testbranch commit --message=blah-blah & echo $! > monotone_commit.pid, [], [ignore], [ignore]) AT_CHECK(sleep 2, [], [ignore], [ignore]) AT_CHECK(test -f test.db-journal, [], [ignore], [ignore]) AT_CHECK(kill -TERM `cat monotone_commit.pid`, [], [ignore], [ignore]) @@ -34,7 +34,7 @@ # and again for SIGINT -AT_CHECK(MONOTONE --rcfile=wait.lua --branch=testbranch commit --message=blah-blah & echo $! > monotone_commit.pid, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=wait.lua --branch=testbranch commit --message=blah-blah & echo $! > monotone_commit.pid, [], [ignore], [ignore]) AT_CHECK(sleep 2, [], [ignore], [ignore]) AT_CHECK(test -f test.db-journal, [], [ignore], [ignore]) AT_CHECK(kill -INT `cat monotone_commit.pid`, [], [ignore], [ignore]) @@ -43,7 +43,7 @@ # should be cleaned up for SIGSEGV -AT_CHECK(MONOTONE --rcfile=wait.lua --branch=testbranch commit --message=blah-blah & echo $! > monotone_commit.pid, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=wait.lua --branch=testbranch commit --message=blah-blah & echo $! > monotone_commit.pid, [], [ignore], [ignore]) AT_CHECK(sleep 2, [], [ignore], [ignore]) AT_CHECK(test -f test.db-journal, [], [ignore], [ignore]) AT_CHECK(kill -SEGV `cat monotone_commit.pid`, [], [ignore], [ignore]) ============================================================ --- tests/t_db_execute.at 8d4eb06517101eb8b46af0d7e71649beda8c2e4b +++ tests/t_db_execute.at 809c2e5d24fa38ebb2106c2cf42ec69b36c2435b @@ -1,30 +1,30 @@ AT_SETUP([db execute]) -MONOTONE_SETUP +MTN_SETUP TWO_COL_TABLE=files COL1=id -AT_CHECK(MONOTONE db execute "INSERT INTO $TWO_COL_TABLE VALUES ('key1', 'value1')", [], [ignore], [ignore]) +AT_CHECK(MTN db execute "INSERT INTO $TWO_COL_TABLE VALUES ('key1', 'value1')", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "SELECT * FROM $TWO_COL_TABLE", [], [stdout], [ignore]) +AT_CHECK(MTN db execute "SELECT * FROM $TWO_COL_TABLE", [], [stdout], [ignore]) AT_CHECK(QGREP(key1 stdout)) AT_CHECK(QGREP(value1 stdout)) -AT_CHECK(MONOTONE db execute "SELECT * FROM $TWO_COL_TABLE WHERE $COL1 = 'nonsense'", [], [stdout], [ignore]) +AT_CHECK(MTN db execute "SELECT * FROM $TWO_COL_TABLE WHERE $COL1 = 'nonsense'", [], [stdout], [ignore]) AT_CHECK(QGREP(key1 stdout), [1]) -AT_CHECK(MONOTONE db execute "SELECT * FROM $TWO_COL_TABLE WHERE $COL1 LIKE 'k%'", [], [stdout], [ignore]) +AT_CHECK(MTN db execute "SELECT * FROM $TWO_COL_TABLE WHERE $COL1 LIKE 'k%'", [], [stdout], [ignore]) AT_CHECK(QGREP(key1 stdout)) -AT_CHECK(MONOTONE db execute "DELETE FROM $TWO_COL_TABLE", [], [ignore], [ignore]) +AT_CHECK(MTN db execute "DELETE FROM $TWO_COL_TABLE", [], [ignore], [ignore]) -AT_CHECK(MONOTONE db execute "SELECT * FROM $TWO_COL_TABLE", [], [stdout], [ignore]) +AT_CHECK(MTN db execute "SELECT * FROM $TWO_COL_TABLE", [], [stdout], [ignore]) AT_CHECK(QGREP(key1 stdout), [1]) # We used to have weird quoting bugs around "%" # string is split into two so the grep doesn't trigger on monotone's # chatter about what command it's going to execute... -AT_CHECK(MONOTONE db execute "SELECT '%s' || 'tuff'", [], [stdout], [ignore]) +AT_CHECK(MTN db execute "SELECT '%s' || 'tuff'", [], [stdout], [ignore]) AT_CHECK(QGREP('%stuff' stdout)) AT_CLEANUP ============================================================ --- tests/t_db_kill_branch_certs_locally.at 4b77eb010e0fad546869da1d6af69d0a1a81d36d +++ tests/t_db_kill_branch_certs_locally.at 8fbc87053c066f5a863165e220955ec415d76c8e @@ -1,5 +1,5 @@ AT_SETUP([db kill_branch_certs_locally command]) -MONOTONE_SETUP +MTN_SETUP # This tests the db kill_branch_certs_locally command @@ -8,19 +8,19 @@ ]) COMMIT(good) REVISION=`BASE_REVISION` -AT_CHECK(MONOTONE cert $REVISION branch bad, [], ignore, ignore) -AT_CHECK(MONOTONE ls branches, [], stdout, ignore) +AT_CHECK(MTN cert $REVISION branch bad, [], ignore, ignore) +AT_CHECK(MTN ls branches, [], stdout, ignore) AT_CHECK(QGREP(good stdout)) AT_CHECK(QGREP(bad stdout)) # Now we delete the branch, and make sure it's gone -AT_CHECK(MONOTONE db kill_branch_certs_locally bad, [], ignore, ignore) -AT_CHECK(MONOTONE ls branches, [], stdout, ignore) +AT_CHECK(MTN db kill_branch_certs_locally bad, [], ignore, ignore) +AT_CHECK(MTN ls branches, [], stdout, ignore) AT_CHECK(QGREP(good stdout)) AT_CHECK(QGREP(bad stdout), [1]) # And lets make sure our database is still OK -AT_CHECK(MONOTONE db check, [], ignore, ignore) +AT_CHECK(MTN db check, [], ignore, ignore) AT_CLEANUP (END) ============================================================ --- tests/t_db_kill_rev_locally.at dba54fa06f40b817e7123cd375b78b96f62a4d43 +++ tests/t_db_kill_rev_locally.at 48afae9e966512f16e4248d7e6af4515e8923eae @@ -1,5 +1,5 @@ AT_SETUP([db kill_rev_locally command]) -MONOTONE_SETUP +MTN_SETUP # This tests the db kill_rev_locally command @@ -15,14 +15,14 @@ CHILD=`BASE_REVISION` # trying to kill the ancestor. This *is supposed to fail* -AT_CHECK(MONOTONE db kill_rev_locally $ANCESTOR, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_revision $ANCESTOR, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db check, [], [ignore], [ignore]) +AT_CHECK(MTN db kill_rev_locally $ANCESTOR, [1], [ignore], [ignore]) +AT_CHECK(MTN automate get_revision $ANCESTOR, [], [ignore], [ignore]) +AT_CHECK(MTN db check, [], [ignore], [ignore]) # killing children is ok, though :) -AT_CHECK(MONOTONE automate get_revision $CHILD, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db kill_rev_locally $CHILD, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_revision $CHILD, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db check, [], ignore, ignore) +AT_CHECK(MTN automate get_revision $CHILD, [], [ignore], [ignore]) +AT_CHECK(MTN db kill_rev_locally $CHILD, [], [ignore], [ignore]) +AT_CHECK(MTN automate get_revision $CHILD, [1], [ignore], [ignore]) +AT_CHECK(MTN db check, [], ignore, ignore) AT_CLEANUP ============================================================ --- tests/t_db_kill_rev_locally_2.at 296391166304e8c739fcc7968ae5f58a36b91265 +++ tests/t_db_kill_rev_locally_2.at e33f20750d5d6fbd8f49c79612ebbaad0270b524 @@ -1,5 +1,5 @@ AT_SETUP([db kill_rev_locally command 2]) -MONOTONE_SETUP +MTN_SETUP # start off with three revisions ADD_FILE(testfile, [blah blah @@ -18,15 +18,15 @@ CHILD2=`BASE_REVISION` # kill head revision -AT_CHECK(MONOTONE automate get_revision $CHILD2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db kill_rev_locally $CHILD2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_revision $CHILD2, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db check, [], ignore, ignore) +AT_CHECK(MTN automate get_revision $CHILD2, [], [ignore], [ignore]) +AT_CHECK(MTN db kill_rev_locally $CHILD2, [], [ignore], [ignore]) +AT_CHECK(MTN automate get_revision $CHILD2, [1], [ignore], [ignore]) +AT_CHECK(MTN db check, [], ignore, ignore) # head is an older revision now, let's kill that too -AT_CHECK(MONOTONE automate get_revision $CHILD1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db kill_rev_locally $CHILD1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_revision $CHILD1, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db check, [], ignore, ignore) +AT_CHECK(MTN automate get_revision $CHILD1, [], [ignore], [ignore]) +AT_CHECK(MTN db kill_rev_locally $CHILD1, [], [ignore], [ignore]) +AT_CHECK(MTN automate get_revision $CHILD1, [1], [ignore], [ignore]) +AT_CHECK(MTN db check, [], ignore, ignore) AT_CLEANUP ============================================================ --- tests/t_db_missing.at 9b3298dc6e907cb663c4b165f03d7df19940e7ef +++ tests/t_db_missing.at 72799aa3e7926a756451b7113f5e2f59227625ad @@ -1,13 +1,13 @@ AT_SETUP([db missing]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) AT_DATA(foo/foo.db, [foo file ]) -AT_CHECK( (cd foo && MONOTONE --db= ls keys), [1], [ignore], [ignore]) -AT_CHECK( (cd foo && MONOTONE --db=foo.db ls keys), [1], [ignore], [ignore]) -AT_CHECK( (cd foo && MONOTONE --db=missing.db ls keys), [1], [ignore], [ignore]) +AT_CHECK( (cd foo && MTN --db= ls keys), [1], [ignore], [ignore]) +AT_CHECK( (cd foo && MTN --db=foo.db ls keys), [1], [ignore], [ignore]) +AT_CHECK( (cd foo && MTN --db=missing.db ls keys), [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_db_with_dots.at b54df6de2ea3fa178dca93aa6003c7273871206d +++ tests/t_db_with_dots.at ae26b2b72d88f8ebe4c5602e21c9d6c89e4969c3 @@ -1,14 +1,14 @@ AT_SETUP([--db with ..]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) -AT_CHECK( (cd foo && MONOTONE --db=../new.db db init), [], [ignore], [ignore]) -AT_CHECK( (cd foo && MONOTONE --db=../new.db ls branches), [], [ignore], [ignore]) +AT_CHECK( (cd foo && MTN --db=../new.db db init), [], [ignore], [ignore]) +AT_CHECK( (cd foo && MTN --db=../new.db ls branches), [], [ignore], [ignore]) # paths in _MTN/options should be absolute and not contain .. AT_CHECK(mkdir bar) -AT_CHECK( (cd bar && MONOTONE --db=../new.db --branch=testbranch setup .), [], [ignore], [ignore]) +AT_CHECK( (cd bar && MTN --db=../new.db --branch=testbranch setup .), [], [ignore], [ignore]) AT_CHECK(grep new.db bar/_MTN/options, [], [ignore], [ignore]) AT_CHECK(grep new.db bar/_MTN/options | grep -v '\.\.', [], [ignore], [ignore]) ============================================================ --- tests/t_delete_dir.at 734aaade26826b6fb8b2a9d56d63276d98803a48 +++ tests/t_delete_dir.at f61986308bf22e63086c550fc5ff8eb94f7ce145 @@ -1,5 +1,5 @@ AT_SETUP([(imp) deleting directories]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir groundzero) ADD_FILE(groundzero/preexisting, [1 @@ -20,10 +20,10 @@ ADD_FILE(groundzero/new-file, [7 ]) AT_CHECK(mv rename-in groundzero/rename-in) -AT_CHECK(MONOTONE rename rename-in groundzero/rename-in, [], [ignore], [ignore]) +AT_CHECK(MTN rename rename-in groundzero/rename-in, [], [ignore], [ignore]) AT_CHECK(mv groundzero/rename-out rename-out) -AT_CHECK(MONOTONE rename groundzero/rename-out rename-out, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop -e groundzero/double-kill, [], [ignore], [ignore]) +AT_CHECK(MTN rename groundzero/rename-out rename-out, [], [ignore], [ignore]) +AT_CHECK(MTN drop -e groundzero/double-kill, [], [ignore], [ignore]) COMMIT(testbranch) OTHER_OPS_R=`BASE_REVISION` @@ -33,24 +33,24 @@ AT_CHECK(rm groundzero/rename-in) AT_CHECK(rm groundzero/new-file) -AT_CHECK(MONOTONE drop -e groundzero, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE drop --recursive -e groundzero, [], [ignore], [ignore]) +AT_CHECK(MTN drop -e groundzero, [1], [ignore], [ignore]) +AT_CHECK(MTN drop --recursive -e groundzero, [], [ignore], [ignore]) COMMIT(testbranch) DIR_DELETE_R=`BASE_REVISION` # orphaned node conflicts on rename-in and new-file -AT_CHECK(MONOTONE merge, [1], [ignore], [ignore]) +AT_CHECK(MTN merge, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE update -r $OTHER_OPS_R, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop groundzero/new-file, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop groundzero/rename-in, [], [ignore], [ignore]) +AT_CHECK(MTN update -r $OTHER_OPS_R, [], [ignore], [ignore]) +AT_CHECK(MTN drop groundzero/new-file, [], [ignore], [ignore]) +AT_CHECK(MTN drop groundzero/rename-in, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout --revision=$BASE_R clean, [], [ignore], [ignore]) -AT_CHECK(cd clean && MONOTONE --branch=testbranch update, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$BASE_R clean, [], [ignore], [ignore]) +AT_CHECK(cd clean && MTN --branch=testbranch update, [], [ignore], [ignore]) AT_CHECK(test -f clean/rename-out, [1]) AT_CHECK(test -f clean/bystander1) ============================================================ --- tests/t_delete_dir_patch.at c5e0a8c0919eb30be885c086894ea908cf0a99ce +++ tests/t_delete_dir_patch.at 0f2bb9b4de62ca4ed2b6a831908e7a68f70e9f86 @@ -1,5 +1,5 @@ AT_SETUP([(imp) merge(, )]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) ADD_FILE(foo/a, [blah blah @@ -8,7 +8,7 @@ BASE_R=`BASE_REVISION` AT_CHECK(mv foo bar) -AT_CHECK(MONOTONE drop --recursive foo, [], [ignore], [ignore]) +AT_CHECK(MTN drop --recursive foo, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(mv bar foo) @@ -18,10 +18,10 @@ ]) COMMIT(testbranch) -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) -AT_CHECK( (cd test_dir && MONOTONE update --branch=testbranch), [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) +AT_CHECK( (cd test_dir && MTN update --branch=testbranch), [], [ignore], [ignore]) AT_CHECK(test ! -f test_dir/foo/a) AT_CHECK(test ! -f test_dir/bar/a) ============================================================ --- tests/t_diff_added_file.at 15a6bb14272964260cefa7a960bbe009288f499f +++ tests/t_diff_added_file.at 2e42020e5ac8d43b569eee0c42093dede83037a0 @@ -1,19 +1,19 @@ # -*- Autoconf -*- AT_SETUP([diffing a revision with an added file]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo1, [foo file 1 ]) AT_DATA(foo2, [foo file 2 ]) -AT_CHECK(MONOTONE add foo1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah, [], [ignore], [ignore]) parent=`BASE_REVISION` -AT_CHECK(MONOTONE add foo2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message bleh, [], [ignore], [ignore]) -AT_CHECK(MONOTONE diff --revision=$parent --revision=`BASE_REVISION`, [], [ignore], [ignore]) +AT_CHECK(MTN add foo2, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message bleh, [], [ignore], [ignore]) +AT_CHECK(MTN diff --revision=$parent --revision=`BASE_REVISION`, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_diff_binary.at de45d9dca34e5765bd998968752d25368c8238e1 +++ tests/t_diff_binary.at f9afc7691fedd9d36c21a38e57c64f50cde1e9d1 @@ -1,5 +1,5 @@ AT_SETUP([diff a binary file]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 # diff should probably not display the contents of binary files @@ -17,9 +17,9 @@ UNGZB64(binary.gz.b64, binary) -AT_CHECK(MONOTONE add binary, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [ignore], [ignore]) -AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(MTN add binary, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [ignore], [ignore]) +AT_CHECK(MTN diff, [], [stdout], [ignore]) AT_CHECK(grep @<:@^@<:@:print:@:>@@:>@ stdout, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_diff_currev.at ee9a2d74b230a17a54292a4b2301f650330bf3ea +++ tests/t_diff_currev.at 637917ca09ebe0f27a10588bab8198f9405fd3b6 @@ -1,23 +1,23 @@ # -*- Autoconf -*- AT_SETUP([diffing with explicit rev same as wc rev]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo1, [foo file 1 ]) -AT_CHECK(MONOTONE add foo1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah, [], [ignore], [ignore]) parent=`BASE_REVISION` # should return 'no changes' (i.e. same as diff without --revision=) -CHECK_SAME_STDOUT(MONOTONE diff, MONOTONE diff --revision=$parent) +CHECK_SAME_STDOUT(MTN diff, MTN diff --revision=$parent) AT_DATA(foo1, [foo changed file ]) # should show local changes against wc's base rev -CHECK_SAME_STDOUT(MONOTONE diff, MONOTONE diff --revision=$parent) +CHECK_SAME_STDOUT(MTN diff, MTN diff --revision=$parent) AT_CLEANUP ============================================================ --- tests/t_diff_external.at f44d899d4e359fce55e22de6bd4c3752d1d18770 +++ tests/t_diff_external.at e30e936aa2a8bcc6b7b6b1e9d2b14773957265a4 @@ -1,5 +1,5 @@ AT_SETUP([diff --external]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo bar ]) @@ -29,7 +29,7 @@ end ]) -AT_CHECK(MONOTONE --rcfile=testhook.lua diff --external, [], [stdout], [ignore]) +AT_CHECK(MTN --rcfile=testhook.lua diff --external, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(CANONICALISE(old_version)) AT_CHECK(CANONICALISE(new_version)) @@ -40,7 +40,7 @@ AT_CHECK(QGREP("rev_old: $OLD_SHA" stdout)) AT_CHECK(QGREP("rev_new: $NEW_SHA" stdout)) -AT_CHECK(MONOTONE --rcfile=testhook.lua diff --external --diff-args="-foobar", [], [stdout], [ignore]) +AT_CHECK(MTN --rcfile=testhook.lua diff --external --diff-args="-foobar", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(CANONICALISE(old_version)) AT_CHECK(CANONICALISE(new_version)) @@ -51,7 +51,7 @@ AT_CHECK(QGREP("rev_old: $OLD_SHA" stdout)) AT_CHECK(QGREP("rev_new: $NEW_SHA" stdout)) -AT_CHECK(MONOTONE --rcfile=testhook.lua diff --external --diff-args="", [], [stdout], [ignore]) +AT_CHECK(MTN --rcfile=testhook.lua diff --external --diff-args="", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(CANONICALISE(old_version)) AT_CHECK(CANONICALISE(new_version)) @@ -63,6 +63,6 @@ AT_CHECK(QGREP("rev_new: $NEW_SHA" stdout)) # Make sure that --diff-args without --external is an error -AT_CHECK(MONOTONE diff --diff-args="foo", [1], [ignore], [ignore]) +AT_CHECK(MTN diff --diff-args="foo", [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_diff_first_rev.at 6ae8976a600c70b0ddaba8ed4e399037685fe968 +++ tests/t_diff_first_rev.at 666fa98de7fc6a27bdae7e687196003e8a32187b @@ -1,9 +1,9 @@ AT_SETUP([diff in a never-committed project]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [flagella ]) -AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(MTN diff, [], [stdout], [ignore]) AT_CHECK(QGREP(testfile stdout)) AT_CHECK(QGREP(flagella stdout)) ============================================================ --- tests/t_diff_outside_workspace.at 933f39d768ce47a78389a31fd6a05d15dc6f29b8 +++ tests/t_diff_outside_workspace.at b3bd424fb389a92f70e2d3198e033fed011cc2d6 @@ -1,24 +1,24 @@ # -*- Autoconf -*- AT_SETUP([diffing a file within revision outside a workspace]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo1, [foo file 1 ]) AT_DATA(foo2, [foo file 2 ]) -AT_CHECK(MONOTONE add foo1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah, [], [ignore], [ignore]) parent=`BASE_REVISION` -AT_CHECK(MONOTONE add foo2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message bleh, [], [ignore], [ignore]) +AT_CHECK(MTN add foo2, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message bleh, [], [ignore], [ignore]) second=`BASE_REVISION` AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE diff --revision=$parent --revision=$second, [], [ignore], [ignore]) +AT_CHECK(MTN diff --revision=$parent --revision=$second, [], [ignore], [ignore]) # check it works when specifying files -AT_CHECK(MONOTONE diff --revision=$parent --revision=$second foo2 --debug, [], [ignore], [ignore]) +AT_CHECK(MTN diff --revision=$parent --revision=$second foo2 --debug, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_diff_restrict.at ee27d0b0ec717a1ca9a88009ace00ecd56e75370 +++ tests/t_diff_restrict.at 0131d18d3c2dca24c98a4eb0770c6bb5599ac04c @@ -1,5 +1,5 @@ AT_SETUP([diff respects restrictions]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(file1, [1: data 1 ]) @@ -20,19 +20,19 @@ AT_DATA(file2, [2: data 3 ]) -AT_CHECK(MONOTONE diff file1, [], [stdout], [ignore]) +AT_CHECK(MTN diff file1, [], [stdout], [ignore]) AT_CHECK(grep file1 stdout, [], [ignore], [ignore]) AT_CHECK(QGREP(file2 stdout), [1], [ignore], [ignore]) -AT_CHECK(MONOTONE diff --revision=$REV0 file1, [], [stdout], [ignore]) +AT_CHECK(MTN diff --revision=$REV0 file1, [], [stdout], [ignore]) AT_CHECK(grep file1 stdout, [], [ignore], [ignore]) AT_CHECK(QGREP(file2 stdout), [1], [ignore], [ignore]) -AT_CHECK(MONOTONE diff --revision=$REV0 --revision=$REV1 file1, [], [stdout], [ignore]) +AT_CHECK(MTN diff --revision=$REV0 --revision=$REV1 file1, [], [stdout], [ignore]) AT_CHECK(grep file1 stdout, [], [ignore], [ignore]) AT_CHECK(QGREP(file2 stdout), [1], [ignore], [ignore]) -AT_CHECK(MONOTONE diff --revision=$REV1 --revision=$REV0 file1, [], [stdout], [ignore]) +AT_CHECK(MTN diff --revision=$REV1 --revision=$REV0 file1, [], [stdout], [ignore]) AT_CHECK(grep file1 stdout, [], [ignore], [ignore]) AT_CHECK(QGREP(file2 stdout), [1], [ignore], [ignore]) ============================================================ --- tests/t_disapprove.at b2dafed395b370536eece985e7065d8b0ad857c3 +++ tests/t_disapprove.at 62c405ce53b552b8eaf679472adde7e906bf3aba @@ -1,15 +1,15 @@ # -*- Autoconf -*- AT_SETUP([disapproving of a revision]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(testfile, [first line of the file second line of the file third line of the file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(testfile)` @@ -19,7 +19,7 @@ third line of the file ]) -AT_CHECK(MONOTONE commit --message "left good version", [], [ignore], [ignore]) +AT_CHECK(MTN commit --message "left good version", [], [ignore], [ignore]) LEFT_GOOD_R_SHA=`BASE_REVISION` LEFT_GOOD_F_SHA=`SHA1(testfile)` AT_CHECK(test $LEFT_GOOD_R_SHA != $ROOT_R_SHA) @@ -32,7 +32,7 @@ an evil line which should never be seen ]) -AT_CHECK(MONOTONE commit --message "left bad version", [], [ignore], [ignore]) +AT_CHECK(MTN commit --message "left bad version", [], [ignore], [ignore]) LEFT_BAD_R_SHA=`BASE_REVISION` LEFT_BAD_F_SHA=`SHA1(testfile)` AT_CHECK(test $LEFT_BAD_R_SHA != $LEFT_GOOD_R_SHA) @@ -47,8 +47,8 @@ ]) -AT_CHECK(MONOTONE disapprove $LEFT_BAD_R_SHA, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN disapprove $LEFT_BAD_R_SHA, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) # files should now be merged ============================================================ --- tests/t_disapprove_branch.at 11ee7293fd1dbc7436988f9eb852d75200cb1640 +++ tests/t_disapprove_branch.at fc92c29cf9a754b60e36b2a8ad0eaf7b7b86e2ee @@ -1,5 +1,5 @@ AT_SETUP([branch handling in disapprove]) -MONOTONE_SETUP +MTN_SETUP # 1) if no --branch is specified, disapprove should use the branch # cert on the rev being disapproved. if there are multiple such ============================================================ --- tests/t_drop.at 395480063e73803977951ec4ae36de074be71eec +++ tests/t_drop.at 97ba8b4dec3ff63c46f1228f9e601742169b7c59 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([add and then drop file does nothing]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(maude, [the file maude ]) @@ -10,14 +10,14 @@ AT_DATA(liver, [the file liver ]) -AT_CHECK(MONOTONE add maude, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop maude, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN add maude, [], [ignore], [ignore]) +AT_CHECK(MTN drop maude, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep -v '_file' stdout, [], [ignore]) -AT_CHECK(MONOTONE add liver, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop liver, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN add liver, [], [ignore], [ignore]) +AT_CHECK(MTN drop liver, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep -v '_file' stdout, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_drop_attr.at 4e21c338cd341b16e2052050ff111b61bd27a630 +++ tests/t_drop_attr.at 029a37e7fd3c2e5cc630b2b827018522f981efd1 @@ -1,16 +1,16 @@ AT_SETUP([drop removes attributes]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo bar ]) -AT_CHECK(MONOTONE attr set testfile some_key some_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr set testfile some_key some_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(some_key stdout)) AT_CHECK(QGREP(some_value stdout)) COMMIT(testbranch) -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [1], [stdout], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN attr get testfile, [1], [stdout], [ignore]) AT_CLEANUP ============================================================ --- tests/t_drop_execute.at d9a492fa85d4765c1e62a4bf40806cb22f20816e +++ tests/t_drop_execute.at 14bc7f6b35a26301d17b2e7a836015c13203579c @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([drop with actual removal]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(file0, [file 0 ]) @@ -11,9 +11,9 @@ ADD_FILE(file2, [file 2 ]) -AT_CHECK(MONOTONE drop file0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop --execute file1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop -e file2, [], [ignore], [ignore]) +AT_CHECK(MTN drop file0, [], [ignore], [ignore]) +AT_CHECK(MTN drop --execute file1, [], [ignore], [ignore]) +AT_CHECK(MTN drop -e file2, [], [ignore], [ignore]) AT_CHECK(test -f file0, [], [ignore], [ignore]) AT_CHECK(test -f file1, [1], [ignore], [ignore]) ============================================================ --- tests/t_drop_missing.at 7d7b49bf0e6aee2bb8a7bf96202f464367673274 +++ tests/t_drop_missing.at a783214a8143bb6d39978dee5c033cf7fe80774d @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([drop missing and unknown files]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(maude, [the file maude ]) @@ -12,32 +12,32 @@ AT_DATA(places/cemetery, [the place file cemetery ]) -AT_CHECK(MONOTONE add maude, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add harold, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add places/cemetery, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message 'committed', [], [ignore], [ignore]) +AT_CHECK(MTN add maude, [], [ignore], [ignore]) +AT_CHECK(MTN add harold, [], [ignore], [ignore]) +AT_CHECK(MTN add places/cemetery, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message 'committed', [], [ignore], [ignore]) AT_CHECK(rm maude) -AT_CHECK(MONOTONE drop maude, [], [ignore], [stderr]) +AT_CHECK(MTN drop maude, [], [ignore], [stderr]) AT_CHECK(grep 'dropping maude from workspace manifest' stderr, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep maude stdout, [0], [ignore]) AT_CHECK(grep harold stdout, [1], [ignore]) AT_CHECK(grep places/cemetery stdout, [1], [ignore]) -AT_CHECK(MONOTONE drop foobar, [], [ignore], [stderr]) +AT_CHECK(MTN drop foobar, [], [ignore], [stderr]) AT_CHECK(grep 'skipping foobar' stderr, [0], [ignore]) AT_CHECK(rm harold) AT_CHECK(rm places/cemetery) -AT_CHECK(MONOTONE drop --missing, [], [ignore], [stderr]) +AT_CHECK(MTN drop --missing, [], [ignore], [stderr]) AT_CHECK(grep 'dropping harold from workspace manifest' stderr, [0], [ignore]) AT_CHECK(grep 'dropping places/cemetery from workspace manifest' stderr, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep maude stdout, [0], [ignore]) AT_CHECK(grep harold stdout, [0], [ignore]) AT_CHECK(grep places/cemetery stdout, [0], [ignore]) ============================================================ --- tests/t_drop_rename_patch.at 7e1c2a82a696a1d8e753cdf967badb906cdd8caf +++ tests/t_drop_rename_patch.at 0a3b4f48cdece61785cbd47edc707c021b6ef3c6 @@ -1,6 +1,6 @@ AT_SETUP([merge(<>, )]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(v1a, [foo blah ]) @@ -10,16 +10,16 @@ ]) AT_CHECK(cp v1a testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) ADD_FILE(renamefile, [this will be overwritten ]) -AT_CHECK(MONOTONE add renamefile, [], [ignore], [ignore]) +AT_CHECK(MTN add renamefile, [], [ignore], [ignore]) COMMIT(testbranch) BASE_R_SHA=`BASE_REVISION` AT_CHECK(rm -f testfile) -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename renamefile testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN rename renamefile testfile, [], [ignore], [ignore]) AT_CHECK(mv renamefile testfile) COMMIT(testbranch) @@ -32,8 +32,8 @@ ]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile v2a, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_drop_vs_dropadd.at ca2bd0804f09260fff1d6b1c714a1f4cd1c5ea52 +++ tests/t_drop_vs_dropadd.at 66d8bed66aabb638ba55de8e97d18be734f92343 @@ -1,7 +1,7 @@ AT_SETUP([merge(, )]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(original, [some stuff here ]) @@ -13,31 +13,31 @@ ]) AT_CHECK(cp original testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) BASE_R_SHA=`BASE_REVISION` # drop it -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) COMMIT(testbranch) REVERT_TO($BASE_R_SHA) # on the other side of the fork, drop it ... -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) # we add this file so that we don't end up with the same revision as # our first "drop" commit -AT_CHECK(MONOTONE add nonce, [], [ignore], [ignore]) +AT_CHECK(MTN add nonce, [], [ignore], [ignore]) COMMIT(testbranch) # ... and add the replacement # on the other side of the fork, drop it AT_CHECK(cp replaced testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout -b testbranch clean, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN checkout -b testbranch clean, [], [ignore], [ignore]) # check that the file is the replacement one AT_CHECK(cmp clean/testfile replaced) ============================================================ --- tests/t_drop_vs_patch_rename.at 1a6aca7fa842b2ea2bdac643970e5b4b652fe57d +++ tests/t_drop_vs_patch_rename.at de1ac02505668fc5064775d8349c7cde5be9006e @@ -1,28 +1,28 @@ AT_SETUP([merge(, )]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(original, [some stuff here ]) -AT_CHECK(MONOTONE add original, [], [ignore], [ignore]) +AT_CHECK(MTN add original, [], [ignore], [ignore]) COMMIT(testbranch) BASE_R_SHA=`BASE_REVISION` # drop it -AT_CHECK(MONOTONE drop original, [], [ignore], [ignore]) +AT_CHECK(MTN drop original, [], [ignore], [ignore]) COMMIT(testbranch) REVERT_TO($BASE_R_SHA) # patch and rename it AT_CHECK(mv original different) -AT_CHECK(MONOTONE rename original different, [], [ignore], [ignore]) +AT_CHECK(MTN rename original different, [], [ignore], [ignore]) echo "more" >> different COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout -b testbranch clean, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN checkout -b testbranch clean, [], [ignore], [ignore]) # check that the file doesn't exist AT_CHECK(test -f clean/original, [1]) ============================================================ --- tests/t_dropkey_1.at 87e5a23e7ed8df5db283b295648832ef72b0f5f7 +++ tests/t_dropkey_1.at ee9116a8d23d4c22713d6389006db33069d2c95b @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([drop a public key]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(pubkey.txt, [@<:@pubkey address@hidden@:>@ MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCPUdR/bM41m2KIpS0eXlTG91PSWvOUdwY4 @@ -11,15 +11,15 @@ @<:@end@:>@ ]) -AT_CHECK(MONOTONE read < pubkey.txt, [], [ignore], [ignore]) +AT_CHECK(MTN read < pubkey.txt, [], [ignore], [ignore]) -AT_CHECK(MONOTONE pubkey address@hidden, [], [stdout], [ignore]) +AT_CHECK(MTN pubkey address@hidden, [], [stdout], [ignore]) AT_CHECK(QGREP('address@hidden' stdout), []) -AT_CHECK(MONOTONE dropkey address@hidden, [], [ignore], [ignore]) +AT_CHECK(MTN dropkey address@hidden, [], [ignore], [ignore]) -AT_CHECK(MONOTONE pubkey address@hidden, [1], [ignore], [stderr]) +AT_CHECK(MTN pubkey address@hidden, [1], [ignore], [stderr]) AT_CHECK(QGREP('does not exist' stderr), []) ============================================================ --- tests/t_dropkey_2.at 1a15229900da781d07f0f6776f942dc0ff2d0b38 +++ tests/t_dropkey_2.at 85a956ca0ba559c0e2003ed72e515325149c5737 @@ -1,22 +1,22 @@ # -*- Autoconf -*- AT_SETUP([drop a public and private key]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK((echo address@hidden; echo address@hidden) | MONOTONE genkey address@hidden, [], [ignore], [ignore]) +AT_CHECK((echo address@hidden; echo address@hidden) | MTN genkey address@hidden, [], [ignore], [ignore]) -AT_CHECK(MONOTONE privkey address@hidden, [], [stdout], [ignore]) +AT_CHECK(MTN privkey address@hidden, [], [stdout], [ignore]) AT_CHECK(QGREP('address@hidden' stdout), []) -AT_CHECK(MONOTONE dropkey address@hidden, [], [ignore], [ignore]) +AT_CHECK(MTN dropkey address@hidden, [], [ignore], [ignore]) -AT_CHECK(MONOTONE privkey address@hidden, [1], [ignore], [stderr]) +AT_CHECK(MTN privkey address@hidden, [1], [ignore], [stderr]) AT_CHECK(QGREP('do not exist' stderr), []) -AT_CHECK(MONOTONE pubkey address@hidden, [1], [ignore], [stderr]) +AT_CHECK(MTN pubkey address@hidden, [1], [ignore], [stderr]) AT_CHECK(QGREP('does not exist' stderr), []) ============================================================ --- tests/t_dump_load.at 3157fe22c921e85c3329ff500c8e199c34c480aa +++ tests/t_dump_load.at d5cf76d37b7ff9d125843679f6253f966181d292 @@ -1,9 +1,9 @@ AT_SETUP([database dump/load]) -MONOTONE_SETUP +MTN_SETUP LARGISH_FILE_CREATE(largish, 1) -AT_CHECK((echo foo; echo foo) | MONOTONE genkey foo, [], [ignore], [ignore]) +AT_CHECK((echo foo; echo foo) | MTN genkey foo, [], [ignore], [ignore]) ADD_FILE(testfile1, [blah balh ]) COMMIT(branch1) @@ -14,15 +14,15 @@ # include a largish file in the dump, so we can test for iostream breakage on # MinGW wrt sync_with_stdio(). -AT_CHECK(MONOTONE add largish, [], [ignore], [ignore]) +AT_CHECK(MTN add largish, [], [ignore], [ignore]) COMMIT(branch2) # run a db analyze so that SQLite creates any internal tables and indices, # because we want to make sure we don't attempt to dump and load these. -AT_CHECK(MONOTONE db execute 'analyze;', [], [ignore], [ignore]) +AT_CHECK(MTN db execute 'analyze;', [], [ignore], [ignore]) -AT_CHECK(MONOTONE db dump, [], [stdout], [ignore]) -AT_CHECK(MONOTONE db load target) AT_CHECK(echo "$R1 address@hidden 2005-08-16T03:16:00 testbranch" >> target) AT_CHECK(echo "$R0 address@hidden 2005-08-16T03:16:00 testbranch" >> target) ============================================================ --- tests/t_log_depth_single.at 98a2f3d7517c097dafa83024dc6b3b5d2303242c +++ tests/t_log_depth_single.at 1eb3cf85837488fe797d471e752d82f6c299c4c9 @@ -1,22 +1,22 @@ AT_SETUP([log --last=N FILENAME]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [foo ]) -AT_CHECK(MONOTONE --branch=testbranch commit --message "Addition of foo.", +AT_CHECK(MTN --branch=testbranch commit --message "Addition of foo.", [], [ignore], [ignore]) ADD_FILE(bar, [bar ]) -AT_CHECK(MONOTONE --branch=testbranch commit --message "Addition of bar.", +AT_CHECK(MTN --branch=testbranch commit --message "Addition of bar.", [], [ignore], [ignore]) ADD_FILE(baz, [baz ]) -AT_CHECK(MONOTONE --branch=testbranch commit --message "Addition of baz.", +AT_CHECK(MTN --branch=testbranch commit --message "Addition of baz.", [], [ignore], [ignore]) -AT_CHECK(MONOTONE log --last=1 foo | grep '^Revision:', [], [stdout], [ignore]) +AT_CHECK(MTN log --last=1 foo | grep '^Revision:', [], [stdout], [ignore]) AT_CHECK(test 1 -eq "`wc -l @@<:@a-z@:>@@<:@a-z@:>@.$", +AT_CHECK(MTN log bar | grep "^Addition of @<:@a-z@:>@@<:@a-z@:>@@<:@a-z@:>@.$", [], [Addition of foo. ], [ignore]) -AT_CHECK(MONOTONE log | grep "^Addition of @<:@a-z@:>@@<:@a-z@:>@@<:@a-z@:>@.$", +AT_CHECK(MTN log | grep "^Addition of @<:@a-z@:>@@<:@a-z@:>@@<:@a-z@:>@.$", [], [Addition of baz. Addition of bar. ============================================================ --- tests/t_log_outside_workspace.at 1e54ecc7b774f1f2b485b79b0f931718cb175ec4 +++ tests/t_log_outside_workspace.at 564008c0ac7530e34b086410f62319b0ec484c8a @@ -1,19 +1,19 @@ # -*- Autoconf -*- AT_SETUP([logging a file within revision outside a workspace]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo1, [foo file 1 ]) AT_DATA(foo2, [foo file 2 ]) -AT_CHECK(MONOTONE add foo1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah, [], [ignore], [ignore]) parent=`BASE_REVISION` AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE log --revision=$parent foo1, [], [ignore], [ignore]) +AT_CHECK(MTN log --revision=$parent foo1, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_log_selectors.at 3d000a79a2acdff3df5c7a8a804d2e38aa035dc5 +++ tests/t_log_selectors.at 74ecf53acd6dde71e30ec6f53554248f565016cc @@ -1,24 +1,24 @@ AT_SETUP([log and selectors returning multiple rids]) -MONOTONE_SETUP +MTN_SETUP # testcase for bug #15877 ADD_FILE(testfile, [blah blah ]) -AT_CHECK(MONOTONE commit -b testbranch --date "2005-08-16T03:16:00" -m foo, [], [ignore], [ignore]) +AT_CHECK(MTN commit -b testbranch --date "2005-08-16T03:16:00" -m foo, [], [ignore], [ignore]) R0=`BASE_REVISION` SET_FILE(testfile, [stuff stuff ]) -AT_CHECK(MONOTONE commit -b testbranch --date "2005-08-16T03:16:00" -m foo, [], [ignore], [ignore]) +AT_CHECK(MTN commit -b testbranch --date "2005-08-16T03:16:00" -m foo, [], [ignore], [ignore]) R1=`BASE_REVISION` SET_FILE(testfile, [other other ]) -AT_CHECK(MONOTONE commit -b otherbranch --date "2005-08-16T03:16:05" -m foo, [], [ignore], [ignore]) +AT_CHECK(MTN commit -b otherbranch --date "2005-08-16T03:16:05" -m foo, [], [ignore], [ignore]) R2=`BASE_REVISION` -AT_CHECK(RAW_MONOTONE --db=$_ROOT_DIR/test.db --root=$_ROOT_DIR log --brief --revision d:2005-08-16, [], [stdout], [ignore]) +AT_CHECK(RAW_MTN --db=$_ROOT_DIR/test.db --root=$_ROOT_DIR log --brief --revision d:2005-08-16, [], [stdout], [ignore]) AT_CHECK(grep $R0 stdout, [0], [ignore]) AT_CHECK(grep $R1 stdout, [0], [ignore]) AT_CHECK(grep $R2 stdout, [0], [ignore]) ============================================================ --- tests/t_log_to_file.at 4a9ad6b478915e87c07d13d7d15b8bdb6ae0a92c +++ tests/t_log_to_file.at 02824ce8f36a6ac5fbbc0eb15f12ab54d2d135b6 @@ -1,15 +1,15 @@ # -*- Autoconf -*- AT_SETUP([check --log]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(input.txt, [random content ]) -AT_CHECK(MONOTONE add input.txt, [], [ignore], [ignore]) +AT_CHECK(MTN add input.txt, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch --log=log.log commit -m "test", [], [stdout], [ignore]) +AT_CHECK(MTN --branch=testbranch --log=log.log commit -m "test", [], [stdout], [ignore]) AT_CHECK(QGREP('^monotone:' stdout), [1]) AT_CHECK(QGREP('^monotone:' log.log), [0]) ============================================================ --- tests/t_ls_branches.at 5fb5cf84c420e5c7143a80b5c2b4e87356568615 +++ tests/t_ls_branches.at 31a8e65c7c54f965b6ae75546dd5f69d5140b168 @@ -1,12 +1,12 @@ # -*- Autoconf -*- AT_SETUP([list branches]) # Setup the environment -MONOTONE_SETUP +MTN_SETUP # ls branches on empty db should return successful and empty -AT_CHECK(MONOTONE ls branches,[0],[stdout],[stderr]) +AT_CHECK(MTN ls branches,[0],[stdout],[stderr]) AT_CHECK(cmp /dev/null stdout,[],[ignore]) AT_CHECK(cmp /dev/null stderr,[],[ignore]) @@ -17,14 +17,14 @@ ]) AT_CHECK(cp foo.testbranch foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp -f foo.otherbranch foo) COMMIT(otherbranch) # ls branches should list 2 branches now -AT_CHECK(MONOTONE ls branches,[0],[stdout],[stderr]) +AT_CHECK(MTN ls branches,[0],[stdout],[stderr]) AT_CHECK(CANONICALISE(stdout)) AT_DATA(branches,[otherbranch testbranch @@ -41,9 +41,9 @@ # if we make a change in the branch.to.be.ignored it should not turn up in the list AT_CHECK(cp foo.testbranch in_ignored) -AT_CHECK(MONOTONE --rcfile=ignore_branch.lua add in_ignored, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=ignore_branch.lua add in_ignored, [], [ignore], [ignore]) COMMIT(branch.to.be.ignored) -AT_CHECK(MONOTONE --rcfile=ignore_branch.lua ls branches,[0],[stdout],[stderr]) +AT_CHECK(MTN --rcfile=ignore_branch.lua ls branches,[0],[stdout],[stderr]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp branches stdout,[],[ignore]) ============================================================ --- tests/t_ls_changed.at 1fc5edbd5d67ff60df161f44864efced6c08670a +++ tests/t_ls_changed.at e23b32c0175bc7ff41da43813339a3ade35297ea @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([listing changed files]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo, [the foo file ]) @@ -10,35 +10,35 @@ ]) AT_DATA(baz, [the baz file ]) -AT_CHECK(MONOTONE add foo bar baz, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message='First commit', [], [ignore], [ignore]) +AT_CHECK(MTN add foo bar baz, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='First commit', [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls changed, [], [stdout], []) +AT_CHECK(MTN ls changed, [], [stdout], []) AT_CHECK(cmp stdout /dev/null, [], [ignore]) -AT_CHECK(MONOTONE drop foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename --execute bar bartender, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls changed, [], [stdout], []) +AT_CHECK(MTN drop foo, [], [ignore], [ignore]) +AT_CHECK(MTN rename --execute bar bartender, [], [ignore], [ignore]) +AT_CHECK(MTN ls changed, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_DATA(ls_foobar, [bar foo ]) AT_CHECK(cmp stdout ls_foobar, [], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message='Second commit', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='Second commit', [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls changed, [], [stdout], []) +AT_CHECK(MTN ls changed, [], [stdout], []) AT_CHECK(cmp stdout /dev/null, [], [ignore]) AT_DATA(baz, [the baz file, modified ]) -AT_CHECK(MONOTONE ls changed, [], [stdout], []) +AT_CHECK(MTN ls changed, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_DATA(ls_baz, [baz ]) AT_CHECK(cmp stdout ls_baz, [], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message='Third commit', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='Third commit', [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls changed, [], [stdout], []) +AT_CHECK(MTN ls changed, [], [stdout], []) AT_CHECK(cmp stdout /dev/null, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_ls_known.at 6c871d99df8c34c37190d281ca538aa5c90e37a4 +++ tests/t_ls_known.at 6cbab836bd4b50ade59f0db616fab7df5cd729a4 @@ -1,19 +1,19 @@ # -*- Autoconf -*- AT_SETUP([listing workspace manifests]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE ls missing, [0], [stdout], [ignore]) +AT_CHECK(MTN ls missing, [0], [stdout], [ignore]) AT_CHECK(cmp /dev/null stdout, [], [ignore]) AT_DATA(foo, [the foo file ]) AT_DATA(bar, [the bar file ]) -AT_CHECK(MONOTONE add foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN add foo bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known | sort, [], [stdout], []) +AT_CHECK(MTN ls known | sort, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_DATA(ls_foobar, [bar foo @@ -25,9 +25,9 @@ ]) AT_DATA(dir/bar, [the bar file ]) -AT_CHECK(MONOTONE add dir/foo dir/bar, [], [ignore], [ignore]) +AT_CHECK(MTN add dir/foo dir/bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known | sort, [], [stdout], []) +AT_CHECK(MTN ls known | sort, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_DATA(ls_foobar_dir, [bar dir @@ -37,19 +37,19 @@ ]) AT_CHECK(cmp stdout ls_foobar_dir, [], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message='committed', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='committed', [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known | sort, [], [stdout], []) +AT_CHECK(MTN ls known | sort, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout ls_foobar_dir, [], [ignore]) -AT_CHECK(MONOTONE drop foo, [], [ignore], [ignore]) +AT_CHECK(MTN drop foo, [], [ignore], [ignore]) AT_CHECK(mv dir dir2) -AT_CHECK(MONOTONE rename dir dir2, [], [ignore], [ignore]) +AT_CHECK(MTN rename dir dir2, [], [ignore], [ignore]) AT_CHECK(mv bar baz) -AT_CHECK(MONOTONE rename bar baz, [], [ignore], [ignore]) +AT_CHECK(MTN rename bar baz, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known | sort, [], [stdout], []) +AT_CHECK(MTN ls known | sort, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_DATA(ls_baz_dir, [baz dir2 ============================================================ --- tests/t_ls_missing.at f6c5d42b460194a850e4411d2eb571f03a921ed2 +++ tests/t_ls_missing.at 1a74c54efffbe4fa8c8a9575992b90e6ebd669c0 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([list missing files]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo, [the foo file ]) @@ -16,32 +16,32 @@ AT_DATA(missingbar, [bar ]) -AT_CHECK(MONOTONE ls missing, [], [], []) +AT_CHECK(MTN ls missing, [], [], []) -AT_CHECK(MONOTONE add foo bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls missing, [], [], []) +AT_CHECK(MTN add foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN ls missing, [], [], []) AT_CHECK(rm foo, [], [], []) -AT_CHECK(MONOTONE ls missing, [], [stdout], []) +AT_CHECK(MTN ls missing, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout missingfoo, [], [ignore]) AT_CHECK(touch foo) -AT_CHECK(MONOTONE drop foo, [], [ignore], [ignore]) +AT_CHECK(MTN drop foo, [], [ignore], [ignore]) AT_CHECK(rm foo, [], [], []) -AT_CHECK(MONOTONE ls missing, [], [], []) +AT_CHECK(MTN ls missing, [], [], []) -AT_CHECK(MONOTONE --branch=testbranch commit --message='committed', [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls missing, [], [], []) +AT_CHECK(MTN --branch=testbranch commit --message='committed', [], [ignore], [ignore]) +AT_CHECK(MTN ls missing, [], [], []) AT_CHECK(rm bar, [], [], []) -AT_CHECK(MONOTONE ls missing, [], [stdout], []) +AT_CHECK(MTN ls missing, [], [stdout], []) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout missingbar, [], [ignore]) AT_CHECK(touch bar) -AT_CHECK(MONOTONE drop bar, [], [ignore], [ignore]) +AT_CHECK(MTN drop bar, [], [ignore], [ignore]) AT_CHECK(rm bar, [], [], []) -AT_CHECK(MONOTONE ls missing, [], [], []) +AT_CHECK(MTN ls missing, [], [], []) AT_CLEANUP ============================================================ --- tests/t_lua_includedir.at cfb180197cc358a2d4bf71385fa0fdc1b53058ed +++ tests/t_lua_includedir.at 944c14ad90d62efe40057371968e99cf152b007e @@ -1,5 +1,5 @@ AT_SETUP([include() and includedir() lua functions]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir gongolo) @@ -22,14 +22,14 @@ ]) # setup a wrk dir -AT_CHECK(MONOTONE setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) +AT_CHECK(MTN setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) # include directly a single file -AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../include.lua status, [], [stdout], [ignore]) +AT_CHECK(cd alt_wrk && MTN --root=. --rcfile=../include.lua status, [], [stdout], [ignore]) AT_CHECK(QGREP("BOOGA BOOGA" stdout)) # include dirs -AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../includedir.lua status, [], [stdout], [ignore]) +AT_CHECK(cd alt_wrk && MTN --root=. --rcfile=../includedir.lua status, [], [stdout], [ignore]) AT_CHECK(QGREP("BOOGA BOOGACICCA CICCA" stdout)) # write a third file: should be read between the two previous ones @@ -38,7 +38,7 @@ end notwowithoutthree() ]) -AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../includedir.lua status, [], [stdout], [ignore]) +AT_CHECK(cd alt_wrk && MTN --root=. --rcfile=../includedir.lua status, [], [stdout], [ignore]) AT_CHECK(QGREP("BOOGA BOOGAhu huCICCA CICCA" stdout)) AT_CLEANUP ============================================================ --- tests/t_merge.at 2a28c7fb2dd8a521f25dbff2a2e0e799ee4b9e36 +++ tests/t_merge.at 63768660a5f0db8ba9d3a3cfb957c9d087c9905c @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([creating a fork and merging]) -MONOTONE_SETUP +MTN_SETUP # this test is kinda like update, only it *does* commit the left right # branch before attempting a merge. it just checks to make sure merging @@ -13,8 +13,8 @@ second line of the file third line of the file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(testfile)` @@ -24,7 +24,7 @@ third line of the file ]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) LEFT_R_SHA=`BASE_REVISION` LEFT_F_SHA=`SHA1(testfile)` AT_CHECK(test $LEFT_R_SHA != $ROOT_R_SHA) @@ -37,7 +37,7 @@ an insertion between second and third third line of the file ]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) RIGHT_R_SHA=`BASE_REVISION` RIGHT_F_SHA=`SHA1(testfile)` AT_CHECK(test $RIGHT_R_SHA != $ROOT_R_SHA) @@ -46,10 +46,10 @@ AT_CHECK(test $RIGHT_F_SHA != $LEFT_F_SHA) # now merge and update again, this time successfully -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch heads, [], [stdout], [ignore]) +AT_CHECK(MTN --branch=testbranch heads, [], [stdout], [ignore]) AT_CHECK(grep empty stdout, [1], [ignore]) # files should now be merged ============================================================ --- tests/t_merge2_add.at 70f7393bb7f12def5cc60fdaa6ae26185bcf84fd +++ tests/t_merge2_add.at f16291fdf2bf30bd5a60cf7a916fc938900bc07f @@ -1,5 +1,5 @@ AT_SETUP([merging adds in unrelated revisions]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -10,15 +10,15 @@ LEFT=`BASE_REVISION` AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE setup --branch=testbranch .) +AT_CHECK(MTN setup --branch=testbranch .) ADD_FILE(testfile2, [This is test file 2 ]) COMMIT(testbranch) RIGHT=`BASE_REVISION` -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_DATA(expected_data1, [This is test file 1 ]) ============================================================ --- tests/t_merge2_add_drop_add.at c7f4977982cf74db0653b9761a13d42badeee5a4 +++ tests/t_merge2_add_drop_add.at d8365c982c1237a6f1085bf6768d25bfe01f89a4 @@ -1,5 +1,5 @@ AT_SETUP([merge(, )]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -20,28 +20,28 @@ BASE_R_SHA=`BASE_REVISION` AT_CHECK(cp right_1_a testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp right_1_b testfile) COMMIT(testbranch) AT_CHECK(rm -f testfile) -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp right_2_a testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) REVERT_TO($BASE_R_SHA) AT_CHECK(cp left testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile right_2_a || cmp testfile left, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_merge2_data.at f1adea0b23478d158fec1e945af77f4d497cc2e7 +++ tests/t_merge2_data.at 33b65f4a838dde73b81373a8e44c5972b1884975 @@ -1,5 +1,5 @@ AT_SETUP([merging data in unrelated revisions]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -16,20 +16,20 @@ ]) AT_CHECK(cp -f left testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) LEFT=`BASE_REVISION` AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE setup --branch=testbranch .) +AT_CHECK(MTN setup --branch=testbranch .) AT_CHECK(cp -f right testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) RIGHT=`BASE_REVISION` -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [stdout], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [stdout], [ignore]) AT_CHECK(cmp left testfile || cmp right testfile, [], [ignore]) ============================================================ --- tests/t_merge_1.at 8175f5de22920cdb8c4198903612346c5709b29a +++ tests/t_merge_1.at aa050bf721e1f9ef0f2c45949b46bb31b6db8c0b @@ -1,5 +1,5 @@ AT_SETUP([test a merge]) -MONOTONE_SETUP +MTN_SETUP NEED_UNB64 @@ -8,7 +8,7 @@ # this function was lost. # This may actually be a bug in the unidiff algorithm; 'diff' and -# 'monotone diff' produce different results when calculating +# 'mtn diff' produce different results when calculating # diff(parent, left). AT_DATA(parent.b64, [Ly8gY29weXJpZ2h0IChDKSAyMDAyLCAyMDAzIGdyYXlkb24gaG9hcmUgPGdyYXlkb25AcG9i @@ -4072,7 +4072,7 @@ UNB64(correct.b64, correct) AT_CHECK(cp -f parent testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) PARENT_SHA=`BASE_REVISION` @@ -4084,9 +4084,9 @@ AT_CHECK(cp -f right testfile) COMMIT(testbranch) -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile correct) AT_CLEANUP ============================================================ --- tests/t_merge_2.at 4951a02f2b4fb8ef8c51ee7328592dea72a75c7b +++ tests/t_merge_2.at 41cc617c2fb2291e693f2624fdf6f53e955830e5 @@ -1,5 +1,5 @@ AT_SETUP([test a merge 2]) -MONOTONE_SETUP +MTN_SETUP NEED_UNB64 @@ -1579,7 +1579,7 @@ UNB64(correct.b64, correct) AT_CHECK(cp -f parent testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) PARENT_SHA=`BASE_REVISION` @@ -1591,9 +1591,9 @@ AT_CHECK(cp -f right testfile) COMMIT(testbranch) -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile correct) AT_CLEANUP ============================================================ --- tests/t_merge_3.at 4e8319848f65376efc55b275998d2598980222aa +++ tests/t_merge_3.at d33d3f4bfe8e7a500eb318593611d6b299b18721 @@ -1,5 +1,5 @@ AT_SETUP([(minor) test a merge 3]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 # This test is a bug report. @@ -1211,14 +1211,14 @@ AT_CHECK(test $LVER = $LEFT, [], [ignore], [ignore]) AT_CHECK(test $RVER = $RIGHT, [], [ignore], [ignore]) -AT_CHECK(MONOTONE fload with ]) -MONOTONE_SETUP +MTN_SETUP # We want a graph which looks like: # A @@ -32,48 +32,48 @@ ]) # produce state A -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.main commit --message 'state A - add foo', [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main commit --message 'state A - add foo', [], [ignore], [ignore]) A_REVISION_SHA=`BASE_REVISION` # produce state C -AT_CHECK(MONOTONE add bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.main commit --message 'state C - add bar', [], [ignore], [ignore]) +AT_CHECK(MTN add bar, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main commit --message 'state C - add bar', [], [ignore], [ignore]) C_REVISION_SHA=`BASE_REVISION` -AT_CHECK(MONOTONE cert $C_REVISION_SHA branch branch.fork) +AT_CHECK(MTN cert $C_REVISION_SHA branch branch.fork) # produce state F REVERT_TO($A_REVISION_SHA) -AT_CHECK(MONOTONE add iced, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.fork commit --message 'state F - add iced', [], [ignore], [ignore]) +AT_CHECK(MTN add iced, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.fork commit --message 'state F - add iced', [], [ignore], [ignore]) F_REVISION_SHA=`BASE_REVISION` # merge heads of branch.fork to make D -AT_CHECK(MONOTONE --branch=branch.fork merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.fork merge, [], [ignore], [ignore]) # produce state E REVERT_TO($C_REVISION_SHA,branch.main) -AT_CHECK(MONOTONE drop bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.main commit --message 'state E - drop bar', [], [ignore], [ignore]) +AT_CHECK(MTN drop bar, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main commit --message 'state E - drop bar', [], [ignore], [ignore]) E_REVISION_SHA=`BASE_REVISION` # state G REVERT_TO($A_REVISION_SHA) -AT_CHECK(MONOTONE add quux, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.main commit --message 'state G - add quux', [], [ignore], [ignore]) +AT_CHECK(MTN add quux, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main commit --message 'state G - add quux', [], [ignore], [ignore]) G_REVISION_SHA=`BASE_REVISION` # merge to get state B -AT_CHECK(MONOTONE --branch=branch.main merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main merge, [], [ignore], [ignore]) # now try the propagate -AT_CHECK(MONOTONE propagate branch.main branch.fork, [], [ignore], [ignore]) +AT_CHECK(MTN propagate branch.main branch.fork, [], [ignore], [ignore]) # check AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE --branch=branch.fork checkout .) +AT_CHECK(MTN --branch=branch.fork checkout .) -AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) +AT_CHECK(MTN automate get_manifest_of, [], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep bar manifest, [1], [ignore], [ignore]) AT_CHECK(grep quux manifest, [0], [ignore], [ignore]) ============================================================ --- tests/t_merge_add_rename_add.at 65aee8363a38ca7e1ba54d2d691725867c0e46e4 +++ tests/t_merge_add_rename_add.at 75c115a20c1027a6bd97c6c538e183b0ae3a5ddd @@ -5,7 +5,7 @@ # This test is a bug report. AT_XFAIL_IF(true) -MONOTONE_SETUP +MTN_SETUP # A # / \ @@ -23,24 +23,24 @@ ]) # produce state A -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.main commit --message 'state A - add foo', [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main commit --message 'state A - add foo', [], [ignore], [ignore]) A_REVISION_SHA=`BASE_REVISION` # produce state B -AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo bar, [], [ignore], [ignore]) AT_CHECK(mv foo bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.main commit --message 'state B - rename foo bar', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main commit --message 'state B - rename foo bar', [], [ignore], [ignore]) B_REVISION_SHA=`BASE_REVISION` # produce state C REVERT_TO($A_REVISION_SHA) -AT_CHECK(MONOTONE add bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.main commit --message 'state C - add bar', [], [ignore], [ignore]) +AT_CHECK(MTN add bar, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main commit --message 'state C - add bar', [], [ignore], [ignore]) C_REVISION_SHA=`BASE_REVISION` # merge heads to make D -AT_CHECK(MONOTONE --branch=branch.main merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.main merge, [], [ignore], [ignore]) # XXX: once the final state has a real definition inside monotone, we need # to add checks here to ensure that state has been reached. ============================================================ --- tests/t_merge_ancestor.at 1a675c4e1b3fab0c18741d03c8716f64409be64d +++ tests/t_merge_ancestor.at b372cf21f319a1262f87f183b0ca6b6582c56e84 @@ -1,5 +1,5 @@ AT_SETUP([merge rev with ancestor]) -MONOTONE_SETUP +MTN_SETUP # The idea here is that if we have, say, A -> B -> C, then merging A # and C should not be possible, because it creates a weird graph with @@ -20,7 +20,7 @@ COMMIT(testbranch) REV2=`BASE_REVISION` -AT_CHECK(MONOTONE explicit_merge $REV0 $REV1 testbranch, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE explicit_merge $REV1 $REV0 testbranch, [1], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $REV0 $REV1 testbranch, [1], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $REV1 $REV0 testbranch, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_merge_binary.at 4cdc96fa85206b0b6d7488886045f1d541a55131 +++ tests/t_merge_binary.at a970e93664ce038ee2f7ce4e0868187831190825 @@ -1,5 +1,5 @@ AT_SETUP([merge binary file]) -MONOTONE_SETUP +MTN_SETUP NEED_UNB64 @@ -222,7 +222,7 @@ UNB64(right.bmp.b64, right.bmp) AT_CHECK(cp -f parent.bmp testfile.bmp) -AT_CHECK(MONOTONE add testfile.bmp, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile.bmp, [], [ignore], [ignore]) COMMIT(testbranch) PARENT_SHA=`BASE_REVISION` @@ -235,6 +235,6 @@ COMMIT(testbranch) # merge should fail! -AT_CHECK(MONOTONE --branch=testbranch merge, [1], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_merge_into_dir.at 326175a419b2bb85df4dcf273cbae7b9d4e9ce9b +++ tests/t_merge_into_dir.at d8548e97b0caade7288b243f7479cbe60d07fa37 @@ -1,5 +1,5 @@ AT_SETUP([merge a project into a subdirectory of an unrelated project]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(cp -r _MTN MT.orig) ADD_FILE(file1, [foo @@ -16,9 +16,9 @@ ]) COMMIT(b2) -AT_CHECK(MONOTONE merge_into_dir b1 b2 dir/zuul, [], [ignore], [ignore]) +AT_CHECK(MTN merge_into_dir b1 b2 dir/zuul, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout -b b2 checkout) +AT_CHECK(MTN checkout -b b2 checkout) AT_CHECK(test -f checkout/file2) AT_CHECK(test -d checkout/dir) AT_CHECK(test -f checkout/dir/quux) ============================================================ --- tests/t_merge_lca.at 51497aebefb43f940038decb61132f2a60ee9789 +++ tests/t_merge_lca.at fdaef4c3722a1d3c3bfba25588baaf34d363c367 @@ -1,5 +1,5 @@ AT_SETUP([merge --lca]) -MONOTONE_SETUP +MTN_SETUP # --lca is a temporary workaround for 3-way merge suckiness. So this # test should go away eventually. @@ -33,8 +33,8 @@ COMMIT(testbranch) C=`BASE_REVISION` -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) F=`BASE_REVISION` REVERT_TO($B) @@ -44,11 +44,11 @@ COMMIT(testbranch) D=`BASE_REVISION` -AT_CHECK(MONOTONE explicit_merge $D $C testbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN explicit_merge $D $C testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) E=`BASE_REVISION` -AT_CHECK(MONOTONE merge --lca, [], [ignore], [stderr]) +AT_CHECK(MTN merge --lca, [], [ignore], [stderr]) AT_CHECK(QGREP($A stderr), [1]) AT_CHECK(QGREP($E stderr), []) AT_CHECK(QGREP($F stderr), []) ============================================================ --- tests/t_merge_manual.at fe047ad7e648c30b17daefb7e7e3d5af19dc7900 +++ tests/t_merge_manual.at 9927fc3cc31197cc11563983e499addcdc8b7b71 @@ -1,5 +1,5 @@ AT_SETUP([merge manual file]) -MONOTONE_SETUP +MTN_SETUP NEED_UNB64 @@ -233,11 +233,11 @@ # --- first: auto add as binary AT_CHECK(cp -f parent.bmp binary.bmp) -AT_CHECK(MONOTONE --rcfile=binary.lua add binary.bmp, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=binary.lua add binary.bmp, [], [ignore], [ignore]) COMMIT(binbranch) PARENT_SHA=`BASE_REVISION` -AT_CHECK(MONOTONE attr get binary.bmp mtn:manual_merge, [], [ignore], [ignore]) +AT_CHECK(MTN attr get binary.bmp mtn:manual_merge, [], [ignore], [ignore]) AT_CHECK(cp -f left.bmp binary.bmp) COMMIT(binbranch) @@ -248,11 +248,11 @@ COMMIT(binbranch) # file marked binary: merge should fail -AT_CHECK(MONOTONE --branch=binbranch merge, [1], [ignore], [ignore]) +AT_CHECK(MTN --branch=binbranch merge, [1], [ignore], [ignore]) # --- second: auto add as text AT_CHECK(cp -f parent.bmp text.bmp) -AT_CHECK(MONOTONE --rcfile=text.lua add text.bmp, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=text.lua add text.bmp, [], [ignore], [ignore]) COMMIT(textbranch) PARENT_SHA=`BASE_REVISION` @@ -265,11 +265,11 @@ COMMIT(textbranch) # file marked text: merge should work! -AT_CHECK(MONOTONE --branch=textbranch merge, [0], [ignore], [ignore]) +AT_CHECK(MTN --branch=textbranch merge, [0], [ignore], [ignore]) # --- third: manually make filename as binary AT_CHECK(cp -f parent.bmp forcebin.bmp) -AT_CHECK(MONOTONE --rcfile=text.lua add forcebin.bmp, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=text.lua add forcebin.bmp, [], [ignore], [ignore]) COMMIT(forcebinbranch) PARENT_SHA=`BASE_REVISION` @@ -281,16 +281,16 @@ AT_CHECK(cp -f right.bmp forcebin.bmp) # set bin -AT_CHECK(MONOTONE attr set forcebin.bmp mtn:manual_merge true, [], [ignore], [ignore]) +AT_CHECK(MTN attr set forcebin.bmp mtn:manual_merge true, [], [ignore], [ignore]) COMMIT(forcebinbranch) # file marked binary: merge should fail -AT_CHECK(MONOTONE --branch=forcebinbranch merge, [1], [ignore], [ignore]) +AT_CHECK(MTN --branch=forcebinbranch merge, [1], [ignore], [ignore]) # --- fourth: automatically make filename as binary, then force text AT_CHECK(cp -f parent.bmp forcetext.bmp) -AT_CHECK(MONOTONE --rcfile=binary.lua add forcetext.bmp, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr set forcetext.bmp mtn:manual_merge false, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=binary.lua add forcetext.bmp, [], [ignore], [ignore]) +AT_CHECK(MTN attr set forcetext.bmp mtn:manual_merge false, [], [ignore], [ignore]) COMMIT(forcetextbranch) PARENT_SHA=`BASE_REVISION` @@ -303,6 +303,6 @@ COMMIT(forcetextbranch) # file marked text: merge should work -AT_CHECK(MONOTONE --branch=forcetextbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=forcetextbranch merge, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_merge_normalization_edge_case.at 878221e1b8160bc69121f1948555364da3690262 +++ tests/t_merge_normalization_edge_case.at aad89437f29ee4c21a02c44238e028fdb227b299 @@ -7,7 +7,7 @@ NEED_UNGZB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(parent.gz.b64, [H4sICK2WEUIAA3AA3Vr/b9u4Ff85/it4wgWVGttNk1vXtQi2ItcbCvS6oe26DWlq0BZt8yKR GknZDg7r3773SEqi5C9x3Ba7zU1tieT79uHje4+UeoMBMXOuCfyZOSPaUJFSlRLNDJFTkpWU @@ -177,11 +177,11 @@ AT_CHECK(test $LVER = $LEFT) AT_CHECK(test $RVER = $RIGHT) -AT_CHECK(MONOTONE fload @ @@ -49,7 +49,7 @@ KLqSDA8igs89M3oRnyvz @<:@end@:>@ ]) -AT_CHECK(MONOTONE read < migrate_keys, [], [ignore], [ignore]) +AT_CHECK(MTN read < migrate_keys, [], [ignore], [ignore]) ADD_FILE(testfile1, [f1v1 ]) @@ -58,7 +58,7 @@ COMMIT(testbranch1) REV=`BASE_REVISION` -AT_CHECK(MONOTONE cert $REV somekey somevalue, [], [ignore], [ignore]) +AT_CHECK(MTN cert $REV somekey somevalue, [], [ignore], [ignore]) SET_FILE(testfile1, [f1v2 ]) @@ -77,10 +77,10 @@ AT_DATA([old_revs_propagate_log], [propagate from branch 'testbranch2' (head c606ed519e48f526bb130fd64fef712f795f0625) to branch 'testbranch1' (head 04fe9ed6642b2e258162f948934726a3085e473f) ]) -AT_CHECK(MONOTONE propagate testbranch2 testbranch1 --message-file=old_revs_propagate_log, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN propagate testbranch2 testbranch1 --message-file=old_revs_propagate_log, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop testfile1, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile1, [], [ignore], [ignore]) SET_FILE(testfile4, [f4v2 ]) COMMIT(testbranch3) @@ -88,10 +88,10 @@ # Exception to this code being untouchable: # This line may have to be modified at a later date; this won't cause # any problem, as long as it's replaced by code with the same effect. -AT_CHECK(MONOTONE db execute "DELETE FROM revision_certs WHERE name = 'date'", [], [ignore], [ignore]) +AT_CHECK(MTN db execute "DELETE FROM revision_certs WHERE name = 'date'", [], [ignore], [ignore]) AT_CHECK(cp test.db latest.db) -AT_CHECK(MONOTONE --db=latest.db db dump, [], [stdout], [ignore]) +AT_CHECK(MTN --db=latest.db db dump, [], [stdout], [ignore]) AT_CHECK(cp stdout latest.db.dump) ###################################################################### @@ -102,14 +102,14 @@ m4_define([CHECK_MIGRATE_FROM], [ AT_DATA($1.db.dumped.gz.b64, $2) UNGZB64($1.db.dumped.gz.b64, $1.db.dumped) -AT_CHECK(MONOTONE --db=$1.db db load < $1.db.dumped, [], [ignore], [ignore]) +AT_CHECK(MTN --db=$1.db db load < $1.db.dumped, [], [ignore], [ignore]) # verify that the db actually has the claimed schema -AT_CHECK(MONOTONE --db=$1.db db version, [], [stdout], [ignore]) +AT_CHECK(MTN --db=$1.db db version, [], [stdout], [ignore]) AT_CHECK(QGREP($1 stdout)) # now do the actual migration -AT_CHECK(MONOTONE --db=$1.db db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN --db=$1.db db migrate, [], [ignore], [ignore]) # and the rosterify -AT_CHECK(MONOTONE --db=$1.db db rosterify, [], [ignore], [ignore]) +AT_CHECK(MTN --db=$1.db db rosterify, [], [ignore], [ignore]) CHECK_SAME_DB_CONTENTS($1.db, latest.db) ]) ============================================================ --- tests/t_migrate_schema.at e5b24dd9ccc44e36b20d1b1dc89509f0e99896fd +++ tests/t_migrate_schema.at 953fbfc66ecf0c783d0f8698c0b08fbcd4f12365 @@ -1,5 +1,5 @@ AT_SETUP([schema migration]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 # This test ensures that 'monotone migrate' can take any old-format @@ -32,7 +32,7 @@ # We don't want the standard db, we want full control ourselves AT_CHECK(rm -f test.db) AT_CHECK(rm -r keys/) -AT_CHECK(MONOTONE db init) +AT_CHECK(MTN db init) # Put some random keys in, with and without corresponding private keys AT_DATA(migrate_keys, [@<:@pubkey address@hidden@:>@ @@ -60,25 +60,25 @@ KLqSDA8igs89M3oRnyvz @<:@end@:>@ ]) -AT_CHECK(MONOTONE read < migrate_keys, [], [ignore], [ignore]) +AT_CHECK(MTN read < migrate_keys, [], [ignore], [ignore]) ADD_FILE(testfile1, [f1v1 ]) ADD_FILE(testfile2, [f2v1 ]) -AT_CHECK(MONOTONE attr set testfile1 testfile1_key initial_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr set . dir_key initial_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr set testfile1 testfile1_key initial_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr set . dir_key initial_value, [], [ignore], [ignore]) COMMIT(testbranch1 --date="1999-01-01T12:00:00") REV=`BASE_REVISION` -AT_CHECK(MONOTONE cert $REV somekey somevalue, [], [ignore], [ignore]) +AT_CHECK(MTN cert $REV somekey somevalue, [], [ignore], [ignore]) SET_FILE(testfile1, [f1v2 ]) ADD_FILE(testfile3, [f3v1 ]) -AT_CHECK(MONOTONE attr drop testfile1 testfile1_key, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr set . dir_key new_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr drop testfile1 testfile1_key, [], [ignore], [ignore]) +AT_CHECK(MTN attr set . dir_key new_value, [], [ignore], [ignore]) COMMIT(testbranch2 --date="2000-01-01T12:00:00") REVERT_TO($REV) @@ -89,16 +89,16 @@ ]) COMMIT(testbranch1 --date="2001-01-01T12:00:00") -AT_CHECK(MONOTONE propagate --date="2002-01-01T12:00:00" testbranch2 testbranch1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN propagate --date="2002-01-01T12:00:00" testbranch2 testbranch1, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop testfile1, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile1, [], [ignore], [ignore]) SET_FILE(testfile4, [f4v2 ]) COMMIT(testbranch3 --date="2003-01-01T12:00:00") AT_CHECK(cp test.db latest.db) -AT_CHECK(MONOTONE --db=latest.db db dump, [], [stdout], [ignore]) +AT_CHECK(MTN --db=latest.db db dump, [], [stdout], [ignore]) AT_CHECK(cp stdout latest.db.dump) ###################################################################### @@ -109,12 +109,12 @@ m4_define([CHECK_MIGRATE_FROM], [ AT_DATA($1.db.dumped.gz.b64, $2) UNGZB64($1.db.dumped.gz.b64, $1.db.dumped) -AT_CHECK(MONOTONE --db=$1.db db load < $1.db.dumped, [], [ignore], [ignore]) +AT_CHECK(MTN --db=$1.db db load < $1.db.dumped, [], [ignore], [ignore]) # verify that the db actually has the claimed schema -AT_CHECK(MONOTONE --db=$1.db db version, [], [stdout], [ignore]) +AT_CHECK(MTN --db=$1.db db version, [], [stdout], [ignore]) AT_CHECK(QGREP($1 stdout)) # now do the actual migration -AT_CHECK(MONOTONE --db=$1.db db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN --db=$1.db db migrate, [], [ignore], [ignore]) CHECK_SAME_DB_CONTENTS($1.db, latest.db) ]) ============================================================ --- tests/t_mixed_case_pwd.at ff1815a6a91f6e658418e7b6456f6ad578a02a12 +++ tests/t_mixed_case_pwd.at d8aa7302338aa83124e08afb2c55e3c343808c5f @@ -1,5 +1,5 @@ AT_SETUP([restrictions when pwd is mixed case]) -MONOTONE_SETUP +MTN_SETUP # This is trivial on case-sensitive filesystems, but a little trickier # on case-preserving ones. @@ -12,9 +12,9 @@ SET_FILE([FooBar/testfile], [stuff stuff ]) -AT_CHECK(cd FooBar && MONOTONE commit . -mfoo, [], [ignore], [ignore]) +AT_CHECK(cd FooBar && MTN commit . -mfoo, [], [ignore], [ignore]) -AT_CHECK(monotone diff, [], [stdout], [ignore]) +AT_CHECK(MTN diff, [], [stdout], [ignore]) AT_CHECK(QGREP("no changes" stdout)) AT_CLEANUP ============================================================ --- tests/t_monotone_agent.at 6bd1959902d38d1fd27d1f77d3e5595e6cec1f60 +++ tests/t_monotone_agent.at 5aef3c88b1b9777c1f7efa7967352ce5389a47ff @@ -1,5 +1,5 @@ AT_SETUP([(todo) write monotone-agent]) -MONOTONE_SETUP +MTN_SETUP # This test is a bug report. AT_XFAIL_IF(true) ============================================================ --- tests/t_monotone_up.at b17d746daae707b1d2a5194ff39e9d0e439de643 +++ tests/t_monotone_up.at f6bdc88b7e755729b9c853724eaeb7b290147d2d @@ -1,7 +1,7 @@ -AT_SETUP([monotone up]) -MONOTONE_SETUP +AT_SETUP([mtn up]) +MTN_SETUP -# People expect 'monotone up' to run update. +# People expect 'mtn up' to run update. # Make sure it does. ADD_FILE(testfile, [blah blah @@ -14,8 +14,8 @@ COMMIT(testbranch) REV1=`BASE_REVISION` -AT_CHECK(MONOTONE checkout --branch=testbranch --revision=$REV0 codir, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE up, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch --revision=$REV0 codir, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN up, [], [ignore], [ignore]) AT_CHECK(cmp testfile codir/testfile) AT_CLEANUP ============================================================ --- tests/t_movedel.at aca376523828cd1fd40fe70e0a3ec72066852b2d +++ tests/t_movedel.at df0c15f63123991cb33fa2b3dce187edc74b70b2 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([renaming a deleted file]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo, [foo file ]) @@ -10,31 +10,31 @@ ]) # produce root -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(foo)` # produce move edge -AT_CHECK(MONOTONE add baz, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN add baz, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo bar, [], [ignore], [ignore]) AT_CHECK(cp foo bar) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # revert to root PROBE_NODE(foo, $ROOT_R_SHA, $ROOT_F_SHA) AT_CHECK(rm bar) # make a delete edge on the move preimage -AT_CHECK(MONOTONE drop foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN drop foo, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # merge the del and the rename -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) # check that the delete landed on the renamed target -AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) +AT_CHECK(MTN automate get_manifest_of, [], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep baz manifest, [0], [ignore], [ignore]) AT_CHECK(grep bar manifest, [1], [ignore], [ignore]) ============================================================ --- tests/t_movepatch.at eedc17bcf8554389d642db6f83674663b496d70f +++ tests/t_movepatch.at eccf0ab5c306a58bbb110d5423fc572d832496a6 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([renaming a patched file]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo, [foo file ]) @@ -10,15 +10,15 @@ ]) # produce root -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(foo)` # produce move edge -AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo bar, [], [ignore], [ignore]) AT_CHECK(cp foo bar) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # revert to root PROBE_NODE(foo, $ROOT_R_SHA, $ROOT_F_SHA) @@ -26,14 +26,14 @@ # make a delta edge on the move preimage AT_CHECK(cp bleh foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # merge the delta and the rename -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) # check that the delta landed on the renamed target -AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) +AT_CHECK(MTN automate get_manifest_of, [], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep bar manifest, [0], [ignore], [ignore]) AT_CHECK(grep foo manifest, [1], [ignore], [ignore]) ============================================================ --- tests/t_mt_ignore.at c1be4b41d6032d7c488ec44a0ccc402be82e15f7 +++ tests/t_mt_ignore.at 3d4606633315af1837c5377d57152b6cd014e837 @@ -1,6 +1,6 @@ AT_SETUP([things in .mt-ignore get ignored]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(touch foo) AT_CHECK(touch bar) @@ -12,7 +12,7 @@ *.d ]) -AT_CHECK(RAW_MONOTONE ls unknown, [], [stdout], [stderr]) +AT_CHECK(RAW_MTN ls unknown, [], [stdout], [stderr]) AT_CHECK(cp stdout unknown) AT_CHECK(cp stderr unknownerr) @@ -22,7 +22,7 @@ AT_CHECK(grep baz unknown, [1], [ignore]) -AT_CHECK(RAW_MONOTONE ls ignored, [], [stdout], [stderr]) +AT_CHECK(RAW_MTN ls ignored, [], [stdout], [stderr]) AT_CHECK(cp stdout ignored) AT_CHECK(cp stderr ignorederr) @@ -32,7 +32,7 @@ AT_CHECK(grep xyzzy ignored, [], [ignore]) AT_CHECK(rm .mt-ignore) -AT_CHECK(RAW_MONOTONE ls ignored, [], [stdout], [stderr]) +AT_CHECK(RAW_MTN ls ignored, [], [stdout], [stderr]) AT_CHECK(grep test.db stdout, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_multiple_heads_msg.at e18276c0c4588a1bac33d4db0f84921eee8419a1 +++ tests/t_multiple_heads_msg.at 9e61cdfd3c747e8773754bf09e38cc6c55787eb2 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([commit/update multiple heads message]) -MONOTONE_SETUP +MTN_SETUP # Create a single revision in branch1 # @@ -13,12 +13,12 @@ AT_DATA(f, [base data ]) -AT_CHECK(MONOTONE add f, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch1 commit --message blah-blah, [], [ignore], [stderr]) +AT_CHECK(MTN add f, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch1 commit --message blah-blah, [], [ignore], [stderr]) AT_CHECK(QGREP('creates divergence' stderr), [1]) ROOT_R_SHA=`BASE_REVISION` -AT_CHECK(MONOTONE --branch=branch1 heads, [], [stdout], [ignore]) +AT_CHECK(MTN --branch=branch1 heads, [], [stdout], [ignore]) AT_CHECK(QGREP($ROOT_R_SHA stdout)) # Create a child @@ -31,11 +31,11 @@ AT_DATA(f, [child1 data ]) -AT_CHECK(MONOTONE --branch=branch1 commit --message blah-blah, [], [ignore], [stderr]) +AT_CHECK(MTN --branch=branch1 commit --message blah-blah, [], [ignore], [stderr]) AT_CHECK(QGREP('creates divergence' stderr), [1]) CHILD1_R_SHA=`BASE_REVISION` -AT_CHECK(MONOTONE --branch=branch1 heads, [], [stdout], [ignore]) +AT_CHECK(MTN --branch=branch1 heads, [], [stdout], [ignore]) AT_CHECK(QGREP($ROOT_R_SHA stdout), [1]) AT_CHECK(QGREP($CHILD1_R_SHA stdout)) @@ -50,11 +50,11 @@ REVERT_TO($ROOT_R_SHA) AT_DATA(f, [child2 data ]) -AT_CHECK(MONOTONE --branch=branch1 commit --message blah-blah, [], [ignore], [stderr]) +AT_CHECK(MTN --branch=branch1 commit --message blah-blah, [], [ignore], [stderr]) CHILD2_R_SHA=`BASE_REVISION` AT_CHECK(QGREP('this revision creates divergence' stderr), []) -AT_CHECK(MONOTONE --branch=branch1 update, [], [ignore], [stderr]) +AT_CHECK(MTN --branch=branch1 update, [], [ignore], [stderr]) AT_CHECK(QGREP('has multiple heads' stderr), []) # Create a new branch @@ -72,7 +72,7 @@ AT_DATA(f, [new1 data ]) -AT_CHECK(MONOTONE --branch=branch2 commit --message blah-blah, [], [ignore], [stderr]) +AT_CHECK(MTN --branch=branch2 commit --message blah-blah, [], [ignore], [stderr]) NEW1_R_SHA=`BASE_REVISION` AT_CHECK(QGREP('this revision creates divergence' stderr), [1]) @@ -80,7 +80,7 @@ AT_DATA(f, [new2 data ]) -AT_CHECK(MONOTONE --branch=branch2 commit --message blah-blah, [], [ignore], [stderr]) +AT_CHECK(MTN --branch=branch2 commit --message blah-blah, [], [ignore], [stderr]) NEW2_R_SHA=`BASE_REVISION` AT_CHECK(QGREP('this revision creates divergence' stderr), []) ============================================================ --- tests/t_need_mt_revision.at cc930f17f155b0549b153fd11673d126081993a3 +++ tests/t_need_mt_revision.at c53b0108a217e92a220f2a4f267f0b71c25ed82c @@ -1,20 +1,20 @@ AT_SETUP([_MTN/revision is required]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [blah blah ]) ADD_FILE(bar, [blah blah ]) AT_CHECK(rm -f foo) -AT_CHECK(MONOTONE ls missing, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls missing, [], [ignore], [ignore]) +AT_CHECK(MTN ls missing, [], [ignore], [ignore]) +AT_CHECK(MTN drop foo, [], [ignore], [ignore]) +AT_CHECK(MTN ls missing, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(rm -f bar) -AT_CHECK(MONOTONE ls missing, [], [ignore], [ignore]) +AT_CHECK(MTN ls missing, [], [ignore], [ignore]) AT_CHECK(rm -f _MTN/revision) -AT_CHECK(MONOTONE ls missing, [1], [ignore], [ignore]) +AT_CHECK(MTN ls missing, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_netsync.at 31e8c678b935b657624d1ca98391efc8dbf921ad +++ tests/t_netsync.at 94ec5c81b61edb56ef6954c60ba6810c00360b5e @@ -1,27 +1,27 @@ # -*- Autoconf -*- AT_SETUP([exchanging work via netsync]) AT_KEYWORDS([netsync]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP AT_DATA(testfile, [version 0 of test file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) F_VER0=`SHA1(testfile)` VER0=`BASE_REVISION` AT_DATA(testfile, [version 1 of test file ]) -AT_CHECK(MONOTONE commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message blah-blah, [], [ignore], [ignore]) F_VER1=`SHA1(testfile)` VER1=`BASE_REVISION` RUN_NETSYNC(pull, testbranch) -AT_CHECK(MONOTONE2 ls certs $VER0, [], [stdout]) +AT_CHECK(MTN2 ls certs $VER0, [], [stdout]) AT_CHECK(mv stdout certs, [], [ignore]) AT_CHECK(grep date certs, [], [ignore]) AT_CHECK(grep author certs, [], [ignore]) @@ -29,7 +29,7 @@ AT_CHECK(grep changelog certs, [], [ignore]) AT_CHECK(grep bad certs, [1], [ignore]) -AT_CHECK(MONOTONE2 ls certs $VER1, [], [stdout]) +AT_CHECK(MTN2 ls certs $VER1, [], [stdout]) AT_CHECK(mv stdout certs, [], [ignore]) AT_CHECK(grep date certs, [], [ignore]) AT_CHECK(grep author certs, [], [ignore]) @@ -37,30 +37,30 @@ AT_CHECK(grep changelog certs, [], [ignore]) AT_CHECK(grep bad certs, [1], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $VER0, [], [stdout]) +AT_CHECK(MTN2 automate get_revision $VER0, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) CHK=`SHA1(stdout)` AT_CHECK(test $CHK = $VER0) -AT_CHECK(MONOTONE2 automate get_revision $VER1, [], [stdout]) +AT_CHECK(MTN2 automate get_revision $VER1, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) CHK=`SHA1(stdout)` AT_CHECK(test $CHK = $VER1) -AT_CHECK(MONOTONE2 automate get_file $F_VER0, [], [stdout]) +AT_CHECK(MTN2 automate get_file $F_VER0, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) CHK=`SHA1(stdout)` AT_CHECK(test $CHK = $F_VER0) -AT_CHECK(MONOTONE2 automate get_file $F_VER1, [], [stdout]) +AT_CHECK(MTN2 automate get_file $F_VER1, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) CHK=`SHA1(stdout)` AT_CHECK(test $CHK = $F_VER1) -AT_CHECK(MONOTONE db info, [], [stdout]) +AT_CHECK(MTN db info, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) INFO1=`SHA1(stdout)` -AT_CHECK(MONOTONE2 db info, [], [stdout]) +AT_CHECK(MTN2 db info, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) INFO2=`SHA1(stdout)` AT_CHECK(test $INFO1 = $INFO2) ============================================================ --- tests/t_netsync_absorbs.at c34ed5130b13ac65b31983549c7a7c8882acbcba +++ tests/t_netsync_absorbs.at 7fc9331c47ec05b6617b0ba0d545956d1491db00 @@ -1,14 +1,14 @@ AT_SETUP([client absorbs server key]) AT_KEYWORDS(netsync) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [foo bar ]) COMMIT(testbranch) -AT_CHECK((echo address@hidden; echo address@hidden) | MONOTONE genkey address@hidden, [], [ignore], [ignore]) -AT_CHECK(MONOTONE pubkey address@hidden, [], [stdout], [ignore]) +AT_CHECK((echo address@hidden; echo address@hidden) | MTN genkey address@hidden, [], [ignore], [ignore]) +AT_CHECK(MTN pubkey address@hidden, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cp stdout foo_public) @@ -16,7 +16,7 @@ NETSYNC_CLIENT_RUN(pull, testbranch) NETSYNC_SERVE_STOP -AT_CHECK(MONOTONE2 pubkey address@hidden, [], [stdout], [ignore]) +AT_CHECK(MTN2 pubkey address@hidden, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp foo_public stdout) ============================================================ --- tests/t_netsync_checks_server_key.at f6b78875f5320727e7fb6e81f0a496790f56b69d +++ tests/t_netsync_checks_server_key.at 6565e609950c477f97c500207f2880d52f9b9a82 @@ -1,8 +1,8 @@ AT_SETUP([netsync verifies server keys]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP -AT_CHECK((echo address@hidden; echo address@hidden) | MONOTONE genkey address@hidden, [], [ignore], [ignore]) +AT_CHECK((echo address@hidden; echo address@hidden) | MTN genkey address@hidden, [], [ignore], [ignore]) # Once to let the client note down the key... RUN_NETSYNC(pull, testbranch) @@ -12,15 +12,15 @@ NETSYNC_CLIENT_RUN(pull, testbranch, 1) # It shouldn't have absorbed the key, either. -AT_CHECK(MONOTONE2 pubkey address@hidden, [1], [stdout], [ignore]) +AT_CHECK(MTN2 pubkey address@hidden, [1], [stdout], [ignore]) # But if we then clear the client's known_hosts entry, it should be fine -AT_CHECK(MONOTONE2 unset known-servers NETSYNC_ADDRESS, [], [ignore], [ignore]) +AT_CHECK(MTN2 unset known-servers NETSYNC_ADDRESS, [], [ignore], [ignore]) # Now it should succeed NETSYNC_CLIENT_RUN(pull, testbranch) # And have absorbed the key -AT_CHECK(MONOTONE2 pubkey address@hidden, [], [stdout], [ignore]) +AT_CHECK(MTN2 pubkey address@hidden, [], [stdout], [ignore]) NETSYNC_SERVE_STOP ============================================================ --- tests/t_netsync_defaults.at ad699c5f7470abec2b97ac1b4d0f71250d134d25 +++ tests/t_netsync_defaults.at d36b14f0bca378135633d5cfb955524eaa9278d7 @@ -1,6 +1,6 @@ AT_SETUP([default server/pattern]) AT_KEYWORDS(netsync) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [blah blah @@ -21,24 +21,24 @@ NETSYNC_SERVE_START(testbranch otherbranch thirdbranch) # First make sure netsync with explicit server/pattern override defaults -AT_CHECK(MONOTONE2 set database default-server nonsense, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 set database default-include-pattern nonsense, [], [ignore], [ignore]) +AT_CHECK(MTN2 set database default-server nonsense, [], [ignore], [ignore]) +AT_CHECK(MTN2 set database default-include-pattern nonsense, [], [ignore], [ignore]) NETSYNC_CLIENT_RUN(pull, testbranch, 0) -AT_CHECK(MONOTONE2 checkout --branch=testbranch --revision=$TESTBRANCH_R testdir1, [], [ignore], [ignore]) +AT_CHECK(MTN2 checkout --branch=testbranch --revision=$TESTBRANCH_R testdir1, [], [ignore], [ignore]) AT_CHECK(test -f testdir1/testfile) # Now make sure explicit server with default pattern works... -AT_CHECK(MONOTONE2 set database default-server nonsense, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 set database default-include-pattern otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN2 set database default-server nonsense, [], [ignore], [ignore]) +AT_CHECK(MTN2 set database default-include-pattern otherbranch, [], [ignore], [ignore]) NETSYNC_CLIENT_RUN(pull, []) -AT_CHECK(MONOTONE2 checkout --branch=otherbranch --revision=$OTHERBRANCH_R testdir2, [], [ignore], [ignore]) +AT_CHECK(MTN2 checkout --branch=otherbranch --revision=$OTHERBRANCH_R testdir2, [], [ignore], [ignore]) AT_CHECK(test -f testdir2/testfile) # And finally, make sure that passing nothing at all also works (uses default) -AT_CHECK(MONOTONE2 set database default-server 127.0.0.1:$_PORT, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 set database default-include-pattern thirdbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 sync, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 checkout --branch=thirdbranch --revision=$THIRDBRANCH_R testdir3, [], [ignore], [ignore]) +AT_CHECK(MTN2 set database default-server 127.0.0.1:$_PORT, [], [ignore], [ignore]) +AT_CHECK(MTN2 set database default-include-pattern thirdbranch, [], [ignore], [ignore]) +AT_CHECK(MTN2 sync, [], [ignore], [ignore]) +AT_CHECK(MTN2 checkout --branch=thirdbranch --revision=$THIRDBRANCH_R testdir3, [], [ignore], [ignore]) AT_CHECK(test -f testdir3/testfile) NETSYNC_SERVE_STOP ============================================================ --- tests/t_netsync_diffbranch.at 6a2a4e9b6dada24dea2ad88bd0c3d0caf8d180bc +++ tests/t_netsync_diffbranch.at 01e026d5b49106ef7fa2fe51d1b9182890cd0f8c @@ -1,8 +1,8 @@ AT_SETUP([pull a netsync branch which has a parent from another branch]) AT_KEYWORDS([netsync]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [blah stuff @@ -17,6 +17,6 @@ RUN_NETSYNC(pull, otherbranch) -CHECK_SAME_STDOUT(MONOTONE ls certs $VER1, MONOTONE2 ls certs $VER1) +CHECK_SAME_STDOUT(MTN ls certs $VER1, MTN2 ls certs $VER1) AT_CLEANUP ============================================================ --- tests/t_netsync_error.at 8188034644f18ea9b5da26a66a87d66bf2e345d0 +++ tests/t_netsync_error.at 9d3851eea12518eaa0829fa08defdacf583432d1 @@ -1,6 +1,6 @@ AT_SETUP([netsync badhost gives nice error]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE pull nosuchhost__blahblah__asdvasoih.com some.pattern, [1], [ignore], [ignore]) +AT_CHECK(MTN pull nosuchhost__blahblah__asdvasoih.com some.pattern, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_netsync_exclude.at afecaf386c96643f94ded258073b119b940b27d6 +++ tests/t_netsync_exclude.at 1ddcb155746357568e2b67ea32b6dfa7c9964355 @@ -1,6 +1,6 @@ AT_SETUP([serve/pull with --exclude]) AT_KEYWORDS([netsync]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [1 @@ -35,18 +35,18 @@ NETSYNC_CLIENT_RUN(pull, 'branch2', [1]) NETSYNC_CLIENT_RUN(pull, 'branch4', [1]) -AT_CHECK(MONOTONE2 automate get_revision $B1, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B2, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B3, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B4, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B1, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B2, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B3, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B4, [1], [ignore], [ignore]) NETSYNC_CLIENT_RUN(pull, 'branch*' --exclude=branch2 --exclude=branch4) -AT_CHECK(MONOTONE2 automate get_revision $B1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B3, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B4, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B1, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B2, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B3, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B4, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE2 ls certs $B2 | QGREP(branch2), [1]) +AT_CHECK(MTN2 ls certs $B2 | QGREP(branch2), [1]) NETSYNC_SERVE_STOP ============================================================ --- tests/t_netsync_exclude_default.at e60e806f5ae6a160048081dccff8ce46c74b8551 +++ tests/t_netsync_exclude_default.at cc9fa9672ec0ce88755689341e6e9e3541e14226 @@ -1,6 +1,6 @@ AT_SETUP([--exclude defaults]) AT_KEYWORDS([netsync]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [1 @@ -15,8 +15,8 @@ RUN_NETSYNC(pull, 'branch*' --exclude=branch2) -AT_CHECK(MONOTONE2 automate get_revision $B11, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B21, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B11, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B21, [1], [ignore], [ignore]) REVERT_TO($B11) SET_FILE(testfile, [12 @@ -31,18 +31,18 @@ B22=`BASE_REVISION` RUN_NETSYNC(pull) -AT_CHECK(MONOTONE2 automate get_revision $B11, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B21, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B12, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B22, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B11, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B21, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B12, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B22, [1], [ignore], [ignore]) # passing only an include pattern causes the default exclude to be # ignored... RUN_NETSYNC(pull, branch2) -AT_CHECK(MONOTONE2 automate get_revision $B11, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B21, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B12, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B22, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B11, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B21, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B12, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B22, [], [ignore], [ignore]) # but not set by default @@ -59,22 +59,22 @@ B23=`BASE_REVISION` RUN_NETSYNC(pull) -AT_CHECK(MONOTONE2 automate get_revision $B11, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B21, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B12, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B22, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B13, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B23, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B11, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B21, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B12, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B22, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B13, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B23, [1], [ignore], [ignore]) # but --set-default overrides RUN_NETSYNC(pull --set-default, 'branch*') -AT_CHECK(MONOTONE2 automate get_revision $B11, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B21, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B12, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B22, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B13, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B23, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B11, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B21, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B12, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B22, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B13, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B23, [], [ignore], [ignore]) REVERT_TO($B13) SET_FILE(testfile, [14 @@ -89,13 +89,13 @@ B24=`BASE_REVISION` RUN_NETSYNC(pull) -AT_CHECK(MONOTONE2 automate get_revision $B11, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B21, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B12, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B22, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B13, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B23, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B14, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $B24, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B11, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B21, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B12, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B22, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B13, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B23, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B14, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $B24, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_netsync_globs.at 553b6e8d18f08e907e1d84324326ec879820842b +++ tests/t_netsync_globs.at ea3d2489c154f76d652ac6e5f1532cb04c7e93ba @@ -1,5 +1,5 @@ AT_SETUP([netsync with globs]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [foo @@ -8,14 +8,14 @@ REV11=`BASE_REVISION` AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE setup --branch=testbranch .) +AT_CHECK(MTN setup --branch=testbranch .) ADD_FILE(testfile, [bar ]) COMMIT(1branch2) REV12=`BASE_REVISION` AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE setup --branch=testbranch .) +AT_CHECK(MTN setup --branch=testbranch .) ADD_FILE(testfile, [baz ]) COMMIT(2branch1) @@ -25,15 +25,15 @@ # check a glob NETSYNC_CLIENT_N_RUN(2, pull, "*anch2") -AT_CHECK(MONOTONE2 automate get_revision $REV12, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $REV11, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE2 automate get_revision $REV21, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $REV12, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $REV11, [1], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $REV21, [1], [ignore], [ignore]) # check explicit multiple branches NETSYNC_CLIENT_N_RUN(3, pull, 1branch1 2branch1) -AT_CHECK(MONOTONE3 automate get_revision $REV12, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE3 automate get_revision $REV11, [], [ignore], [ignore]) -AT_CHECK(MONOTONE3 automate get_revision $REV21, [], [ignore], [ignore]) +AT_CHECK(MTN3 automate get_revision $REV12, [1], [ignore], [ignore]) +AT_CHECK(MTN3 automate get_revision $REV11, [], [ignore], [ignore]) +AT_CHECK(MTN3 automate get_revision $REV21, [], [ignore], [ignore]) NETSYNC_SERVE_STOP ============================================================ --- tests/t_netsync_largish_file.at 378eb7ed343ad9a0e8caef98f96779d7ce2dc682 +++ tests/t_netsync_largish_file.at 1aa5a70db58b28dd4a337925f8196c1be7e42686 @@ -1,14 +1,14 @@ AT_SETUP([netsync largish file]) AT_KEYWORDS([netsync]) # Check that we can netsync a 32MB file. -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP LARGISH_FILE_CREATE(largish, 32) -AT_CHECK(MONOTONE add largish, [], [ignore], [ignore]) +AT_CHECK(MTN add largish, [], [ignore], [ignore]) COMMIT(testbranch) F_VER0=`SHA1(largish)` @@ -18,7 +18,7 @@ NETSYNC_SERVE_STOP -AT_CHECK(MONOTONE --db=test2.db --branch=testbranch checkout other, [], [ignore], [ignore]) +AT_CHECK(MTN --db=test2.db --branch=testbranch checkout other, [], [ignore], [ignore]) CHK=`SHA1(other/largish)` AT_CHECK(test $CHK = $F_VER0) ============================================================ --- tests/t_netsync_nocerts.at a46961c621de2d5ffe721d3cbc7b6561b7964a1b +++ tests/t_netsync_nocerts.at 066f76cb779ec77c72a408b4f31d52fb84925a15 @@ -1,5 +1,5 @@ AT_SETUP([(normal) netsync revision with no certs]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [blah stuff @@ -7,7 +7,7 @@ COMMIT(testbranch) VER0=`BASE_REVISION` -AT_CHECK(MONOTONE db execute 'delete from revision_certs', [], [ignore], [ignore]) +AT_CHECK(MTN db execute 'delete from revision_certs', [], [ignore], [ignore]) SET_FILE(testfile, [other stuff ]) @@ -16,9 +16,9 @@ RUN_NETSYNC(pull, testbranch) -CHECK_SAME_STDOUT(MONOTONE automate get_revision $VER0, MONOTONE2 automate get_revision $VER0) -CHECK_SAME_STDOUT(MONOTONE ls certs $VER0, MONOTONE2 ls certs $VER0) -CHECK_SAME_STDOUT(MONOTONE automate get_revision $VER1, MONOTONE2 automate get_revision $VER1) -CHECK_SAME_STDOUT(MONOTONE ls certs $VER1, MONOTONE2 ls certs $VER1) +CHECK_SAME_STDOUT(MTN automate get_revision $VER0, MTN2 automate get_revision $VER0) +CHECK_SAME_STDOUT(MTN ls certs $VER0, MTN2 ls certs $VER0) +CHECK_SAME_STDOUT(MTN automate get_revision $VER1, MTN2 automate get_revision $VER1) +CHECK_SAME_STDOUT(MTN ls certs $VER1, MTN2 ls certs $VER1) AT_CLEANUP ============================================================ --- tests/t_netsync_notes.at c96e414dbd2fdb33dfec014c9dad04d11e1278f6 +++ tests/t_netsync_notes.at 6ea106066863e7a513a28385daa291e3fcf6d804 @@ -1,16 +1,16 @@ # -*- Autoconf -*- AT_SETUP([exchanging work via netsync, with notes]) AT_KEYWORDS([netsync]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP_WITH_NOTES # Checking the effect of a new revisions AT_DATA(testfile, [version 0 of test file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) F_VER0=`SHA1(testfile)` VER0=`BASE_REVISION` MAN0=`BASE_MANIFEST` @@ -18,7 +18,7 @@ AT_DATA(testfile, [version 1 of test file ]) -AT_CHECK(MONOTONE commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message blah-blah, [], [ignore], [ignore]) F_VER1=`SHA1(testfile)` VER1=`BASE_REVISION` MAN1=`BASE_MANIFEST` @@ -81,7 +81,7 @@ AT_CHECK(cmp testnotes.log testnotes.test, [0], [ignore], [ignore]) # Checking the effect of a simple cert change -AT_CHECK(MONOTONE tag $VER0 testtag, [], [ignore], [ignore]) +AT_CHECK(MTN tag $VER0 testtag, [], [ignore], [ignore]) RUN_NETSYNC(pull, testbranch) ============================================================ --- tests/t_netsync_permissions.at fde3b03429da042b17d3f25769f1e08f77c58733 +++ tests/t_netsync_permissions.at 710da2e0fc052cb1dfad079b01280880a3b334b5 @@ -1,13 +1,13 @@ # -*- Autoconf -*- AT_SETUP([netsync permissions]) -MONOTONE_SETUP +MTN_SETUP # generate a new key address@hidden -AT_CHECK((echo $OTHER; echo $OTHER) | MONOTONE genkey $OTHER, [], [ignore], [ignore]) +AT_CHECK((echo $OTHER; echo $OTHER) | MTN genkey $OTHER, [], [ignore], [ignore]) NETSYNC_SETUP @@ -23,14 +23,14 @@ ADD_FILE(badfile, [badfile ]) -AT_CHECK(MONOTONE --branch=badbranch commit --message badfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=badbranch commit --message badfile, [], [ignore], [ignore]) AT_CHECK(cp test.db clean.db) AT_CHECK(cp -r keys/ clean_keys) ADD_FILE(testfile, [testfile ]) -AT_CHECK(MONOTONE --branch=testbranch commit --message testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message testfile, [], [ignore], [ignore]) BASE=`BASE_REVISION` MINHOOKS_NETSYNC_SERVE_START(testbranch --confdir open) @@ -40,30 +40,30 @@ AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) NETSYNC_CLIENT_RUN(pull --key="", testbranch) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [0], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [0], [stdout], [stderr]) # pull with default key AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) NETSYNC_CLIENT_RUN(pull, testbranch) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [0], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [0], [stdout], [stderr]) # pull with other key AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) NETSYNC_CLIENT_RUN(pull --key=$OTHER, testbranch) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [0], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [0], [stdout], [stderr]) # pull with unknown key fails AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) address@hidden -AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MONOTONE2 genkey $UNKNOWN, [], [ignore], [ignore]) +AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MTN2 genkey $UNKNOWN, [], [ignore], [ignore]) NETSYNC_CLIENT_RUN(pull --key=$UNKNOWN, testbranch, [1]) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [1], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [1], [stdout], [stderr]) # push with default key @@ -72,7 +72,7 @@ REVERT_N_TO(2, $BASE) ADD_N_FILE(2, default, [default ]) -AT_CHECK(MONOTONE2 commit --message default, [], [ignore], [ignore]) +AT_CHECK(MTN2 commit --message default, [], [ignore], [ignore]) DEFAULT_REV=`BASE_REVISION` NETSYNC_CLIENT_RUN(push, testbranch) @@ -81,7 +81,7 @@ REVERT_N_TO(2, $BASE) ADD_N_FILE(2, other, [other ]) -AT_CHECK(MONOTONE2 commit --message other, [], [ignore], [ignore]) +AT_CHECK(MTN2 commit --message other, [], [ignore], [ignore]) OTHER_REV=`BASE_REVISION` NETSYNC_CLIENT_RUN(push --key=$OTHER , testbranch) @@ -90,16 +90,16 @@ REVERT_N_TO(2, $BASE) ADD_N_FILE(2, unknown, [unknown ]) -AT_CHECK(MONOTONE2 commit --message unknown, [], [ignore], [ignore]) +AT_CHECK(MTN2 commit --message unknown, [], [ignore], [ignore]) UNKNOWN_REV=`BASE_REVISION` -AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MONOTONE2 genkey $UNKNOWN, [], [ignore], [ignore]) +AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MTN2 genkey $UNKNOWN, [], [ignore], [ignore]) NETSYNC_CLIENT_RUN(push --key=$UNKNOWN, testbranch, [1]) NETSYNC_SERVE_STOP -AT_CHECK(MONOTONE automate get_revision $DEFAULT_REV, [0], [stdout], [stderr]) -AT_CHECK(MONOTONE automate get_revision $OTHER_REV, [0], [stdout], [stderr]) -AT_CHECK(MONOTONE automate get_revision $UNKNOWN_REV, [1], [stdout], [stderr]) +AT_CHECK(MTN automate get_revision $DEFAULT_REV, [0], [stdout], [stderr]) +AT_CHECK(MTN automate get_revision $OTHER_REV, [0], [stdout], [stderr]) +AT_CHECK(MTN automate get_revision $UNKNOWN_REV, [1], [stdout], [stderr]) # test with closed security settings @@ -118,7 +118,7 @@ ADD_N_FILE(2, testfile, [testfile ]) -AT_CHECK(MONOTONE --branch=testbranch commit --message testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message testfile, [], [ignore], [ignore]) BASE=`BASE_REVISION` MINHOOKS_NETSYNC_SERVE_START(testbranch --confdir closed) @@ -128,37 +128,37 @@ AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) NETSYNC_CLIENT_RUN(pull --key="", testbranch, [1]) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [1], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [1], [stdout], [stderr]) # pull with default key AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) NETSYNC_CLIENT_RUN(pull, testbranch) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [0], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [0], [stdout], [stderr]) # pull with bad branch fails AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) NETSYNC_CLIENT_RUN(pull, badbranch, 1) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [1], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [1], [stdout], [stderr]) # pull with other key fails AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) NETSYNC_CLIENT_RUN(pull --key=$OTHER, testbranch, [1]) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [1], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [1], [stdout], [stderr]) # pull with unknown key fails AT_CHECK(cp clean.db test2.db) AT_CHECK(rm -r keys2 && cp -r clean_keys/ keys2) address@hidden -AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MONOTONE2 genkey $UNKNOWN, [], [ignore], [ignore]) +AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MTN2 genkey $UNKNOWN, [], [ignore], [ignore]) NETSYNC_CLIENT_RUN(pull --key=$UNKNOWN, testbranch, [1]) -AT_CHECK(MONOTONE2 automate get_revision $BASE, [1], [stdout], [stderr]) +AT_CHECK(MTN2 automate get_revision $BASE, [1], [stdout], [stderr]) # push with default key @@ -167,7 +167,7 @@ REVERT_N_TO(2, $BASE) ADD_N_FILE(2, default, [default ]) -AT_CHECK(MONOTONE2 commit --message default, [], [ignore], [ignore]) +AT_CHECK(MTN2 commit --message default, [], [ignore], [ignore]) DEFAULT_REV=`BASE_REVISION` NETSYNC_CLIENT_RUN(push, testbranch) @@ -176,7 +176,7 @@ REVERT_N_TO(2, $BASE) ADD_N_FILE(2, other, [other ]) -AT_CHECK(MONOTONE2 commit --message other, [], [ignore], [ignore]) +AT_CHECK(MTN2 commit --message other, [], [ignore], [ignore]) OTHER_REV=`BASE_REVISION` NETSYNC_CLIENT_RUN(push --key=$OTHER, testbranch, [1]) @@ -185,15 +185,15 @@ REVERT_N_TO(2, $BASE) ADD_N_FILE(2, unknown, [unknown ]) -AT_CHECK(MONOTONE2 commit --message unknown, [], [ignore], [ignore]) +AT_CHECK(MTN2 commit --message unknown, [], [ignore], [ignore]) UNKNOWN_REV=`BASE_REVISION` -AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MONOTONE2 genkey $UNKNOWN, [], [ignore], [ignore]) +AT_CHECK((echo $UNKNOWN; echo $UNKNOWN) | MTN2 genkey $UNKNOWN, [], [ignore], [ignore]) NETSYNC_CLIENT_RUN(push --key=$UNKNOWN, testbranch, [1]) NETSYNC_SERVE_STOP -AT_CHECK(MONOTONE automate get_revision $DEFAULT_REV, [0], [stdout], [stderr]) -AT_CHECK(MONOTONE automate get_revision $OTHER_REV, [1], [stdout], [stderr]) -AT_CHECK(MONOTONE automate get_revision $UNKNOWN_REV, [1], [stdout], [stderr]) +AT_CHECK(MTN automate get_revision $DEFAULT_REV, [0], [stdout], [stderr]) +AT_CHECK(MTN automate get_revision $OTHER_REV, [1], [stdout], [stderr]) +AT_CHECK(MTN automate get_revision $UNKNOWN_REV, [1], [stdout], [stderr]) AT_CLEANUP ============================================================ --- tests/t_netsync_pubkey.at 331073b6faf1b43e2ff5ba2d3b557842e3ac28c8 +++ tests/t_netsync_pubkey.at 502507bbb68033fc9410fe13be3757c08edbf2e1 @@ -1,7 +1,7 @@ AT_SETUP([netsync transfers public keys]) AT_KEYWORDS([netsync]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP PUBKEY=52f32ec62128ea3541ebdd9d17400e268cfcd3fe @@ -28,7 +28,7 @@ @<:@end@:>@ ]) -AT_CHECK(MONOTONE read tmp) -AT_CHECK(MONOTONE automate parents $REV_B, [], [stdout], [ignore]) +AT_CHECK(MTN automate parents $REV_B, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp stdout) AT_CHECK(echo $REV_A > tmp) -AT_CHECK(MONOTONE automate parents $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate parents $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp stdout) AT_CHECK(echo $REV_C > tmp) -AT_CHECK(MONOTONE automate parents $REV_D, [], [stdout], [ignore]) +AT_CHECK(MTN automate parents $REV_D, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp stdout) AT_CHECK(echo $REV_C > tmp) -AT_CHECK(MONOTONE automate parents $REV_E, [], [stdout], [ignore]) +AT_CHECK(MTN automate parents $REV_E, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp stdout) AT_CHECK(echo $REV_D >revs_de.unsorted) AT_CHECK(echo $REV_E >>revs_de.unsorted) AT_CHECK(sort revs_de.unsorted > revs_de) -AT_CHECK(MONOTONE automate parents $REV_F, [], [stdout], [ignore]) +AT_CHECK(MTN automate parents $REV_F, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp revs_de stdout) AT_CHECK(echo $REV_F > tmp) -AT_CHECK(MONOTONE automate children $REV_D, [], [stdout], [ignore]) +AT_CHECK(MTN automate children $REV_D, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp stdout) AT_CHECK(echo $REV_F > tmp) -AT_CHECK(MONOTONE automate children $REV_E, [], [stdout], [ignore]) +AT_CHECK(MTN automate children $REV_E, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp tmp stdout) -AT_CHECK(MONOTONE automate children $REV_C, [], [stdout], [ignore]) +AT_CHECK(MTN automate children $REV_C, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp revs_de stdout) AT_CHECK(echo $REV_B >revs_bc.unsorted) AT_CHECK(echo $REV_C >>revs_bc.unsorted) AT_CHECK(sort revs_bc.unsorted > revs_bc) -AT_CHECK(MONOTONE automate children $REV_A, [], [stdout], [ignore]) +AT_CHECK(MTN automate children $REV_A, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp revs_bc stdout) ============================================================ --- tests/t_patch_drop_add.at 545ad9bb3c34da728a5893133e0b2cc3239d7e5f +++ tests/t_patch_drop_add.at 067e9edfbbe8d383b27d6af1ba242887d3e5cc21 @@ -1,6 +1,6 @@ AT_SETUP([merge(<>, )]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(v1a, [foo blah ]) @@ -10,7 +10,7 @@ ]) AT_CHECK(cp v1a testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) BASE_R_SHA=`BASE_REVISION` @@ -18,11 +18,11 @@ COMMIT(testbranch) AT_CHECK(rm -f testfile) -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp v2a testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) REVERT_TO($BASE_R_SHA) @@ -31,8 +31,8 @@ ]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile v2a, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_patch_vs_drop_add.at 35ae384649b4fb96b3d32e7c1f28909ecdf84652 +++ tests/t_patch_vs_drop_add.at 0369943f376a5830852e4b1fd46241f39bfd5ce7 @@ -1,9 +1,9 @@ AT_SETUP([merge(, )]) # In this case, the patch should be completely ignored; we shouldn't # even try to do a merge. -MONOTONE_SETUP +MTN_SETUP AT_DATA(base, [foo blah ]) @@ -13,7 +13,7 @@ ]) AT_CHECK(cp base testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) BASE_R_SHA=`BASE_REVISION` @@ -23,15 +23,15 @@ REVERT_TO($BASE_R_SHA) AT_CHECK(rm -f testfile) -AT_CHECK(MONOTONE drop testfile, [], [ignore], [ignore]) +AT_CHECK(MTN drop testfile, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(cp new_right testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_CHECK(cmp testfile new_right, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_persist_phrase.at 1b42aa46cbae9afdeae5ab98ef2aa9a3e90065d0 +++ tests/t_persist_phrase.at e436768b88c695cf5c628d60b69ead7a8f3bbfc9 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([persistence of passphrase]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(persist.lua, [ function persist_phrase_ok() @@ -15,7 +15,7 @@ AT_DATA(input.txt, [version 0 of the file ]) -AT_CHECK(MONOTONE add input.txt, [], [ignore], [ignore]) +AT_CHECK(MTN add input.txt, [], [ignore], [ignore]) AT_DATA(input.txt, [version 1 of the file ]) @@ -23,10 +23,10 @@ AT_DATA(passphrase, address@hidden ]) -AT_CHECK(MONOTONE --branch=testbranch --rcfile=persist.lua commit --message=blah-blah A2 -> B1 -> # B2, where A and B are different branches, and the user propagates A @@ -26,13 +26,13 @@ B_HEAD_REV=`BASE_REVISION` AT_CHECK(cp test.db test2.db) -AT_CHECK(MONOTONE propagate a b, [], [ignore], [ignore]) +AT_CHECK(MTN propagate a b, [], [ignore], [ignore]) CHECK_SAME_DB_CONTENTS(test.db, test2.db) -AT_CHECK(MONOTONE cert $B_HEAD_REV branch c, [], [ignore], [ignore]) +AT_CHECK(MTN cert $B_HEAD_REV branch c, [], [ignore], [ignore]) AT_CHECK(cp test.db test3.db) -AT_CHECK(MONOTONE propagate b c, [], [ignore], [ignore]) +AT_CHECK(MTN propagate b c, [], [ignore], [ignore]) CHECK_SAME_DB_CONTENTS(test.db, test3.db) ============================================================ --- tests/t_propagate_desc.at b03a137a514b121a1ba4ae31b63b86ee37f2cdb8 +++ tests/t_propagate_desc.at ea340cb5fe0d6ab15d653f9722da33c2555b7df0 @@ -1,5 +1,5 @@ AT_SETUP([propagate a descendent]) -MONOTONE_SETUP +MTN_SETUP # This tests the case where we have something like A1 -> A2 -> B1 -> # B2, where A and B are different branches, and the user propagates B @@ -24,10 +24,10 @@ COMMIT(b) B_HEAD_REV=`BASE_REVISION` -AT_CHECK(MONOTONE propagate b a, [], [ignore], [ignore]) -AT_CHECK(MONOTONE heads --branch=b, [], [stdout], [ignore]) +AT_CHECK(MTN propagate b a, [], [ignore], [ignore]) +AT_CHECK(MTN heads --branch=b, [], [stdout], [ignore]) AT_CHECK(QGREP($B_HEAD_REV stdout)) -AT_CHECK(MONOTONE heads --branch=a, [], [stdout], [ignore]) +AT_CHECK(MTN heads --branch=a, [], [stdout], [ignore]) AT_CHECK(QGREP($B_HEAD_REV stdout)) AT_CLEANUP ============================================================ --- tests/t_rcfile_dir.at f9aa64b4b4df88b80587b24a87f1d77408a7b576 +++ tests/t_rcfile_dir.at 32c8b1e6a24b7c6c0e0573f041e4460975bfd718 @@ -1,5 +1,5 @@ AT_SETUP([--rcfile=directory]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir gongolo) @@ -16,8 +16,8 @@ ]) # note: rcfile is placed outside workdir -AT_CHECK(MONOTONE setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) -AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../gongolo status, [], [stdout], [ignore]) +AT_CHECK(MTN setup --branch=testbranch alt_wrk, [], [ignore], [ignore]) +AT_CHECK(cd alt_wrk && MTN --root=. --rcfile=../gongolo status, [], [stdout], [ignore]) AT_CHECK(QGREP("BOOGA BOOGACICCA CICCA" stdout)) # write a third file: should be read beetween the two previous ones @@ -26,7 +26,7 @@ end notwowithoutthree() ]) -AT_CHECK(cd alt_wrk && MONOTONE --root=. --rcfile=../gongolo status, [], [stdout], [ignore]) +AT_CHECK(cd alt_wrk && MTN --root=. --rcfile=../gongolo status, [], [stdout], [ignore]) AT_CHECK(QGREP("BOOGA BOOGAhu huCICCA CICCA" stdout)) AT_CLEANUP ============================================================ --- tests/t_rcfile_required.at 00e9a1027a39508c944565768b86961b49f9cdf0 +++ tests/t_rcfile_required.at 4b2670d59558c59908432266c05620f152c1c0cf @@ -1,8 +1,8 @@ AT_SETUP([--rcfile requires extant file]) -MONOTONE_SETUP +MTN_SETUP # rcfiles may contain security settings. So make it a hard error if # the user typoes or somesuch. -AT_CHECK(MONOTONE --rcfile=no-such-file status, [1], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=no-such-file status, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_rcfile_stdin.at 09db80cb7bee886ced4c2cb8afbf1be24e04f699 +++ tests/t_rcfile_stdin.at 86d3092ac770339b7c227e6d2c53d453e184c27b @@ -1,5 +1,5 @@ AT_SETUP([--rcfile=-]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo.rc, [function note_commit(new_id, certs) io.write("BOOGA BOOGA\n") @@ -8,7 +8,7 @@ ADD_FILE(testfile, [blah blah ]) -AT_CHECK(foo.keyfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE read nonexistent, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE read foo.keyfile, [], [ignore], [ignore]) +AT_CHECK(MTN --db foo.db pubkey foo >foo.keyfile, [], [ignore], [ignore]) +AT_CHECK(MTN read nonexistent, [1], [ignore], [ignore]) +AT_CHECK(MTN read foo.keyfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls keys, [], [stdout], [ignore]) +AT_CHECK(MTN ls keys, [], [stdout], [ignore]) AT_CHECK(QGREP(foo stdout), []) AT_CLEANUP ============================================================ --- tests/t_read_privkey.at d03aae665c6a20fb4434dc2004a7ca37171027d5 +++ tests/t_read_privkey.at a96894993ff4d8563d382bf843bd466585cc2acc @@ -1,5 +1,5 @@ AT_SETUP([read and convert old privkey packet]) -MONOTONE_SETUP +MTN_SETUP # this is an old privkey generated with 0.23 @@ -19,9 +19,9 @@ @<:@end@:>@ ]) -AT_CHECK(MONOTONE read pkt, [], [ignore], [stderr]) +AT_CHECK(MTN read pkt, [], [ignore], [stderr]) AT_CHECK(QGREP "read 1 packet" stderr) -AT_CHECK(MONOTONE ls keys, [], [stdout]) +AT_CHECK(MTN ls keys, [], [stdout]) AT_CHECK(QGREP "address@hidden" stdout) ADD_FILE(foo, [foo @@ -30,6 +30,6 @@ # check that we can use the key we just read # if it imported wrong, it'll fail by not accepting the passphrase -AT_CHECK((echo address@hidden; echo address@hidden) | MONOTONE ci -b foo -m bar, [], [ignore], [ignore]) +AT_CHECK((echo address@hidden; echo address@hidden) | MTN ci -b foo -m bar, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_refresh_inodeprints.at 4a52c531307debc050c3f4fa55186141e5d3d68c +++ tests/t_refresh_inodeprints.at c68ae08b2a795bd9caab6c988bcfe1a40ae45582 @@ -1,5 +1,5 @@ AT_SETUP([refresh_inodeprints]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -7,7 +7,7 @@ AT_CHECK(test -e _MTN/inodeprints, [1]) -AT_CHECK(MONOTONE refresh_inodeprints) +AT_CHECK(MTN refresh_inodeprints) AT_CHECK(test -s _MTN/inodeprints) ============================================================ --- tests/t_related_merge2_data.at 9c17bfbe8a5babc3944229c8b57c293f6143376f +++ tests/t_related_merge2_data.at e2966b2d7b3ac5c809dee453afaaa16d3cb82340 @@ -1,5 +1,5 @@ AT_SETUP([merging data in unrelated files]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -21,19 +21,19 @@ ANC=`BASE_REVISION` AT_CHECK(cp -f left testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) LEFT=`BASE_REVISION` REVERT_TO($ANC) AT_CHECK(cp -f right testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) COMMIT(testbranch) RIGHT=`BASE_REVISION` -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) AT_DATA(expected_foo, [irrelevant file ]) ============================================================ --- tests/t_remerge.at a77e22b1a429843b91a9c8810c0c359162c91040 +++ tests/t_remerge.at 1975b6f3a572f40f4b839a83ceaa54c7d56e318b @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([merging a rename twice]) -MONOTONE_SETUP +MTN_SETUP # x_branch y_branch # @@ -34,62 +34,62 @@ ]) # produce state A -AT_CHECK(MONOTONE add x, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.x commit --message 'state A', [], [ignore], [ignore]) +AT_CHECK(MTN add x, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.x commit --message 'state A', [], [ignore], [ignore]) A_REVISION_SHA=`BASE_REVISION` # produce state B echo "data of state B" >x -AT_CHECK(MONOTONE --branch=branch.x commit --message 'state B', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.x commit --message 'state B', [], [ignore], [ignore]) # produce state C echo "data of state C" >x -AT_CHECK(MONOTONE --branch=branch.x commit --message 'state C', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.x commit --message 'state C', [], [ignore], [ignore]) C_REVISION_SHA=`BASE_REVISION` # produce state E REVERT_TO($A_REVISION_SHA) -AT_CHECK(MONOTONE rename x y, [], [ignore], [ignore]) +AT_CHECK(MTN rename x y, [], [ignore], [ignore]) mv x y -AT_CHECK(MONOTONE --branch=branch.y commit --message 'state E', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y commit --message 'state E', [], [ignore], [ignore]) E_REVISION_SHA=`BASE_REVISION` # produce state F -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.y commit --message 'state F', [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y commit --message 'state F', [], [ignore], [ignore]) # produce state G -AT_CHECK(MONOTONE propagate branch.x branch.y, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.y update, [], [ignore], [ignore]) +AT_CHECK(MTN propagate branch.x branch.y, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y update, [], [ignore], [ignore]) G_REVISION_SHA=`BASE_REVISION` AT_CHECK(grep 'state C' y, [], [ignore], [ignore]) # produce state D REVERT_TO($C_REVISION_SHA) echo "data of state D" >x -AT_CHECK(MONOTONE add bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.x commit --message 'state D', [], [ignore], [ignore]) +AT_CHECK(MTN add bar, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.x commit --message 'state D', [], [ignore], [ignore]) # produce state H REVERT_TO($G_REVISION_SHA) -AT_CHECK(MONOTONE add baz, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.y commit --message 'state H', [], [ignore], [ignore]) +AT_CHECK(MTN add baz, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y commit --message 'state H', [], [ignore], [ignore]) # produce state I -AT_CHECK(MONOTONE propagate branch.x branch.y, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.y update, [], [ignore], [ignore]) +AT_CHECK(MTN propagate branch.x branch.y, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y update, [], [ignore], [ignore]) AT_CHECK(grep 'state D' y, [], [ignore], [ignore]) # produce state J REVERT_TO($E_REVISION_SHA) -AT_CHECK(MONOTONE add quux, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.y commit --message 'state J', [], [ignore], [ignore]) +AT_CHECK(MTN add quux, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y commit --message 'state J', [], [ignore], [ignore]) # produce state K -AT_CHECK(MONOTONE --branch=branch.y merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=branch.y update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=branch.y update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) +AT_CHECK(MTN automate get_manifest_of, [], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep y manifest, [], [ignore], [ignore]) AT_CHECK(grep -v x manifest, [], [ignore], [ignore]) ============================================================ --- tests/t_rename.at db57e180eba5fbf1ab8234c68f5af389d00f42c4 +++ tests/t_rename.at 0acd4c33b35c3576b131ceda42d97d7bf4b0a107 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([renaming a file]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo, [foo file ]) @@ -10,60 +10,60 @@ ]) # produce root -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(foo)` # produce move edge -AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo bar, [], [ignore], [ignore]) AT_CHECK(cp foo bar) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # revert to root PROBE_NODE(foo, $ROOT_R_SHA, $ROOT_F_SHA) AT_CHECK(rm bar) # make a simple add edge -AT_CHECK(MONOTONE add bleh, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add bleh, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # merge the add and the rename -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest_of, [ignore], [stdout]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) +AT_CHECK(MTN automate get_manifest_of, [ignore], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep bar manifest, [0], [ignore], [ignore]) AT_CHECK(grep bleh manifest, [0], [ignore], [ignore]) # rename a rename target -AT_CHECK(MONOTONE rename bleh blah, [], [ignore], [ignore]) +AT_CHECK(MTN rename bleh blah, [], [ignore], [ignore]) AT_CHECK(grep bleh _MTN/work, [0], [ignore], [ignore]) AT_CHECK(grep blah _MTN/work, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE rename blah blyh, [], [ignore], [ignore]) +AT_CHECK(MTN rename blah blyh, [], [ignore], [ignore]) AT_CHECK(grep bleh _MTN/work, [0], [ignore], [ignore]) AT_CHECK(grep blah _MTN/work, [1], [ignore], [ignore]) AT_CHECK(grep blyh _MTN/work, [0], [ignore], [ignore]) # undo a rename -AT_CHECK(MONOTONE rename blyh bleh, [], [ignore], [ignore]) +AT_CHECK(MTN rename blyh bleh, [], [ignore], [ignore]) AT_CHECK(test -f _MTN/work, [1], [ignore], [ignore]) # move file before renaming it -AT_CHECK(MONOTONE status, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [ignore], [ignore]) AT_CHECK(mv bar barfoo) -AT_CHECK(MONOTONE rename bar barfoo, [], [ignore], [stderr]) +AT_CHECK(MTN rename bar barfoo, [], [ignore], [stderr]) AT_CHECK(grep 'renaming bar to barfoo in workspace manifest' stderr, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [ignore], [ignore]) # move file to wrong place before renaming it AT_CHECK(mv barfoo bar) -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [ignore], [ignore]) AT_CHECK(mv bar barfoofoo) -AT_CHECK(MONOTONE rename bar barfoo, [], [ignore], [stderr]) +AT_CHECK(MTN rename bar barfoo, [], [ignore], [stderr]) AT_CHECK(grep 'renaming bar to barfoo in workspace manifest' stderr, [0], [ignore]) -AT_CHECK(MONOTONE status, [1], [ignore], [ignore]) +AT_CHECK(MTN status, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_rename_added_in_rename.at 986d6f8c484b4cd73df3e6df7c67ad61f3bd1a2d +++ tests/t_rename_added_in_rename.at f47f876338378bbb57230a07173af4b5f555145f @@ -1,5 +1,5 @@ AT_SETUP([merge with add, rename file, and rename dir]) -MONOTONE_SETUP +MTN_SETUP # This one's kind of complicated. # @@ -28,7 +28,7 @@ COMMIT(testbranch) BASE_R=`BASE_REVISION` -AT_CHECK(MONOTONE rename foo/ bar/, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo/ bar/, [], [ignore], [ignore]) AT_CHECK(mv foo bar) COMMIT(testbranch) RENAME_DIR_R=`BASE_REVISION` @@ -41,17 +41,17 @@ COMMIT(testbranch) ADDED_R=`BASE_REVISION` -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) AT_CHECK(mv foo/a foo/b) -AT_CHECK(MONOTONE rename foo/a foo/b, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo/a foo/b, [], [ignore], [ignore]) COMMIT(testbranch) RENAME_FILE_R=`BASE_REVISION` -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) -AT_CHECK( (cd test_dir && MONOTONE update --branch=testbranch), [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) +AT_CHECK( (cd test_dir && MTN update --branch=testbranch), [], [ignore], [ignore]) TEST_R=`cd test_dir; BASE_REVISION` AT_CHECK(test $TEST_R != $BASE_R) ============================================================ --- tests/t_rename_attr.at 45118187a514afa2d945b3c9a98b8b2c0580d7a2 +++ tests/t_rename_attr.at 1cdfbc94b56b189e57f55b765f77c58858c3ec67 @@ -1,26 +1,26 @@ AT_SETUP([rename moves attributes]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [foo bar ]) -AT_CHECK(MONOTONE attr set testfile some_key some_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr set testfile some_key some_value, [], [ignore], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(some_key stdout)) AT_CHECK(QGREP(some_value stdout)) COMMIT(testbranch) -AT_CHECK(MONOTONE rename testfile otherfile, [], [ignore], [ignore]) +AT_CHECK(MTN rename testfile otherfile, [], [ignore], [ignore]) AT_CHECK(mv testfile otherfile) COMMIT(testbranch) # Create a new testfile, so 'attr get' has a chance to succeed ADD_FILE(testfile, [thing stuff ]) -AT_CHECK(MONOTONE attr get testfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr get testfile, [], [stdout], [ignore]) AT_CHECK(QGREP(some_key stdout), [1]) AT_CHECK(QGREP(some_value stdout), [1]) -AT_CHECK(MONOTONE attr get otherfile, [], [stdout], [ignore]) +AT_CHECK(MTN attr get otherfile, [], [stdout], [ignore]) AT_CHECK(QGREP(some_key stdout)) AT_CHECK(QGREP(some_value stdout)) ============================================================ --- tests/t_rename_conflict.at 2b20920ba1f699e4d609457bd83703baac7144ad +++ tests/t_rename_conflict.at 313a7ca0ff8a527b4f73a581be77f2d10a4da06c @@ -1,5 +1,5 @@ AT_SETUP([merge(, )]) -MONOTONE_SETUP +MTN_SETUP # Should cause a merge conflict. @@ -9,16 +9,16 @@ BASE_R=`BASE_REVISION` AT_CHECK(mv a b) -AT_CHECK(MONOTONE rename a b, [], [ignore], [ignore]) +AT_CHECK(MTN rename a b, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(mv b a) REVERT_TO($BASE_R) AT_CHECK(mv a c) -AT_CHECK(MONOTONE rename a c, [], [ignore], [ignore]) +AT_CHECK(MTN rename a c, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE merge --branch=testbranch, [1], [ignore], [ignore]) +AT_CHECK(MTN merge --branch=testbranch, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_rename_destdir.at 8e16b441f52d44260f34fa9edd99ca92c3b5863a +++ tests/t_rename_destdir.at 47c94ebe2a1adecb069fc4c865f1c4470194a9e3 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([rename files into a directory]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(gnat, [gnat ]) @@ -27,43 +27,43 @@ # checkout in a clean dir and cd there m4_define([REN_CHECKOUT], [ AT_CHECK(rm -fr $_ROOT_DIR/checkout, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout -b testbranch $_ROOT_DIR/checkout, [0], [ignore], [ignore]) +AT_CHECK(MTN checkout -b testbranch $_ROOT_DIR/checkout, [0], [ignore], [ignore]) ]) REN_CHECKOUT # basics -AT_CHECK(cd checkout && MONOTONE rename ant foo, [0], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE rename mosquito termite foo, [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename ant foo, [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename mosquito termite foo, [0], [ignore], [ignore]) REN_CHECKOUT # with --execute -AT_CHECK(cd checkout && MONOTONE --execute rename ant foo, [0], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE --execute rename mosquito termite foo, [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN --execute rename ant foo, [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN --execute rename mosquito termite foo, [0], [ignore], [ignore]) AT_CHECK(cd checkout && test -e foo/ant -a -e foo/mosquito -a -e foo/termite) AT_CHECK(cd checkout && test ! -e ant -a ! -e mosquito -a ! -e termite) # to root -AT_CHECK(cd checkout && MONOTONE --execute rename foo/ant ., [0], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE rename foo/termite ., [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN --execute rename foo/ant ., [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename foo/termite ., [0], [ignore], [ignore]) AT_CHECK(cd checkout && test -e ant -a -e foo/termite -a ! -e foo/ant -a ! -e termite) REN_CHECKOUT # conflicts -AT_CHECK(cd checkout && MONOTONE rename gnat foo, [1], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE rename gnat termite foo, [1], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE rename termite foo, [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename gnat foo, [1], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename gnat termite foo, [1], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename termite foo, [0], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE rename mosquito foo/ant, [0], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE rename ant foo, [1], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename mosquito foo/ant, [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN rename ant foo, [1], [ignore], [ignore]) REN_CHECKOUT -AT_CHECK(cd checkout && MONOTONE --execute rename gnat foo, [1], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE --execute rename gnat termite foo, [1], [ignore], [ignore]) -AT_CHECK(cd checkout && MONOTONE --execute rename termite foo, [0], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN --execute rename gnat foo, [1], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN --execute rename gnat termite foo, [1], [ignore], [ignore]) +AT_CHECK(cd checkout && MTN --execute rename termite foo, [0], [ignore], [ignore]) AT_CHECK(cd checkout && test -e foo/termite -a ! -e termite -a -e gnat -a -d foo/gnat -a ! -e foo/gnat/gnat) REN_CHECKOUT ============================================================ --- tests/t_rename_diff_names.at 6bf74dfd0239f9cd781fae7a7871f490f9bc82f3 +++ tests/t_rename_diff_names.at fefdeb0fe53a6cfb68f3d0aa66125541aeec58ae @@ -1,8 +1,8 @@ AT_SETUP([filenames in diff after rename]) -MONOTONE_SETUP +MTN_SETUP # If a file is renamed from "testfile" to "otherfile" and has changes, -# then 'monotone diff' should display: +# then 'mtn diff' should display: # --- testfile # +++ otherfile @@ -12,11 +12,11 @@ SET_FILE(testfile, [stuff stuff ]) -AT_CHECK(MONOTONE rename --execute testfile otherfile, [], [ignore], [ignore]) +AT_CHECK(MTN rename --execute testfile otherfile, [], [ignore], [ignore]) AT_CHECK(test -f otherfile) -AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(MTN diff, [], [stdout], [ignore]) AT_CHECK(QGREP(-- "--- testfile" stdout)) AT_CHECK(QGREP(-- "+++ otherfile" stdout)) ============================================================ --- tests/t_rename_dir_add_dir_with_old_name.at 20a0beb813e9b6231c13fada0408b1e876db7a3a +++ tests/t_rename_dir_add_dir_with_old_name.at 611601dcd075b5c27d82a988f2304ec252c36475 @@ -1,25 +1,25 @@ # -*- Autoconf -*- AT_SETUP([renaming a directory and then adding a new with the old name]) -MONOTONE_SETUP +MTN_SETUP # add 'foo/test' file AT_CHECK(mkdir foo) AT_DATA(foo/test, [test file in foo dir ]) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) # rename 'foo' dir to 'bar' -AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo bar, [], [ignore], [ignore]) AT_CHECK(mv foo bar) # add new 'foo' dir AT_CHECK(mkdir foo) AT_DATA(foo/test, [test file in new foo dir ]) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) COMMIT(testbranch) AT_CLEANUP ============================================================ --- tests/t_rename_dir_cross_level.at 400f1b82f0f9594a2c6592c420a9728a9b75f250 +++ tests/t_rename_dir_cross_level.at e27892fc6963f95aa5554bbc2adcaa4aeb280a87 @@ -1,5 +1,5 @@ AT_SETUP([rename_dir to non-sibling]) -MONOTONE_SETUP +MTN_SETUP # Pretty rigorous test of rename_dir, in particular when the target # and source of the rename are not sibling directories. @@ -35,29 +35,29 @@ ]) ADD_FILE($OLD_DIR/new-file, [foo ping ]) -AT_CHECK(MONOTONE rename $OLD_DIR/rename-out-file rename-out-file, [], [ignore], [ignore]) +AT_CHECK(MTN rename $OLD_DIR/rename-out-file rename-out-file, [], [ignore], [ignore]) AT_CHECK(mv $OLD_DIR/rename-out-file rename-out-file) -AT_CHECK(MONOTONE rename $OLD_DIR/rename-out-dir rename-out-dir, [], [ignore], [ignore]) +AT_CHECK(MTN rename $OLD_DIR/rename-out-dir rename-out-dir, [], [ignore], [ignore]) AT_CHECK(mv $OLD_DIR/rename-out-dir rename-out-dir) -AT_CHECK(MONOTONE rename rename-in-dir $OLD_DIR/rename-in-dir, [], [ignore], [ignore]) +AT_CHECK(MTN rename rename-in-dir $OLD_DIR/rename-in-dir, [], [ignore], [ignore]) AT_CHECK(mv rename-in-dir $OLD_DIR/rename-in-dir) -AT_CHECK(MONOTONE rename rename-in-file $OLD_DIR/rename-in-file, [], [ignore], [ignore]) +AT_CHECK(MTN rename rename-in-file $OLD_DIR/rename-in-file, [], [ignore], [ignore]) AT_CHECK(mv rename-in-file $OLD_DIR/rename-in-file) -AT_CHECK(MONOTONE drop $OLD_DIR/doomed, [], [ignore], [ignore]) +AT_CHECK(MTN drop $OLD_DIR/doomed, [], [ignore], [ignore]) COMMIT(testbranch) LEFT_R=`BASE_REVISION` REVERT_TO($BASE_R) -AT_CHECK(MONOTONE rename $OLD_DIR/ $NEW_DIR/, [], [ignore], [ignore]) +AT_CHECK(MTN rename $OLD_DIR/ $NEW_DIR/, [], [ignore], [ignore]) AT_CHECK(mv $OLD_DIR $NEW_DIR) COMMIT(testbranch) RIGHT_R=`BASE_REVISION` -AT_CHECK(MONOTONE merge --branch=testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN merge --branch=testbranch, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) -AT_CHECK( (cd test_dir && MONOTONE --branch=testbranch update), [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) +AT_CHECK( (cd test_dir && MTN --branch=testbranch update), [], [ignore], [ignore]) MERGED_R=`cd test_dir && BASE_REVISION` AT_CHECK(test $BASE_R != $MERGED_R) AT_CHECK(test $LEFT_R != $MERGED_R) ============================================================ --- tests/t_rename_dir_patch.at 3a8a56c1deb3cc7ebc2158ab7b3b9b2403ab1ea0 +++ tests/t_rename_dir_patch.at cf4737e4c501c0e24e36ad934f0c7cffc3d01ead @@ -1,5 +1,5 @@ AT_SETUP([merge(, )]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) ADD_FILE(foo/a, [blah blah @@ -8,7 +8,7 @@ BASE_R=`BASE_REVISION` AT_CHECK(mv foo bar) -AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo bar, [], [ignore], [ignore]) COMMIT(testbranch) AT_CHECK(mv bar foo) @@ -18,10 +18,10 @@ ]) COMMIT(testbranch) -AT_CHECK(MONOTONE --branch=testbranch merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) -AT_CHECK( (cd test_dir && MONOTONE update --branch=testbranch), [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$BASE_R test_dir, [], [ignore], [ignore]) +AT_CHECK( (cd test_dir && MTN update --branch=testbranch), [], [ignore], [ignore]) AT_CHECK(test ! -f test_dir/foo/a) AT_CHECK(test -f test_dir/bar/a) ============================================================ --- tests/t_rename_execute.at 691eb8c88e9c604222199bd7d229fd916cafde3d +++ tests/t_rename_execute.at dc2ad16d08ce135647787d9401ca02062f26d6e6 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([rename with actual file rename]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(file0, [file 0 ]) @@ -11,9 +11,9 @@ ADD_FILE(file2, [file 2 ]) -AT_CHECK(MONOTONE rename file0 newfile0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename --execute file1 newfile1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename -e file2 newfile2, [], [ignore], [ignore]) +AT_CHECK(MTN rename file0 newfile0, [], [ignore], [ignore]) +AT_CHECK(MTN rename --execute file1 newfile1, [], [ignore], [ignore]) +AT_CHECK(MTN rename -e file2 newfile2, [], [ignore], [ignore]) AT_CHECK(test -f file0, [], [ignore], [ignore]) AT_CHECK(test -f file1, [1], [ignore], [ignore]) ============================================================ --- tests/t_rename_file_to_dir.at 2c57a749942a915191f822db0d390e4c9940cd88 +++ tests/t_rename_file_to_dir.at cb24e3c2ee9c4b02bfee44e9f4451de09363f63f @@ -1,5 +1,5 @@ AT_SETUP([rename file to dir]) -MONOTONE_SETUP +MTN_SETUP # this test is a bug report # the situation where a file is renamed to a dir should be trapped and @@ -12,9 +12,9 @@ COMMIT(testbranch) AT_CHECK(mkdir dir) -AT_CHECK(MONOTONE rename file dir, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [3], [ignore], [ignore]) -AT_CHECK(MONOTONE diff, [3], [ignore], [ignore]) +AT_CHECK(MTN rename file dir, [], [ignore], [ignore]) +AT_CHECK(MTN status, [3], [ignore], [ignore]) +AT_CHECK(MTN diff, [3], [ignore], [ignore]) AT_CHECK(false) ============================================================ --- tests/t_renamed.at bb95c0a19d39188374eaa64ee10651cf6bc312cb +++ tests/t_renamed.at 917a6a39e99006f0d14586584e764d144e6dfeef @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([renaming a directory]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) @@ -12,15 +12,15 @@ ]) # produce root -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(foo/foo)` # produce move edge -AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore]) +AT_CHECK(MTN rename foo bar, [], [ignore], [ignore]) AT_CHECK(cp -pr foo bar) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # revert to root PROBE_NODE(foo/foo, $ROOT_R_SHA, $ROOT_F_SHA) @@ -29,13 +29,13 @@ # make an add *into the directory* AT_DATA(foo/bar, [bar file ]) -AT_CHECK(MONOTONE add foo/bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add foo/bar, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) # merge the add and the rename -AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest_of, [ignore], [stdout]) +AT_CHECK(MTN merge, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) +AT_CHECK(MTN automate get_manifest_of, [ignore], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep bar/bar manifest, [0], [ignore], [ignore]) AT_CHECK(grep bar/foo manifest, [0], [ignore], [ignore]) ============================================================ --- tests/t_replace_dir_with_file.at 8e6eccb9b9e04de4a9601fa4a1d3d0c8ce61ece3 +++ tests/t_replace_dir_with_file.at 17bf7bc70bc45c822e0499698a1f8033fbdd2dae @@ -1,5 +1,5 @@ AT_SETUP([replace dir with file]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir dir) ADD_FILE(dir/file, [file @@ -10,7 +10,7 @@ AT_DATA(dir, [this isn't a directory ]) -AT_CHECK(MONOTONE status, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE diff, [1], [ignore], [ignore]) +AT_CHECK(MTN status, [1], [ignore], [ignore]) +AT_CHECK(MTN diff, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_replace_file_with_dir.at 8cdc795662782f9609d8e5620e9ce9db00103a96 +++ tests/t_replace_file_with_dir.at de21f722d01626bc2d752926be268012c024490f @@ -1,5 +1,5 @@ AT_SETUP([replace file with dir]) -MONOTONE_SETUP +MTN_SETUP # this test is a bug report # the situation where a file is replaced by a dir should be trapped and @@ -13,8 +13,8 @@ AT_CHECK(rm file) AT_CHECK(mkdir file) -AT_CHECK(MONOTONE status, [3], [ignore], [ignore]) -AT_CHECK(MONOTONE diff, [3], [ignore], [ignore]) +AT_CHECK(MTN status, [3], [ignore], [ignore]) +AT_CHECK(MTN diff, [3], [ignore], [ignore]) AT_CHECK(false) ============================================================ --- tests/t_restricted_commands_consistent.at e11f8aafa55195d6350e35bd53e9fc0e11b0d1d6 +++ tests/t_restricted_commands_consistent.at 353aef2051932de6ab4bc5248e652221ee4a572e @@ -1,5 +1,5 @@ AT_SETUP([restricted commands are consistent]) -MONOTONE_SETUP +MTN_SETUP # the following commands accept file arguments and --exclude and --depth # options used to define a restriction on the files that will be processed: @@ -39,7 +39,7 @@ # $1 the monotone command and associated arguments to run m4_define([RUN], [ -AT_CHECK(MONOTONE $1, [], [stdout], [stderr]) +AT_CHECK(MTN $1, [], [stdout], [stderr]) ]) # $1 0 or 1 to indicate whether grep should find find words in the output or not @@ -97,7 +97,7 @@ AT_CHECK(mkdir foo/bar) PATCH_FILES(initial addition of files) -AT_CHECK(MONOTONE add file1 file2 foo, [], [ignore], [ignore]) +AT_CHECK(MTN add file1 file2 foo, [], [ignore], [ignore]) COMMIT(testbranch) # check that ls unknown/ignored/missing/known, status, diff, revert and commit @@ -106,13 +106,13 @@ # ls unknown # dropped files are valid for restriction but are unknown in the post-state -AT_CHECK(MONOTONE drop file1 file2 foo/foo1 foo/foo2 foo/bar/bar1 foo/bar/bar2, [], [ignore], [ignore]) +AT_CHECK(MTN drop file1 file2 foo/foo1 foo/foo2 foo/bar/bar1 foo/bar/bar2, [], [ignore], [ignore]) TEST(ls unknown $ROOT_ARGS, stdout, $ROOT_INCLUDED, $ROOT_EXCLUDED) TEST(ls unknown $INCLUDE_ARGS, stdout, $INCLUDE_INCLUDED, $INCLUDE_EXCLUDED) TEST(ls unknown $EXCLUDE_ARGS, stdout, $EXCLUDE_INCLUDED, $EXCLUDE_EXCLUDED) TEST(ls unknown $BOTH_ARGS, stdout, $BOTH_INCLUDED, $BOTH_EXCLUDED) TEST(ls unknown $DEPTH_ARGS, stdout, $DEPTH_INCLUDED, $DEPTH_EXCLUDED) -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) # ls ignored @@ -125,13 +125,13 @@ ]) # only unknown files are considered by ls ignored -AT_CHECK(MONOTONE drop file1 file2 foo/foo1 foo/foo2 foo/bar/bar1 foo/bar/bar2, [], [ignore], [ignore]) +AT_CHECK(MTN drop file1 file2 foo/foo1 foo/foo2 foo/bar/bar1 foo/bar/bar2, [], [ignore], [ignore]) TEST(ls ignored --rcfile ignore.lua $ROOT_ARGS, stdout, $ROOT_INCLUDED, $ROOT_EXCLUDED) TEST(ls ignored --rcfile ignore.lua $INCLUDE_ARGS, stdout, $INCLUDE_INCLUDED, $INCLUDE_EXCLUDED) TEST(ls ignored --rcfile ignore.lua $EXCLUDE_ARGS, stdout, $EXCLUDE_INCLUDED, $EXCLUDE_EXCLUDED) TEST(ls ignored --rcfile ignore.lua $BOTH_ARGS, stdout, $BOTH_INCLUDED, $BOTH_EXCLUDED) TEST(ls ignored --rcfile ignore.lua $DEPTH_ARGS, stdout, $DEPTH_INCLUDED, $DEPTH_EXCLUDED) -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) # ls missing @@ -141,7 +141,7 @@ TEST(ls missing $EXCLUDE_ARGS, stdout, $EXCLUDE_INCLUDED, $EXCLUDE_EXCLUDED) TEST(ls missing $BOTH_ARGS, stdout, $BOTH_INCLUDED, $BOTH_EXCLUDED) TEST(ls missing $DEPTH_ARGS, stdout, $DEPTH_INCLUDED, $DEPTH_EXCLUDED) -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) PATCH_FILES(changes for testing ls known, status, diff) @@ -193,9 +193,9 @@ RUN(commit -m root $ROOT_ARGS) NEW=`BASE_REVISION` -AT_CHECK(MONOTONE status, [], [stdout], [stderr]) +AT_CHECK(MTN status, [], [stdout], [stderr]) CHECK(stdout, $ROOT_EXCLUDED, $ROOT_INCLUDED) -AT_CHECK(MONOTONE diff -r $OLD -r $NEW, [], [stdout], [ignore]) +AT_CHECK(MTN diff -r $OLD -r $NEW, [], [stdout], [ignore]) CHECK(stdout, $ROOT_INCLUDED, $ROOT_EXCLUDED) OLD=`BASE_REVISION` @@ -203,9 +203,9 @@ RUN(commit -m includes $INCLUDE_ARGS) NEW=`BASE_REVISION` -AT_CHECK(MONOTONE diff -r $OLD -r $NEW, [], [stdout], [ignore]) +AT_CHECK(MTN diff -r $OLD -r $NEW, [], [stdout], [ignore]) CHECK(stdout, $INCLUDE_INCLUDED, $INCLUDE_EXCLUDED) -AT_CHECK(MONOTONE diff -r $OLD -r $NEW, [], [stdout], [ignore]) +AT_CHECK(MTN diff -r $OLD -r $NEW, [], [stdout], [ignore]) CHECK(stdout, $INCLUDE_INCLUDED, $INCLUDE_EXCLUDED) OLD=`BASE_REVISION` @@ -213,9 +213,9 @@ RUN(commit -m excludes $EXCLUDE_ARGS) NEW=`BASE_REVISION` -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) CHECK(stdout, $EXCLUDE_EXCLUDED, $EXCLUDE_INCLUDED) -AT_CHECK(MONOTONE diff -r $OLD -r $NEW, [], [stdout], [ignore]) +AT_CHECK(MTN diff -r $OLD -r $NEW, [], [stdout], [ignore]) CHECK(stdout, $EXCLUDE_INCLUDED, $EXCLUDE_EXCLUDED) OLD=`BASE_REVISION` @@ -223,9 +223,9 @@ RUN(commit -m both $BOTH_ARGS) NEW=`BASE_REVISION` -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) CHECK(stdout, $BOTH_EXCLUDED, $BOTH_INCLUDED) -AT_CHECK(MONOTONE diff -r $OLD -r $NEW, [], [stdout], [ignore]) +AT_CHECK(MTN diff -r $OLD -r $NEW, [], [stdout], [ignore]) CHECK(stdout, $BOTH_INCLUDED, $BOTH_EXCLUDED) OLD=`BASE_REVISION` @@ -233,9 +233,9 @@ RUN(commit -m depth $DEPTH_ARGS) NEW=`BASE_REVISION` -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) CHECK(stdout, $DEPTH_EXCLUDED, $DEPTH_INCLUDED) -AT_CHECK(MONOTONE diff -r $OLD -r $NEW, [], [stdout], [ignore]) +AT_CHECK(MTN diff -r $OLD -r $NEW, [], [stdout], [ignore]) CHECK(stdout, $DEPTH_INCLUDED, $DEPTH_EXCLUDED) AT_CLEANUP ============================================================ --- tests/t_restricted_commit_with_inodeprints.at 0761808634d3e002cf9bd48b83e8a9a4ef088d9a +++ tests/t_restricted_commit_with_inodeprints.at e58a07fda8ad6d5ce61825f024d188644775fe34 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([restricted commit with inodeprints]) -MONOTONE_SETUP +MTN_SETUP # this test is a bug report. the problem is that inodeprints tries to update its # cache for all files in the complete manifest, but a restricted commit can @@ -29,7 +29,7 @@ COMMIT(testbranch) # enable inodeprints mode -AT_CHECK(MONOTONE refresh_inodeprints, [], [ignore], [ignore]) +AT_CHECK(MTN refresh_inodeprints, [], [ignore], [ignore]) ADD_FILE(file2, [file2 ]) @@ -41,6 +41,6 @@ # restricted commit of file2 succeeds with file1 missing # but the corresponding inodeprint update fails -AT_CHECK(MONOTONE commit --message 'file2' file2, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message 'file2' file2, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_restricted_diff_unchanged.at aa1b5c9d50296b24e69a619088806821993b7c1a +++ tests/t_restricted_diff_unchanged.at dc2f5623a3d5ea956e85ab337e93a518dd2a4184 @@ -1,5 +1,5 @@ AT_SETUP([diff -rREV1 -rREV2 UNCHANGED-FILE]) -MONOTONE_SETUP +MTN_SETUP # This test is a bug report. The problem appears to be in # calculated_restricted_change_set, as called by do_diffs; it passes a @@ -18,6 +18,6 @@ COMMIT(testbranch) R2=`BASE_REVISION` -AT_CHECK(MONOTONE diff -r$R1 -r$R2 testfile, [], [], [ignore]) +AT_CHECK(MTN diff -r$R1 -r$R2 testfile, [], [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_restriction_excludes_parent.at 47287111c7d5732ff50a467e6514ad0c99c00a41 +++ tests/t_restriction_excludes_parent.at 14383c7d022554d07f4e1e618c46293f8639c4ee @@ -1,5 +1,5 @@ AT_SETUP([restriction excludes parent dir]) -MONOTONE_SETUP +MTN_SETUP # - restricting a new project excludes the root directory addition # - restricting to things below a newly added directory excludes the directory @@ -17,7 +17,7 @@ ]) # exclude newly added root dir but include file below it -AT_CHECK(MONOTONE st file, [1], [ignore], [ignore]) +AT_CHECK(MTN st file, [1], [ignore], [ignore]) COMMIT(testbranch) @@ -28,6 +28,6 @@ # exclude newly added foo dir but include bar below it -AT_CHECK(MONOTONE st foo/bar, [1], [ignore], [ignore]) +AT_CHECK(MTN st foo/bar, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_restriction_with_exclude.at d356460f153f0a8c64052b530d07c6e3da6b8bf5 +++ tests/t_restriction_with_exclude.at d26edc65c12d59094abb5e396c1fc81c301527c0 @@ -1,5 +1,5 @@ AT_SETUP([use restrictions with --exclude]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) AT_DATA(file1, [x @@ -7,10 +7,10 @@ AT_DATA(foo/bar, [y ]) -AT_CHECK(MONOTONE add file1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add foo/bar, [], [ignore], [ignore]) +AT_CHECK(MTN add file1, [], [ignore], [ignore]) +AT_CHECK(MTN add foo/bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ci --exclude . -m 'x', [1], [ignore], [ignore]) +AT_CHECK(MTN ci --exclude . -m 'x', [1], [ignore], [ignore]) # this is dumb. excluding the whole tree and including file1 is # equivalent to just including file1. except that at this point @@ -18,29 +18,29 @@ # excludes this creation. this causes the commit to fail because # file1 has no parent. # -# AT_CHECK(MONOTONE ci --exclude . file1 -m 'x', [], [ignore], [ignore]) -# AT_CHECK(MONOTONE status --brief | grep "foo/bar", [], [ignore], [ignore]) -# AT_CHECK(MONOTONE status --brief | grep "file1", [1], [ignore], [ignore]) +# AT_CHECK(MTN ci --exclude . file1 -m 'x', [], [ignore], [ignore]) +# AT_CHECK(MTN status --brief | grep "foo/bar", [], [ignore], [ignore]) +# AT_CHECK(MTN status --brief | grep "file1", [1], [ignore], [ignore]) # AT_CHECK(echo a >>file1) -AT_CHECK(MONOTONE ci --exclude foo -m 'x', [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "foo/bar", [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "file1", [1], [ignore], [ignore]) +AT_CHECK(MTN ci --exclude foo -m 'x', [], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "foo/bar", [], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "file1", [1], [ignore], [ignore]) AT_CHECK(echo a >>file1) -AT_CHECK(MONOTONE ci . --exclude file1 -m 'x', [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "foo/bar", [1], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "file1", [], [ignore], [ignore]) +AT_CHECK(MTN ci . --exclude file1 -m 'x', [], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "foo/bar", [1], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "file1", [], [ignore], [ignore]) AT_CHECK(echo b >>foo/bar) -AT_CHECK(MONOTONE ci . --exclude foo foo/bar -m 'x', [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "foo/bar", [1], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "file1", [1], [ignore], [ignore]) +AT_CHECK(MTN ci . --exclude foo foo/bar -m 'x', [], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "foo/bar", [1], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "file1", [1], [ignore], [ignore]) AT_CHECK(echo a >>file1) AT_CHECK(echo b >>foo/bar) -AT_CHECK(MONOTONE ci --exclude foo foo/bar -m 'x', [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "foo/bar", [1], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "file1", [], [ignore], [ignore]) +AT_CHECK(MTN ci --exclude foo foo/bar -m 'x', [], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "foo/bar", [1], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "file1", [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_restriction_with_exclude_iprint.at 9eeb53c39d2dc0fe57457a538e4765ad15dfe1ee +++ tests/t_restriction_with_exclude_iprint.at 64920c090989d93b7c8bcd5026d539dcc39b45b5 @@ -1,5 +1,5 @@ AT_SETUP([use restrictions with --exclude and inodeprints]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) AT_DATA(file1, [x @@ -7,15 +7,15 @@ AT_DATA(foo/bar, [y ]) -AT_CHECK(MONOTONE add file1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add foo/bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE ci -m 'x', [], [ignore], [ignore]) +AT_CHECK(MTN add file1, [], [ignore], [ignore]) +AT_CHECK(MTN add foo/bar, [], [ignore], [ignore]) +AT_CHECK(MTN ci -m 'x', [], [ignore], [ignore]) -AT_CHECK(monotone refresh_inodeprints) +AT_CHECK(MTN refresh_inodeprints) AT_CHECK(echo a >>file1) AT_CHECK(echo b >>foo/bar) -AT_CHECK(MONOTONE ci --exclude foo -m 'x', [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "foo/bar", [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief | grep "file1", [1], [ignore], [ignore]) +AT_CHECK(MTN ci --exclude foo -m 'x', [], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "foo/bar", [], [ignore], [ignore]) +AT_CHECK(MTN status --brief | grep "file1", [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_restrictions.at 765a23ae21d3034f6a94899cc919b7962e2ed239 +++ tests/t_restrictions.at 0afe18c3c6fb8ede3414612e9f380f648266dab7 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([manifest restrictions]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(ignored.lua, [ function ignore_file(name) @@ -36,53 +36,53 @@ AT_DATA(work/A/B/fileAB, [file in a deeper subdirectory ]) -AT_CHECK(MONOTONE add work/fileX, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add work/file2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add work/file3, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add work/A/fileA, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add work/A/B/fileAB, [], [ignore], [ignore]) +AT_CHECK(MTN add work/fileX, [], [ignore], [ignore]) +AT_CHECK(MTN add work/file2, [], [ignore], [ignore]) +AT_CHECK(MTN add work/file3, [], [ignore], [ignore]) +AT_CHECK(MTN add work/A/fileA, [], [ignore], [ignore]) +AT_CHECK(MTN add work/A/B/fileAB, [], [ignore], [ignore]) # initial commit -AT_CHECK(MONOTONE --branch=testbranch commit --message='add file[X23]', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='add file[X23]', [], [ignore], [ignore]) -AT_CHECK(MONOTONE ls known --depth=0, [], [stdout], [ignore]) +AT_CHECK(MTN ls known --depth=0, [], [stdout], [ignore]) AT_CHECK(grep fileX stdout, [1], [ignore]) -AT_CHECK(MONOTONE ls known --depth=0 . , [], [stdout], [ignore]) +AT_CHECK(MTN ls known --depth=0 . , [], [stdout], [ignore]) AT_CHECK(grep fileX stdout, [1], [ignore]) -AT_CHECK(MONOTONE ls known --depth=1 . , [], [stdout], [ignore]) +AT_CHECK(MTN ls known --depth=1 . , [], [stdout], [ignore]) AT_CHECK(grep fileX stdout, [0], [ignore]) -AT_CHECK(MONOTONE ls known --depth=0 work/A , [], [stdout], [ignore]) +AT_CHECK(MTN ls known --depth=0 work/A , [], [stdout], [ignore]) AT_CHECK(grep fileAB stdout, [1], [ignore]) -AT_CHECK(MONOTONE ls known --depth=1 work/A , [], [stdout], [ignore]) +AT_CHECK(MTN ls known --depth=1 work/A , [], [stdout], [ignore]) AT_CHECK(grep fileAB stdout, [0], [ignore]) # test restriction of unknown, missing, ignored files -AT_CHECK(MONOTONE ls unknown, [], [stdout], [ignore]) +AT_CHECK(MTN ls unknown, [], [stdout], [ignore]) AT_CHECK(grep work/file4 stdout, [0], [ignore]) -AT_CHECK(MONOTONE ls unknown work, [], [stdout], [ignore]) +AT_CHECK(MTN ls unknown work, [], [stdout], [ignore]) AT_CHECK(grep work/file4 stdout, [0], [ignore]) AT_CHECK(mv work/file2 work/filex2) -AT_CHECK(MONOTONE ls missing, [], [stdout], [ignore]) +AT_CHECK(MTN ls missing, [], [stdout], [ignore]) AT_CHECK(grep work/file2 stdout, [0], [ignore]) -AT_CHECK(MONOTONE ls missing work/file2, [], [stdout], [ignore]) +AT_CHECK(MTN ls missing work/file2, [], [stdout], [ignore]) AT_CHECK(grep work/file2 stdout, [0], [ignore]) AT_CHECK(mv work/filex2 work/file2) -AT_CHECK(MONOTONE ls ignored --rcfile=ignored.lua, [], [stdout], [ignore]) +AT_CHECK(MTN ls ignored --rcfile=ignored.lua, [], [stdout], [ignore]) AT_CHECK(grep work/foo.o stdout, [0], [ignore]) -AT_CHECK(MONOTONE ls ignored --rcfile=ignored.lua work, [], [stdout], [ignore]) +AT_CHECK(MTN ls ignored --rcfile=ignored.lua work, [], [stdout], [ignore]) AT_CHECK(grep work/foo.o stdout, [0], [ignore]) # create moved, dropped, and changed work to test status, diff, commit @@ -99,9 +99,9 @@ AT_DATA(work/A/B/fileAB, [version 2 of fileAB with some changes ]) -AT_CHECK(MONOTONE rename work/fileX work/file1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop work/file2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add work/file4, [], [ignore], [ignore]) +AT_CHECK(MTN rename work/fileX work/file1, [], [ignore], [ignore]) +AT_CHECK(MTN drop work/file2, [], [ignore], [ignore]) +AT_CHECK(MTN add work/file4, [], [ignore], [ignore]) # moved fileX to file1 # dropped file2 @@ -132,108 +132,108 @@ # status -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(INCLUDED(X 1 2 3 4), [0], [ignore]) # include both source and target of rename -AT_CHECK(MONOTONE status work/fileX work/file1, [], [stdout], [ignore]) +AT_CHECK(MTN status work/fileX work/file1, [], [stdout], [ignore]) AT_CHECK(INCLUDED(X 1),[0], [ignore]) AT_CHECK(EXCLUDED(2 3 4), [0], [ignore]) # include drop -AT_CHECK(MONOTONE status work/file2, [], [stdout], [ignore]) +AT_CHECK(MTN status work/file2, [], [stdout], [ignore]) AT_CHECK(INCLUDED(2), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 3 4), [0], [ignore]) # include delta -AT_CHECK(MONOTONE status work/file3, [], [stdout], [ignore]) +AT_CHECK(MTN status work/file3, [], [stdout], [ignore]) AT_CHECK(INCLUDED(3), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 2 4), [0], [ignore]) # include add -AT_CHECK(MONOTONE status work/file4, [], [stdout], [ignore]) +AT_CHECK(MTN status work/file4, [], [stdout], [ignore]) AT_CHECK(INCLUDED(4), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 2 3), [0], [ignore]) # diff -AT_CHECK(MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(MTN diff, [], [stdout], [ignore]) AT_CHECK(INCLUDED(X 1 2 3 4), [0], [ignore]) -AT_CHECK(MONOTONE diff --depth=0 . , [], [stdout], [ignore]) +AT_CHECK(MTN diff --depth=0 . , [], [stdout], [ignore]) AT_CHECK(grep fileAB stdout, [1], [ignore]) -AT_CHECK(MONOTONE diff --depth=2 . , [], [stdout], [ignore]) +AT_CHECK(MTN diff --depth=2 . , [], [stdout], [ignore]) AT_CHECK(grep fileA stdout, [0], [ignore]) -AT_CHECK(MONOTONE diff --context --depth=0 . , [], [stdout], [ignore]) +AT_CHECK(MTN diff --context --depth=0 . , [], [stdout], [ignore]) AT_CHECK(grep fileAB stdout, [1], [ignore]) -AT_CHECK(MONOTONE diff --context --depth=2 . , [], [stdout], [ignore]) +AT_CHECK(MTN diff --context --depth=2 . , [], [stdout], [ignore]) AT_CHECK(grep fileA stdout, [0], [ignore]) # include both source and target of rename -AT_CHECK(MONOTONE diff work/fileX work/file1, [], [stdout], [ignore]) +AT_CHECK(MTN diff work/fileX work/file1, [], [stdout], [ignore]) AT_CHECK(INCLUDED(X 1), [0], [ignore]) AT_CHECK(EXCLUDED(2 3 4), [0], [ignore]) # include drop -AT_CHECK(MONOTONE diff work/file2, [], [stdout], [ignore]) +AT_CHECK(MTN diff work/file2, [], [stdout], [ignore]) AT_CHECK(INCLUDED(2), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 3 4),[0], [ignore]) # include delta -AT_CHECK(MONOTONE diff work/file3, [], [stdout], [ignore]) +AT_CHECK(MTN diff work/file3, [], [stdout], [ignore]) AT_CHECK(INCLUDED(3), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 2 4),[0], [ignore]) # include add -AT_CHECK(MONOTONE diff work/file4, [], [stdout], [ignore]) +AT_CHECK(MTN diff work/file4, [], [stdout], [ignore]) AT_CHECK(INCLUDED(4), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 2 3),[0], [ignore]) # commit -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(INCLUDED(X 1 2 3 4), [0], [ignore]) # include rename source and target -AT_CHECK(MONOTONE commit --message='move fileX to file1' work/fileX work/file1, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message='move fileX to file1' work/fileX work/file1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(INCLUDED(2 3 4), [0], [ignore]) AT_CHECK(EXCLUDED(X 1), [0], [ignore]) # include drop -AT_CHECK(MONOTONE commit --message='drop file2' work/file2, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message='drop file2' work/file2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(INCLUDED(3 4), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 2), [0], [ignore]) # include delta -AT_CHECK(MONOTONE commit --message='change file3' work/file3, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message='change file3' work/file3, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(INCLUDED(4), [0], [ignore]) AT_CHECK(EXCLUDED(X 1 2 3), [0], [ignore]) # include add -AT_CHECK(MONOTONE commit --message='add file4' work/file4, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message='add file4' work/file4, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(EXCLUDED(X 1 2 3 4), [0], [ignore]) # setup for excluded commits @@ -265,8 +265,8 @@ AT_CHECK(ls, [], [ignore], []) -AT_CHECK(MONOTONE add file.*, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit --message='add 12 files', [], [ignore], [ignore]) +AT_CHECK(MTN add file.*, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message='add 12 files', [], [ignore], [ignore]) for i in one three four five six seven eight nine ten eleven do @@ -274,7 +274,7 @@ AT_CHECK(mv stdout file.$i) done -AT_CHECK(MONOTONE diff file.four file.ten, [], [stdout], [ignore]) +AT_CHECK(MTN diff file.four file.ten, [], [stdout], [ignore]) AT_CHECK(grep "file.four" stdout, [0], [ignore]) AT_CHECK(grep "file.ten" stdout, [0], [ignore]) ============================================================ --- tests/t_restrictions_warn_on_unknown.at b834d346d6cc5f559f9bbc6707128edc0b87c0ab +++ tests/t_restrictions_warn_on_unknown.at b9c525fc21221480da412bd6c7fbdfdeeb3a5b98 @@ -1,6 +1,6 @@ AT_SETUP([warn on bad restriction]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE diff bogusdir1 bogusdir2, [1], [ignore], [stderr]) +AT_CHECK(MTN diff bogusdir1 bogusdir2, [1], [ignore], [stderr]) AT_CLEANUP ============================================================ --- tests/t_revert.at b7a13168d70cb6b35d4967cda0a8af2b0f85ba5f +++ tests/t_revert.at 84792f4ca2448135cc5361e9068de9b934fbabbf @@ -1,15 +1,15 @@ # -*- Autoconf -*- AT_SETUP([revert file to base version]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(testfile0, [version 0 of first test file ]) -AT_CHECK(MONOTONE add testfile0, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile0, [], [ignore], [ignore]) V1=`SHA1(testfile0)` -AT_CHECK(MONOTONE --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) # check reverting a single file by name @@ -17,7 +17,7 @@ ]) AT_CHECK(grep squirrils testfile0, [0], [ignore]) -AT_CHECK(MONOTONE revert testfile0, [], [ignore], [ignore]) +AT_CHECK(MTN revert testfile0, [], [ignore], [ignore]) AT_CHECK(grep squirrils testfile0, [1], [ignore]) V2=`SHA1(testfile0)` AT_CHECK(test $V1 = $V2) @@ -27,36 +27,36 @@ AT_DATA(testfile0, [squirrils monkeys dingos ]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_CHECK(test ! -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) # check reverting a delete -AT_CHECK(MONOTONE drop testfile0, [0], [ignore], [ignore]) +AT_CHECK(MTN drop testfile0, [0], [ignore], [ignore]) AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_CHECK(test ! -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) # check reverting a change and a delete AT_CHECK(echo 'liver and maude' >> testfile0, [], [ignore]) -AT_CHECK(MONOTONE drop testfile0, [0], [ignore], [ignore]) +AT_CHECK(MTN drop testfile0, [0], [ignore], [ignore]) AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) -AT_CHECK(MONOTONE revert testfile0, [], [ignore], [ignore]) +AT_CHECK(MTN revert testfile0, [], [ignore], [ignore]) AT_CHECK(test ! -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) V3=`SHA1(testfile0)` AT_CHECK(test $V1 = $V3) @@ -65,13 +65,13 @@ AT_DATA(testfile1, [squirrils monkeys dingos ]) -AT_CHECK(MONOTONE add testfile1, [0], [ignore], [ignore]) +AT_CHECK(MTN add testfile1, [0], [ignore], [ignore]) AT_CHECK(grep testfile1 _MTN/work, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile1 stdout, [0], [ignore]) -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_CHECK(test ! -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile1 stdout, [1], [ignore]) # check reverting a directory @@ -79,56 +79,56 @@ AT_CHECK(mkdir sub, [], [ignore]) AT_DATA(sub/testfile2, [maude ]) -AT_CHECK(MONOTONE add sub/testfile2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit --message='new file', [], [ignore], [ignore]) +AT_CHECK(MTN add sub/testfile2, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message='new file', [], [ignore], [ignore]) AT_DATA(sub/testfile2, [liver ]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep sub stdout, [], [ignore]) -AT_CHECK(MONOTONE revert sub, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN revert sub, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep sub stdout, [1], [ignore]) # it also shouldn't matter how we spell the subdirectory name AT_DATA(sub/testfile2, [liver ]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep sub stdout, [], [ignore]) -AT_CHECK(MONOTONE revert sub/, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN revert sub/, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep sub stdout, [1], [ignore]) # check reverting a missing file -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_CHECK(rm testfile0) -AT_CHECK(MONOTONE status, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE revert testfile0, [], [stdout], [ignore]) -AT_CHECK(MONOTONE status, [], [ignore], [ignore]) +AT_CHECK(MTN status, [1], [ignore], [ignore]) +AT_CHECK(MTN revert testfile0, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [ignore], [ignore]) # check reverting some changes and leaving others -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(cp testfile0 foofile0, []) AT_CHECK(cp sub/testfile2 sub/foofile2, []) -AT_CHECK(MONOTONE rename testfile0 foofile0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename sub/testfile2 sub/foofile2, [], [ignore], [ignore]) +AT_CHECK(MTN rename testfile0 foofile0, [], [ignore], [ignore]) +AT_CHECK(MTN rename sub/testfile2 sub/foofile2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) AT_CHECK(grep foofile2 stdout, [0], [ignore]) AT_CHECK(test -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE revert sub/foofile2, [], [stdout]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN revert sub/foofile2, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) AT_CHECK(grep foofile2 stdout, [1], [ignore]) AT_CHECK(test -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE revert foofile0, [], [stdout]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN revert foofile0, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep foofile0 stdout, [1], [ignore]) AT_CHECK(grep foofile2 stdout, [1], [ignore]) AT_CHECK(test ! -e _MTN/work, [], [ignore]) @@ -136,7 +136,7 @@ # check that "revert" by itself just prints usage. AT_CHECK(echo blah > foofile0, []) V1=`SHA1(foofile0)` -AT_CHECK(MONOTONE revert, [2], [ignore], [ignore]) +AT_CHECK(MTN revert, [2], [ignore], [ignore]) V2=`SHA1(foofile0)` AT_CHECK(test $V1 = $V2) ============================================================ --- tests/t_revert_dirs.at 4c393d42ee07377fd36db5e53b53f67666c30a10 +++ tests/t_revert_dirs.at d78cec431ce995d093f008cc449b1dc59f2d2c45 @@ -1,5 +1,5 @@ AT_SETUP([revert directories]) -MONOTONE_SETUP +MTN_SETUP # reverting files deeper in the directory tree with only some leading # components of their relative path specified @@ -7,14 +7,14 @@ AT_CHECK(mkdir -p abc/def/ghi, [], [ignore]) AT_DATA(abc/def/ghi/file, [deep deep snow ]) -AT_CHECK(MONOTONE add abc/def/ghi/file, [], [ignore], [ignore]) -AT_CHECK(MONOTONE commit --message='deep file' --branch=test, [], [ignore], [ignore]) +AT_CHECK(MTN add abc/def/ghi/file, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message='deep file' --branch=test, [], [ignore], [ignore]) AT_DATA(abc/def/ghi/file, [deep deep mud ]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep abc/def/ghi/file stdout, [], [ignore]) -AT_CHECK(MONOTONE revert abc/def, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN revert abc/def, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep abc/def/ghi/file stdout, [1], [ignore]) AT_CLEANUP ============================================================ --- tests/t_revert_ignored.at f7822d7bc0dfffe69d75685219978cec9b76889c +++ tests/t_revert_ignored.at 3d02d5e6fb6e94f51745f78fc21d97387b0eb756 @@ -1,5 +1,5 @@ AT_SETUP([revert ignored files]) -MONOTONE_SETUP +MTN_SETUP # revert, with only ignored files listed on the command line, should not # revert anything @@ -35,21 +35,21 @@ AT_DATA(baz, [bazbaz ]) -AT_CHECK(MONOTONE status --rcfile ignore.lua, [], [stdout], [ignore]) +AT_CHECK(MTN status --rcfile ignore.lua, [], [stdout], [ignore]) AT_CHECK(grep foo stdout, [0], [ignore], [ignore]) AT_CHECK(grep bar stdout, [0], [ignore], [ignore]) AT_CHECK(grep baz stdout, [0], [ignore], [ignore]) -AT_CHECK(MONOTONE status --rcfile ignore.lua *.ignored, [], [stdout], [ignore]) +AT_CHECK(MTN status --rcfile ignore.lua *.ignored, [], [stdout], [ignore]) AT_CHECK(grep foo stdout, [1], [ignore], [ignore]) AT_CHECK(grep bar stdout, [1], [ignore], [ignore]) AT_CHECK(grep baz stdout, [1], [ignore], [ignore]) # revert with nothing but excluded files should do nothing -AT_CHECK(MONOTONE revert --rcfile ignore.lua *.ignored) +AT_CHECK(MTN revert --rcfile ignore.lua *.ignored) -AT_CHECK(MONOTONE status --rcfile ignore.lua, [], [stdout], [ignore]) +AT_CHECK(MTN status --rcfile ignore.lua, [], [stdout], [ignore]) AT_CHECK(grep foo stdout, [0], [ignore], [ignore]) AT_CHECK(grep bar stdout, [0], [ignore], [ignore]) AT_CHECK(grep baz stdout, [0], [ignore], [ignore]) ============================================================ --- tests/t_revert_move_to_renamed_dir.at 2a3f2a7fcb58451604add5cbd2461de6c8de5d7b +++ tests/t_revert_move_to_renamed_dir.at 4cfa1559e876f34bba6896963571c6896640c8bb @@ -1,5 +1,5 @@ AT_SETUP([revert moving a file to a renamed directory]) -MONOTONE_SETUP +MTN_SETUP # this test is a bug report # see http://savannah.nongnu.org/bugs/?func=detailitem&item_id=15994 @@ -10,12 +10,12 @@ ]) AT_CHECK(mkdir dir) -AT_CHECK(MONOTONE add dir, [], [ignore], [ignore]) +AT_CHECK(MTN add dir, [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE --execute mv file dir, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --execute mv dir foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE revert dir, [], [ignore], [ignore]) +AT_CHECK(MTN --execute mv file dir, [], [ignore], [ignore]) +AT_CHECK(MTN --execute mv dir foo, [], [ignore], [ignore]) +AT_CHECK(MTN revert dir, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_revert_new_project.at 364fa3c8e677fec2303aee44d3caa3197b0dc982 +++ tests/t_revert_new_project.at df9475d3fd0a11f4a8ca30d37a8588be020da8fd @@ -1,17 +1,17 @@ # -*- Autoconf -*- AT_SETUP([revert file in new project]) -MONOTONE_SETUP +MTN_SETUP # reverting one of one files AT_DATA(testfile0, [version 0 of first test file ]) -AT_CHECK(MONOTONE add testfile0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE revert testfile0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN add testfile0, [], [ignore], [ignore]) +AT_CHECK(MTN revert testfile0, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) @@ -21,9 +21,9 @@ AT_DATA(testfile1, [version 0 of second test file ]) -AT_CHECK(MONOTONE add testfile0 testfile1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE revert testfile0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN add testfile0 testfile1, [], [ignore], [ignore]) +AT_CHECK(MTN revert testfile0, [], [ignore], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) ============================================================ --- tests/t_revert_rename.at 18dd10d856fa1fd660a460a9cb6b03b2f2605849 +++ tests/t_revert_rename.at c32e38ba66c28b7c1d1c432e18ee29ab98f773b8 @@ -1,38 +1,38 @@ AT_SETUP([revert renames]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(testfile0, [version 0 of first test file ]) -AT_CHECK(MONOTONE add testfile0, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile0, [], [ignore], [ignore]) V1=`SHA1(testfile0)` -AT_CHECK(MONOTONE --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) AT_DATA(foofile0, [squirrils monkeys dingos ]) -AT_CHECK(MONOTONE rename testfile0 foofile0, [], [ignore], [ignore]) +AT_CHECK(MTN rename testfile0 foofile0, [], [ignore], [ignore]) AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) AT_CHECK(grep foofile0 _MTN/work, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) -AT_CHECK(MONOTONE revert foofile0, [0], [ignore], [ignore]) +AT_CHECK(MTN revert foofile0, [0], [ignore], [ignore]) AT_CHECK(test ! -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) AT_CHECK(grep foofile0 stdout, [1], [ignore]) AT_DATA(foofile0, [squirrils monkeys dingos ]) -AT_CHECK(MONOTONE rename testfile0 foofile0, [], [ignore], [ignore]) +AT_CHECK(MTN rename testfile0 foofile0, [], [ignore], [ignore]) AT_CHECK(grep testfile0 _MTN/work, [0], [ignore]) AT_CHECK(grep foofile0 _MTN/work, [0], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [0], [ignore]) AT_CHECK(grep foofile0 stdout, [0], [ignore]) -AT_CHECK(MONOTONE revert testfile0, [0], [ignore], [ignore]) +AT_CHECK(MTN revert testfile0, [0], [ignore], [ignore]) AT_CHECK(test ! -e _MTN/work, [], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout]) +AT_CHECK(MTN status, [], [stdout]) AT_CHECK(grep testfile0 stdout, [1], [ignore]) AT_CHECK(grep foofile0 stdout, [1], [ignore]) ============================================================ --- tests/t_revert_restrict.at 388d1de8c7a2d50910c1316b052a4fcbb5ae25e1 +++ tests/t_revert_restrict.at 42779e9522bd083c9287d35e2af526fbe2b3351e @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([revert works with restrictions]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(origfile, [some file ]) @@ -29,26 +29,26 @@ AT_CHECK(cp origfile testfile) AT_CHECK(cp orig.ignore file.ignore) AT_CHECK(cp orig2 file2) -AT_CHECK(MONOTONE add testfile file.ignore file2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) +AT_CHECK(MTN add testfile file.ignore file2, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) # modify the files, then revert the 'ignored' file AT_CHECK(cp modified1 testfile) AT_CHECK(cp modified2 file.ignore) -AT_CHECK(MONOTONE --rcfile=ignore_hook.lua revert file.ignore, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=ignore_hook.lua revert file.ignore, [], [ignore], [ignore]) # check that only the 'ignored' file was reverted AT_CHECK(cmp testfile modified1, [0], [ignore], [ignore]) AT_CHECK(cmp file.ignore orig.ignore, [0], [ignore], [ignore]) # now run it again with two paths, one in the ignorehook list, the other normal -AT_CHECK(MONOTONE revert ., [], [ignore], [ignore]) +AT_CHECK(MTN revert ., [], [ignore], [ignore]) AT_CHECK(cp modified1 testfile) AT_CHECK(cp modified2 file.ignore) AT_CHECK(cp modified3 file2) -AT_CHECK(MONOTONE --rcfile=ignore_hook.lua revert file.ignore testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=ignore_hook.lua revert file.ignore testfile, [], [ignore], [ignore]) # check that the files are correct AT_CHECK(cmp testfile origfile, [0], [ignore], [ignore]) @@ -62,7 +62,7 @@ AT_CHECK(cp modified2 file.ignore) AT_CHECK(rm file2) -AT_CHECK(MONOTONE --rcfile=ignore_hook.lua revert --missing . --debug, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=ignore_hook.lua revert --missing . --debug, [], [ignore], [ignore]) AT_CHECK(cmp testfile modified1, [0], [ignore], [ignore]) AT_CHECK(cmp file.ignore modified2, [0], [ignore], [ignore]) @@ -76,7 +76,7 @@ AT_CHECK(cp orig.ignore file.ignore) AT_CHECK(cp orig2 file2) -AT_CHECK(MONOTONE --rcfile=ignore_hook.lua revert --missing . --debug, [], [ignore], [ignore]) +AT_CHECK(MTN --rcfile=ignore_hook.lua revert --missing . --debug, [], [ignore], [ignore]) AT_CHECK(cmp testfile modified1, [0], [ignore], [ignore]) AT_CHECK(cmp file.ignore orig.ignore, [0], [ignore], [ignore]) ============================================================ --- tests/t_revert_unchanged.at c34af77a744fa19ecc23abae754488d9ba4b4a12 +++ tests/t_revert_unchanged.at f64d0151ab4084b02d546ac092e3d802c96dc5c9 @@ -1,16 +1,16 @@ # -*- Autoconf -*- AT_SETUP([revert unchanged file preserves mtime]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(file1, [file 1 version 1 ]) AT_DATA(time1, [time point 1 ]) -AT_CHECK(MONOTONE add file1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) +AT_CHECK(MTN add file1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) # ensure file modification time changes are detected @@ -28,7 +28,7 @@ ]) AT_CHECK(sleep 2) -AT_CHECK(MONOTONE revert file1, [], [ignore], [ignore]) +AT_CHECK(MTN revert file1, [], [ignore], [ignore]) AT_CHECK(ls -l, [], [ignore], [ignore]) AT_CHECK(find . -newer time2, [], [stdout], [ignore]) @@ -40,7 +40,7 @@ ]) AT_CHECK(sleep 1) -AT_CHECK(MONOTONE revert file1, [], [ignore], [ignore]) +AT_CHECK(MTN revert file1, [], [ignore], [ignore]) AT_CHECK(ls -l, [], [ignore], [ignore]) AT_CHECK(find . -newer time3, [], [stdout], [ignore]) ============================================================ --- tests/t_rosterify_attrs.at 8cbfbe3e77406349916b0f1dfb13d3a9b8683b94 +++ tests/t_rosterify_attrs.at 766a19f967c6a453901ce203d232e1f08e93c288 @@ -1,5 +1,5 @@ AT_SETUP([rosterify migrates file/dir attrs]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 # This is a db containing two revisions. Both contain the files @@ -96,9 +96,9 @@ AT_CHECK(rm -f test.db) UNGZB64(test.db.dump.gz.b64, test.db.dump) -AT_CHECK(MONOTONE db load < test.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify, [], [ignore], [ignore]) +AT_CHECK(MTN db load < test.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN db rosterify, [], [ignore], [ignore]) # check the first manifest AT_DATA([first_manifest_good], [format_version "1" @@ -116,7 +116,7 @@ attr "mtn:execute" "true" ]) AT_CHECK(cp -f first_manifest_good expout) -CHECK_SAME_CANONICALISED_STDOUT(cat expout, MONOTONE automate select i: | monotone automate toposort address@hidden | head -1 | monotone automate get_manifest_of address@hidden) +CHECK_SAME_CANONICALISED_STDOUT(cat expout, MTN automate select i: | MTN automate toposort address@hidden | head -1 | MTN automate get_manifest_of address@hidden) # check the second manifest AT_DATA([second_manifest_good], [format_version "1" @@ -134,6 +134,6 @@ attr "mtn:execute" "yes" ]) AT_CHECK(cp -f second_manifest_good expout) -CHECK_SAME_CANONICALISED_STDOUT(cat expout, MONOTONE automate select i: | monotone automate toposort address@hidden | tail -n 1 | monotone automate get_manifest_of address@hidden) +CHECK_SAME_CANONICALISED_STDOUT(cat expout, MTN automate select i: | MTN automate toposort address@hidden | tail -n 1 | MTN automate get_manifest_of address@hidden) AT_CLEANUP ============================================================ --- tests/t_rosterify_drop_attrs.at f61d5a48ec42d5f34ae66b1664f6c862237c221a +++ tests/t_rosterify_drop_attrs.at be8790afd74a04eb4f680abc7a466182f5781599 @@ -1,5 +1,5 @@ AT_SETUP([rosterify --drop-attr]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 # This is a db containing two revisions. The first revision contains the @@ -86,11 +86,11 @@ AT_CHECK(rm -f test.db) UNGZB64(test.db.dump.gz.b64, test.db.dump) -AT_CHECK(MONOTONE db load < test.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN db load < test.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify --drop-attr foo, [], [ignore], [ignore]) +AT_CHECK(MTN db rosterify, [1], [ignore], [ignore]) +AT_CHECK(MTN db rosterify --drop-attr foo, [], [ignore], [ignore]) AT_DATA([manifest_good], [format_version "1" @@ -100,6 +100,6 @@ content @<:@f572d396fae9206628714fb2ce00f72e94f2258f@:>@ attr "mtn:execute" "yes" ]) -CHECK_SAME_CANONICALISED_STDOUT(cat manifest_good, MONOTONE automate select i: | monotone automate toposort address@hidden | head -1 | monotone automate get_manifest_of address@hidden) +CHECK_SAME_CANONICALISED_STDOUT(cat manifest_good, MTN automate select i: | MTN automate toposort address@hidden | head -1 | MTN automate get_manifest_of address@hidden) AT_CLEANUP ============================================================ --- tests/t_rosterify_on_rosterified_db.at 9ea6c0c44d0388445a7b9c72a4d4c74fdff09d9c +++ tests/t_rosterify_on_rosterified_db.at 792912987616c747bdb07dd9aede0b89ed5cac8c @@ -1,5 +1,5 @@ AT_SETUP([db rosterify twice gives an error second time]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 AT_DATA([test.db.dump.gz.b64], [H4sICFkQw0MCA3Rlc3QuZGIuZHVtcADtWFmPm0oWfm5+BcpLEnUnZl/uVaSLbYwXwAsY7B6N @@ -52,12 +52,12 @@ AT_CHECK(rm -f test.db) UNGZB64(test.db.dump.gz.b64, test.db.dump) -AT_CHECK(MONOTONE db load < test.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN db load < test.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify, [], [ignore], [ignore]) +AT_CHECK(MTN db rosterify, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify, [1], [ignore], [stderr]) +AT_CHECK(MTN db rosterify, [1], [ignore], [stderr]) AT_CHECK(QGREP(already stderr)) AT_CLEANUP ============================================================ --- tests/t_rosterify_one_rev.at e8f2d7a0c019a13cd90dca77649ea5f7d1266592 +++ tests/t_rosterify_one_rev.at f1aced84f137509e9820437fe8aa1f98c69c5f84 @@ -1,5 +1,5 @@ AT_SETUP([rosterify on a db with 1 rev]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 # This is a db containing only one revision. The revision contains @@ -55,10 +55,10 @@ AT_CHECK(rm -f test.db) UNGZB64(test.db.dump.gz.b64, test.db.dump) -AT_CHECK(MONOTONE db load < test.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN db load < test.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify, [], [ignore], [ignore]) +AT_CHECK(MTN db rosterify, [], [ignore], [ignore]) AT_DATA([manifest_good], [format_version "1" @@ -72,6 +72,6 @@ file "testfile" content @<:@c0eff70406a3aeed4a50e0772c0ee1f8919d9988@:>@ ]) -CHECK_SAME_CANONICALISED_STDOUT(cat manifest_good, MONOTONE automate select i: | monotone automate get_manifest_of address@hidden) +CHECK_SAME_CANONICALISED_STDOUT(cat manifest_good, MTN automate select i: | MTN automate get_manifest_of address@hidden) AT_CLEANUP ============================================================ --- tests/t_rosterify_rename.at c7442cf1ceef0d2ddcfc6bc098e86d6a30b40193 +++ tests/t_rosterify_rename.at 25841662405631bc1d8375700625ab3ede0ba493 @@ -1,5 +1,5 @@ AT_SETUP([db rosterify preserves renames]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 AT_DATA([test.db.dump.gz.b64], [H4sICKhtq0MAA3Rlc3QuZGIuZHVtcADtWFmTotqWfi5/hXFeqk6Y58g83Bsn4gIiogIigmhH @@ -74,9 +74,9 @@ AT_CHECK(rm -f test.db) UNGZB64(test.db.dump.gz.b64, test.db.dump) -AT_CHECK(MONOTONE db load < test.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify, [], [ignore], [ignore]) +AT_CHECK(MTN db load < test.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN db rosterify, [], [ignore], [ignore]) # check the second revision AT_DATA([expout], [format_version "1" @@ -92,6 +92,6 @@ to "testfile_end" ]) -CHECK_SAME_CANONICALISED_STDOUT(cat expout, MONOTONE automate select i: | monotone automate toposort address@hidden | tail -n 1 | monotone automate get_revision address@hidden) +CHECK_SAME_CANONICALISED_STDOUT(cat expout, MTN automate select i: | MTN automate toposort address@hidden | tail -n 1 | MTN automate get_revision address@hidden) AT_CLEANUP ============================================================ --- tests/t_rosterify_root_suture.at ff625956c64676b2b33f9ccc9f9a45b7b7587318 +++ tests/t_rosterify_root_suture.at e37f2ebc488c564fb184e036b451349d510772f2 @@ -1,5 +1,5 @@ AT_SETUP([db rosterify on a db with a root suture]) -MONOTONE_SETUP +MTN_SETUP NEED_UNGZB64 AT_DATA([test.db.dump.gz.b64], [H4sICPFEAEQCA3Rlc3QuZGIuZHVtcADtWlmPo1qSfi7/ilS/3HtFdZt9mVFLgwFjbBaz2caj @@ -113,11 +113,11 @@ AT_CHECK(rm -f test.db) UNGZB64(test.db.dump.gz.b64, test.db.dump) -AT_CHECK(MONOTONE db load < test.db.dump, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db migrate, [], [ignore], [ignore]) -AT_CHECK(MONOTONE db rosterify, [], [ignore], [ignore]) +AT_CHECK(MTN db load < test.db.dump, [], [ignore], [ignore]) +AT_CHECK(MTN db migrate, [], [ignore], [ignore]) +AT_CHECK(MTN db rosterify, [], [ignore], [ignore]) -AT_CHECK(for REV in `MONOTONE automate select i:`; do MONOTONE automate get_revision $REV; done, [], [stdout], [ignore]) +AT_CHECK(for REV in `MTN automate select i:`; do MTN automate get_revision $REV; done, [], [stdout], [ignore]) AT_CHECK(QGREP('delete ""' stdout)) AT_CHECK(QGREP('add_dir ""' stdout)) ============================================================ --- tests/t_scan.at b27c459a9e7b8e0892cd531dd452acd69321c130 +++ tests/t_scan.at 4368d5002f40b8f9ef58f34ac677078c4b7d3c86 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([scanning trees]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo) AT_CHECK(mkdir foo/bar) @@ -37,9 +37,9 @@ content @<:@5c39de9ca49b3aa34fa21f5778954665d947476c@:>@ ]) -AT_CHECK(MONOTONE add testfile0 foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) +AT_CHECK(MTN add testfile0 foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message='blah blah', [], [ignore], [ignore]) +AT_CHECK(MTN automate get_manifest_of, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout manifest, [], [ignore]) ============================================================ --- tests/t_select_cert.at 524a836a7ce677e089bbc9ad89f8c84599fa688f +++ tests/t_select_cert.at 90896ee81d4af67f053188fe5b4b2b84360b7dc5 @@ -1,5 +1,5 @@ AT_SETUP([selecting arbitrary certs]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [this is just a file ]) @@ -18,32 +18,32 @@ AT_CHECK(cp testfile testfile3) COMMIT(testbranch) -AT_CHECK(MONOTONE cert $FIRST testcert 'value=with=equal=signs') -AT_CHECK(MONOTONE cert $SECOND testcert 'value') +AT_CHECK(MTN cert $FIRST testcert 'value=with=equal=signs') +AT_CHECK(MTN cert $SECOND testcert 'value') # Check that inexact values fail... -AT_CHECK(MONOTONE list certs 'c:testcert=value=', [1], [ignore], [stderr]) +AT_CHECK(MTN list certs 'c:testcert=value=', [1], [ignore], [stderr]) AT_CHECK(grep 'no match for selection' stderr, [0], [ignore]) # Check that wild cards succeed... -AT_CHECK(MONOTONE list certs 'c:testcert=value=*', [], [ignore], [ignore]) +AT_CHECK(MTN list certs 'c:testcert=value=*', [], [ignore], [ignore]) # Check that wild cards succeed (this one becomes a misuse, because it will # match two revisions)... -AT_CHECK(MONOTONE list certs 'c:testcert=value*', [1], [ignore], [stderr]) +AT_CHECK(MTN list certs 'c:testcert=value*', [1], [ignore], [stderr]) AT_CHECK(grep 'has multiple ambiguous expansions' stderr, [0], [ignore]) # Check that no value succeeds... -AT_CHECK(MONOTONE list certs 'c:testcert', [1], [ignore], [stderr]) +AT_CHECK(MTN list certs 'c:testcert', [1], [ignore], [stderr]) AT_CHECK(grep 'has multiple ambiguous expansions' stderr, [0], [ignore]) # Check that exact value succeed... rm -Rf _MTN -AT_CHECK(MONOTONE co --revision='c:testcert=value' ., [], [ignore], [ignore]) +AT_CHECK(MTN co --revision='c:testcert=value' ., [], [ignore], [ignore]) AT_CHECK(cmp testfile testfile2, [], [ignore]) rm -Rf _MTN -AT_CHECK(MONOTONE co --revision='c:testcert=value=with=equal=signs' ., [], [ignore], [ignore]) +AT_CHECK(MTN co --revision='c:testcert=value=with=equal=signs' ., [], [ignore], [ignore]) AT_CHECK(cmp testfile testfile1, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_selector_globbing.at ddb658e8f3a3bdbf8a8c10e0d2a8e90bd2b1565e +++ tests/t_selector_globbing.at f38c34b7cc902b9159eec99ef034370a048e42f4 @@ -1,5 +1,5 @@ AT_SETUP([b: and t: selector globbing]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -16,20 +16,20 @@ COMMIT(branch) R3=`BASE_REVISION` -AT_CHECK(MONOTONE tag $R1 foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE tag $R2 bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE tag $R3 foobarbaz, [], [ignore], [ignore]) +AT_CHECK(MTN tag $R1 foo, [], [ignore], [ignore]) +AT_CHECK(MTN tag $R2 bar, [], [ignore], [ignore]) +AT_CHECK(MTN tag $R3 foobarbaz, [], [ignore], [ignore]) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select b:testbranch, echo $R1) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select b:otherbranch, echo $R2) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select b:branch, echo $R3) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select b:test*, echo $R1) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select b:*branch*, (echo $R1; echo $R2; echo $R3) | sort) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select b:testbranch, echo $R1) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select b:otherbranch, echo $R2) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select b:branch, echo $R3) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select b:test*, echo $R1) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select b:*branch*, (echo $R1; echo $R2; echo $R3) | sort) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select t:foo, echo $R1) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select t:bar, echo $R2) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select t:foobarbaz, echo $R3) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select t:*bar, echo $R2) -CHECK_SAME_CANONICALISED_STDOUT(MONOTONE automate select t:*bar*, (echo $R2; echo $R3) | sort) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select t:foo, echo $R1) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select t:bar, echo $R2) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select t:foobarbaz, echo $R3) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select t:*bar, echo $R2) +CHECK_SAME_CANONICALISED_STDOUT(MTN automate select t:*bar*, (echo $R2; echo $R3) | sort) AT_CLEANUP ============================================================ --- tests/t_selector_later_earlier.at ee9880a80a4d63392f2ae2e92163118ae1f97e51 +++ tests/t_selector_later_earlier.at 0cd18dedd244e697816a29a3fb582f83926dfeaf @@ -1,10 +1,10 @@ AT_SETUP([check later and earlier selectors]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [this is just a file ]) AT_CHECK(cp testfile testfile1) -AT_CHECK(MONOTONE commit --date="2005-03-11T20:33:01" --branch=foo --message=march, [], [ignore], [ignore]) +AT_CHECK(MTN commit --date="2005-03-11T20:33:01" --branch=foo --message=march, [], [ignore], [ignore]) AT_CHECK(echo "`BASE_REVISION`" , [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout first) @@ -12,7 +12,7 @@ AT_DATA(testfile, [Now, this is a different file ]) AT_CHECK(cp testfile testfile2) -AT_CHECK(MONOTONE commit --date="2005-04-22T12:15:00" --branch=foo --message=aprila, [], [ignore], [ignore]) +AT_CHECK(MTN commit --date="2005-04-22T12:15:00" --branch=foo --message=aprila, [], [ignore], [ignore]) AT_CHECK(echo "`BASE_REVISION`" , [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout second) @@ -20,7 +20,7 @@ AT_DATA(testfile, [And we change it a third time ]) AT_CHECK(cp testfile testfile3) -AT_CHECK(MONOTONE commit --date="2005-04-24T07:44:39" --branch=foo --message=aprilb, [], [ignore], [ignore]) +AT_CHECK(MTN commit --date="2005-04-24T07:44:39" --branch=foo --message=aprilb, [], [ignore], [ignore]) AT_CHECK(echo "`BASE_REVISION`" , [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout third) @@ -30,7 +30,7 @@ # ------------------- # this time is just 'before' the first commit, thus no output should come -AT_CHECK(RAW_MONOTONE automate select "e:2005-03-11T20:33:00", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "e:2005-03-11T20:33:00", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout nosel) AT_CHECK(test -f nosel -a ! -s nosel) @@ -38,20 +38,20 @@ # these sels should extract only the first commit # Note: the second sel is the exact time of the first commit. AT_CHECK(cp -f first expout) -CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MONOTONE automate select "e:2005-04") -CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MONOTONE automate select "e:2005-03-11T20:33:01") -CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MONOTONE automate select "e:2005-03-11T20:33:02") +CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MTN automate select "e:2005-04") +CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MTN automate select "e:2005-03-11T20:33:01") +CHECK_SAME_CANONICALISED_STDOUT(cat first, RAW_MTN automate select "e:2005-03-11T20:33:02") # now the first two -CHECK_SAME_CANONICALISED_STDOUT(sort second first, RAW_MONOTONE automate select "e:2005-04-23") +CHECK_SAME_CANONICALISED_STDOUT(sort second first, RAW_MTN automate select "e:2005-04-23") # finally, all the files -AT_CHECK(RAW_MONOTONE automate select "e:2005-04-30", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "e:2005-04-30", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout a_s) LINE_COUNT=`wc -l < a_s` AT_CHECK(test 3 -eq $LINE_COUNT) -AT_CHECK(RAW_MONOTONE automate select "e:2006-07", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "e:2006-07", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout a_s) LINE_COUNT=`wc -l < a_s` @@ -64,30 +64,30 @@ # unlike 'earlier', the 'later' selector matches only strictly greater # commit times. Giving a time equal to that of third commit thus # should not match anything -AT_CHECK(RAW_MONOTONE automate select "l:2005-04-24T07:44:39", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "l:2005-04-24T07:44:39", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout nosel) AT_CHECK(test -f nosel -a ! -s nosel) -AT_CHECK(RAW_MONOTONE automate select "l:2005-05", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "l:2005-05", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout nosel) AT_CHECK(test -f nosel -a ! -s nosel) # these sels should extract only the last commit # Note: the second sel is one sec before the last commit -CHECK_SAME_CANONICALISED_STDOUT(cat third, RAW_MONOTONE automate select "l:2005-04-23") -CHECK_SAME_CANONICALISED_STDOUT(cat third, RAW_MONOTONE automate select "l:2005-04-24T07:44:38") +CHECK_SAME_CANONICALISED_STDOUT(cat third, RAW_MTN automate select "l:2005-04-23") +CHECK_SAME_CANONICALISED_STDOUT(cat third, RAW_MTN automate select "l:2005-04-24T07:44:38") # now we match the second and third commit -CHECK_SAME_CANONICALISED_STDOUT(sort third second, RAW_MONOTONE automate select "l:2005-04-21") +CHECK_SAME_CANONICALISED_STDOUT(sort third second, RAW_MTN automate select "l:2005-04-21") # finally, all the files -AT_CHECK(RAW_MONOTONE automate select "l:2005-03", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "l:2005-03", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout a_s) LINE_COUNT=`wc -l < a_s` AT_CHECK(test 3 -eq $LINE_COUNT) -AT_CHECK(RAW_MONOTONE automate select "l:2003-01", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "l:2003-01", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout a_s) LINE_COUNT=`wc -l < a_s` @@ -98,13 +98,13 @@ # ------------------- # matching only the second commit -CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MONOTONE automate select "l:2005-04-01/e:2005-04-23") -CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MONOTONE automate select "l:2005-04-01/e:2005-04-22T20:00:00") -CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MONOTONE automate select "l:2005-04-21T23:01:00/e:2005-04-22T20:00:00") +CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MTN automate select "l:2005-04-01/e:2005-04-23") +CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MTN automate select "l:2005-04-01/e:2005-04-22T20:00:00") +CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MTN automate select "l:2005-04-21T23:01:00/e:2005-04-22T20:00:00") # non overlapping intervals should not match, even if the single selector # will -AT_CHECK(RAW_MONOTONE automate select "l:2005-04-22/e:2005-04-21", [], [stdout], [ignore]) +AT_CHECK(RAW_MTN automate select "l:2005-04-22/e:2005-04-21", [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout nosel) AT_CHECK(test -f nosel -a ! -s nosel) ============================================================ --- tests/t_selectors_b_h.at f9d2243fcc6c3f4d63b6c5e14e8b3ac76896ca86 +++ tests/t_selectors_b_h.at e372d0f020ed0256495647cd90f14888e7834f2a @@ -1,5 +1,5 @@ AT_SETUP([b: and h: selectors]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -16,11 +16,11 @@ COMMIT(otherbranch) REV3=`BASE_REVISION` -CHECK_SAME_CANONICALISED_STDOUT((echo $REV1 && echo $REV2) | sort, MONOTONE automate select b:testbranch) -CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MONOTONE automate select b:otherbranch) -CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MONOTONE automate select b:) -CHECK_SAME_CANONICALISED_STDOUT(echo $REV2, MONOTONE automate select h:testbranch) -CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MONOTONE automate select h:otherbranch) -CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MONOTONE automate select h:) +CHECK_SAME_CANONICALISED_STDOUT((echo $REV1 && echo $REV2) | sort, MTN automate select b:testbranch) +CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MTN automate select b:otherbranch) +CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MTN automate select b:) +CHECK_SAME_CANONICALISED_STDOUT(echo $REV2, MTN automate select h:testbranch) +CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MTN automate select h:otherbranch) +CHECK_SAME_CANONICALISED_STDOUT(echo $REV3, MTN automate select h:) AT_CLEANUP ============================================================ --- tests/t_serve_ignores_mt_options.at c7318436382fa91a8a3d0d67aaee1049b11b1def +++ tests/t_serve_ignores_mt_options.at 8da5965c17cd49996caa689913957a5ba2acdff5 @@ -1,16 +1,16 @@ # -*- Autoconf -*- AT_SETUP([checking that certain commands ignores the contents of _MTN/options]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP # Now, commit something to transfer AT_DATA(testfile, [version 0 of test file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) # Hack _MTN/options AT_CHECK([sed -e 's/key ".*"/key "address@hidden"/' < _MTN/options > _MTN/options.new]) ============================================================ --- tests/t_set_default.at 4869ee5e5dee61a59e25a34facb6f5834696651d +++ tests/t_set_default.at cd94be70831b23b7c0fd56d7463fffadacf27621 @@ -1,6 +1,6 @@ AT_SETUP([--set-default]) AT_KEYWORDS(netsync) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP ADD_FILE(testfile, [foo @@ -10,7 +10,7 @@ # set defaults in db 2 RUN_NETSYNC(pull, testbranch) -AT_CHECK(MONOTONE2 automate get_revision $T1, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $T1, [], [ignore], [ignore]) SET_FILE(testfile, [blah blah ]) @@ -19,13 +19,13 @@ # make sure the defaults really were set to 'testbranch' NETSYNC_SERVE_START(testbranch) -AT_CHECK(MONOTONE2 pull, [], [ignore], [ignore]) +AT_CHECK(MTN2 pull, [], [ignore], [ignore]) NETSYNC_SERVE_STOP -AT_CHECK(MONOTONE2 automate get_revision $T2, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $T2, [], [ignore], [ignore]) # do a --set-default pull of another branch NETSYNC_SERVE_START(otherbranch) -AT_CHECK(MONOTONE2 --set-default pull localhost:$_PORT otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN2 --set-default pull localhost:$_PORT otherbranch, [], [ignore], [ignore]) NETSYNC_SERVE_STOP # create a new revision on that branch @@ -36,9 +36,9 @@ # and make sure that our default is now it NETSYNC_SERVE_START(otherbranch) -AT_CHECK(MONOTONE2 pull, [], [ignore], [ignore]) +AT_CHECK(MTN2 pull, [], [ignore], [ignore]) NETSYNC_SERVE_STOP -AT_CHECK(MONOTONE2 automate get_revision $O1, [], [ignore], [ignore]) +AT_CHECK(MTN2 automate get_revision $O1, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_setup_checkout_modify_new_dir.at 69ea1cf9eebce9fcc86928d50e456eb37e0c29a0 +++ tests/t_setup_checkout_modify_new_dir.at dca394f3ac7c60c2f0ed701eac8849cc6567245d @@ -1,5 +1,5 @@ AT_SETUP([setup/checkout touch new _MTN/options only]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [blah blah ]) @@ -8,11 +8,11 @@ # okay, now wd is on testbranch # setup a dir on otherbranch and make sure we stay on testbranch -AT_CHECK(MONOTONE setup setupdir --branch=otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN setup setupdir --branch=otherbranch, [], [ignore], [ignore]) SET_FILE(foo, [stuff stuff ]) -AT_CHECK(MONOTONE commit --message=foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate heads testbranch, [], [stdout], [ignore]) +AT_CHECK(MTN commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(MTN automate heads testbranch, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout headsout) CHECK_SAME_STDOUT(BASE_REVISION, cat headsout) @@ -20,15 +20,15 @@ # now create a revision in otherbranch... AT_DATA(setupdir/blah, [yum yum ]) -AT_CHECK(cd setupdir && MONOTONE add blah, [], [ignore], [ignore]) -AT_CHECK(cd setupdir && MONOTONE commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd setupdir && MTN add blah, [], [ignore], [ignore]) +AT_CHECK(cd setupdir && MTN commit --message=foo, [], [ignore], [ignore]) # and check it out -AT_CHECK(MONOTONE checkout codir --branch=otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN checkout codir --branch=otherbranch, [], [ignore], [ignore]) # and make sure we still stayed on testbranch SET_FILE(foo, [more more ]) -AT_CHECK(MONOTONE commit --message=foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate heads testbranch, [], [stdout], [ignore]) +AT_CHECK(MTN commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(MTN automate heads testbranch, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout headsout) CHECK_SAME_STDOUT(BASE_REVISION, cat headsout) ============================================================ --- tests/t_setup_creates_log.at e3c84e44d0c83997ff6b5cba8242a4de1a712e99 +++ tests/t_setup_creates_log.at 3ac3d06fa6e843d71340c630869566549cb61188 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([setup creates _MTN/log]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(test -f _MTN/log -a ! -s _MTN/log) ============================================================ --- tests/t_setup_existing_path.at 7b4b33c2ed726cbf00a4e38fbd7696baa8038b58 +++ tests/t_setup_existing_path.at c3cca6b687a342f882bc96697e2cde5eef065f5f @@ -1,13 +1,13 @@ AT_SETUP([setup on existing path]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(foo, [blah blah ]) -AT_CHECK(MONOTONE setup --branch=testbranch foo, [1], [ignore], [ignore]) +AT_CHECK(MTN setup --branch=testbranch foo, [1], [ignore], [ignore]) AT_CHECK(mkdir bar) -AT_CHECK(MONOTONE setup --branch=testbranch bar, [], [ignore], [ignore]) +AT_CHECK(MTN setup --branch=testbranch bar, [], [ignore], [ignore]) AT_CHECK(test -d bar/_MTN) AT_CHECK(rm -r bar/_MTN) -AT_CHECK(cd bar && MONOTONE setup --branch=testbranch, [], [ignore], [ignore]) +AT_CHECK(cd bar && MTN setup --branch=testbranch, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_short_opts.at 1457b0b8dc5ff7391d34f4c09eaa70f75a56a3e4 +++ tests/t_short_opts.at ad994cdb1da39e3b6330838529833f0684da6fb4 @@ -1,10 +1,10 @@ # -*- Autoconf -*- # a test for the abbreviate options (-b, -k, -r, -m) AT_SETUP([short options work correctly]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(maude, [the file maude ]) @@ -12,18 +12,18 @@ AT_DATA(liver, [the file liver ]) -# same as MONOTONE macro but without --db and --key -m4_define([SHORT_MONOTONE], [$PREEXECUTE monotone --rcfile=$_ROOT_DIR/test_hooks.lua --nostd --norc --root=$_ROOT_DIR --keydir=$_ROOT_DIR/keys]) +# same as MTN macro but without --db and --key +m4_define([SHORT_MTN], [RAW_MTN --rcfile=$_ROOT_DIR/test_hooks.lua --nostd --norc --root=$_ROOT_DIR --keydir=$_ROOT_DIR/keys]) -AT_CHECK(SHORT_MONOTONE add maude, [], [ignore], [ignore]) +AT_CHECK(SHORT_MTN add maude, [], [ignore], [ignore]) # check it won't work with a bad key -AT_CHECK(SHORT_MONOTONE -k address@hidden -b test.branch commit -d test.db -m happy, [1], [ignore], [ignore]) +AT_CHECK(SHORT_MTN -k address@hidden -b test.branch commit -d test.db -m happy, [1], [ignore], [ignore]) # the failed log will have been saved AT_CHECK(rm _MTN/log) # and it does work with a key -AT_CHECK(SHORT_MONOTONE -k address@hidden -b test.branch commit -d test.db -m happy, [], [ignore], [ignore]) +AT_CHECK(SHORT_MTN -k address@hidden -b test.branch commit -d test.db -m happy, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_show_conflicts.at 22f141eceecb8fa87d0c8e46ccd165e4d9aae7d7 +++ tests/t_show_conflicts.at 7d1d04fdb276ac4664a75a9eec6e365787e220d8 @@ -1,5 +1,5 @@ AT_SETUP([show_conflicts]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [file foo ]) @@ -8,18 +8,18 @@ COMMIT(branch) BASE=`BASE_REVISION` -AT_CHECK(MONOTONE mv -e foo baz, [], [ignore], [ignore]) +AT_CHECK(MTN mv -e foo baz, [], [ignore], [ignore]) AT_CHECK(echo xxx >>bar) COMMIT(branch) LEFT=`BASE_REVISION` -AT_CHECK(MONOTONE update -r $BASE, [], [ignore], [ignore]) -AT_CHECK(MONOTONE mv -e foo quux, [], [ignore], [ignore]) +AT_CHECK(MTN update -r $BASE, [], [ignore], [ignore]) +AT_CHECK(MTN mv -e foo quux, [], [ignore], [ignore]) AT_CHECK(echo yyy >>bar) COMMIT(branch) RIGHT=`BASE_REVISION` -AT_CHECK(MONOTONE show_conflicts $LEFT $RIGHT, [], [ignore], [stderr]) +AT_CHECK(MTN show_conflicts $LEFT $RIGHT, [], [ignore], [stderr]) AT_CHECK(mv stderr conflicts) AT_CHECK(QGREP("There are 1 node_name_conflicts" conflicts)) ============================================================ --- tests/t_single_char_filenames.at aeeaf4693e0414db9c0f512a3ec07888ab5d04e8 +++ tests/t_single_char_filenames.at f4389e3ed6da72440b531c236668f368da16cb7a @@ -5,37 +5,37 @@ AT_SETUP([single character filename support]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(a, [some data ]) -AT_CHECK(MONOTONE add a, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add a, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) A_R_SHA1=`BASE_REVISION` -AT_CHECK(MONOTONE rename a b, [], [ignore], [ignore]) +AT_CHECK(MTN rename a b, [], [ignore], [ignore]) AT_CHECK(mv a b) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) B_R_SHA1=`BASE_REVISION` -AT_CHECK(MONOTONE drop b, [], [ignore], [ignore]) +AT_CHECK(MTN drop b, [], [ignore], [ignore]) AT_CHECK(rm -f b) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) NULL_R_SHA1=`BASE_REVISION` AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE checkout --revision=$A_R_SHA1 a-dir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$A_R_SHA1 a-dir, [], [ignore], [ignore]) AT_CHECK(test -e a-dir/a, [], [ignore]) AT_CHECK(test ! -e a-dir/b, [], [ignore]) AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE checkout --revision=$B_R_SHA1 b-dir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$B_R_SHA1 b-dir, [], [ignore], [ignore]) AT_CHECK(test ! -e b-dir/a, [], [ignore]) AT_CHECK(test -e b-dir/b, [], [ignore]) AT_CHECK(rm -rf _MTN) -AT_CHECK(MONOTONE checkout --revision=$NULL_R_SHA1 null-dir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$NULL_R_SHA1 null-dir, [], [ignore], [ignore]) AT_CHECK(test ! -e null-dir/a, [], [ignore]) AT_CHECK(test ! -e null-dir/b, [], [ignore]) ============================================================ --- tests/t_singlecvs.at 32bf2cf13d8cb1e5e93e04a979d2202f3172a24a +++ tests/t_singlecvs.at 7bf742f69e55e280c4dcfc9d9887f1f06357da2b @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([importing a CVS file with one version]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(importme.0, [version 0 of test file ]) @@ -28,7 +28,7 @@ # import into monotone and check presence of file -AT_CHECK(MONOTONE --branch=testbranch cvs_import $CVSROOT/testdir, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_file $TSHA0, [], [ignore]) +AT_CHECK(MTN --branch=testbranch cvs_import $CVSROOT/testdir, [], [ignore], [ignore]) +AT_CHECK(MTN automate get_file $TSHA0, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_sink_has_extra_epochs.at 1476ccf22fb668341183462217d355e0b075d35f +++ tests/t_sink_has_extra_epochs.at 38fd5d4099848e042971b25213de4142e1201f94 @@ -1,5 +1,5 @@ AT_SETUP([one-way netsync where the sink has more epochs]) -MONOTONE_SETUP +MTN_SETUP NETSYNC_SETUP # If the sink has more epochs than the source (say, on branches that are @@ -16,19 +16,19 @@ ADD_FILE(foo, [foo ]) COMMIT(testbranch) -AT_CHECK(MONOTONE db set_epoch testbranch 1234567890123456789009876543210987654321) +AT_CHECK(MTN db set_epoch testbranch 1234567890123456789009876543210987654321) AT_CHECK(rm -r _MTN/) -AT_CHECK(MONOTONE2 setup -b otherbranch ., [], [ignore], [ignore]) +AT_CHECK(MTN2 setup -b otherbranch ., [], [ignore], [ignore]) AT_DATA(bar, [bar ]) -AT_CHECK(MONOTONE2 add bar, [], [ignore], [ignore]) -AT_CHECK(MONOTONE2 commit -m blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN2 add bar, [], [ignore], [ignore]) +AT_CHECK(MTN2 commit -m blah-blah, [], [ignore], [ignore]) NETSYNC_SERVE_START(*branch) NETSYNC_CLIENT_N_RUN(2, push, *branch, 0) NETSYNC_SERVE_STOP -AT_CHECK(MONOTONE ls branches, [], [stdout], [ignore]) +AT_CHECK(MTN ls branches, [], [stdout], [ignore]) AT_CHECK(QGREP testbranch stdout, [], [ignore], [ignore]) AT_CHECK(QGREP otherbranch stdout, [], [ignore], [ignore]) ============================================================ --- tests/t_sql_gunzip.at 1e43988cec90fe9e16a51379b7b832cfc609d122 +++ tests/t_sql_gunzip.at 76a0b4b82555007524bc58297b5210b109cb6ac8 @@ -1,7 +1,7 @@ AT_SETUP([sql function gunzip (which replaced unpack)]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE db execute "select gunzip(X'1f8b08000000000000004d91416e1b310c00effb8a45ee49244a14c973aefd8161189444260bc4abc05eb4e8efabf6e0f44c903318eef6eb72d57d73bb1feb89049b33696c899c52cc8eaa85255aca1d0a292179d5725e96f1d92f37fbb9ddb7b1af27eb92ad2527ce9144dc4324552cc15120f7e04ade02f6f3bfbd6f2018954c8e217108812a774ae06e8c2167a00ea100149509fcd2a37dac4f2fd7e3598fe3767f5a56bf8deb94ae85d0c43a8a59eb52758a6473068e52da3c211d55d27959d7f518ebc9a516ece211a95a254950215856469b83cc2459b4db7fd0b70fdddfedc7787f40a1ea4c920a74e292d45082000b0925c296bd936189c00f68200c85c3d48ca152622cde3ab2c5bf5d1c6dc6ea35c7fc0d6d633f6e5b7d6d9bd6715cae631fc7d8ede5ebf7c3622e73634f5571860476950a314b0d39a2468ac90b49c48705276d1c7ab6d2c92303ceaf8265b2a84952ad983aa056382f7f003a0168da19020000')", [], [stdout], [ignore]) +AT_CHECK(MTN db execute "select gunzip(X'1f8b08000000000000004d91416e1b310c00effb8a45ee49244a14c973aefd8161189444260bc4abc05eb4e8efabf6e0f44c903318eef6eb72d57d73bb1feb89049b33696c899c52cc8eaa85255aca1d0a292179d5725e96f1d92f37fbb9ddb7b1af27eb92ad2527ce9144dc4324552cc15120f7e04ade02f6f3bfbd6f2018954c8e217108812a774ae06e8c2167a00ea100149509fcd2a37dac4f2fd7e3598fe3767f5a56bf8deb94ae85d0c43a8a59eb52758a6473068e52da3c211d55d27959d7f518ebc9a516ece211a95a254950215856469b83cc2459b4db7fd0b70fdddfedc7787f40a1ea4c920a74e292d45082000b0925c296bd936189c00f68200c85c3d48ca152622cde3ab2c5bf5d1c6dc6ea35c7fc0d6d633f6e5b7d6d9bd6715cae631fc7d8ede5ebf7c3622e73634f5571860476950a314b0d39a2468ac90b49c48705276d1c7ab6d2c92303ceaf8265b2a84952ad983aa056382f7f003a0168da19020000')", [], [stdout], [ignore]) AT_CHECK(QGREP('new_manifest \@<:@795cf87a1c37f7314f5aa6891e34d267a757fba6\@:>@' stdout)) AT_CHECK(QGREP('from \@<:@7b675e9ed59eecd9bac3f4ef828196c2069d5a93\@:>@' stdout)) ============================================================ --- tests/t_status.at 13e9e62d33cf4e02f5970d5d92131db1caadb34a +++ tests/t_status.at 3f5c78f1a98d7860cfb0f78a93d4ac98f9f426e5 @@ -1,5 +1,5 @@ AT_SETUP([status with missing files]) -MONOTONE_SETUP +MTN_SETUP # patch existing file # add new file (with patch) @@ -30,15 +30,15 @@ patched ]) -AT_CHECK(MONOTONE drop dropped, [], [ignore], [ignore]) +AT_CHECK(MTN drop dropped, [], [ignore], [ignore]) AT_CHECK(mv from to, [], [ignore], [ignore]) AT_CHECK(mv from_patched to_patched, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename from to, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename from_patched to_patched, [], [ignore], [ignore]) +AT_CHECK(MTN rename from to, [], [ignore], [ignore]) +AT_CHECK(MTN rename from_patched to_patched, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status, [], [stdout], [ignore]) +AT_CHECK(MTN status, [], [stdout], [ignore]) AT_CHECK(grep '^delete "dropped"' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^rename "from"' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^ to "to"' stdout, [], [ignore], [ignore]) @@ -48,7 +48,7 @@ AT_CHECK(grep '^patch "patched"' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^patch "to_patched"' stdout, [], [ignore], [ignore]) -AT_CHECK(MONOTONE status --brief, [], [stdout], [ignore]) +AT_CHECK(MTN status --brief, [], [stdout], [ignore]) AT_CHECK(grep '^dropped dropped' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^renamed from' stdout, [], [ignore], [ignore]) AT_CHECK(grep '^ to to' stdout, [], [ignore], [ignore]) ============================================================ --- tests/t_status_missing.at 7f9d094be78574103bd56735a502e162ac836f03 +++ tests/t_status_missing.at 179fbc279634225ca1395ee17eb0989592f7344e @@ -1,5 +1,5 @@ AT_SETUP([status with missing files]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile1, [foo ]) @@ -17,7 +17,7 @@ # status should list all missing files before failing # if/when there are missing files -AT_CHECK(MONOTONE status, [1], [ignore], [stderr]) +AT_CHECK(MTN status, [1], [ignore], [stderr]) AT_CHECK(grep testfile1 stderr, [], [ignore], [ignore]) AT_CHECK(grep testfile2 stderr, [], [ignore], [ignore]) ============================================================ --- tests/t_sticky_branch.at 232b47d5ba86cd863dae9d2ecdf92f477114d51d +++ tests/t_sticky_branch.at 6b86f04baa6f6ec1158becba2bd3f26e9e7ff233 @@ -1,70 +1,70 @@ AT_SETUP([sticky branches]) -MONOTONE_SETUP +MTN_SETUP # setup saves given branch -AT_CHECK(MONOTONE setup setupdir --branch=testbranch, [], [ignore], [ignore]) +AT_CHECK(MTN setup setupdir --branch=testbranch, [], [ignore], [ignore]) AT_DATA(setupdir/foo, [blah blah ]) -AT_CHECK(cd setupdir && MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(cd setupdir && MONOTONE commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd setupdir && MTN add foo, [], [ignore], [ignore]) +AT_CHECK(cd setupdir && MTN commit --message=foo, [], [ignore], [ignore]) # checkout saves given branch -AT_CHECK(MONOTONE checkout --branch=testbranch codir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch codir, [], [ignore], [ignore]) AT_CHECK(cmp setupdir/foo codir/foo) AT_DATA(codir/foo, [other other ]) -AT_CHECK(cd codir && MONOTONE commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN commit --message=foo, [], [ignore], [ignore]) # log doesn't affect given branch -AT_CHECK(cd codir && MONOTONE log, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN log, [], [ignore], [ignore]) AT_DATA(codir/foo, [more more ]) -AT_CHECK(cd codir && MONOTONE commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN commit --message=foo, [], [ignore], [ignore]) AT_DATA(expbranches, [testbranch ], []) -AT_CHECK(MONOTONE ls branches, [], [stdout], [ignore]) +AT_CHECK(MTN ls branches, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp expbranches stdout) # commit saves given branch AT_DATA(codir/foo, [newbranch newbranch ]) -AT_CHECK(cd codir && MONOTONE commit --branch=otherbranch --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN commit --branch=otherbranch --message=foo, [], [ignore], [ignore]) AT_DATA(codir/foo, [newbranch 2 newbranch 2 ]) -AT_CHECK(cd codir && MONOTONE commit --message=foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE checkout --branch=otherbranch otherdir, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=otherbranch otherdir, [], [ignore], [ignore]) AT_CHECK(cmp codir/foo otherdir/foo) # update saves the given branch -AT_CHECK(MONOTONE checkout --branch=testbranch updir, [], [ignore], [ignore]) -AT_CHECK(cd updir && MONOTONE update --branch=otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch updir, [], [ignore], [ignore]) +AT_CHECK(cd updir && MTN update --branch=otherbranch, [], [ignore], [ignore]) AT_CHECK(cmp otherdir/foo updir/foo) AT_DATA(otherdir/foo, [yet another chunk of entropy ]) -AT_CHECK(cd otherdir && MONOTONE commit --message=foo, [], [ignore], [ignore]) -AT_CHECK(cd updir && MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(cd otherdir && MTN commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd updir && MTN update, [], [ignore], [ignore]) AT_CHECK(cmp otherdir/foo updir/foo) # merge doesn't affect given branch -AT_CHECK(MONOTONE co --branch=testbranch third1, [], [ignore], [ignore]) +AT_CHECK(MTN co --branch=testbranch third1, [], [ignore], [ignore]) AT_DATA(third1/a, [1a ]) -AT_CHECK(cd third1 && MONOTONE add a, [], [ignore], [ignore]) -AT_CHECK(cd third1 && MONOTONE commit --branch=third --message=foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE co --branch=testbranch third2, [], [ignore], [ignore]) +AT_CHECK(cd third1 && MTN add a, [], [ignore], [ignore]) +AT_CHECK(cd third1 && MTN commit --branch=third --message=foo, [], [ignore], [ignore]) +AT_CHECK(MTN co --branch=testbranch third2, [], [ignore], [ignore]) AT_DATA(third2/b, [2b ]) -AT_CHECK(cd third2 && MONOTONE add b, [], [ignore], [ignore]) -AT_CHECK(cd third2 && MONOTONE commit --branch=third --message=foo, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE merge --branch=third, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate heads third, [], [stdout], [ignore]) +AT_CHECK(cd third2 && MTN add b, [], [ignore], [ignore]) +AT_CHECK(cd third2 && MTN commit --branch=third --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN merge --branch=third, [], [ignore], [ignore]) +AT_CHECK(MTN automate heads third, [], [stdout], [ignore]) AT_CHECK(mv stdout old-third-heads) AT_DATA(codir/foo, [more more ]) -AT_CHECK(cd codir && MONOTONE commit --message=foo, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN commit --message=foo, [], [ignore], [ignore]) # we check that this didn't create a new head of branch third -AT_CHECK(MONOTONE automate heads third, [], [stdout], [ignore]) +AT_CHECK(MTN automate heads third, [], [stdout], [ignore]) AT_CHECK(cmp stdout old-third-heads) AT_CLEANUP ============================================================ --- tests/t_subdir_add.at 45791575b75fc561844d7cdabe9f8847c68ce259 +++ tests/t_subdir_add.at 413569b9d605818267a5fb437976a27b28565e88 @@ -1,5 +1,5 @@ AT_SETUP([add in subdir]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir subdir) AT_CHECK(mkdir subdir/anotherdir) @@ -9,14 +9,14 @@ ]) # Add a file -AT_CHECK( (cd subdir; MONOTONE add foo), [], [ignore], [ignore]) +AT_CHECK( (cd subdir; MTN add foo), [], [ignore], [ignore]) # Add a directory -AT_CHECK( (cd subdir; MONOTONE add anotherdir), [], [ignore], [ignore]) +AT_CHECK( (cd subdir; MTN add anotherdir), [], [ignore], [ignore]) COMMIT(testbranch) REV=`BASE_REVISION` -AT_CHECK(MONOTONE checkout --revision=$REV codir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV codir, [], [ignore], [ignore]) AT_CHECK(cmp subdir/foo codir/subdir/foo) AT_CHECK(cmp subdir/anotherdir/bar codir/subdir/anotherdir/bar) ============================================================ --- tests/t_subdir_attr.at 3a4b2b01e39e48f9686b4442f1b57877de30b06d +++ tests/t_subdir_attr.at 716e179f39e9aede60227886ab345df87351c02b @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([attr command in subdirs]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir -p foo/bar, [], [ignore], [ignore]) AT_DATA(top, [top data @@ -12,18 +12,18 @@ AT_DATA(foo/bar/bardata, [foobar data ]) -AT_CHECK(MONOTONE add top foo, [], [ignore], [ignore]) +AT_CHECK(MTN add top foo, [], [ignore], [ignore]) # set attributes in directories -AT_CHECK( (cd foo; MONOTONE attr set foodata test:test_attr true), [], [ignore], [ignore]) -AT_CHECK( (cd foo/bar; MONOTONE attr set bardata test:test_attr false), [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK( (cd foo; MTN attr set foodata test:test_attr true), [], [ignore], [ignore]) +AT_CHECK( (cd foo/bar; MTN attr set bardata test:test_attr false), [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) REV=`BASE_REVISION` # see if they're right -AT_CHECK(MONOTONE checkout --revision=$REV co-dir, [], [stdout]) +AT_CHECK(MTN checkout --revision=$REV co-dir, [], [stdout]) AT_CHECK(grep "test:test_attr:foo/foodata:true" stdout, [], [ignore]) AT_CHECK(grep "test:test_attr:foo/bar/bardata:false" stdout, [], [ignore]) ============================================================ --- tests/t_subdir_drop.at 96d6401411920ea2e1a6ac380f662699b8362c22 +++ tests/t_subdir_drop.at afa2ede8e1dd01a0e0305ad1c6e9571138462b4b @@ -1,5 +1,5 @@ AT_SETUP([(minor) drop in subdir]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir subdir) AT_CHECK(mkdir subdir/anotherdir) @@ -7,18 +7,18 @@ ]) AT_DATA(subdir/anotherdir/bar, [more data ]) -AT_CHECK(MONOTONE add ., [], [ignore], [ignore]) +AT_CHECK(MTN add ., [], [ignore], [ignore]) COMMIT(testbranch) REV=`BASE_REVISION` # Create a checkout we can update -AT_CHECK(MONOTONE checkout --revision=$REV codir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV codir, [], [ignore], [ignore]) -AT_CHECK( (cd subdir && MONOTONE drop foo), [], [ignore], [ignore]) -AT_CHECK( (cd subdir && MONOTONE drop --recursive anotherdir), [], [ignore], [ignore]) +AT_CHECK( (cd subdir && MTN drop foo), [], [ignore], [ignore]) +AT_CHECK( (cd subdir && MTN drop --recursive anotherdir), [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK( (cd codir && MONOTONE update), [], [ignore], [ignore]) +AT_CHECK( (cd codir && MTN update), [], [ignore], [ignore]) AT_CHECK(test -f codir/subdir/foo, [1]) AT_CHECK(test -f codir/subdir/anotherdir/bar, [1]) ============================================================ --- tests/t_subdir_rename.at 194e7566c73d1cb59ab603130cb332919cd68015 +++ tests/t_subdir_rename.at d23edfa0136220f41049cb6b3b4f0468ec7da3bf @@ -1,5 +1,5 @@ AT_SETUP([rename in subdir]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir subdir) AT_CHECK(mkdir subdir/anotherdir) @@ -7,18 +7,18 @@ ]) AT_DATA(subdir/anotherdir/bar, [more data ]) -AT_CHECK(MONOTONE add ., [], [ignore], [ignore]) +AT_CHECK(MTN add ., [], [ignore], [ignore]) COMMIT(testbranch) REV=`BASE_REVISION` AT_CHECK(mv subdir/foo subdir/foo-renamed) -AT_CHECK( (cd subdir && MONOTONE rename foo foo-renamed), [], [ignore], [ignore]) +AT_CHECK( (cd subdir && MTN rename foo foo-renamed), [], [ignore], [ignore]) AT_CHECK(mv subdir/anotherdir anotherdir-renamed) -AT_CHECK( (cd subdir && MONOTONE rename anotherdir ../anotherdir-renamed), [], [ignore], [ignore]) +AT_CHECK( (cd subdir && MTN rename anotherdir ../anotherdir-renamed), [], [ignore], [ignore]) COMMIT(testbranch) -AT_CHECK(MONOTONE checkout --revision=$REV codir, [], [ignore], [ignore]) -AT_CHECK( (cd codir && MONOTONE update --branch=testbranch), [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV codir, [], [ignore], [ignore]) +AT_CHECK( (cd codir && MTN update --branch=testbranch), [], [ignore], [ignore]) AT_CHECK(test -f codir/subdir/foo, [1]) AT_CHECK(test -f codir/subdir/anotherdir/bar, [1]) AT_CHECK(cmp subdir/foo-renamed codir/subdir/foo-renamed) ============================================================ --- tests/t_subdir_revert.at 56188db5e096ea2186a0e03f8df858e1acb45bd4 +++ tests/t_subdir_revert.at 0624939545238eacaca348e3324353c0f29aa14c @@ -1,5 +1,5 @@ AT_SETUP([revert in subdirs]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir subdir) AT_CHECK(mkdir subdir/anotherdir) @@ -7,12 +7,12 @@ ]) AT_DATA(subdir/anotherdir/bar, [more data ]) -AT_CHECK(MONOTONE add ., [], [ignore], [ignore]) +AT_CHECK(MTN add ., [], [ignore], [ignore]) COMMIT(testbranch) REV=`BASE_REVISION` # Create a checkout we can play with -AT_CHECK(MONOTONE checkout --revision=$REV codir, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --revision=$REV codir, [], [ignore], [ignore]) # Write to the checked out files AT_DATA(codir/subdir/foo, [other data @@ -21,8 +21,8 @@ ]) # Revert them -AT_CHECK( (cd codir/subdir && MONOTONE revert foo), [], [ignore], [ignore]) -AT_CHECK( (cd codir/subdir && MONOTONE revert anotherdir), [], [ignore], [ignore]) +AT_CHECK( (cd codir/subdir && MTN revert foo), [], [ignore], [ignore]) +AT_CHECK( (cd codir/subdir && MTN revert anotherdir), [], [ignore], [ignore]) # Check them AT_CHECK(cmp subdir/foo codir/subdir/foo) ============================================================ --- tests/t_subdirs.at c4f829c5b8bbdf0ed27d534bf13a1b8fd9672c6a +++ tests/t_subdirs.at 4af0c0ebc95ad50843a1b318d8831994430b7e61 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([subdirectory restrictions]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(mkdir foo bar) @@ -11,8 +11,8 @@ AT_DATA(bar/bar.txt, [file bar.txt in dir bar ]) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE add bar, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN add bar, [], [ignore], [ignore]) COMMIT(testbranch) @@ -30,37 +30,37 @@ # - which use add_restriction and in_restriction through # restrict_patch_set -AT_CHECK(MONOTONE status, [], [stdout], []) +AT_CHECK(MTN status, [], [stdout], []) AT_CHECK(grep 'foo/foo' stdout, [0], [ignore]) AT_CHECK(grep 'bar/bar' stdout, [0], [ignore]) ROOT=`pwd` -m4_define([MONOTONE_SUB], [monotone --rcfile=$ROOT/test_hooks.lua --nostd --norc --db=$ROOT/test.db address@hidden --keydir=$ROOT/keys]) +m4_define([MTN_SUB], [RAW_MTN --rcfile=$ROOT/test_hooks.lua --nostd --norc --db=$ROOT/test.db address@hidden --keydir=$ROOT/keys]) cd foo -AT_CHECK(MONOTONE_SUB status, [], [stdout], []) +AT_CHECK(MTN_SUB status, [], [stdout], []) AT_CHECK(grep 'foo/foo' stdout, [0], [ignore]) AT_CHECK(grep 'bar/bar' stdout, [0], [ignore]) -AT_CHECK(MONOTONE_SUB status ., [], [stdout], [ignore]) +AT_CHECK(MTN_SUB status ., [], [stdout], [ignore]) AT_CHECK(grep 'foo/foo' stdout, [0], [ignore]) AT_CHECK(grep 'bar/bar' stdout, [1], [ignore]) -AT_CHECK(MONOTONE_SUB status .., [], [stdout], []) +AT_CHECK(MTN_SUB status .., [], [stdout], []) AT_CHECK(grep 'foo/foo' stdout, [0], [ignore]) AT_CHECK(grep 'bar/bar' stdout, [0], [ignore]) cd .. cd bar -AT_CHECK(MONOTONE_SUB status, [], [stdout], []) +AT_CHECK(MTN_SUB status, [], [stdout], []) AT_CHECK(grep 'foo/foo' stdout, [0], [ignore]) AT_CHECK(grep 'bar/bar' stdout, [0], [ignore]) -AT_CHECK(MONOTONE_SUB status ., [], [stdout], [ignore]) +AT_CHECK(MTN_SUB status ., [], [stdout], [ignore]) AT_CHECK(grep 'foo/foo' stdout, [1], [ignore]) AT_CHECK(grep 'bar/bar' stdout, [0], [ignore]) -AT_CHECK(MONOTONE_SUB status .., [], [stdout], []) +AT_CHECK(MTN_SUB status .., [], [stdout], []) AT_CHECK(grep 'foo/foo' stdout, [0], [ignore]) AT_CHECK(grep 'bar/bar' stdout, [0], [ignore]) cd .. ============================================================ --- tests/t_tags.at f8ebf7132751a4bf8d4ae4ed58384095e30d9cae +++ tests/t_tags.at 6b7316069ad15cf36945ca1db09422c3fb2bc82c @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([tags and tagging of revisions]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(file1, [file 1 ]) @@ -12,32 +12,32 @@ ]) # make sure a tag of a nonexistent revision fails -AT_CHECK(MONOTONE tag af2f6c1f3b7892672357a1018124ee80c752475d foo, [1], [ignore], [ignore]) +AT_CHECK(MTN tag af2f6c1f3b7892672357a1018124ee80c752475d foo, [1], [ignore], [ignore]) # make and tag revision 1 -AT_CHECK(MONOTONE add file1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message 'add file1', [], [ignore], [ignore]) +AT_CHECK(MTN add file1, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message 'add file1', [], [ignore], [ignore]) REV1=`BASE_REVISION` -AT_CHECK(MONOTONE tag $REV1 tag1, [], [ignore], [ignore]) +AT_CHECK(MTN tag $REV1 tag1, [], [ignore], [ignore]) # make and tag revision 2 -AT_CHECK(MONOTONE add file2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message 'add file2', [], [ignore], [ignore]) +AT_CHECK(MTN add file2, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message 'add file2', [], [ignore], [ignore]) REV2=`BASE_REVISION` -AT_CHECK(MONOTONE tag $REV2 tag2, [], [ignore], [ignore]) +AT_CHECK(MTN tag $REV2 tag2, [], [ignore], [ignore]) # make and tag revision 3 -AT_CHECK(MONOTONE add file3, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message 'add file3', [], [ignore], [ignore]) +AT_CHECK(MTN add file3, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message 'add file3', [], [ignore], [ignore]) REV3=`BASE_REVISION` -AT_CHECK(MONOTONE tag $REV3 tag3, [], [stdout], [stderr]) +AT_CHECK(MTN tag $REV3 tag3, [], [stdout], [stderr]) # check tags created above -AT_CHECK(MONOTONE ls tags, [], [stdout], [ignore]) +AT_CHECK(MTN ls tags, [], [stdout], [ignore]) AT_CHECK(grep tag1 stdout, [], [ignore], [ignore]) AT_CHECK(grep tag2 stdout, [], [ignore], [ignore]) AT_CHECK(grep tag3 stdout, [], [ignore], [ignore]) @@ -48,7 +48,7 @@ AT_CHECK(rm -rf _MTN file1 file2 file3) -AT_CHECK(MONOTONE co --revision=tag1 ., [], [ignore], [ignore]) +AT_CHECK(MTN co --revision=tag1 ., [], [ignore], [ignore]) TAG1=`BASE_REVISION` AT_CHECK(test $TAG1 = $REV1) AT_CHECK(test -e file1, [0], [ignore], [ignore]) @@ -57,7 +57,7 @@ AT_CHECK(rm -rf _MTN file1 file2 file3) -AT_CHECK(MONOTONE co --revision=tag2 ., [], [ignore], [ignore]) +AT_CHECK(MTN co --revision=tag2 ., [], [ignore], [ignore]) TAG2=`BASE_REVISION` AT_CHECK(test $TAG2 = $REV2) AT_CHECK(test -e file1, [0], [ignore], [ignore]) @@ -66,7 +66,7 @@ AT_CHECK(rm -rf _MTN file1 file2 file3) -AT_CHECK(MONOTONE co --revision=tag3 ., [], [ignore], [ignore]) +AT_CHECK(MTN co --revision=tag3 ., [], [ignore], [ignore]) TAG3=`BASE_REVISION` AT_CHECK(test $TAG1 = $REV1) AT_CHECK(test -e file1, [0], [ignore], [ignore]) ============================================================ --- tests/t_testresult.at 9175533207adda8067129f2646b05c9f89fa7079 +++ tests/t_testresult.at 95cb68b34df4cdebf4564e45448145c0818d0422 @@ -1,15 +1,15 @@ # -*- Autoconf -*- AT_SETUP([creating a good and bad test result]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(testfile, [first line of the file second line of the file third line of the file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(testfile)` @@ -19,7 +19,7 @@ third line of the file ]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) LEFT_GOOD_R_SHA=`BASE_REVISION` LEFT_GOOD_F_SHA=`SHA1(testfile)` AT_CHECK(test $LEFT_GOOD_R_SHA != $ROOT_R_SHA) @@ -32,7 +32,7 @@ an evil line which should never be seen ]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) LEFT_BAD_R_SHA=`BASE_REVISION` LEFT_BAD_F_SHA=`SHA1(testfile)` AT_CHECK(test $LEFT_BAD_R_SHA != $LEFT_GOOD_R_SHA) @@ -47,10 +47,10 @@ ]) -AT_CHECK(MONOTONE testresult $ROOT_R_SHA 1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE testresult $LEFT_GOOD_R_SHA 1, [], [ignore], [ignore]) -AT_CHECK(MONOTONE testresult $LEFT_BAD_R_SHA 0, [], [ignore], [ignore]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN testresult $ROOT_R_SHA 1, [], [ignore], [ignore]) +AT_CHECK(MTN testresult $LEFT_GOOD_R_SHA 1, [], [ignore], [ignore]) +AT_CHECK(MTN testresult $LEFT_BAD_R_SHA 0, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) # files should now be merged ============================================================ --- tests/t_trusted.at 2ba3de4eef581c8da540326f851df50232d744c2 +++ tests/t_trusted.at 3055a711fb8c60cfa665cfdea3f7c40c9002c639 @@ -1,14 +1,14 @@ AT_SETUP([trust hooks and 'trusted' command]) -MONOTONE_SETUP +MTN_SETUP # run as CHECK_TRUSTED(rev, name, value, signers) m4_define([CHECK_TRUSTED], [ -AT_CHECK(MONOTONE trusted $1 $2 $3 $4, [], [stdout], [ignore]) +AT_CHECK(MTN trusted $1 $2 $3 $4, [], [stdout], [ignore]) AT_CHECK(QGREP(-i ' trusted' stdout)) ]) # run as CHECK_UNTRUSTED(rev, name, value, signers) m4_define([CHECK_UNTRUSTED], [ -AT_CHECK(MONOTONE trusted $1 $2 $3 $4, [], [stdout], [ignore]) +AT_CHECK(MTN trusted $1 $2 $3 $4, [], [stdout], [ignore]) AT_CHECK(QGREP(-i ' untrusted' stdout)) ]) ============================================================ --- tests/t_unidiff.at 0d9f22a79b11ab73828ab936ad229e3bf72684d5 +++ tests/t_unidiff.at 95f7dce4462369e0b5e9227dc44463685654d918 @@ -1,10 +1,10 @@ # -*- Autoconf -*- AT_SETUP([calculation of unidiffs]) NEED_UNB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(firstfile.b64, [LyogU3Vicm91dGluZXMgc2hhcmVkIGJ5IGFsbCBsYW5ndWFnZXMgdGhhdCBhcmUgdmFyaWFu dHMgb2YgQy4KICAgQ29weXJpZ2h0IChDKSAxOTkyLCA5MywgOTQsIDk1LCA5NiwgMTk5NyBG @@ -4777,8 +4777,8 @@ # decode first file and commit to db UNB64(firstfile.b64, firstfile) AT_CHECK(cp firstfile testfile, [], [ignore]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) AT_CHECK(mv testfile firstfile, [], [ignore]) # decode second file @@ -4786,7 +4786,7 @@ # calculate diff to second file using monotone AT_CHECK(cp secondfile testfile, [], [ignore]) -AT_CHECK(MONOTONE diff, [], [stdout]) +AT_CHECK(MTN diff, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(mv stdout monodiff, [], [ignore]) ============================================================ --- tests/t_unidiff2.at c2a19f74432f8422e1bfbdfc730c2ee974633cf0 +++ tests/t_unidiff2.at 6c4561cac70ea16755e2470dcbe02941b6d87dcc @@ -1,10 +1,10 @@ # -*- Autoconf -*- AT_SETUP([calculation of incorrect unidiffs]) NEED_UNB64 -MONOTONE_SETUP +MTN_SETUP AT_DATA(firstfile.b64, [Ly8gY29weXJpZ2h0IChDKSAyMDAyLCAyMDAzIGdyYXlkb24gaG9hcmUgPGdyYXlkb25AcG9i b3guY29tPgovLyBhbGwgcmlnaHRzIHJlc2VydmVkLgovLyBsaWNlbnNlZCB0byB0aGUgcHVi @@ -1686,8 +1686,8 @@ # decode first file and commit to db UNB64(firstfile.b64, firstfile) AT_CHECK(cp firstfile testfile, [], [ignore]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) AT_CHECK(mv testfile firstfile, [], [ignore]) # decode second file @@ -1695,7 +1695,7 @@ # calculate diff to second file using monotone AT_CHECK(cp secondfile testfile, [], [ignore]) -AT_CHECK(MONOTONE diff, [], [stdout]) +AT_CHECK(MTN diff, [], [stdout]) AT_CHECK(mv stdout monodiff, [], [ignore]) # look for a meaningless change ============================================================ --- tests/t_unidiff3.at 0dd1c36bed7368620ef9bfacff424ddc6b6b5e63 +++ tests/t_unidiff3.at d2a1e7ae546152afc9a0e85117370d3bbb35e57d @@ -1,15 +1,15 @@ AT_SETUP([diff against empty file]) -MONOTONE_SETUP +MTN_SETUP AT_CHECK(printf "1\n2\n", [], [stdout]) AT_CHECK(mv stdout foo) -AT_CHECK(MONOTONE add foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=foo commit -m foo, [], [ignore], [ignore]) +AT_CHECK(MTN add foo, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=foo commit -m foo, [], [ignore], [ignore]) AT_CHECK(mv foo foo.away) AT_CHECK(touch foo) -AT_CHECK(MONOTONE diff foo, [], [stdout]) +AT_CHECK(MTN diff foo, [], [stdout]) AT_CHECK(mv stdout monodiff, [], [ignore]) # see whether the patch is well-formed ============================================================ --- tests/t_unreadable__MTN.at 1b4a381cf098a344f3a81ec1aefec35580afb7f8 +++ tests/t_unreadable__MTN.at 9b9146b3a360ec0be8396f382648fdd5740a7001 @@ -5,12 +5,11 @@ # disable for now; can't see a sane way to test this NOT_ON_WIN32 -MONOTONE_SETUP +MTN_SETUP AT_CHECK(chmod a-rwx _MTN/) -AT_CHECK(monotone --norc, [1], [ignore], [ignore]) -AT_CHECK(monotone, [1], [ignore], [ignore]) +AT_CHECK(RAW_MTN, [1], [ignore], [ignore]) AT_CHECK(chmod u+rwx _MTN/) ============================================================ --- tests/t_unreadable_db.at 68fd851c690ee94af78fc71b4ab44dbcffe5bd65 +++ tests/t_unreadable_db.at 5363ad9a59c98dbd5e1880aefe87c3bf8f472506 @@ -1,5 +1,5 @@ AT_SETUP([fail cleanly on unreadable db]) -MONOTONE_SETUP +MTN_SETUP # disable for now; can't see a sane way to test this NOT_ON_WIN32 @@ -9,27 +9,27 @@ # unreadable file AT_CHECK(chmod a-rwx test.db) -AT_CHECK(MONOTONE, [2], [ignore], [ignore]) -AT_CHECK(MONOTONE ls branches, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db info, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db version, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE db migrate, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE commit -mfoo, [1], [ignore], [ignore]) -AT_CHECK(echo | MONOTONE db load, [1], [ignore], [ignore]) +AT_CHECK(MTN, [2], [ignore], [ignore]) +AT_CHECK(MTN ls branches, [1], [ignore], [ignore]) +AT_CHECK(MTN db info, [1], [ignore], [ignore]) +AT_CHECK(MTN db version, [1], [ignore], [ignore]) +AT_CHECK(MTN db migrate, [1], [ignore], [ignore]) +AT_CHECK(MTN commit -mfoo, [1], [ignore], [ignore]) +AT_CHECK(echo | MTN db load, [1], [ignore], [ignore]) AT_CHECK(chmod a+rwx test.db) AT_CHECK(mkdir subdir) -AT_CHECK(MONOTONE --db subdir/foo.db db init, [], [ignore], [ignore]) +AT_CHECK(MTN --db subdir/foo.db db init, [], [ignore], [ignore]) # unreadable directory AT_CHECK(chmod a-rwx subdir) -AT_CHECK(MONOTONE --db subdir/foo.db, [2], [ignore], [ignore]) -AT_CHECK(MONOTONE --db subdir/foo.db ls branches, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE --db subdir/foo.db db info, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE --db subdir/foo.db db version, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE --db subdir/foo.db db migrate, [1], [ignore], [ignore]) -AT_CHECK(echo | MONOTONE --db subdir/foo.db db load, [1], [ignore], [ignore]) -AT_CHECK(MONOTONE --db subdir/bar.db db init, [1], [ignore], [ignore]) +AT_CHECK(MTN --db subdir/foo.db, [2], [ignore], [ignore]) +AT_CHECK(MTN --db subdir/foo.db ls branches, [1], [ignore], [ignore]) +AT_CHECK(MTN --db subdir/foo.db db info, [1], [ignore], [ignore]) +AT_CHECK(MTN --db subdir/foo.db db version, [1], [ignore], [ignore]) +AT_CHECK(MTN --db subdir/foo.db db migrate, [1], [ignore], [ignore]) +AT_CHECK(echo | MTN --db subdir/foo.db db load, [1], [ignore], [ignore]) +AT_CHECK(MTN --db subdir/bar.db db init, [1], [ignore], [ignore]) AT_CHECK(chmod a+rwx subdir) AT_CLEANUP ============================================================ --- tests/t_update.at d25cbe1b2bb51859fe0b15c0996f23ee31f920d6 +++ tests/t_update.at c676a76258b05ddd31172ae069efb9c593c6305b @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([creating a fork and updating]) -MONOTONE_SETUP +MTN_SETUP # this test is kinda like fork, only it doesn't commit the right side of # the fork; instead, it updates, and (in theory) shifts from right to @@ -12,8 +12,8 @@ second line of the file third line of the file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(testfile)` @@ -23,7 +23,7 @@ third line of the file ]) -AT_CHECK(MONOTONE commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message=blah-blah, [], [ignore], [ignore]) LEFT_R_SHA=`BASE_REVISION` LEFT_F_SHA=`SHA1(testfile)` AT_CHECK(test $LEFT_R_SHA != $ROOT_R_SHA) @@ -37,7 +37,7 @@ third line of the file ]) -AT_CHECK(MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(MTN update, [], [ignore], [ignore]) # files should now be merged ============================================================ --- tests/t_update_1.at a8ec618111f576a24bd3f1b21ac6d1051aa13647 +++ tests/t_update_1.at 4890762d109d4c428fbb5046de5a953869bcf75b @@ -1,5 +1,5 @@ AT_SETUP([update 1]) -MONOTONE_SETUP +MTN_SETUP # We have A1 -> B1, A and B different branches. Update from A1 # shouldn't take us to B1. Then propagate B -> A, and update from A1; @@ -18,15 +18,15 @@ REVERT_TO($A1_SHA) # Put in an explicit --branch, because REVERT_TO is not smart about # such things. -AT_CHECK(MONOTONE --branch=a update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=a update, [], [ignore], [ignore]) AT_CHECK(test $A1_SHA = `BASE_REVISION`) -AT_CHECK(MONOTONE propagate b a, [], [ignore], [ignore]) +AT_CHECK(MTN propagate b a, [], [ignore], [ignore]) REVERT_TO($A1_SHA) # Put in an explicit --branch, because REVERT_TO is not smart about # such things. -AT_CHECK(MONOTONE --branch=a update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=a update, [], [ignore], [ignore]) AT_CHECK(test $B1_SHA = `BASE_REVISION`) AT_CLEANUP ============================================================ --- tests/t_update_2.at 3d8bbfbedd3078a69e860b05270b0a08e5f9a105 +++ tests/t_update_2.at d235e7551ad39fe5a6adf55f33f0a02e84fddbaf @@ -1,5 +1,5 @@ AT_SETUP([(normal) update 2]) -MONOTONE_SETUP +MTN_SETUP # testing that update is able to jump over discontinuities in # branches. If we have A1 -> B1 -> A2, then updating branch A from A1 @@ -23,7 +23,7 @@ REVERT_TO($A1_R) -AT_CHECK(MONOTONE update --branch=mainbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update --branch=mainbranch, [], [ignore], [ignore]) GOT_R=`BASE_REVISION` AT_CHECK(test $GOT_R != $A1_R) ============================================================ --- tests/t_update_branch.at 33934ce6e4ef6bde1c5ccce8417cc1e7fe750224 +++ tests/t_update_branch.at 9261937ba3797e8f6202d65e410f032ec130ba40 @@ -1,5 +1,5 @@ AT_SETUP([update -b foo updates _MTN/options correctly]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -13,7 +13,7 @@ # This update should fail (because not only does it have no update # candidate, but it's currently at an off-branch revision); and should # not update the _MTN/options -AT_CHECK(MONOTONE update -b testbranch, [1], [ignore], [ignore]) +AT_CHECK(MTN update -b testbranch, [1], [ignore], [ignore]) AT_CHECK(QGREP(otherbranch _MTN/options), []) AT_CHECK(QGREP(testbranch _MTN/options), [1]) @@ -21,7 +21,7 @@ AT_CHECK(QGREP(otherbranch _MTN/options), [1]) AT_CHECK(QGREP(testbranch _MTN/options), []) -AT_CHECK(MONOTONE update -b otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update -b otherbranch, [], [ignore], [ignore]) AT_CHECK(QGREP(otherbranch _MTN/options), []) AT_CHECK(QGREP(testbranch _MTN/options), [1]) ============================================================ --- tests/t_update_inodeprints.at 7918726b22ac7cac356448a1a9df80dd4afbe597 +++ tests/t_update_inodeprints.at c7878b9d7949a8e97dc2cb4a615c23c4ca228557 @@ -1,5 +1,5 @@ AT_SETUP([update_inodeprints]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -7,7 +7,7 @@ AT_CHECK(test -e _MTN/inodeprints, [1]) -AT_CHECK(MONOTONE update_inodeprints) +AT_CHECK(MTN update_inodeprints) AT_CHECK(test -s _MTN/inodeprints) ============================================================ --- tests/t_update_missing.at 9fe6a573758f9e4659a018284aacb77ea3b0805b +++ tests/t_update_missing.at deed29897d9730e73a7873f7c7982fc2763785bd @@ -1,13 +1,13 @@ # -*- Autoconf -*- AT_SETUP([updating from a merge which adds a file]) -MONOTONE_SETUP +MTN_SETUP touch a -AT_CHECK(MONOTONE add a, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=a commit --message "commit a", [], [ignore], [ignore]) +AT_CHECK(MTN add a, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=a commit --message "commit a", [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` ROOT_F_SHA=`SHA1(a)` @@ -15,8 +15,8 @@ mkdir b touch b/c -AT_CHECK(MONOTONE add b, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=a commit --message "commit b/c", [], [ignore], [ignore]) +AT_CHECK(MTN add b, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=a commit --message "commit b/c", [], [ignore], [ignore]) PROBE_NODE(a, $ROOT_R_SHA, $ROOT_F_SHA) @@ -24,10 +24,10 @@ rmdir b touch d -AT_CHECK(MONOTONE add d, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=a commit --message "commit d", [], [ignore], [ignore]) +AT_CHECK(MTN add d, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=a commit --message "commit d", [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=a merge, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=a update, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=a merge, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=a update, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_nonexistent.at 045eadf406dd46aa126cc91b318006098e76002e +++ tests/t_update_nonexistent.at 586d3ce0745f8272a11071390b0f0eb355e7229e @@ -1,10 +1,10 @@ AT_SETUP([update to non-existent rev]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) COMMIT(testbranch) -AT_CHECK(MONOTONE update --revision=73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) +AT_CHECK(MTN update --revision=73070030f7b0d0f3d4ee02545d45ca4bbe5e189f, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_null_revision.at a76d17125e67f334c1162fb21081dc941ba8da18 +++ tests/t_update_null_revision.at a6dee25bdaccec3cce51d4dc6087482c60968980 @@ -1,9 +1,9 @@ AT_SETUP([update no-ops when no parent revision]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(foo, [blah balh ]) -AT_CHECK(MONOTONE update --branch=testbranch, [1], [ignore], [ignore]) +AT_CHECK(MTN update --branch=testbranch, [1], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_off_branch.at b9d36236416ad78ec83e04ad96bb342839ffff8b +++ tests/t_update_off_branch.at f4621ad8f41fe39c125e95b0b6dc7a03b9d700f8 @@ -1,5 +1,5 @@ AT_SETUP([update to off-branch rev]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -11,8 +11,8 @@ COMMIT(otherbranch) OR=`BASE_REVISION` -AT_CHECK(MONOTONE checkout --branch=testbranch --revision=$TR codir, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE update --revision=$OR, [], [ignore], [ignore]) +AT_CHECK(MTN checkout --branch=testbranch --revision=$TR codir, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN update --revision=$OR, [], [ignore], [ignore]) AT_CHECK(grep '^ *branch "otherbranch"' _MTN/options, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_switch_branch.at 4dc9c4e7562dded128cca9b56ffb72398c4b6e42 +++ tests/t_update_switch_branch.at 3111cf9ba565b0a17f6e76bb0f6725ebf71b1f2f @@ -1,5 +1,5 @@ AT_SETUP([update -b switches branches even when noop]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(testfile, [blah blah ]) @@ -7,12 +7,12 @@ RID1=`BASE_REVISION` -AT_CHECK(MONOTONE cert $RID1 branch otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN cert $RID1 branch otherbranch, [], [ignore], [ignore]) AT_CHECK(QGREP(testbranch _MTN/options)) AT_CHECK(QGREP(otherbranch _MTN/options), [1]) -AT_CHECK(MONOTONE update -b otherbranch, [], [ignore], [ignore]) +AT_CHECK(MTN update -b otherbranch, [], [ignore], [ignore]) RID2=`BASE_REVISION` AT_CHECK(test "$RID1" = "$RID2") ============================================================ --- tests/t_update_to_revision.at 5c67e05438436f0e76bbb4b535481cb4b0f5a27d +++ tests/t_update_to_revision.at 639e16755408f4a76726d342dd17940b365193c0 @@ -1,8 +1,8 @@ # -*- Autoconf -*- AT_SETUP([updating to a given revision]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(root, [first line of the file second line of the file @@ -39,41 +39,41 @@ # Create root revision. AT_CHECK(cp root testfile) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message blah-blah, [], [ignore], [ignore]) ROOT_R_SHA=`BASE_REVISION` # Create middle revision based off root. AT_CHECK(cp middle testfile) -AT_CHECK(MONOTONE commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message blah-blah, [], [ignore], [ignore]) MIDDLE_R_SHA=`BASE_REVISION` # Create leaf revision based off middle. AT_CHECK(cp left-leaf testfile) -AT_CHECK(MONOTONE commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message blah-blah, [], [ignore], [ignore]) LEFT_LEAF_R_SHA=`BASE_REVISION` # Test going backward in the revision tree. -AT_CHECK(MONOTONE update --revision=$ROOT_R_SHA, [], [ignore], [ignore]) +AT_CHECK(MTN update --revision=$ROOT_R_SHA, [], [ignore], [ignore]) diff -u testfile root AT_CHECK(cmp testfile root, [], [ignore]) # Test going forward in the revision tree. -AT_CHECK(MONOTONE update --revision=$MIDDLE_R_SHA, [], [ignore], [ignore]) +AT_CHECK(MTN update --revision=$MIDDLE_R_SHA, [], [ignore], [ignore]) AT_CHECK(cmp testfile middle, [], [ignore]) # Create a fork from middle. AT_CHECK(cp right-leaf testfile) -AT_CHECK(MONOTONE commit --message blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN commit --message blah-blah, [], [ignore], [ignore]) RIGHT_LEAF_R_SHA=`BASE_REVISION` # Test going from the right left to the left leaf via the common ancestor. -AT_CHECK(MONOTONE update --revision=$LEFT_LEAF_R_SHA, [], [ignore], [ignore]) +AT_CHECK(MTN update --revision=$LEFT_LEAF_R_SHA, [], [ignore], [ignore]) AT_CHECK(cmp testfile left-leaf, [], [ignore]) # Test that workspace changes are kept while going backward. AT_CHECK(cp modified-left-leaf testfile) -AT_CHECK(MONOTONE update --revision=$ROOT_R_SHA, [], [ignore], [ignore]) +AT_CHECK(MTN update --revision=$ROOT_R_SHA, [], [ignore], [ignore]) AT_CHECK(cmp testfile modified-root, [], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_with_blocked_rename.at ec11f3c0fdf105effa16659c990631bbab76cc18 +++ tests/t_update_with_blocked_rename.at 8e8653ef7d4cff4af2ea1486ae3ffb136fc65ca8 @@ -1,5 +1,5 @@ AT_SETUP([update with blocked rename]) -MONOTONE_SETUP +MTN_SETUP # This test is a bug report AT_XFAIL_IF(true) @@ -23,26 +23,26 @@ done # Alice starts a projectand creates foo -AT_CHECK(MONOTONE --branch=testbranch setup alice, [], [ignore], [ignore]) -AT_CHECK( (cd alice; MONOTONE add file.*), [], [ignore], [ignore]) -AT_CHECK( (cd alice; MONOTONE commit -m 'alice adds files'), [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch setup alice, [], [ignore], [ignore]) +AT_CHECK( (cd alice; MTN add file.*), [], [ignore], [ignore]) +AT_CHECK( (cd alice; MTN commit -m 'alice adds files'), [], [ignore], [ignore]) # Bob checks out project, gets files and creates file bar -AT_CHECK(MONOTONE --branch=testbranch checkout bob, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch checkout bob, [], [ignore], [ignore]) AT_DATA(bob/bar, [bob's bar ]) # Alice renames some files -AT_CHECK( (cd alice; MONOTONE rename file.3 bar), [], [ignore], [ignore]) -AT_CHECK( (cd alice; MONOTONE rename file.4 bar.4), [], [ignore], [ignore]) -AT_CHECK( (cd alice; MONOTONE rename file.5 bar.5), [], [ignore], [ignore]) +AT_CHECK( (cd alice; MTN rename file.3 bar), [], [ignore], [ignore]) +AT_CHECK( (cd alice; MTN rename file.4 bar.4), [], [ignore], [ignore]) +AT_CHECK( (cd alice; MTN rename file.5 bar.5), [], [ignore], [ignore]) AT_CHECK(mv alice/file.3 alice/bar) AT_CHECK(mv alice/file.4 alice/bar.4) AT_CHECK(mv alice/file.5 alice/bar.5) -AT_CHECK( (cd alice; MONOTONE commit -m 'alice renames files'), [], [ignore], [ignore]) +AT_CHECK( (cd alice; MTN commit -m 'alice renames files'), [], [ignore], [ignore]) # Bob updates but bar is in the way -AT_CHECK( (cd bob; MONOTONE update), [], [ignore], [ignore]) +AT_CHECK( (cd bob; MTN update), [], [ignore], [ignore]) # non-renamed files remain ============================================================ --- tests/t_update_with_pending_add.at 191a9bb03fe47fd446be8475be0b38c076b23851 +++ tests/t_update_with_pending_add.at e67df3f0047517d043c4539c6d8ecdef48a0ae8f @@ -1,7 +1,7 @@ # -*- Autoconf -*- AT_SETUP([update with pending add]) -MONOTONE_SETUP +MTN_SETUP # This test relies on file-suturing AT_XFAIL_IF(true) @@ -11,7 +11,7 @@ COMMIT(testbranch) -AT_CHECK(MONOTONE --branch testbranch co codir, [], [ignore], [ignore]) +AT_CHECK(MTN --branch testbranch co codir, [], [ignore], [ignore]) ADD_FILE(file3, [file3 ]) @@ -21,13 +21,13 @@ AT_DATA(codir/file2, [file2 ]) -AT_CHECK(cd codir && MONOTONE add file2, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN add file2, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN update, [], [ignore], [ignore]) # make sure there are no changes in the workspace AT_CHECK(test ! -e codir/_MTN/work, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(cd codir && MTN diff, [], [stdout], [ignore]) AT_CHECK(grep 'no changes' stdout, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_with_pending_drop.at 74cf8a3d47adaf7a50ed7b2488b39f0ae8039268 +++ tests/t_update_with_pending_drop.at 38d410ed41a70dc505222a65d8628a6de89080f0 @@ -1,32 +1,32 @@ # -*- Autoconf -*- AT_SETUP([update with pending drop]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(file, [test1 ]) COMMIT(testbranch) -AT_CHECK(MONOTONE --branch testbranch co codir, [], [ignore], [ignore]) +AT_CHECK(MTN --branch testbranch co codir, [], [ignore], [ignore]) AT_CHECK(rm file, [], [ignore], [ignore]) -AT_CHECK(MONOTONE drop file, [], [ignore], [ignore]) +AT_CHECK(MTN drop file, [], [ignore], [ignore]) COMMIT(testbranch) REV=`BASE_REVISION` -AT_CHECK(cd codir && MONOTONE drop file, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN drop file, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN update, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE automate get_revision $REV, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN automate get_revision $REV, [], [ignore], [ignore]) # make sure there are no changes in the workspace AT_CHECK(test ! -e codir/_MTN/work, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(cd codir && MTN diff, [], [stdout], [ignore]) AT_CHECK(grep 'no changes' stdout, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_update_with_pending_rename.at da0deb279259309a94cd9838544b92ba8457b3df +++ tests/t_update_with_pending_rename.at 49686db2530c8a2de840058a5ea4c5e1be791f29 @@ -1,33 +1,33 @@ # -*- Autoconf -*- AT_SETUP([update with pending rename]) -MONOTONE_SETUP +MTN_SETUP ADD_FILE(file, [test1 ]) COMMIT(testbranch) -AT_CHECK(MONOTONE --branch testbranch co codir, [], [ignore], [ignore]) +AT_CHECK(MTN --branch testbranch co codir, [], [ignore], [ignore]) AT_CHECK(mv file file2, [], [ignore], [ignore]) -AT_CHECK(MONOTONE rename file file2, [], [ignore], [ignore]) +AT_CHECK(MTN rename file file2, [], [ignore], [ignore]) COMMIT(testbranch) REV=`BASE_REVISION` AT_CHECK(mv codir/file codir/file2, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE rename file file2, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE update, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN rename file file2, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN update, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE automate get_revision $REV, [], [ignore], [ignore]) +AT_CHECK(cd codir && MTN automate get_revision $REV, [], [ignore], [ignore]) # make sure there are no changes in the workspace AT_CHECK(test ! -e codir/_MTN/work, [], [ignore], [ignore]) -AT_CHECK(cd codir && MONOTONE diff, [], [stdout], [ignore]) +AT_CHECK(cd codir && MTN diff, [], [stdout], [ignore]) AT_CHECK(grep 'no changes' stdout, [], [ignore], [ignore]) AT_CLEANUP ============================================================ --- tests/t_vars.at 4ec56a21dec7294597890e4f9106aa70bfe312b9 +++ tests/t_vars.at 2ebfeaa3f4d8fdc22fdc79a3124e7671ae3cf294 @@ -1,13 +1,13 @@ AT_SETUP([vars]) -MONOTONE_SETUP +MTN_SETUP -AT_CHECK(MONOTONE set domain1 key1 orig_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE set domain1 key1 overwritten_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE set domain1 key2 other_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE set domain2 key1 other_domain_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE set domain2 key2 yet_another_value, [], [ignore], [ignore]) -AT_CHECK(MONOTONE unset domain2 key2) -AT_CHECK(MONOTONE unset domain2 key2, [1], [ignore], [ignore]) +AT_CHECK(MTN set domain1 key1 orig_value, [], [ignore], [ignore]) +AT_CHECK(MTN set domain1 key1 overwritten_value, [], [ignore], [ignore]) +AT_CHECK(MTN set domain1 key2 other_value, [], [ignore], [ignore]) +AT_CHECK(MTN set domain2 key1 other_domain_value, [], [ignore], [ignore]) +AT_CHECK(MTN set domain2 key2 yet_another_value, [], [ignore], [ignore]) +AT_CHECK(MTN unset domain2 key2) +AT_CHECK(MTN unset domain2 key2, [1], [ignore], [ignore]) # FIXME: use a less lame output format AT_DATA(domain1_vars, [domain1: key1 overwritten_value @@ -17,13 +17,13 @@ ]) AT_CHECK(cat domain1_vars domain2_vars > all_vars) -AT_CHECK(MONOTONE ls vars, [], [stdout], [ignore]) +AT_CHECK(MTN ls vars, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp all_vars stdout) -AT_CHECK(MONOTONE ls vars domain1, [], [stdout], [ignore]) +AT_CHECK(MTN ls vars domain1, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp domain1_vars stdout) -AT_CHECK(MONOTONE ls vars domain2, [], [stdout], [ignore]) +AT_CHECK(MTN ls vars domain2, [], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp domain2_vars stdout) ============================================================ --- tests/t_vcheck.at 8656291fbb8e643e82f3bfb8ffa5616346388cb6 +++ tests/t_vcheck.at 869a50c06a18a25f5cc53af70cd380e4c52d2ef6 @@ -1,5 +1,5 @@ AT_SETUP([(todo) vcheck]) -MONOTONE_SETUP +MTN_SETUP # This test is a bug report. AT_XFAIL_IF(true) ============================================================ --- tests/t_versions.at dad3fbfa60f5c9ae1f74fc7aac7913c655903a54 +++ tests/t_versions.at d50341aa7dc9b0cd02e0f52ba9218576496ce36f @@ -1,19 +1,19 @@ # -*- Autoconf -*- AT_SETUP([multiple version committing]) -MONOTONE_SETUP +MTN_SETUP AT_DATA(testfile, [version 0 of the file ]) -AT_CHECK(MONOTONE add testfile, [], [ignore], [ignore]) -AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) +AT_CHECK(MTN add testfile, [], [ignore], [ignore]) +AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) for i in 1 2 3 4 5 6 do AT_CHECK(echo "version $i of the file", [], [stdout]) AT_CHECK(mv stdout testfile) - AT_CHECK(MONOTONE --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) + AT_CHECK(MTN --branch=testbranch commit --message=blah-blah, [], [ignore], [ignore]) AT_CHECK(SHA1(testfile), [], [stdout]) AT_CHECK(mv stdout fsha-$i, [], [ignore]) AT_CHECK(BASE_REVISION, [], [stdout]) @@ -28,12 +28,12 @@ RSHA=`cat rsha-$i` FSHA=`cat fsha-$i` - AT_CHECK(MONOTONE automate get_file $FSHA, [], [stdout]) + AT_CHECK(MTN automate get_file $FSHA, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout testfile, [], [ignore]) AT_CHECK(rm -rf _MTN) - AT_CHECK(MONOTONE checkout --revision=$RSHA ., [], [stdout]) + AT_CHECK(MTN checkout --revision=$RSHA ., [], [stdout]) AT_CHECK(SHA1(testfile), [], [stdout]) AT_CHECK(cmp stdout fsha-$i, [], [ignore]) ============================================================ --- testsuite.at 590bff43e1c17bee568fc3339531e7cff1c072d2 +++ testsuite.at 452e8fb6a61f93c811af62863cd201f36d3dc39c @@ -15,15 +15,15 @@ # some command abbreviations to make life easier # Set PREEXECUTE in your environment to run monotone under, e.g., valgrind. -m4_define([MONOTONE], [$PREEXECUTE $_MTN_EXEC --rcfile=$_ROOT_DIR/test_hooks.lua --nostd --norc --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys address@hidden --root=$_ROOT_DIR]) -m4_define([RAW_MONOTONE], [$PREEXECUTE monotone --norc]) -m4_define([MINHOOKS_MONOTONE], [$PREEXECUTE $_MTN_EXEC --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys --rcfile=$_ROOT_DIR/min_hooks.lua address@hidden --root=$_ROOT_DIR]) -m4_define([SHA1], [monotone --norc identify $1]) +m4_define([MTN], [$PREEXECUTE $_MTN_EXEC --rcfile=$_ROOT_DIR/test_hooks.lua --nostd --norc --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys address@hidden --root=$_ROOT_DIR]) +m4_define([RAW_MTN], [$PREEXECUTE $_MTN_EXEC --norc]) +m4_define([MINHOOKS_MTN], [$PREEXECUTE $_MTN_EXEC --db=$_ROOT_DIR/test.db --keydir=$_ROOT_DIR/keys --rcfile=$_ROOT_DIR/min_hooks.lua address@hidden --root=$_ROOT_DIR]) +m4_define([SHA1], [$_MTN_EXEC --norc identify $1]) m4_define([BASE_REVISION], [cat _MTN/revision]) -m4_define([BASE_MANIFEST], [cat _MTN/revision | monotone --norc automate get_manifest_of address@hidden | monotone --norc identify]) -m4_define([WORKING_REVISION], [monotone --norc automate get_revision | monotone --norc identify]) -m4_define([WORKING_MANIFEST], [monotone --norc automate get_manifest_of | monotone --norc identify]) -m4_define([CERTVALUE], [monotone automate certs $1 | sed -e '1,/name "$2"/d' | sed -e '/^$/,$d' | grep '^ *value' | sed -e 's/^m4_dquote([^"])*"//' -e 's/"m4_dquote([^"])*$//']) +m4_define([BASE_MANIFEST], [cat _MTN/revision | $_MTN_EXEC --norc automate get_manifest_of address@hidden | $_MTN_EXEC --norc identify]) +m4_define([WORKING_REVISION], [$_MTN_EXEC --norc automate get_revision | $_MTN_EXEC --norc identify]) +m4_define([WORKING_MANIFEST], [$_MTN_EXEC --norc automate get_manifest_of | $_MTN_EXEC --norc identify]) +m4_define([CERTVALUE], [$_MTN_EXEC automate certs $1 | sed -e '1,/name "$2"/d' | sed -e '/^$/,$d' | grep '^ *value' | sed -e 's/^m4_dquote([^"])*"//' -e 's/"m4_dquote([^"])*$//']) m4_define([CANONICALISE], [ if test "$OSTYPE" = "msys"; then dos2unix -q -o $1 @@ -44,15 +44,15 @@ $2[]_ATEOF ]) -# the MONOTONE_SETUP macro deploys the standard lua hooks and loads the +# the MTN_SETUP macro deploys the standard lua hooks and loads the # standard testing key, which we use for further tests. -m4_define([MONOTONE_SETUP], [ +m4_define([MTN_SETUP], [ # Absolutify monotone path. -_MTN_EXEC=`which monotone` +_MTN_EXEC=`which mtn` -# Save the PWD so MONOTONE macro can refer back to it +# Save the PWD so MTN macro can refer back to it _ROOT_DIR=`pwd -P` # Pick a random port, so running multiple testsuites concurrently on the @@ -162,9 +162,9 @@ ]) -AT_CHECK(MONOTONE db init, [], [ignore], [ignore]) -AT_CHECK(MONOTONE read /dev/null else - ps | awk -- '{p=$NF;a=1;if(p=="COMMAND")next;pp=split(p,ps,"/");if(ps[[pp]]=="monotone")system("kill -KILL " $a);}' + ps | awk -- '{p=$NF;a=1;if(p=="COMMAND")next;pp=split(p,ps,"/");if(ps[[pp]]=="mtn")system("kill -KILL " $a);}' fi else kill -KILL $mt_pid 2>/dev/null @@ -475,26 +475,26 @@ # note that NETSYNC_SERVE_START is _not_ a special case of this macro. m4_define([NETSYNC_SERVE_N_START], [ NETSYNC_KILLHARD -MONOTONE --db=test$1.db --keydir=keys$1 --rcfile=netsync.lua --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($2, [], "{}*", $2) & +MTN --db=test$1.db --keydir=keys$1 --rcfile=netsync.lua --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($2, [], "{}*", $2) & sleep 4 ]) # run as NETSYNC_SERVE_START(pattern) m4_define([NETSYNC_SERVE_START], [ NETSYNC_KILLHARD -MONOTONE --rcfile=netsync.lua --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($1, [], "{}*", $1) & +MTN --rcfile=netsync.lua --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($1, [], "{}*", $1) & sleep 4 ]) # run as STDHOOKS_NETSYNC_SERVE_N_START(2|3, pattern) # note that NETSYNC_SERVE_START is _not_ a special case of this macro. m4_define([MINHOOKS_NETSYNC_SERVE_N_START], [ NETSYNC_KILLHARD -MINHOOKS_MONOTONE --db=test$1.db --keydir=keys$1 --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($2, [], "{}*", $2) & +MINHOOKS_MTN --db=test$1.db --keydir=keys$1 --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($2, [], "{}*", $2) & sleep 4 ]) # run as MINHOOKS_NETSYNC_SERVE_START(pattern) m4_define([MINHOOKS_NETSYNC_SERVE_START], [ NETSYNC_KILLHARD -MINHOOKS_MONOTONE --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($1, [], "{}*", $1) & +MINHOOKS_MTN --pid-file=monotone_at.pid --dump=_MTN/server_dump --bind=NETSYNC_ADDRESS serve m4_if($1, [], "{}*", $1) & sleep 4 ]) # run as NETSYNC_SERVE_STOP @@ -506,7 +506,7 @@ # run as NETSYNC_CLIENT_N_RUN(2|3, push|pull|sync, pattern[, expected result]) # first argument chooses whether to use the 2nd or 3rd database m4_define([NETSYNC_CLIENT_N_RUN], [ -AT_CHECK(MONOTONE --db=test$1.db --keydir=keys$1 --rcfile=netsync.lua $2 NETSYNC_ADDRESS $3, [$4], [ignore], [ignore]) +AT_CHECK(MTN --db=test$1.db --keydir=keys$1 --rcfile=netsync.lua $2 NETSYNC_ADDRESS $3, [$4], [ignore], [ignore]) ]) # run as NETSYNC_CLIENT_RUN(push|pull|sync, pattern[, expected result]) m4_define([NETSYNC_CLIENT_RUN], [