# # rename_file "tests/t_automate_get_manifest.at" # to "tests/t_automate_get_manifest_of.at" # # patch "automate.cc" # from [dffb37bed13f8c61c701bbfdca29ed63ace5ae63] # to [c4e0b149529da3612735cc7b4b26b4b30256e5bb] # # patch "commands.cc" # from [a1bf2bc0ade2260e2ebb5ac988b937b0d60b3824] # to [24df813cf064d799a932e807b0fd28fd737d0ceb] # # patch "tests/t_automate_get_manifest_of.at" # from [88eec4f7a9f3e30322a9ff7897f95f5ed43aa1d8] # to [861f8c3fbaf0cfdaed8a22f195d3f96ded76ebec] # # patch "tests/t_cvsimport_drepper.at" # from [9971343eeaf1e731f921931d47e7152d64332d68] # to [3db0e1cc27abf05a356ec12ea1cbc24e1175b0a1] # # patch "tests/t_cvsimport_drepper2.at" # from [71bb28761fbd140ec26f78aa9d1f96751c3277a8] # to [367f9dbd80c5ca5b6eb2431f6b9860c6f7801209] # # patch "tests/t_database_check.at" # from [7cd1598d68805979e7b435a58dede713dc38ad25] # to [f9e93071aa9dd8bdf4643550b9a54ee87aca2fda] # # patch "tests/t_erename.at" # from [ef285c34d12c67627b9b6dee00c3957dbe46be12] # to [9426aa15f5054436ca30dcd2af753af591e22f8a] # # patch "tests/t_i18n_file.at" # from [a788a76de1663a1ec1b9ef8d571763ed618f2b88] # to [a9fcbd8d1ca4dd5cd17e2c681f142db32590b95c] # # patch "tests/t_merge_add_del.at" # from [14ee39bb126bd3469017d27f471434e4429a33f9] # to [1f411da2f286911a000fc6ea9d4efa5fb7ba68c4] # # patch "tests/t_movedel.at" # from [a3cf97dca10d5b59aeb7e995f13b2268ef1f4112] # to [aca376523828cd1fd40fe70e0a3ec72066852b2d] # # patch "tests/t_movepatch.at" # from [e7ef086e17d1348933f44acc0147cde8774450ca] # to [eedc17bcf8554389d642db6f83674663b496d70f] # # patch "tests/t_normalized_filenames.at" # from [619361fe90d6f531b7e6035b1cef8219092d68b7] # to [752012e95dce64872e27021972a2bd715e03c3c1] # # patch "tests/t_remerge.at" # from [e9cf7d222425e8ed9f7c10a3714af3e5bf5b143e] # to [a77e22b1a429843b91a9c8810c0c359162c91040] # # patch "tests/t_rename.at" # from [4ec762efe273f44b4a63dcc27cb9c40b0af312b4] # to [df3e8ad397cc664e5c0d47a35dad0a5ed044ee21] # # patch "tests/t_renamed.at" # from [94f19a1bcd6feb2de88e5c4ab0133065ccb64c9a] # to [bb95c0a19d39188374eaa64ee10651cf6bc312cb] # # patch "tests/t_scan.at" # from [4dec2b73f7b7a7c746df73b27f32550def4918f4] # to [0f184e0d43389244694bb6900b4b0de97a18547b] # # patch "testsuite.at" # from [e20185b74f9d18fd817bc5cb6bb43b4230f933da] # to [055fd836fe919f0b6203ae0a3b17dd20e48f6043] # ======================================================================== --- automate.cc dffb37bed13f8c61c701bbfdca29ed63ace5ae63 +++ automate.cc c4e0b149529da3612735cc7b4b26b4b30256e5bb @@ -961,10 +961,10 @@ output.write(dat.inner()().data(), dat.inner()().size()); } -// Name: get_manifest +// Name: get_manifest_of // Arguments: // 1: a revision id (optional, determined from working directory if non-existant) -// Added in: 1.0 +// Added in: 2.0 // Purpose: Prints the contents of the manifest associated with the given revision ID. // // Output format: A basic_io string containing the manifest. @@ -972,10 +972,10 @@ // Error conditions: If the revision ID specified is unknown or invalid prints an // error message to stderr and exits with status 1. static void -automate_get_manifest(std::vector args, - std::string const & help_name, - app_state & app, - std::ostream & output) +automate_get_manifest_of(std::vector args, + std::string const & help_name, + app_state & app, + std::ostream & output) { if (args.size() > 1) throw usage(help_name); @@ -1385,8 +1385,8 @@ automate_certs(args, root_cmd_name, app, output); else if (cmd() == "get_revision") automate_get_revision(args, root_cmd_name, app, output); - else if (cmd() == "get_manifest") - automate_get_manifest(args, root_cmd_name, app, output); + else if (cmd() == "get_manifest_of") + automate_get_manifest_of(args, root_cmd_name, app, output); else if (cmd() == "get_file") automate_get_file(args, root_cmd_name, app, output); else if (cmd() == "keys") ======================================================================== --- commands.cc a1bf2bc0ade2260e2ebb5ac988b937b0d60b3824 +++ commands.cc 24df813cf064d799a932e807b0fd28fd737d0ceb @@ -3639,9 +3639,9 @@ "stdio\n" "certs REV\n" "select SELECTOR\n" - "get_file ID\n" - "get_manifest [ID]\n" - "get_revision [ID]\n" + "get_file FILEID\n" + "get_manifest_of [REVID]\n" + "get_revision [REVID]\n" "keys\n"), N_("automation interface"), OPT_NONE) ======================================================================== --- tests/t_automate_get_manifest_of.at 88eec4f7a9f3e30322a9ff7897f95f5ed43aa1d8 +++ tests/t_automate_get_manifest_of.at 861f8c3fbaf0cfdaed8a22f195d3f96ded76ebec @@ -1,6 +1,6 @@ # -*- Autoconf -*- -AT_SETUP([automate get_manifest]) +AT_SETUP([automate get_manifest_of]) NEED_UNB64 MONOTONE_SETUP @@ -18,18 +18,18 @@ BASE_R=`BASE_REVISION` # check that a correct usage produces correctly formatted output -AT_CHECK(MONOTONE automate get_manifest $BASE_R, [], [stdout], [ignore]) +AT_CHECK(MONOTONE 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, [], [stdout], [ignore]) +AT_CHECK(MONOTONE 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 $NOSUCHREV, [1], [stdout], [ignore]) +AT_CHECK(MONOTONE automate get_manifest_of $NOSUCHREV, [1], [stdout], [ignore]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp empty stdout) ======================================================================== --- tests/t_cvsimport_drepper.at 9971343eeaf1e731f921931d47e7152d64332d68 +++ tests/t_cvsimport_drepper.at 3db0e1cc27abf05a356ec12ea1cbc24e1175b0a1 @@ -196,7 +196,7 @@ AT_CHECK(MONOTONE --branch=foo.bar cvs_import e, [], [ignore], [ignore]) AT_CHECK(MONOTONE --branch=foo.bar.disasm-branch co) -AT_CHECK(cd foo.bar.disasm-branch && MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(cd foo.bar.disasm-branch && MONOTONE automate get_manifest_of, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp test.manifest stdout) ======================================================================== --- tests/t_cvsimport_drepper2.at 71bb28761fbd140ec26f78aa9d1f96751c3277a8 +++ tests/t_cvsimport_drepper2.at 367f9dbd80c5ca5b6eb2431f6b9860c6f7801209 @@ -77,7 +77,7 @@ AT_CHECK(MONOTONE --branch=foo.bar cvs_import e, [], [ignore], [ignore]) AT_CHECK(MONOTONE --branch=foo.bar co) -AT_CHECK(cd foo.bar && MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(cd foo.bar && MONOTONE automate get_manifest_of, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp test.manifest stdout) AT_CHECK(cd foo.bar && MONOTONE list tags, [], [stdout]) ======================================================================== --- tests/t_database_check.at 7cd1598d68805979e7b435a58dede713dc38ad25 +++ tests/t_database_check.at f9e93071aa9dd8bdf4643550b9a54ee87aca2fda @@ -41,7 +41,7 @@ AT_CHECK(MONOTONE add file1, [], [ignore], [ignore]) AT_CHECK(MONOTONE commit --branch=test --message='add file1', [], [ignore], [ignore]) REV1=`BASE_REVISION` -MAN1=`monotone --norc automate get_manifest | monotone --norc identify` +MAN1=`monotone --norc automate get_manifest_of | monotone --norc identify` AT_CHECK(MONOTONE add file2, [], [ignore], [ignore]) AT_CHECK(MONOTONE commit --branch=test --message='add file2', [], [ignore], [ignore]) ======================================================================== --- tests/t_erename.at ef285c34d12c67627b9b6dee00c3957dbe46be12 +++ tests/t_erename.at 9426aa15f5054436ca30dcd2af753af591e22f8a @@ -42,7 +42,7 @@ # merge the add and the rename AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) AT_CHECK(MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest, [ignore], [stdout]) +AT_CHECK(MONOTONE 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]) ======================================================================== --- tests/t_i18n_file.at a788a76de1663a1ec1b9ef8d571763ed618f2b88 +++ tests/t_i18n_file.at a9fcbd8d1ca4dd5cd17e2c681f142db32590b95c @@ -43,7 +43,7 @@ export LANG=en_US.UTF-8 export CHARSET=UTF-8 -AT_CHECK(MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep funny manifest, [], [ignore], [ignore]) AT_CHECK(grep spaces manifest, [], [ignore], [ignore]) @@ -74,7 +74,7 @@ # check the names showed up in our manifest -AT_CHECK(MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep funny manifest, [], [ignore], [ignore]) AT_CHECK(grep spaces manifest, [], [ignore], [ignore]) @@ -101,7 +101,7 @@ # check the names showed up in our manifest -AT_CHECK(MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) AT_CHECK(mv stdout manifest) AT_CHECK(grep funny manifest, [], [ignore], [ignore]) AT_CHECK(grep spaces manifest, [], [ignore], [ignore]) ======================================================================== --- tests/t_merge_add_del.at 14ee39bb126bd3469017d27f471434e4429a33f9 +++ tests/t_merge_add_del.at 1f411da2f286911a000fc6ea9d4efa5fb7ba68c4 @@ -76,7 +76,7 @@ AT_CHECK(rm -rf MT) AT_CHECK(MONOTONE --branch=branch.fork checkout .) -AT_CHECK(MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(MONOTONE 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_movedel.at a3cf97dca10d5b59aeb7e995f13b2268ef1f4112 +++ tests/t_movedel.at aca376523828cd1fd40fe70e0a3ec72066852b2d @@ -34,7 +34,7 @@ AT_CHECK(MONOTONE update, [], [ignore], [ignore]) # check that the delete landed on the renamed target -AT_CHECK(MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(MONOTONE 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 e7ef086e17d1348933f44acc0147cde8774450ca +++ tests/t_movepatch.at eedc17bcf8554389d642db6f83674663b496d70f @@ -33,7 +33,7 @@ AT_CHECK(MONOTONE update, [], [ignore], [ignore]) # check that the delta landed on the renamed target -AT_CHECK(MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(MONOTONE 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_normalized_filenames.at 619361fe90d6f531b7e6035b1cef8219092d68b7 +++ tests/t_normalized_filenames.at 752012e95dce64872e27021972a2bd715e03c3c1 @@ -7,12 +7,12 @@ # the inner code directly. AT_DATA(MT/work, [add_dir "." ]) -AT_CHECK(MONOTONE automate get_manifest, [3], [ignore], [ignore]) +AT_CHECK(MONOTONE automate get_manifest_of, [3], [ignore], [ignore]) AT_DATA(MT/work, [add_dir "./bar" ]) -AT_CHECK(MONOTONE automate get_manifest, [3], [ignore], [ignore]) +AT_CHECK(MONOTONE automate get_manifest_of, [3], [ignore], [ignore]) AT_CHECK(MONOTONE automate get_revision, [3], [ignore], [ignore]) AT_CHECK(MONOTONE commit --message=foo --branch=foo, [3], [ignore], [ignore]) ======================================================================== --- tests/t_remerge.at e9cf7d222425e8ed9f7c10a3714af3e5bf5b143e +++ tests/t_remerge.at a77e22b1a429843b91a9c8810c0c359162c91040 @@ -89,7 +89,7 @@ AT_CHECK(MONOTONE --branch=branch.y merge, [], [ignore], [ignore]) AT_CHECK(MONOTONE --branch=branch.y update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest, [], [stdout]) +AT_CHECK(MONOTONE 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 4ec762efe273f44b4a63dcc27cb9c40b0af312b4 +++ tests/t_rename.at df3e8ad397cc664e5c0d47a35dad0a5ed044ee21 @@ -31,7 +31,7 @@ # merge the add and the rename AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) AT_CHECK(MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest, [ignore], [stdout]) +AT_CHECK(MONOTONE 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]) ======================================================================== --- tests/t_renamed.at 94f19a1bcd6feb2de88e5c4ab0133065ccb64c9a +++ tests/t_renamed.at bb95c0a19d39188374eaa64ee10651cf6bc312cb @@ -35,7 +35,7 @@ # merge the add and the rename AT_CHECK(MONOTONE merge, [], [ignore], [ignore]) AT_CHECK(MONOTONE update, [], [ignore], [ignore]) -AT_CHECK(MONOTONE automate get_manifest, [ignore], [stdout]) +AT_CHECK(MONOTONE 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_scan.at 4dec2b73f7b7a7c746df73b27f32550def4918f4 +++ tests/t_scan.at 0f184e0d43389244694bb6900b4b0de97a18547b @@ -37,7 +37,7 @@ 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, [], [stdout]) +AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout]) AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp stdout manifest, [], [ignore]) ======================================================================== --- testsuite.at e20185b74f9d18fd817bc5cb6bb43b4230f933da +++ testsuite.at 055fd836fe919f0b6203ae0a3b17dd20e48f6043 @@ -729,7 +729,7 @@ m4_include(tests/t_setup_existing_path.at) m4_include(tests/t_mt_ignore.at) m4_include(tests/t_automate_get_file.at) -m4_include(tests/t_automate_get_manifest.at) +m4_include(tests/t_automate_get_manifest_of.at) m4_include(tests/t_automate_get_revision.at) m4_include(tests/t_unreadable_db.at) m4_include(tests/t_restriction_with_exclude.at)