# # # patch "tests/attr_mtn_execute/__driver__.lua" # from [71336814d175009d5d873903a44870ab4344335c] # to [5a4c0bf50626d926e36b2299c07044e7812b15fc] # # patch "tests/branch_leaves_sync_bug/__driver__.lua" # from [c7e9f31992e04433708c88079db0369317958ab3] # to [6b227867aeb3692dba4e68efdfe5c59ff5c15919] # # patch "tests/clone_branch_no_dir/__driver__.lua" # from [695acc47ef59819a19f5293c3e2d0c8b8232ea5c] # to [b490cd593cefd9aa0b4dec9ab177eb72c3fb8058] # # patch "tests/clone_creates__MTN_log/__driver__.lua" # from [16d91acb1b626ef98ae7df93cb48dba96d014dbe] # to [5a8fe703d56ea39db22dcfbe6183294c1eb3f01b] # # patch "tests/clone_creates_right__MTN_options/__driver__.lua" # from [519e888f7c192dae07f453ffb921f946764d4c97] # to [f3a5d2acf159fc76c9f431305ab979a412c2a766] # # patch "tests/clone_validates_target_directory/__driver__.lua" # from [01411ca13ab3cf0866ebde87e2eefdfa58bc2e95] # to [1286723ee00ea9ea6831e12575ba7ac32a066645] # # patch "tests/clone_warning_with_multiple_heads/__driver__.lua" # from [7bbaac4ce7b65b394e9d22e1e8aad9238458bc1d] # to [338c983da4ef7d4f07c7e5cdd3863b7548a0dc9d] # # patch "tests/netsync_mtn_uri_scheme/__driver__.lua" # from [1efc798d6deec6ca12b604e5df5c4fae496fdb36] # to [11c6bd111a4180fadd93774ada78feadc002a73c] # # patch "tests/netsync_over_pipes/__driver__.lua" # from [db081492456a1dca7c1f7d963515d3d2dd8e2980] # to [dab7c5a31eca39da39976f03251ed8feaff76d77] # ============================================================ --- tests/attr_mtn_execute/__driver__.lua 71336814d175009d5d873903a44870ab4344335c +++ tests/attr_mtn_execute/__driver__.lua 5a4c0bf50626d926e36b2299c07044e7812b15fc @@ -29,7 +29,7 @@ copy("test.db", "test-clone.db") -- test clone with mtn:execute copy("test.db", "test-clone.db") -testURI="file:" .. test.root .. "/test-clone.db" +testURI="file://" .. test.root .. "/test-clone.db?testbranch" -check(nodb_mtn("clone", testURI, "testbranch", "clone"), 0, false, true) +check(nodb_mtn("clone", testURI, "clone"), 0, false, true) check(indir("clone", {"test", "-x","foo"}, 0, false, false)) ============================================================ --- tests/branch_leaves_sync_bug/__driver__.lua c7e9f31992e04433708c88079db0369317958ab3 +++ tests/branch_leaves_sync_bug/__driver__.lua 6b227867aeb3692dba4e68efdfe5c59ff5c15919 @@ -46,7 +46,7 @@ chdir(test.root) -- Create Beth's workspace via checkout, so 'update' works chdir(test.root) -check(abe_mtn("sync", "file://" .. test.root .. "/beth.db", "*"), 0, false, false) +check(abe_mtn("sync", "file://" .. test.root .. "/beth.db?*"), 0, false, false) check(beth_mtn("checkout", "--branch", "testbranch", "Beth"), 0, false, false) chdir("Beth") check(beth_mtn("genkey", "address@hidden"), 0, false, false, string.rep("address@hidden", 2)) @@ -64,7 +64,7 @@ rev_b = base_revision() rev_b = base_revision() -- Sync dbs -check(abe_mtn("sync", "file://" .. test.root .. "/beth.db", "*"), 0, false, false) +check(abe_mtn("sync", "file://" .. test.root .. "/beth.db?*"), 0, false, false) -- Abe merges chdir("Abe") @@ -80,7 +80,7 @@ rev_d = base_revision() rev_d = base_revision() -- Sync dbs (not clear if direction of sync matters) -check(beth_mtn("sync", "file://" .. test.root .. "/abe.db", "*"), 0, false, false) +check(beth_mtn("sync", "file://" .. test.root .. "/abe.db?*"), 0, false, false) -- bug; rev_d and rev_c are both heads according to branch_leaves table. check(beth_mtn("db", "check"), 0, false, false) ============================================================ --- tests/clone_branch_no_dir/__driver__.lua 695acc47ef59819a19f5293c3e2d0c8b8232ea5c +++ tests/clone_branch_no_dir/__driver__.lua b490cd593cefd9aa0b4dec9ab177eb72c3fb8058 @@ -6,18 +6,18 @@ copy("test.db", "test-clone.db") commit("mybranch") copy("test.db", "test-clone.db") -testURI="file:" .. test.root .. "/test-clone.db" +testURI="file://" .. test.root .. "/test-clone.db?mybranch" -check(nodb_mtn("clone", testURI, "mybranch"), 0, false, false) +check(nodb_mtn("clone", testURI), 0, false, false) check(exists("mybranch")) check(readfile("foo") == readfile("mybranch/foo")) -- but now that that directory exists, this clone should fail -check(nodb_mtn("clone", testURI, "mybranch"), 1, false, false) +check(nodb_mtn("clone", testURI), 1, false, false) -- but succeed if given a specific dir -check(nodb_mtn("clone", testURI, "mybranch", "otherdir"), 0, false, false) +check(nodb_mtn("clone", testURI, "otherdir"), 0, false, false) -- clone into . should not fail, like checkout mkdir("test4") -check(indir("test4", nodb_mtn("clone", testURI, "mybranch", ".")), 0, false, false) +check(indir("test4", nodb_mtn("clone", testURI, ".")), 0, false, false) ============================================================ --- tests/clone_creates__MTN_log/__driver__.lua 16d91acb1b626ef98ae7df93cb48dba96d014dbe +++ tests/clone_creates__MTN_log/__driver__.lua 5a8fe703d56ea39db22dcfbe6183294c1eb3f01b @@ -13,9 +13,9 @@ copy("test.db", "test-clone.db") check(mtn("--branch=testbranch", "--rcfile=commit_log.lua", "commit"), 0, false, false) copy("test.db", "test-clone.db") -testURI="file:" .. test.root .. "/test-clone.db" +testURI="file://" .. test.root .. "/test-clone.db?testbranch" -check(nodb_mtn("clone", testURI, "testbranch", "testbranch"), 0, false, true) +check(nodb_mtn("clone", testURI, "testbranch"), 0, false, true) check(exists("testbranch/_MTN/log")) check(fsize("_MTN/log") == 0) ============================================================ --- tests/clone_creates_right__MTN_options/__driver__.lua 519e888f7c192dae07f453ffb921f946764d4c97 +++ tests/clone_creates_right__MTN_options/__driver__.lua f3a5d2acf159fc76c9f431305ab979a412c2a766 @@ -10,7 +10,7 @@ commit() writefile("testfile", "blah") commit() -testURI="file:" .. test.root .. "/test-clone.db" +testURI="file://" .. test.root .. "/test-clone.db?testbranch" -- We use RAW_MTN because it used to be that passing --db= (as -- MTN does) would hide a bug in this functionality... @@ -18,15 +18,16 @@ testURI="file:" .. test.root .. "/test-c -- all of these inherit options settings from the current _MTN dir -- unless they override them on the command line -check(nodb_mtn("clone", testURI, "testbranch", "test_dir1"), 0, false, false) -check(nodb_mtn("clone", "--revision", rev, testURI, "testbranch", "test_dir2"), 0, false, false) -check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", testURI, "testbranch", "test_dir3"), 0, false, false) -check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", testURI, "testbranch", "--revision", rev, "test_dir4"), 0, false, false) +check(nodb_mtn("clone", testURI, "test_dir1"), 0, false, false) +check(nodb_mtn("clone", "--revision", rev, testURI, "test_dir2"), 0, false, false) +check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", testURI, "test_dir3"), 0, false, false) +check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", testURI, "--revision", rev, "test_dir4"), 0, false, false) -- checkout fails if the specified revision is not a member of the specified branch -check(nodb_mtn("clone", testURI, "--revision", rev, "foobar", "test_dir5"), 1, false, false) +check(nodb_mtn("clone", testURI, "--revision", rev, "test_dir5"), 1, false, false) check(mtn("cert", rev, "branch", "foobar"), 0, false, false) -check(nodb_mtn("clone", testURI, "--revision", rev, "foobar", "test_dir6"), 0, false, false) +testURI="file://" .. test.root .. "/test-clone.db?foobar" +check(nodb_mtn("clone", testURI, "--revision", rev, "test_dir6"), 0, false, false) for i = 1,2 do ============================================================ --- tests/clone_validates_target_directory/__driver__.lua 01411ca13ab3cf0866ebde87e2eefdfa58bc2e95 +++ tests/clone_validates_target_directory/__driver__.lua 1286723ee00ea9ea6831e12575ba7ac32a066645 @@ -6,15 +6,15 @@ copy("test.db", "test-clone.db") commit() copy("test.db", "test-clone.db") -testURI="file:" .. test.root .. "/test-clone.db" +testURI="file://" .. test.root .. "/test-clone.db?testbranch" -check(nodb_mtn("clone", testURI, "testbranch", "test_dir1"), 0, false, false) +check(nodb_mtn("clone", testURI, "test_dir1"), 0, false, false) writefile("test_dir2") -check(nodb_mtn("clone", testURI, "testbranch", "test_dir2"), 1, false, false) +check(nodb_mtn("clone", testURI, "test_dir2"), 1, false, false) mkdir("test_dir3") -check(nodb_mtn("clone", testURI, "testbranch", "test_dir3"), 1, false, false) +check(nodb_mtn("clone", testURI, "test_dir3"), 1, false, false) if existsonpath("chmod") and existsonpath("test") then -- skip this part if run as root (hi Gentoo!) @@ -27,9 +27,9 @@ if existsonpath("chmod") and existsonpat else mkdir("test_dir4") check({"chmod", "444", "test_dir4"}, 0, false) - check(nodb_mtn("clone", testURI, "testbranch", "test_dir4"), + check(nodb_mtn("clone", testURI, "test_dir4"), 1, false, false) - check(nodb_mtn("clone", testURI, "testbranch", "test_dir4/subdir"), + check(nodb_mtn("clone", testURI, "test_dir4/subdir"), 1, false, false) -- Reset the permissions so Autotest can correctly clean up our -- temporary directory. ============================================================ --- tests/clone_warning_with_multiple_heads/__driver__.lua 7bbaac4ce7b65b394e9d22e1e8aad9238458bc1d +++ tests/clone_warning_with_multiple_heads/__driver__.lua 338c983da4ef7d4f07c7e5cdd3863b7548a0dc9d @@ -16,9 +16,9 @@ copy("test.db", "test-clone.db") REV3=base_revision() copy("test.db", "test-clone.db") -testURI="file:" .. test.root .. "/test-clone.db" +testURI="file://" .. test.root .. "/test-clone.db?testbranch" -check(nodb_mtn("clone", testURI, "testbranch", "test_dirA"), +check(nodb_mtn("clone", testURI, "test_dirA"), 1, false, true) check(qgrep(REV2, "stderr")) check(qgrep(REV3, "stderr")) ============================================================ --- tests/netsync_mtn_uri_scheme/__driver__.lua 1efc798d6deec6ca12b604e5df5c4fae496fdb36 +++ tests/netsync_mtn_uri_scheme/__driver__.lua 11c6bd111a4180fadd93774ada78feadc002a73c @@ -22,7 +22,7 @@ check(not qgrep("^branch-test-exclude$", check( qgrep("^branch-test$", "stdout")) check(not qgrep("^branch-test-exclude$", "stdout")) -check(mtn2("pull", "mtn://" .. srv.address .. "?include=*"), 0, false, false) +check(mtn2("pull", "mtn://" .. srv.address .. "?*"), 0, false, false) check(mtn2("ls", "branches"), 0, true) check(qgrep("^branch$", "stdout")) check(qgrep("^branch-test$", "stdout")) ============================================================ --- tests/netsync_over_pipes/__driver__.lua db081492456a1dca7c1f7d963515d3d2dd8e2980 +++ tests/netsync_over_pipes/__driver__.lua dab7c5a31eca39da39976f03251ed8feaff76d77 @@ -7,6 +7,6 @@ commit() addfile("testfile", "foo") commit() -check(mtn("sync", "file:test2.db", "testbranch"), 0, false, true) +check(mtn("sync", "file:test2.db?testbranch"), 0, false, true) check(not qgrep("error", "stderr")) check_same_db_contents("test.db", "test2.db")