# # # patch "tests/automate_ancestry_difference/__driver__.lua" # from [687f03320d55546d2cfb300fae7d51259c9805e7] # to [8055e4a9c4ca7d610867f9752025fa036e44fe69] # # patch "tests/automate_common_ancestors/__driver__.lua" # from [160e7f614d29d06f1a49223a1448a5e427b9c6a1] # to [275caeac79bb6832f1208a4020560a96cfe8d631] # # patch "tests/automate_content_diff/__driver__.lua" # from [49eb0b60c12eefb624af0e586d6bd860ac03cfb4] # to [cef21524bbca6239119b0183a169956d49294f86] # # patch "tests/automate_db_set,get/__driver__.lua" # from [02b5bf1de2e70fcc0861a8f8769a0f844975ccc9] # to [fd6a4ba35fc6972f1fee162b5440450373bc2ed7] # # patch "tests/automate_erase_ancestors/__driver__.lua" # from [bc2885d75224dd0d39ef378b1fce02a771a019ea] # to [f0ffd4911ac8d370873d136102000beb6034f93b] # # patch "tests/automate_get_base_revision_id/__driver__.lua" # from [864a246da964afb954c64436507dcef869aa1f6e] # to [6523a5777b3c4fab3ed1bba5a4d41b4a021d1134] # # patch "tests/automate_get_content_changed/__driver__.lua" # from [c5f370f8e1bb223a807e5f214397f68ae4545d56] # to [4b94b8fa5d66cba64b23c1bea0195004916984a7] # # patch "tests/automate_get_corresponding_path/__driver__.lua" # from [a40c3a12d101610834ebd79bb9f251ba8599e928] # to [78cded0e7aac1af06e6e9dc92d9c5efa0bc3421d] # # patch "tests/automate_get_current_revision_id/__driver__.lua" # from [e47ff08a045482db81b698d51752069bbffb2a56] # to [38e56b48d2d3feb94a64abe5c6a2989240de27aa] # # patch "tests/automate_get_file,_automate_get_file_of/__driver__.lua" # from [1488e443fdf351aad88fc3c2fbdb93a0c1dd3f3f] # to [3f8dc89caf8e9541bae64a239db3d1baa09e2cd0] # # patch "tests/automate_get_manifest_of/__driver__.lua" # from [637b289e52f24a68d5af91f4394dbf8f2d0ec301] # to [545d922210e63b0d786d0b6de87db29e4b4702e5] # # patch "tests/automate_get_revision/__driver__.lua" # from [86d844d42180fe5d15d92feb3ead32d41438cec3] # to [85de2c5a36aad927505e8ba5adf86de2daadc847] # # patch "tests/automate_interface_version/__driver__.lua" # from [6fdc200cf0f8c01e6174ebb04f521b0e645198ec] # to [3af8d46d4fef94eacf2d9917423cb020de712c59] # # patch "tests/automate_put_file/__driver__.lua" # from [a7aef8144d70bf049d0b8aa3d47a2252c01e7279] # to [6487914df46ad9e88a71121ece51034cd98ee11a] # # patch "tests/automate_put_revision/__driver__.lua" # from [deeeb9cb4ff8625284a4f69846ef9fa561a42ccf] # to [f43f9e9992843fefa06f36fc144f6c5c1e212577] # # patch "tests/automate_put_revision_for_merge/__driver__.lua" # from [aa5ec996f615b4bbc6c293310e1c51f08acc9fd1] # to [8efd84d3bad2c60199c4a3432fcfea1728b4d52c] # # patch "tests/automate_put_revision_unknown_file/__driver__.lua" # from [dc7ec109a51b1e8ccc29e876be4d40bad5363dbf] # to [990356e4ca8c804d3d9b7da67b277403f648800c] # # patch "tests/automate_stdio_options/__driver__.lua" # from [9f9b0600a85959c0eb66344ace1d2ce3c5f5f3be] # to [1e67093c31dbd68fa3c5b33ea1aea694b3d54b50] # ============================================================ --- tests/automate_ancestry_difference/__driver__.lua 687f03320d55546d2cfb300fae7d51259c9805e7 +++ tests/automate_ancestry_difference/__driver__.lua 8055e4a9c4ca7d610867f9752025fa036e44fe69 @@ -13,21 +13,21 @@ revs = make_graph() revs = make_graph() -- Now do some checks -check(mtn("automate", "ancestry_difference", "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) -check(mtn("automate", "ancestry_difference", revs.a, "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) +check(mtn("automate", "ancestry-difference", "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) +check(mtn("automate", "ancestry-difference", revs.a, "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) -revmap("ancestry_difference", {revs.a}, {revs.a}) -revmap("ancestry_difference", {revs.a, revs.a}, {}) -revmap("ancestry_difference", {revs.a, revs.b}, {}) -revmap("ancestry_difference", {revs.a, revs.f}, {}) -revmap("ancestry_difference", {revs.f, revs.f}, {}) -revmap("ancestry_difference", {revs.b, revs.a}, {revs.b}) -revmap("ancestry_difference", {revs.b}, {revs.a, revs.b}, false) -revmap("ancestry_difference", {revs.f, revs.d, revs.e}, {revs.f}, false) -revmap("ancestry_difference", {revs.f, revs.e}, {revs.d, revs.f}, false) -revmap("ancestry_difference", {revs.b, revs.f}, {revs.b}) +revmap("ancestry-difference", {revs.a}, {revs.a}) +revmap("ancestry-difference", {revs.a, revs.a}, {}) +revmap("ancestry-difference", {revs.a, revs.b}, {}) +revmap("ancestry-difference", {revs.a, revs.f}, {}) +revmap("ancestry-difference", {revs.f, revs.f}, {}) +revmap("ancestry-difference", {revs.b, revs.a}, {revs.b}) +revmap("ancestry-difference", {revs.b}, {revs.a, revs.b}, false) +revmap("ancestry-difference", {revs.f, revs.d, revs.e}, {revs.f}, false) +revmap("ancestry-difference", {revs.f, revs.e}, {revs.d, revs.f}, false) +revmap("ancestry-difference", {revs.b, revs.f}, {revs.b}) acdef = {revs.a, revs.c, revs.d, revs.e, revs.f} acedf = {revs.a, revs.c, revs.e, revs.d, revs.f} -x = pcall(revmap, "ancestry_difference", {revs.f}, acdef, false) -y = pcall(revmap, "ancestry_difference", {revs.f}, acedf, false) +x = pcall(revmap, "ancestry-difference", {revs.f}, acdef, false) +y = pcall(revmap, "ancestry-difference", {revs.f}, acedf, false) check(x or y) ============================================================ --- tests/automate_common_ancestors/__driver__.lua 160e7f614d29d06f1a49223a1448a5e427b9c6a1 +++ tests/automate_common_ancestors/__driver__.lua 275caeac79bb6832f1208a4020560a96cfe8d631 @@ -12,16 +12,16 @@ revs = make_graph() revs = make_graph() -- Now do some checks -check(mtn("automate", "common_ancestors", +check(mtn("automate", "common-ancestors", "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) -check(mtn("automate", "common_ancestors", revs.a, +check(mtn("automate", "common-ancestors", revs.a, "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) +revmap("common-ancestors", {revs.a}, {revs.a}) +revmap("common-ancestors", {revs.a, revs.a}, {revs.a}) +revmap("common-ancestors", {revs.a, revs.b}, {revs.a}) +revmap("common-ancestors", {revs.a, revs.f}, {revs.a}) +revmap("common-ancestors", {revs.f, revs.f}, {revs.a, revs.c, revs.d, revs.e, revs.f}) +revmap("common-ancestors", {revs.b, revs.f}, {revs.a}) +revmap("common-ancestors", {revs.f, revs.d, revs.e}, {revs.a, revs.c}) +revmap("common-ancestors", {revs.b, revs.e}, {revs.a}) -revmap("common_ancestors", {revs.a}, {revs.a}) -revmap("common_ancestors", {revs.a, revs.a}, {revs.a}) -revmap("common_ancestors", {revs.a, revs.b}, {revs.a}) -revmap("common_ancestors", {revs.a, revs.f}, {revs.a}) -revmap("common_ancestors", {revs.f, revs.f}, {revs.a, revs.c, revs.d, revs.e, revs.f}) -revmap("common_ancestors", {revs.b, revs.f}, {revs.a}) -revmap("common_ancestors", {revs.f, revs.d, revs.e}, {revs.a, revs.c}) -revmap("common_ancestors", {revs.b, revs.e}, {revs.a}) ============================================================ --- tests/automate_content_diff/__driver__.lua 49eb0b60c12eefb624af0e586d6bd860ac03cfb4 +++ tests/automate_content_diff/__driver__.lua cef21524bbca6239119b0183a169956d49294f86 @@ -1,18 +1,18 @@ mtn_setup() mtn_setup() -- check output if there are no changes -check(mtn("automate", "content_diff"), 0, true, true) +check(mtn("automate", "content-diff"), 0, true, true) check(fsize("stdout") == 0 and fsize("stderr") == 0) -- check non-existing path -check(mtn("automate", "content_diff", "non_existing"), 1, true, true) +check(mtn("automate", "content-diff", "non_existing"), 1, true, true) -- check existing path against current workspace addfile("existing", "foo bar") -- do not restrict here, since '' (the root) has not yet been committed -check(mtn("automate", "content_diff"), 0, true, true) +check(mtn("automate", "content-diff"), 0, true, true) check(fsize("stdout") ~= 0) -- add three more revisions and test for correct revid handling @@ -26,11 +26,11 @@ R3=base_revision() R3=base_revision() -- one and two revisions should work -check(mtn("automate", "content_diff", "-r", R1), 0, true, true) +check(mtn("automate", "content-diff", "-r", R1), 0, true, true) check(fsize("stdout") ~= 0) -check(mtn("automate", "content_diff", "-r", R1, "-r", R2), 0, true, true) +check(mtn("automate", "content-diff", "-r", R1, "-r", R2), 0, true, true) check(fsize("stdout") ~= 0) -- three and more should not -check(mtn("automate", "content_diff", "-r", R1, "-r", R2, "-r", R3), 1, true, true) +check(mtn("automate", "content-diff", "-r", R1, "-r", R2, "-r", R3), 1, true, true) ============================================================ --- tests/automate_db_set,get/__driver__.lua 02b5bf1de2e70fcc0861a8f8769a0f844975ccc9 +++ tests/automate_db_set,get/__driver__.lua fd6a4ba35fc6972f1fee162b5440450373bc2ed7 @@ -1,13 +1,13 @@ writefile("expected", "testvalue") mtn_setup() writefile("empty", "") writefile("expected", "testvalue") -check(mtn("automate", "db_set", "testdomain", "testname", "testvalue"), 0, true, false) +check(mtn("automate", "db-set", "testdomain", "testname", "testvalue"), 0, true, false) check(samefile("empty", "stdout")) -check(mtn("automate", "db_get", "testdomain", "testname"), 0, true, false) +check(mtn("automate", "db-get", "testdomain", "testname"), 0, true, false) check(samefile("expected", "stdout")) -- ensure that missing names fail +check(mtn("automate", "db-get", "testdomain", "testname2"), 1, true, false) -check(mtn("automate", "db_get", "testdomain", "testname2"), 1, true, false) ============================================================ --- tests/automate_erase_ancestors/__driver__.lua bc2885d75224dd0d39ef378b1fce02a771a019ea +++ tests/automate_erase_ancestors/__driver__.lua f0ffd4911ac8d370873d136102000beb6034f93b @@ -1,7 +1,7 @@ mtn_setup() mtn_setup() -check(mtn("automate", "erase_ancestors", "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) +check(mtn("automate", "erase-ancestors", "c7539264e83c5d6af4c792f079b5d46e9c128665"), 1, false, false) -- A -- / \ @@ -16,15 +16,15 @@ revs = make_graph() -- Now do some checks -revmap("erase_ancestors", {}, {}) +revmap("erase-ancestors", {}, {}) for _,x in pairs(revs) do - revmap("erase_ancestors", {x}, {x}) + revmap("erase-ancestors", {x}, {x}) end -revmap("erase_ancestors", {revs.a, revs.b}, {revs.b}) -revmap("erase_ancestors", {revs.a, revs.c}, {revs.c}) -revmap("erase_ancestors", {revs.a, revs.f}, {revs.f}) +revmap("erase-ancestors", {revs.a, revs.b}, {revs.b}) +revmap("erase-ancestors", {revs.a, revs.c}, {revs.c}) +revmap("erase-ancestors", {revs.a, revs.f}, {revs.f}) +revmap("erase-ancestors", {revs.b, revs.c}, {revs.b, revs.c}) +revmap("erase-ancestors", {revs.a, revs.b, revs.c}, {revs.b, revs.c}) +revmap("erase-ancestors", {revs.b, revs.f}, {revs.b, revs.f}) +revmap("erase-ancestors", {revs.a, revs.b, revs.f}, {revs.b, revs.f}) -revmap("erase_ancestors", {revs.b, revs.c}, {revs.b, revs.c}) -revmap("erase_ancestors", {revs.a, revs.b, revs.c}, {revs.b, revs.c}) -revmap("erase_ancestors", {revs.b, revs.f}, {revs.b, revs.f}) -revmap("erase_ancestors", {revs.a, revs.b, revs.f}, {revs.b, revs.f}) ============================================================ --- tests/automate_get_base_revision_id/__driver__.lua 864a246da964afb954c64436507dcef869aa1f6e +++ tests/automate_get_base_revision_id/__driver__.lua 6523a5777b3c4fab3ed1bba5a4d41b4a021d1134 @@ -13,7 +13,7 @@ mtn_setup() -- check an empty base revision id -check(mtn("automate", "get_base_revision_id"), 0, true, false) +check(mtn("automate", "get-base-revision-id"), 0, true, false) check(trim(readfile("stdout")) == extract_base_revision()) addfile("foo", "this is file foo") @@ -22,12 +22,12 @@ commit() commit() -check(mtn("automate", "get_base_revision_id"), 0, true, false) +check(mtn("automate", "get-base-revision-id"), 0, true, false) check(trim(readfile("stdout")) == extract_base_revision()) -- check that pending changes don't affect the base revision id addfile("foo", "this is foo") -check(mtn("automate", "get_base_revision_id"), 0, true, false) +check(mtn("automate", "get-base-revision-id"), 0, true, false) check(trim(readfile("stdout")) == extract_base_revision()) ============================================================ --- tests/automate_get_content_changed/__driver__.lua c5f370f8e1bb223a807e5f214397f68ae4545d56 +++ tests/automate_get_content_changed/__driver__.lua 4b94b8fa5d66cba64b23c1bea0195004916984a7 @@ -10,7 +10,7 @@ rev = base_revision() rev = base_revision() -- check that a correct usage produces correctly formatted output -check(mtn("automate", "get_content_changed", rev, "foo"), 0, true, false) +check(mtn("automate", "get-content-changed", rev, "foo"), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) ============================================================ --- tests/automate_get_corresponding_path/__driver__.lua a40c3a12d101610834ebd79bb9f251ba8599e928 +++ tests/automate_get_corresponding_path/__driver__.lua 78cded0e7aac1af06e6e9dc92d9c5efa0bc3421d @@ -16,7 +16,7 @@ rev = base_revision() rev = base_revision() -- file foo has been renamed to foo2, in the new revision we should be able to find the old name -check(mtn("automate", "get_corresponding_path", rev, "foo2", old_rev), 0, true, false) +check(mtn("automate", "get-corresponding-path", rev, "foo2", old_rev), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) @@ -25,7 +25,7 @@ rev = base_revision() check(mtn("commit", "--date=2005-05-21T12:30:51", "--branch=testbranch", "--message=blah-blah"), 0, false, false) rev = base_revision() -check(mtn("automate", "get_corresponding_path", rev, "foo3", old_rev), 0, true, false) +check(mtn("automate", "get-corresponding-path", rev, "foo3", old_rev), 0, true, false) canonicalize("stdout") check(samefile("expected2", "stdout")) ============================================================ --- tests/automate_get_current_revision_id/__driver__.lua e47ff08a045482db81b698d51752069bbffb2a56 +++ tests/automate_get_current_revision_id/__driver__.lua 38e56b48d2d3feb94a64abe5c6a2989240de27aa @@ -1,10 +1,10 @@ function chk() mtn_setup() function chk() - check(mtn("automate", "get_current_revision_id"), 0, true, false) + check(mtn("automate", "get-current-revision-id"), 0, true, false) rename("stdout", "current") - check(mtn("automate", "get_revision"), 0, true) + check(mtn("automate", "get-revision"), 0, true) check(mtn("identify"), 0, true, nil, {"stdout"}) check(trim(readfile("current")) == trim(readfile("stdout"))) end ============================================================ --- tests/automate_get_file,_automate_get_file_of/__driver__.lua 1488e443fdf351aad88fc3c2fbdb93a0c1dd3f3f +++ tests/automate_get_file,_automate_get_file_of/__driver__.lua 3f8dc89caf8e9541bae64a239db3d1baa09e2cd0 @@ -15,16 +15,16 @@ rev1 = base_revision() -- -- check that a correct usage produces correctly formatted output -check(mtn("automate", "get_file", fileid), 0, true, false) +check(mtn("automate", "get-file", fileid), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) -- ensure that missing revisions fail -check(mtn("automate", "get_file", string.rep("0", 40)), 1, true, false) +check(mtn("automate", "get-file", string.rep("0", 40)), 1, true, false) check(fsize("stdout") == 0) -- ensure that revisions are not being completed -check(mtn("automate", "get_file", string.sub(fileid, 1, 30)), 1, true, false) +check(mtn("automate", "get-file", string.sub(fileid, 1, 30)), 1, true, false) check(fsize("stdout") == 0) -- @@ -32,23 +32,23 @@ check(fsize("stdout") == 0) -- -- check if the file is properly outputted -check(mtn("automate", "get_file_of", "foo"), 0, true, false) +check(mtn("automate", "get-file-of", "foo"), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) -- ensure that unknown paths fail -check(mtn("automate", "get_file_of", "bar"), 1, true, false) +check(mtn("automate", "get-file-of", "bar"), 1, true, false) check(fsize("stdout") == 0) -- ensure that unknown revisions fail -check(mtn("automate", "get_file_of", "-r", string.rep("0", 40), filename), 1, true, false) +check(mtn("automate", "get-file-of", "-r", string.rep("0", 40), filename), 1, true, false) check(fsize("stdout") == 0) -- ensure that a former revision's file contents are readable as well writefile("foo", "foobar\n"); commit() rev2 = base_revision() -check(mtn("automate", "get_file_of", "-r", rev1, "foo"), 0, true, false) +check(mtn("automate", "get-file-of", "-r", rev1, "foo"), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) ============================================================ --- tests/automate_get_manifest_of/__driver__.lua 637b289e52f24a68d5af91f4394dbf8f2d0ec301 +++ tests/automate_get_manifest_of/__driver__.lua 545d922210e63b0d786d0b6de87db29e4b4702e5 @@ -10,25 +10,25 @@ rev = base_revision() rev = base_revision() -- check that a correct usage produces correctly formatted output -check(mtn("automate", "get_manifest_of", rev), 0, true, false) +check(mtn("automate", "get-manifest-of", rev), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) -- should work even if we don't specify the manifest ID -check(mtn("automate", "get_manifest_of"), 0, true, false) +check(mtn("automate", "get-manifest-of"), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) -- ensure that missing revisions fail -check(mtn("automate", "get_manifest_of", string.rep("0", 40)), 1, true, false) +check(mtn("automate", "get-manifest-of", string.rep("0", 40)), 1, true, false) check(fsize("stdout") == 0) -- ensure that revisions are not being completed -check(mtn("automate", "get_revision", string.sub(rev, 1, 30)), 1, true, false) +check(mtn("automate", "get-revision", string.sub(rev, 1, 30)), 1, true, false) check(fsize("stdout") == 0) -- check that modified working copy manifest is correct writefile("foo", "bla bla\n") -check(mtn("automate", "get_manifest_of"), 0, true, false) +check(mtn("automate", "get-manifest-of"), 0, true, false) canonicalize("stdout") check(samefile("expected2", "stdout")) ============================================================ --- tests/automate_get_revision/__driver__.lua 86d844d42180fe5d15d92feb3ead32d41438cec3 +++ tests/automate_get_revision/__driver__.lua 85de2c5a36aad927505e8ba5adf86de2daadc847 @@ -10,19 +10,19 @@ base = base_revision() base = base_revision() -- check that a correct usage produces correctly formatted output -check(mtn("automate", "get_revision", base), 0, true, false) +check(mtn("automate", "get-revision", base), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) -- should work even if we don't specify the revision -check(mtn("automate", "get_revision"), 0, true, false) +check(mtn("automate", "get-revision"), 0, true, false) canonicalize("stdout") check(samefile("expected2", "stdout")) -- ensure that missing revisions fail -check(mtn("automate", "get_file", string.rep("0", 40)), 1, true, false) +check(mtn("automate", "get-file", string.rep("0", 40)), 1, true, false) check(fsize("stdout") == 0) -- ensure that revisions are not being completed -check(mtn("automate", "get_file", string.sub(base, 1, 30)), 1, true, false) +check(mtn("automate", "get-file", string.sub(base, 1, 30)), 1, true, false) check(fsize("stdout") == 0) ============================================================ --- tests/automate_interface_version/__driver__.lua 6fdc200cf0f8c01e6174ebb04f521b0e645198ec +++ tests/automate_interface_version/__driver__.lua 3af8d46d4fef94eacf2d9917423cb020de712c59 @@ -1,7 +1,10 @@ mtn_setup() mtn_setup() +-- check the old underscore command name first to ensure both names are valid check(mtn("automate", "interface_version"), 0, true, false) + +check(mtn("automate", "interface-version"), 0, true, false) rename("stdout", "a_v") -- MinGW's wc produces " 1" as output. Arithmetic comparison works, string comparison doesn't ============================================================ --- tests/automate_put_file/__driver__.lua a7aef8144d70bf049d0b8aa3d47a2252c01e7279 +++ tests/automate_put_file/__driver__.lua 6487914df46ad9e88a71121ece51034cd98ee11a @@ -7,41 +7,41 @@ writefile("expected2", contents2) writefile("expected2", contents2) -- check we error on wrong number of args -check(mtn("automate", "put_file"), 1, false, false) -check(mtn("automate", "put_file", "a", "b", "c"), 1, false, false) +check(mtn("automate", "put-file"), 1, false, false) +check(mtn("automate", "put-file", "a", "b", "c"), 1, false, false) -- check actually putting a file in -check(mtn("automate", "put_file", contents), 0, true, false) +check(mtn("automate", "put-file", contents), 0, true, false) canonicalize("stdout") file = "4cbd040533a2f43fc6691d773d510cda70f4126a" result = readfile("stdout") check(result == file.."\n") -- check that the file is there -check(mtn("automate", "get_file", file), 0, true, false) +check(mtn("automate", "get-file", file), 0, true, false) canonicalize("stdout") check(samefile("expected", "stdout")) -check(mtn("automate", "put_file", file, contents2), 0, true, false) +check(mtn("automate", "put-file", file, contents2), 0, true, false) canonicalize("stdout") file2 = "ea2e27149f06a6519aa46084da815265c10b0a2a" result = readfile("stdout") check(result == file2.."\n") -- check that the file is there -check(mtn("automate", "get_file", file2), 0, true, false) +check(mtn("automate", "get-file", file2), 0, true, false) canonicalize("stdout") check(samefile("expected2", "stdout")) -- check that nothing blows up if we feed it a file for a second time (with or -- without a delta base) -check(mtn("automate", "put_file", contents2), 0, true, false) +check(mtn("automate", "put-file", contents2), 0, true, false) canonicalize("stdout") file2 = "ea2e27149f06a6519aa46084da815265c10b0a2a" result = readfile("stdout") check(result == file2.."\n") -check(mtn("automate", "put_file", file, contents2), 0, true, false) +check(mtn("automate", "put-file", file, contents2), 0, true, false) canonicalize("stdout") file2 = "ea2e27149f06a6519aa46084da815265c10b0a2a" result = readfile("stdout") @@ -49,4 +49,4 @@ check(result == file2.."\n") -- check that things _do_ blow up if we feed it a file with a non-existent -- base (even if we already have the file we are trying to write!) +check(mtn("automate", "put-file", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", contents2), 1, true, false) -check(mtn("automate", "put_file", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", contents2), 1, true, false) ============================================================ --- tests/automate_put_revision/__driver__.lua deeeb9cb4ff8625284a4f69846ef9fa561a42ccf +++ tests/automate_put_revision/__driver__.lua f43f9e9992843fefa06f36fc144f6c5c1e212577 @@ -1,14 +1,14 @@ rev = "format_version \"1\"\n\nnew_manif mtn_setup() rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000004]\n\nold_revision []\n\nadd_dir \"\"\n\nadd_file \"foo\"\n content [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145]\n" -check(mtn("automate", "put_file", "blah"), 0, true, false) +check(mtn("automate", "put-file", "blah"), 0, true, false) canonicalize("stdout") file = "5bf1fd927dfb8679496a2e6cf00cbe50c1c87145" result = readfile("stdout") check(result == file.."\n") -check(mtn("automate", "put_revision", rev), 0, true, false) +check(mtn("automate", "put-revision", rev), 0, true, false) canonicalize("stdout") rev = "4c2c1d846fa561601254200918fba1fd71e6795d" result = readfile("stdout") @@ -28,10 +28,10 @@ rev = "format_version \"1\"\n\nnew_manif -- I'm trying to re-add a file which already exists -- rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [4c2c1d846fa561601254200918fba1fd71e6795d]\n\nadd_file \"foo\"\n content [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145]\n" -check(mtn("automate", "put_revision", rev), 3, false, false) +check(mtn("automate", "put-revision", rev), 3, false, false) --- but this should work (tests that we can use put_revision to commit a +-- but this should work (tests that we can use put-revision to commit a -- single-parent revision) -check(mtn("automate", "put_file", ""), 0, false, false) +check(mtn("automate", "put-file", ""), 0, false, false) rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [4c2c1d846fa561601254200918fba1fd71e6795d]\n\patch \"foo\"\n from [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145] to [da39a3ee5e6b4b0d3255bfef95601890afd80709]\n" +check(mtn("automate", "put-revision", rev), 0, false, false) -check(mtn("automate", "put_revision", rev), 0, false, false) ============================================================ --- tests/automate_put_revision_for_merge/__driver__.lua aa5ec996f615b4bbc6c293310e1c51f08acc9fd1 +++ tests/automate_put_revision_for_merge/__driver__.lua 8efd84d3bad2c60199c4a3432fcfea1728b4d52c @@ -1,4 +1,4 @@ --- test that 'automate put_revision' works for merge revisions +-- test that 'automate put-revision' works for merge revisions mtn_setup() addfile("foo", "blah blah parent") @@ -34,8 +34,8 @@ revision_text = ("format_version \"1\"\n .. "\n" .. "\n\n\n" -- just for fun ) -check(mtn("automate", "put_file", readfile("foo-merge")), 0, false, false) -check(mtn("automate", "put_revision", revision_text), 0, true, false) +check(mtn("automate", "put-file", readfile("foo-merge")), 0, false, false) +check(mtn("automate", "put-revision", revision_text), 0, true, false) r_merge = trim(readfile("stdout")) check(mtn("update", "-r", r_merge, "-b", "asdf"), 0, false, false) ============================================================ --- tests/automate_put_revision_unknown_file/__driver__.lua dc7ec109a51b1e8ccc29e876be4d40bad5363dbf +++ tests/automate_put_revision_unknown_file/__driver__.lua 990356e4ca8c804d3d9b7da67b277403f648800c @@ -1,12 +1,12 @@ -- --- subsequent test for automate put_revision +-- subsequent test for automate put-revision -- this should error out since the file version for foo.txt is unknown -- mtn_setup() -- added files are checked rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision []\n\nadd_dir \"\"\n\nadd_file \"foo.txt\"\ncontent [1234567890123456789012345678901234567890]" -check(mtn("automate", "put_revision", rev), 3, false, false) +check(mtn("automate", "put-revision", rev), 3, false, false) addfile("foo", "asdf") commit() @@ -15,4 +15,4 @@ rev = "format_version \"1\"\n\nnew_manif -- modified files are also checked rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [" .. rhash .. "]]\n\npatch \"foo\" from [" .. fhash .. "] to [0000000000000000000000000000000000000000]" +check(mtn("automate", "put-revision", rev), 3, false, false) -check(mtn("automate", "put_revision", rev), 3, false, false) ============================================================ --- tests/automate_stdio_options/__driver__.lua 9f9b0600a85959c0eb66344ace1d2ce3c5f5f3be +++ tests/automate_stdio_options/__driver__.lua 1e67093c31dbd68fa3c5b33ea1aea694b3d54b50 @@ -20,7 +20,7 @@ writefile("file", "modified") commit("testbranch") writefile("file", "modified") -diffcmd = "o1:r12:h:testbranche l12:content_diffe" +diffcmd = "o1:r12:h:testbranche l12:content-diffe" check(mtn("automate", "stdio"), 0, true, false, string.rep(diffcmd, 2)) dat = readfile("stdout") check(parse_stdio(dat, 0) == parse_stdio(dat, 1))