[Monotone-commits-diffs] net.venge.monotone.lua-5.2: f9dc65ad78b0a06da037a4897d291b8bca4b5f16

[code]

revision:            f9dc65ad78b0a06da037a4897d291b8bca4b5f16
date:                2012-04-25T15:39:58
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.lua-5.2
changelog:
* test/func/automate_interface_version/__driver__.lua,
  test/func/automate_put_revision/__driver__.lua,
  test/func/clone_weird_branch_names/__driver__.lua,
  test/func/list_databases/__driver__.lua,
  test/func/list_workspaces/__driver__.lua,
  test/func/log_--no-files_and_--merges/__driver__.lua,
  test/func/serve-automate-single-run/__driver__.lua,
  test/func/two_parent_workspace_inodeprints/__driver__.lua: A single
  backslash in a string does nothing good except when followed by a
  character with a defined meaning.  All others are invalid in Lua, and
  usually incorrect.  They have been removed or double, as was fit for
  each case.

manifest:
format_version "1"

new_manifest [52e3c1f22819182bddc7e9f6a88d8bbaae72e601]

old_revision [9c086b9ef0b3d73abec54a71e1efa82c82bd5e79]

patch "test/func/automate_interface_version/__driver__.lua"
 from [6fdc200cf0f8c01e6174ebb04f521b0e645198ec]
   to [8b65eadc6b526d1490ed02dc74a06134612c5c7b]

patch "test/func/automate_put_revision/__driver__.lua"
 from [deeeb9cb4ff8625284a4f69846ef9fa561a42ccf]
   to [e116294fa44da8646b2e41288615035f913b9563]

patch "test/func/clone_weird_branch_names/__driver__.lua"
 from [0afc1816afa8d3e4b2dfb9fd016500f224432f0a]
   to [e1253c24b2b696483bb621c85e48caa8d5c2cc90]

patch "test/func/list_databases/__driver__.lua"
 from [d78cd923f7f4950590407127854dcd3467b85625]
   to [9ab31d5e81fbca51ae7a5a919953e79d9c8e6631]

patch "test/func/list_workspaces/__driver__.lua"
 from [d7cc622b5a893fd344653512a434440082dbc247]
   to [e83147fac524181f19720ec74b04a38f7b1c41a7]

patch "test/func/log_--no-files_and_--merges/__driver__.lua"
 from [1a7944f904399553b56f8f4cc69b22152d03b851]
   to [7e1b2967179f5b5dec932ee44c0004e41b527bb0]

patch "test/func/serve-automate-single-run/__driver__.lua"
 from [7a75e9ff02a15ebc62a44c1c596ed39e3fdae0a0]
   to [9ac5e0e67c0a6849289ddfaf175505f674da6410]

patch "test/func/two_parent_workspace_inodeprints/__driver__.lua"
 from [cb9175dd15771248cc7d53864fa77c17b9d09802]
   to [27930df4f388e02e7fa017e62aa0dd9873ac3d35]
============================================================
--- test/func/automate_interface_version/__driver__.lua	6fdc200cf0f8c01e6174ebb04f521b0e645198ec
+++ test/func/automate_interface_version/__driver__.lua	8b65eadc6b526d1490ed02dc74a06134612c5c7b
@@ -7,4 +7,4 @@ check(numlines("a_v") == 1)
 -- MinGW's wc produces "      1" as output.  Arithmetic comparison works, string comparison doesn't
 check(numlines("a_v") == 1)
 -- This is really ^[0-9]+\.[0-9]+$, but m4 is obfuscatory.
-check(qgrep("^[0-9]+\.[0-9]+$", "a_v"))
+check(qgrep("^[0-9]+\\.[0-9]+$", "a_v"))
============================================================
--- test/func/automate_put_revision/__driver__.lua	deeeb9cb4ff8625284a4f69846ef9fa561a42ccf
+++ test/func/automate_put_revision/__driver__.lua	e116294fa44da8646b2e41288615035f913b9563
@@ -33,5 +33,5 @@ check(mtn("automate", "put_file", ""), 0
 -- 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)
-rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [4c2c1d846fa561601254200918fba1fd71e6795d]\n\patch \"foo\"\n from [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145] to [da39a3ee5e6b4b0d3255bfef95601890afd80709]\n"
+rev = "format_version \"1\"\n\nnew_manifest [0000000000000000000000000000000000000000]\n\nold_revision [4c2c1d846fa561601254200918fba1fd71e6795d]\n\npatch \"foo\"\n from [5bf1fd927dfb8679496a2e6cf00cbe50c1c87145] to [da39a3ee5e6b4b0d3255bfef95601890afd80709]\n"
 check(mtn("automate", "put_revision", rev), 0, false, false)
