[Monotone-commits-diffs] net.venge.monotone.string-sanitization: 8a84cbfb78635c15928397fa96b020927eb52f7a

[code]

revision:            8a84cbfb78635c15928397fa96b020927eb52f7a
date:                2011-03-01T01:39:56
author:              address@hidden
branch:              net.venge.monotone.string-sanitization
changelog:
* test/func/*/__driver__.lua: fix a couple of failing tests caused
  by the recent string changes

manifest:
format_version "1"

new_manifest [88e4d3c1b3c4a4d832841d92a28d370f54beb478]

old_revision [40d6ee12440701113489513401fabce277189f80]

patch "test/func/addition_of_files_and_directories/__driver__.lua"
 from [e29d6372557546b569771cc3191cbbc4a78400a1]
   to [0051df02ca4bdb2c88e5931b087aaa6b3b0e67e5]

patch "test/func/automate_log/__driver__.lua"
 from [58b89a2de80cf56d9bdc3983123aecf71b9475d0]
   to [686e1a3bb354f293e228e11dd630ed88fb6358ba]

patch "test/func/drop_missing_and_unknown_files/__driver__.lua"
 from [6e145212c1085b0f6dc31673386efffdb680d23c]
   to [dd3bde9ef250bed48c56e5f0ae0cb454ddcf9228]

patch "test/func/drop_with_actual_removal/__driver__.lua"
 from [c9d54979b1aa971f6d81159e82160a771c381dec]
   to [898696063d078885fbc42143a8813ec6a7c37bde]

patch "test/func/rename_warns_on_subdir_move/__driver__.lua"
 from [54f3a635476643fd907b987f474d9e70fa93719f]
   to [e8b6134155c2b559c97d153b42280f15c9db4006]

patch "test/func/renaming_a_file/__driver__.lua"
 from [e50cef4ee28f3032e8468da7d41548b0bd1a78e9]
   to [95457ea61436f717087e3334871aa2edeca75f29]

patch "test/func/resolve_conflicts_content/update-1"
 from [d46c485d67feccba79540fc6cd164d963ffdf500]
   to [e7dc8443c2b1baa9f8a7eda7cbcbbd2685cbbab3]

patch "test/func/resolve_conflicts_none/update-1"
 from [9e140e34be5c104056d061ed65dd2efdf9a56c44]
   to [3d979297e64c6051a701f706b977eeda1d3d92d0]

patch "test/func/skip_invalid_paths/__driver__.lua"
 from [18ccf9b67e40c8297e2638e49bbf300770145efc]
   to [1b91c6e9ed33dd1066d9920a9c2a578767f13af9]

patch "test/func/two_parent_workspace_add_drop_rename/__driver__.lua"
 from [f2edf6e4783c744259d791f4452fdabd211451e6]
   to [3caddee7e154c62729fa5f31820a5ac1915c525a]

patch "test/func/undrop/__driver__.lua"
 from [05b13418ee4c4522954a3f2534d548c8019c30fe]
   to [a732b394c0292d56e3b62b151d6085bbdd3e0944]

patch "test/func/ws_ops_with_wrong_node_type/__driver__.lua"
 from [67e446cbe85a052f948cb65a30114d21359c50b9]
   to [5134453dc18f0f438b44c7ae71ef3a8c6548b592]
============================================================
--- test/func/addition_of_files_and_directories/__driver__.lua	e29d6372557546b569771cc3191cbbc4a78400a1
+++ test/func/addition_of_files_and_directories/__driver__.lua	0051df02ca4bdb2c88e5931b087aaa6b3b0e67e5
@@ -13,15 +13,15 @@ check(mtn("add", "file0"), 0, false, tru
 -- newly added files should appear as such
 
 check(mtn("add", "file0"), 0, false, true)
-check(qgrep("adding file0", "stderr"))
+check(qgrep("adding 'file0'", "stderr"))
 
 check(mtn("add", "dir"), 0, false, true)
-check(not qgrep("adding dir/file1", "stderr"))
-check(not qgrep("adding dir/file2", "stderr"))
+check(not qgrep("adding 'dir/file1'", "stderr"))
+check(not qgrep("adding 'dir/file2'", "stderr"))
 
 check(mtn("add", "-R", "dir"), 0, false, true)
-check(qgrep("adding dir/file1", "stderr"))
-check(qgrep("adding dir/file2", "stderr"))
+check(qgrep("adding 'dir/file1'", "stderr"))
+check(qgrep("adding 'dir/file2'", "stderr"))
 
 check(mtn("status"), 0, true)
 check(qgrep("file0", "stdout"))
@@ -34,11 +34,11 @@ check(mtn("add", "file0"), 0, false, tru
 -- (i.e. they should be ignored)
 
 check(mtn("add", "file0"), 0, false, true)
-check(qgrep("skipping file0", "stderr"))
+check(qgrep("skipping 'file0'", "stderr"))
 
 check(mtn("add", "-R", "dir"), 0, false, true)
-check(qgrep("skipping dir/file1", "stderr"))
-check(qgrep("skipping dir/file2", "stderr"))
+check(qgrep("skipping 'dir/file1'", "stderr"))
+check(qgrep("skipping 'dir/file2'", "stderr"))
 
 check(mtn("status"), 0, true)
 check(not qgrep("file0", "stdout"))
@@ -58,14 +58,14 @@ check(mtn("add", "--unknown"), 0, false,
 --check(raw_mtn("ls", "unkown"), 0, true, false)
 
 check(mtn("add", "--unknown"), 0, false, true)
-check(qgrep('adding file3', "stderr"))
---check(not qgrep('adding file4.ignore', "stderr"))
-check(qgrep('adding dir/file5', "stderr"))
---check(not qgrep('adding dir/file6.ignore', "stderr"))
-check(qgrep('adding dir2', "stderr"))
-check(not qgrep('adding dir2/file7', "stderr"))
-check(not qgrep('skipping dir2/file7', "stderr"))
-check(not qgrep('adding test_hooks.lua', "stderr"))
+check(qgrep("adding 'file3'", "stderr"))
+--check(not qgrep("adding 'file4\.ignore'", "stderr"))
+check(qgrep("adding 'dir/file5'", "stderr"))
+--check(not qgrep("adding 'dir/file6\.ignore'", "stderr"))
+check(qgrep("adding 'dir2'", "stderr"))
+check(not qgrep("adding 'dir2/file7'", "stderr"))
+check(not qgrep("skipping 'dir2/file7'", "stderr"))
+check(not qgrep("adding 'test_hooks.lua'", "stderr"))
 
 check(mtn("status"), 0, true)
 check(not qgrep("file0", "stdout"))
============================================================
--- test/func/drop_missing_and_unknown_files/__driver__.lua	6e145212c1085b0f6dc31673386efffdb680d23c
+++ test/func/drop_missing_and_unknown_files/__driver__.lua	dd3bde9ef250bed48c56e5f0ae0cb454ddcf9228
@@ -10,7 +10,7 @@ check(mtn("drop", "--bookkeep-only", "ma
 remove("maude")
 
 check(mtn("drop", "--bookkeep-only", "maude"), 0, false, true)
-check(qgrep('dropping maude from workspace manifest', "stderr"))
+check(qgrep("dropping 'maude' from workspace manifest", "stderr"))
 
 check(mtn("status"), 0, true)
 check(qgrep("maude", "stdout"))
@@ -18,14 +18,14 @@ check(mtn("drop", "foobar"), 0, false, t
 check(not qgrep("places/cemetery", "stdout"))
 
 check(mtn("drop", "foobar"), 0, false, true)
-check(qgrep("skipping foobar", "stderr"))
+check(qgrep("skipping 'foobar'", "stderr"))
 
 remove("harold")
 remove("places/cemetery")
 
 check(mtn("drop", "--bookkeep-only", "--missing"), 0, false, true)
-check(qgrep('dropping harold from workspace manifest', "stderr"))
-check(qgrep('dropping places/cemetery from workspace manifest', "stderr"))
+check(qgrep("dropping 'harold' from workspace manifest", "stderr"))
+check(qgrep("dropping 'places/cemetery' from workspace manifest", "stderr"))
 
 check(mtn("status"), 0, true)
 check(qgrep("maude", "stdout"))
============================================================
--- test/func/renaming_a_file/__driver__.lua	e50cef4ee28f3032e8468da7d41548b0bd1a78e9
+++ test/func/renaming_a_file/__driver__.lua	95457ea61436f717087e3334871aa2edeca75f29
@@ -49,7 +49,7 @@ check(mtn("rename", "--bookkeep-only", "
 check(mtn("status"), 0, false, false)
 rename("bar", "barfoo")
 check(mtn("rename", "--bookkeep-only", "bar", "barfoo"), 0, false, true)
-check(qgrep('renaming bar to barfoo in workspace manifest', "stderr"))
+check(qgrep("renaming 'bar' to 'barfoo' in workspace manifest", "stderr"))
 check(mtn("status"), 0, false, false)
 
 -- move file to wrong place before renaming it
@@ -58,5 +58,5 @@ check(mtn("rename", "--bookkeep-only", "
 check(mtn("status"), 0, false, false)
 rename("bar", "barfoofoo")
 check(mtn("rename", "--bookkeep-only", "bar", "barfoo"), 0, false, true)
-check(qgrep('renaming bar to barfoo in workspace manifest', "stderr"))
+check(qgrep("renaming 'bar' to 'barfoo' in workspace manifest", "stderr"))
 check(mtn("status"), 1, false, false)
============================================================
--- test/func/drop_with_actual_removal/__driver__.lua	c9d54979b1aa971f6d81159e82160a771c381dec
+++ test/func/drop_with_actual_removal/__driver__.lua	898696063d078885fbc42143a8813ec6a7c37bde
@@ -77,7 +77,7 @@ check(mtn("drop", "file2"), 0, false, tr
 -- drop of changed committed file
 -- it remains and a warning is printed
 check(mtn("drop", "file2"), 0, false, true)
-check(qgrep("file file2 changed", "stderr"))
+check(qgrep("file 'file2' changed", "stderr"))
 check(exists("file2"))
 
 -- drop of changed committed file --bookkeep-
--- test/func/ws_ops_with_wrong_node_type/__driver__.lua	67e446cbe85a052f948cb65a30114d21359c50b9
+++ test/func/ws_ops_with_wrong_node_type/__driver__.lua	5134453dc18f0f438b44c7ae71ef3a8c6548b592
@@ -17,6 +17,6 @@ check(mtn("add", "dir2"), 0, false, true
 -- should now be already added (this is a soft error now.  see stderr to
 -- ensure proper response
 check(mtn("add", "dir2"), 0, false, true)
-check(qgrep("skipping dir2, already accounted for in workspace", "stderr"))
+check(qgrep("skipping 'dir2', already accounted for in workspace", "stderr"))
 -- should have happened already in the --bookkeep-only version above.
 check(mtn("rename", "file", "dir2"), 1, false, false)
============================================================
--- test/func/two_parent_workspace_add_drop_rename/__driver__.lua	f2edf6e4783c744259d791f4452fdabd211451e6
+++ test/func/two_parent_workspace_add_drop_rename/__driver__.lua	3caddee7e154c62729fa5f31820a5ac1915c525a
@@ -17,12 +17,12 @@ check(mtn("add", "fudgie"), 0, false, tr
 writefile("fudgie", "fudgie content")
 
 check(mtn("add", "fudgie"), 0, false, true)
-check(qgrep("adding fudgie", "stderr"))
+check(qgrep("adding 'fudgie'", "stderr"))
 
 check(mtn("drop", "--bookkeep-only", "fudgie"), 0, false, true)
-check(qgrep("dropping fudgie", "stderr"))
+check(qgrep("dropping 'fudgie'", "stderr"))
 
 check(mtn("rename", "foo", "bar"), 0, false, true)
-check(qgrep("renaming foo to bar", "stderr"))
+check(qgrep("renaming 'foo' to 'bar'", "stderr"))
 
 commit()
============================================================
--- test/func/resolve_conflicts_content/update-1	d46c485d67feccba79540fc6cd164d963ffdf500
+++ test/func/resolve_conflicts_content/update-1	e7dc8443c2b1baa9f8a7eda7cbcbbd2685cbbab3
@@ -2,8 +2,8 @@ mtn: [right] b221355d26015cd04668aa4587c
 mtn: selected update target b221355d26015cd04668aa4587cff8068e4646a2
 mtn: [left]  a047a11aae2e43f05171d8ffd8bbfde054f8a4f5
 mtn: [right] b221355d26015cd04668aa4587cff8068e4646a2
-mtn: updating files/bar
-mtn: updating files/baz
-mtn: updating files/inter1
-mtn: updating files/inter2
+mtn: updating 'files/bar'
+mtn: updating 'files/baz'
+mtn: updating 'files/inter1'
+mtn: updating 'files/inter2'
 mtn: updated to base revision b221355d26015cd04668aa4587cff8068e4646a2
============================================================
--- test/func/resolve_conflicts_none/update-1	9e140e34be5c104056d061ed65dd2efdf9a56c44
+++ test/func/resolve_conflicts_none/update-1	3d979297e64c6051a701f706b977eeda1d3d92d0
@@ -2,7 +2,7 @@ mtn: [right] 7f38dd536c4f995a4a7ccd788d2
 mtn: selected update target 7f38dd536c4f995a4a7ccd788d2b5be2755805cf
 mtn: [left]  9c1b716d160fd291ed7c68f5b6387cfbf8afb6fb
 mtn: [right] 7f38dd536c4f995a4a7ccd788d2b5be2755805cf
-mtn: updating bar
-mtn: updating baz
-mtn: updating foo
+mtn: updating 'bar'
+mtn: updating 'baz'
+mtn: updating 'foo'
 mtn: updated to base revision 7f38dd536c4f995a4a7ccd788d2b5be2755805cf
============================================================
--- test/func/skip_invalid_paths/__driver__.lua	18ccf9b67e40c8297e2638e49bbf300770145efc
+++ test/func/skip_invalid_paths/__driver__.lua	1b91c6e9ed33dd1066d9920a9c2a578767f13af9
@@ -9,7 +9,7 @@ check(qgrep("skipping file 'foo/\\\\' wi
 
 check(mtn("add", "--recursive", "foo"), 0, false, true)
 check(qgrep("skipping file 'foo/\\\\' with unsupported name", "stderr"))
-check(qgrep("adding foo to workspace manifest", "stderr"))
+check(qgrep("adding 'foo' to workspace manifest", "stderr"))
 
 check(mtn("add", "foo/\\"), 1, false, true)
 check(qgrep("misuse: path 'foo/\\\\' is invalid", "stderr"))
============================================================
--- test/func/rename_warns_on_subdir_move/__driver__.lua	54f3a635476643fd907b987f474d9e70fa93719f
+++ test/func/rename_warns_on_subdir_move/__driver__.lua	e8b6134155c2b559c97d153b42280f15c9db4006
@@ -6,10 +6,10 @@ check(mtn("mv", "file", "file"), 1, fals
 commit()
 
 check(mtn("mv", "file", "file"), 1, false, true)
-check(qgrep("destination file/ is not a directory", "stderr"))
+check(qgrep("destination 'file/' is not a directory", "stderr"))
 
 check(mtn("mv", "dir", "dir"), 0, false, true)
-check(qgrep("cannot move `dir' to a subdirectory of itself, `dir/dir'", "stderr"))
+check(qgrep("cannot move 'dir' to a subdirectory of itself, 'dir/dir'", "stderr"))
 
 check(mtn("mv", "dir", "dir/subdir"), 0, false, true)
-check(qgrep("cannot move `dir' to a subdirectory of itself, `dir/subdir/dir'", "stderr"))
+check(qgrep("cannot move 'dir' to a subdirectory of itself, 'dir/subdir/dir'", "stderr"))
============================================================
--- test/func/undrop/__driver__.lua	05b13418ee4c4522954a3f2534d548c8019c30fe
+++ test/func/undrop/__driver__.lua	a732b394c0292d56e3b62b151d6085bbdd3e0944
@@ -17,7 +17,7 @@ check(mtn("drop", "changed"), 0, false, 
 -- With changes before 'drop', 'undrop' is like 'revert --bookkeeponly'
 writefile("changed", "modified")
 check(mtn("drop", "changed"), 0, false, true)
-check(qgrep("file changed changed - it will be dropped but not deleted", "stderr"))
+check(qgrep("file 'changed' changed - it will be dropped but not deleted", "stderr"))
 check(mtn("undrop", "changed"), 0, false, false)
 check(readfile("changed")=="modified")
 check(mtn("status"), 0, true, false)
@@ -30,8 +30,8 @@ check(mtn("drop", "changed", "unchanged"
 
 writefile("changed", "modified")
 check(mtn("drop", "changed", "unchanged"), 0, false, true)
-check(qgrep("file changed changed - it will be dropped but not deleted", "stderr"))
-check(qgrep("dropping unchanged from workspace", "stderr"))
+check(qgrep("file 'changed' changed - it will be dropped but not deleted", "stderr"))
+check(qgrep("dropping 'unchanged' from workspace", "stderr"))
 check(mtn("undrop", "changed", "unchanged"), 0, false, false)
 check(readfile("changed")=="modified")
 check(readfile("unchanged")=="base")
@@ -48,10 +48,10 @@ check(mtn("drop", "--recursive", "dir1")
 
 writefile("dir1/file1", "file1-changed")
 check(mtn("drop", "--recursive", "dir1"), 0, false, true)
-check(qgrep("file dir1/file1 changed - it will be dropped but not deleted", "stderr"))
-check(qgrep("directory dir1 not empty - it will be dropped but not deleted", "stderr"))
-check(qgrep("dropping dir1/file2 from workspace", "stderr"))
-check(qgrep("dropping dir1 from workspace", "stderr"))
+check(qgrep("file 'dir1/file1' changed - it will be dropped but not deleted", "stderr"))
+check(qgrep("directory 'dir1' not empty - it will be dropped but not deleted", "stderr"))
+check(qgrep("dropping 'dir1/file2' from workspace", "stderr"))
+check(qgrep("dropping 'dir1' from workspace", "stderr"))
 
 check(mtn("undrop", "dir1"), 0, false, true)
 check(readfile("dir1/file1")=="file1-changed")
@@ -63,9 +63,9 @@ check(mtn("drop", "--recursive", "dir1")
 writefile("dir1/file1", "file1")
 
 check(mtn("drop", "--recursive", "dir1"), 0, false, true)
-check(qgrep("dropping dir1/file1 from workspace", "stderr"))
-check(qgrep("dropping dir1/file2 from workspace", "stderr"))
-check(qgrep("dropping dir1 from workspace", "stderr"))
+check(qgrep("dropping 'dir1/file1' from workspace", "stderr"))
+check(qgrep("dropping 'dir1/file2' from workspace", "stderr"))
+check(qgrep("dropping 'dir1' from workspace", "stderr"))
 
 check(mtn("undrop", "dir1"), 0, false, true)
 check(readfile("dir1/file1")=="file1")
@@ -79,7 +79,7 @@ check(mtn("drop", "dir1"), 1, false, tru
 
 -- drop a directory without --recursive gives an error, so 'undrop --recursive' is redundant
 check(mtn("drop", "dir1"), 1, false, true)
-check(qgrep("cannot remove dir1/, it is not empty", "stderr"))
+check(qgrep("cannot remove 'dir1/', it is not empty", "stderr"))
 
 -- File that was dropped and committed cannot be undropped
 check(mtn("drop", "changed"), 0, false, false)
============================================================
--- test/func/automate_log/__driver__.lua	58b89a2de80cf56d9bdc3983123aecf71b9475d0
+++ test/func/automate_log/__driver__.lua	686e1a3bb354f293e228e11dd630ed88fb6358ba
@@ -3,7 +3,7 @@ mtn_setup()
 mtn_setup()
 
 -- empty branch
-check(mtn("automate", "log"), 1, false, true)
+check(mtn("automate", "log"), 0, false, true)
 check(qgrep("warning: workspace has no parent revision,", "stderr"))
 
 includecommon("automate_ancestry.lua")