============================================================
--- test/func/clone_weird_branch_names/__driver__.lua	0afc1816afa8d3e4b2dfb9fd016500f224432f0a
+++ test/func/clone_weird_branch_names/__driver__.lua	e1253c24b2b696483bb621c85e48caa8d5c2cc90
@@ -9,7 +9,7 @@ test_uri="file://" .. url_encode_path(te
 
 -- some of the special chars need to get double-escaped to get "through"
 test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") ..
-  "?" .. url_encode_query("my-branch\\\[1,2\\\]-1^3")
+  "?" .. url_encode_query("my-branch\\[1,2\\]-1^3")
 check(nodb_mtn("clone", test_uri), 0, false, false)
 check(exists("my-branch[1,2]-1^3"))
 check(readfile("foo") == readfile("my-branch[1,2]-1^3/foo"))
============================================================
--- test/func/list_databases/__driver__.lua	d78cd923f7f4950590407127854dcd3467b85625
+++ test/func/list_databases/__driver__.lua	9ab31d5e81fbca51ae7a5a919953e79d9c8e6631
@@ -25,15 +25,15 @@ check(mt("ls", "dbs"), 0, true, false)
 check(exists("managed_databases/bar.mtn"))
 
 check(mt("ls", "dbs"), 0, true, false)
-check(qgrep(":bar.mtn.+in.+list_databases\/managed_databases", "stdout"))
+check(qgrep(":bar.mtn.+in.+list_databases/managed_databases", "stdout"))
 check(qgrep("\tno known valid workspaces", "stdout"))
 
 check(mt("setup", "-d", ":bar", "-b", "test.foo.branch", "test_foo"), 0, false, false)
 
 check(mt("ls", "dbs"), 0, true, false)
 check(not qgrep("\tno known valid workspaces", "stdout"))
-check(qgrep("\ttest.foo.branch.+in.+list_databases\/test_foo", "stdout"))
+check(qgrep("\ttest.foo.branch.+in.+list_databases/test_foo", "stdout"))
 
 check(rename("managed_databases/bar.mtn", "managed_databases/bar.db"))
 check(mt("ls", "dbs"), 0, true, false)
-check(qgrep(":bar.db.+in.+list_databases\/managed_databases", "stdout"))
+check(qgrep(":bar.db.+in.+list_databases/managed_databases", "stdout"))
============================================================
--- test/func/list_workspaces/__driver__.lua	d7cc622b5a893fd344653512a434440082dbc247
+++ test/func/list_workspaces/__driver__.lua	e83147fac524181f19720ec74b04a38f7b1c41a7
@@ -10,17 +10,17 @@ check(raw_mtn("ls", "workspaces", "-d", 
 check(raw_mtn("setup", "-d", "test.mtn", "-b", "test.branch1", "work1"), 0, false, false)
 
 check(raw_mtn("ls", "workspaces", "-d", "test.mtn"), 0, true, false)
-check(qgrep("test.branch1.+in.+list_workspaces\/work1", "stdout"))
+check(qgrep("test.branch1.+in.+list_workspaces/work1", "stdout"))
 
 check(raw_mtn("setup", "-d", "test.mtn", "-b", "test.branch2", "work2"), 0, false, false)
 check(rename("work1", "work3"))
 
 check(raw_mtn("ls", "workspaces", "-d", "test.mtn"), 0, true, false)
-check(qgrep("test.branch2.+in.+list_workspaces\/work2", "stdout"))
-check(not qgrep("test.branch1.+in.+list_workspaces\/work1", "stdout"))
+check(qgrep("test.branch2.+in.+list_workspaces/work2", "stdout"))
+check(not qgrep("test.branch1.+in.+list_workspaces/work1", "stdout"))
 
 check(indir("work3", raw_mtn("register_workspace", "-d", "../test.mtn")), 0, false, false)
 
 check(raw_mtn("ls", "workspaces", "-d", "test.mtn"), 0, true, false)
-check(qgrep("test.branch1.+in.+list_workspaces\/work3", "stdout"))
+check(qgrep("test.branch1.+in.+list_workspaces/work3", "stdout"))
 
============================================================
--- test/func/log_--no-files_and_--merges/__driver__.lua	1a7944f904399553b56f8f4cc69b22152d03b851
+++ test/func/log_--no-files_and_--merges/__driver__.lua	7e1b2967179f5b5dec932ee44c0004e41b527bb0
@@ -29,8 +29,8 @@ check(mtn("log"), 0, true, false)
 
 -- check that merge is included by default
 check(mtn("log"), 0, true, false)
-check(qgrep("^[\\|\\\\\/ ]+Revision.*"..R2, "stdout"))
+check(qgrep("^[\\|\\\\/ ]+Revision.*"..R2, "stdout"))
 
 -- and that it is excluded by --no-merges
 check(mtn("log", "--no-merges"), 0, true, false)
-check(not qgrep("^[\\|\\\\\/ ]+Revision.*"..R2, "stdout"))
+check(not qgrep("^[\\|\\\\/ ]+Revision.*"..R2, "stdout"))
============================================================
--- test/func/serve-automate-single-run/__driver__.lua	7a75e9ff02a15ebc62a44c1c596ed39e3fdae0a0
+++ test/func/serve-automate-single-run/__driver__.lua	9ac5e0e67c0a6849289ddfaf175505f674da6410
@@ -28,7 +28,7 @@ check(mtn2("automate", "remote", "--remo
 
 check(mtn2("automate", "remote", "--remote-stdio-host", server.address,
     "interface_version"), 0, true, false)
-check(qgrep("^[0-9]{2,}\.[0-9]+$", "stdout"))
+check(qgrep("^[0-9]{2,}\\.[0-9]+$", "stdout"))
 
 check(mtn2("automate", "remote", "--remote-stdio-host", server.address,
     "leaves"), 0, true, false)
============================================================
--- test/func/two_parent_workspace_inodeprints/__driver__.lua	cb9175dd15771248cc7d53864fa77c17b9d09802
+++ test/func/two_parent_workspace_inodeprints/__driver__.lua	27930df4f388e02e7fa017e62aa0dd9873ac3d35
@@ -19,13 +19,13 @@ check(mtn("status"), 0, true, false)
 
 -- check that we've got the expected initial status
 check(mtn("status"), 0, true, false)
-check(qgrep("patched[ 	]\+foo", "stdout"))
+check(qgrep("patched[ 	]+foo", "stdout"))
 
 -- enable inodeprints
 writefile("_MTN/inodeprints")
 
 check(mtn("status"), 0, true, false)
-check(qgrep("patched[ 	]\+foo", "stdout"))
+check(qgrep("patched[ 	]+foo", "stdout"))
 
 sleep(5)