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

[code]

revision:            a8e86aea039090f45b6c732e8d4922dd0d66bb64
date:                2011-03-13T23:28:45
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.string-sanitization
changelog:
* test/func/*/*: Change some test material to adapt to changed error
  messages

manifest:
format_version "1"

new_manifest [c72bec980f0681a4a5d2e3024a3cbac0a0b07f0b]

old_revision [7e24e7f1c988811dee247971becff5f87bdcf688]

patch "test/func/automate_inventory_ignore_dirs/expected_2.stderr"
 from [9937d25da7c3bd55a10ba16018fade6ee9562e92]
   to [d55fe80779f96748104edd28d6f40f68323e9768]

patch "test/func/automate_set_drop_attribute/__driver__.lua"
 from [6de8648b80cc4aeb0c5f08e66dc4b5c7964ce339]
   to [5a090a94f10ebfa6ddb7378f9a285865ce881245]

patch "test/func/automate_show_conflicts_defaults/__driver__.lua"
 from [1db31e9b04fa6410eee236d9270843dc062a8424]
   to [96a299a7be5813698d201562be57f0300670333d]

patch "test/func/changelog_editor/__driver__.lua"
 from [0eccf936ef1688640f00aba6c786ad14c3ddb3cf]
   to [70a687f4022fd57367899726c3e11d772ad95dbd]

patch "test/func/clone_aborts_on_branch_pattern_in_uri/__driver__.lua"
 from [960b48a9f83ceb2caad655e07abf084cc5ad4f0a]
   to [bf16d8dcec86e4ae012d1c6078082f9d13a9fd80]

patch "test/func/commit_using__MTN_log/__driver__.lua"
 from [64507df85499593c9de2e854a3add3b4d6683c47]
   to [b5a955883dbe4a7bbefdc162dd270215dbb09bb5]

patch "test/func/diff_reverse/__driver__.lua"
 from [e174ee4ebe94c2af95edf48fd2f30029f95a8958]
   to [c5f22b6a72edf6a98dbe2a3817067e7779f316d6]

patch "test/func/merge((patch_a),_(drop_a))/__driver__.lua"
 from [bc219dd7af69d3aac168acc48d12ac59f6edc305]
   to [336ee81dc87b3f5843cfcbc94b0e2c899f965523]

patch "test/func/resolve_conflicts_errors/__driver__.lua"
 from [8c27319a9b511c25b97e2cac91d0e584423583c3]
   to [4911dc65645a5af929cd990eef09c97146e60d17]

patch "test/func/resolve_conflicts_errors/conflicts-attr-store-2"
 from [500ec44e9f9534091546581601cf58927137d359]
   to [5fbf832ebdb1554a95c7ef41abb93a38858f6dc7]

patch "test/func/resolve_conflicts_read_all/invalid-add_left"
 from [7e560447bbcfe9bd416582dcc143a0ea45bc828d]
   to [3fb71334c2cc5855c3504304454398770ae1de38]

patch "test/func/resolve_conflicts_read_all/invalid-add_right"
 from [9d8195f9f9cd124855b9e82ff639b5c140d663bf]
   to [5954e057432ec04ecd71fe416252b43d1a19e6af]

patch "test/func/resolve_conflicts_read_all/invalid-rename_left"
 from [3be81555ea98530c4d530b1922fcd4537915560e]
   to [862028adf11b2193c8414e1bf0c6504afd9c58d4]

patch "test/func/resolve_conflicts_read_all/invalid-rename_right"
 from [1259ba3642e09d01b143bb561ea1e038d6e9fe93]
   to [f8aba9b06db8b96e35b456e70e8735f51a25f990]

patch "test/func/two_parent_workspace_commands_that_fail/__driver__.lua"
 from [76a483d78b6eb2863e4404654b9e12f48631d131]
   to [268519096042c3dce7328da87198918d3d5a55b8]
============================================================
--- test/func/commit_using__MTN_log/__driver__.lua	64507df85499593c9de2e854a3add3b4d6683c47
+++ test/func/commit_using__MTN_log/__driver__.lua	b5a955883dbe4a7bbefdc162dd270215dbb09bb5
@@ -12,7 +12,7 @@ check(mtn("--branch=testbranch", "--rcfi
 -- this should now fail, given that the log file has content and the cancel line
 -- has been removed
 check(mtn("--branch=testbranch", "--rcfile=commit_cancelled.lua", "commit"), 1, false, true)
-check(qgrep('Commit cancelled.', "stderr"))
+check(qgrep('commit cancelled.', "stderr"))
 
 check(exists("_MTN/log"))
 check(fsize("_MTN/log") > 0)
============================================================
--- test/func/two_parent_workspace_commands_that_fail/__driver__.lua	76a483d78b6eb2863e4404654b9e12f48631d131
+++ test/func/two_parent_workspace_commands_that_fail/__driver__.lua	268519096042c3dce7328da87198918d3d5a55b8
@@ -27,7 +27,7 @@ diffdiag = ("mtn: misuse: this workspace
 
 diag = "mtn: misuse: this command can only be used in a single-parent workspace\n"
 diffdiag = ("mtn: misuse: this workspace has more than one parent\n"..
-        "mtn: misuse: (specify a revision to diff against with --revision)\n")
+        "mtn: misuse: (specify a revision to diff against with '--revision')\n")
 
 check(mtn("merge_into_workspace", anc), 1, nil, true)
 check(grep("-v", "detected at", "stderr"), 0, diag)
============================================================
--- test/func/automate_set_drop_attribute/__driver__.lua	6de8648b80cc4aeb0c5f08e66dc4b5c7964ce339
+++ test/func/automate_set_drop_attribute/__driver__.lua	5a090a94f10ebfa6ddb7378f9a285865ce881245
@@ -13,9 +13,9 @@ check(mtn("automate", "set_attribute", "
 check(qgrep("wrong argument count", "stderr"))
 
 check(mtn("automate", "set_attribute", "unknown_path", "foo", "bar"), 1, false, true)
-check(qgrep("Unknown path", "stderr"))
+check(qgrep("unknown path", "stderr"))
 check(mtn("automate", "drop_attribute", "unknown_path"), 1, false, true)
-check(qgrep("Unknown path", "stderr"))
+check(qgrep("unknown path", "stderr"))
 
 -- check if we can add an attribute
 addfile("testfile", "foo")
============================================================
--- test/func/merge((patch_a),_(drop_a))/__driver__.lua	bc219dd7af69d3aac168acc48d12ac59f6edc305
+++ test/func/merge((patch_a),_(drop_a))/__driver__.lua	336ee81dc87b3f5843cfcbc94b0e2c899f965523
@@ -22,6 +22,6 @@ check(mtn("merge"), 0, false, true)
 
 -- check that we're warned about the changes being dropped...
 
-check(qgrep("Content changes to the file", "stderr"))
+check(qgrep("content changes to the file", "stderr"))
 check(qgrep(left, "stderr"))
 
============================================================
--- test/func/automate_show_conflicts_defaults/__driver__.lua	1db31e9b04fa6410eee236d9270843dc062a8424
+++ test/func/automate_show_conflicts_defaults/__driver__.lua	96a299a7be5813698d201562be57f0300670333d
@@ -73,7 +73,7 @@ check(indir(non_ws_dir, mtn_outside_ws("
 
 --  Check error message when outside workspace when branch not specified
 check(indir(non_ws_dir, mtn_outside_ws("automate", "show_conflicts")), 1, false, true)
-check(qgrep("misuse: please specify a branch, with --branch=BRANCH", "stderr"))
+check(qgrep("misuse: please specify a branch, with '--branch=BRANCH'", "stderr"))
 
 --  Check error message for wrong arg count
 check(indir(non_ws_dir, mtn_outside_ws("automate", "show_conflicts", "rev1")), 1, false, true)
============================================================
--- test/func/automate_inventory_ignore_dirs/expected_2.stderr	9937d25da7c3bd55a10ba16018fade6ee9562e92
+++ test/func/automate_inventory_ignore_dirs/expected_2.stderr	d55fe80779f96748104edd28d6f40f68323e9768
@@ -4,4 +4,4 @@ ignore_file: 'source/ignored_dir/oops': 
 ignore_file: 'source/ignored_dir': true
 ignore_file: 'source/ignored_1': true
 ignore_file: 'source/ignored_dir/oops': true
-mtn: warning: 'source/ignored_dir/oops' is both known and ignored; it will be shown as 'missing'. Check .mtn-ignore.
+mtn: warning: 'source/ignored_dir/oops' is both known and ignored; it will be shown as 'missing'. Check '.mtn-ignore'
============================================================
--- test/func/resolve_conflicts_read_all/invalid-add_left	7e560447bbcfe9bd416582dcc143a0ea45bc828d
+++ test/func/resolve_conflicts_read_all/invalid-add_left	3fb71334c2cc5855c3504304454398770ae1de38
@@ -1,4 +1,4 @@ mtn: warning: 1 conflict with no support
 mtn: warning: 1 conflict with no supported resolutions.
-mtn: conflict: invalid name _MTN in root directory
+mtn: conflict: invalid name '_MTN' in root directory
 mtn: 'foo' pivoted to root on the left
 mtn: 'foo/_MTN' added in revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c on the right
============================================================
--- test/func/resolve_conflicts_read_all/invalid-add_right	9d8195f9f9cd124855b9e82ff639b5c140d663bf
+++ test/func/resolve_conflicts_read_all/invalid-add_right	5954e057432ec04ecd71fe416252b43d1a19e6af
@@ -1,4 +1,4 @@ mtn: warning: 1 conflict with no support
 mtn: warning: 1 conflict with no supported resolutions.
-mtn: conflict: invalid name _MTN in root directory
+mtn: conflict: invalid name '_MTN' in root directory
 mtn: 'foo' pivoted to root on the right
 mtn: 'foo/_MTN' added in revision cdf9a4171d1d386f9ecb83218a11df6c5fa75c6c on the left
============================================================
--- test/func/resolve_conflicts_read_all/invalid-rename_left	3be81555ea98530c4d530b1922fcd4537915560e
+++ test/func/resolve_conflicts_read_all/invalid-rename_left	862028adf11b2193c8414e1bf0c6504afd9c58d4
@@ -1,4 +1,4 @@ mtn: warning: 1 conflict with no support
 mtn: warning: 1 conflict with no supported resolutions.
-mtn: conflict: invalid name _MTN in root directory
+mtn: conflict: invalid name '_MTN' in root directory
 mtn: 'foo' pivoted to root on the left
 mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the right
============================================================
--- test/func/resolve_conflicts_read_all/invalid-rename_right	1259ba3642e09d01b143bb561ea1e038d6e9fe93
+++ test/func/resolve_conflicts_read_all/invalid-rename_right	f8aba9b06db8b96e35b456e70e8735f51a25f990
@@ -1,4 +1,4 @@ mtn: warning: 1 conflict with no support
 mtn: warning: 1 conflict with no supported resolutions.
-mtn: conflict: invalid name _MTN in root directory
+mtn: conflict: invalid name '_MTN' in root directory
 mtn: 'foo' pivoted to root on the right
 mtn: 'bad/_MTN' renamed to 'foo/_MTN' on the left
============================================================
--- test/func/resolve_conflicts_errors/__driver__.lua	8c27319a9b511c25b97e2cac91d0e584423583c3
+++ test/func/resolve_conflicts_errors/__driver__.lua	4911dc65645a5af929cd990eef09c97146e60d17
@@ -98,6 +98,6 @@ check(grep("workspace required but not f
 -- _MTN, so need workspace. Fixes bug 30473
 check(indir("..", mtn("conflicts", "store", "--db", "resolve_conflicts_errors/test.db", "--branch=testbranch")), 1, nil, true)
 check(grep("workspace required but not found", "stderr"), 0, true)
-check(grep("conflicts file must be under _MTN", "stderr"), 0, true)
+check(grep("conflicts file must be under '_MTN'", "stderr"), 0, true)
 
 -- end of file
============================================================
--- test/func/resolve_conflicts_errors/conflicts-attr-store-2	500ec44e9f9534091546581601cf58927137d359
+++ test/func/resolve_conflicts_errors/conflicts-attr-store-2	5fbf832ebdb1554a95c7ef41abb93a38858f6dc7
@@ -1 +1 @@
-mtn: misuse: conflicts file must be under _MTN
+mtn: misuse: conflicts file must be under '_MTN'
============================================================
--- test/func/diff_reverse/__driver__.lua	e174ee4ebe94c2af95edf48fd2f30029f95a8958
+++ test/func/diff_reverse/__driver__.lua	c5f22b6a72edf6a98dbe2a3817067e7779f316d6
@@ -10,10 +10,10 @@ check(mtn("diff", "--reverse"), 1, false
 
 -- illegal --reverse option
 check(mtn("diff", "--reverse"), 1, false, true)
-check(qgrep("--reverse only allowed with exactly one revision", "stderr"))
+check(qgrep("'--reverse' only allowed with exactly one revision", "stderr"))
 
 check(mtn("diff", "--reverse", rev, rev), 1, false, true)
-check(qgrep("--reverse only allowed with exactly one revision", "stderr"))
+check(qgrep("'--reverse' only allowed with exactly one revision", "stderr"))
 
 -- no --reverse option
 check(mtn("diff", "--revision=" .. rev), 0, true, false)
============================================================
--- test/func/changelog_editor/__driver__.lua	0eccf936ef1688640f00aba6c786ad14c3ddb3cf
+++ test/func/changelog_editor/__driver__.lua	70a687f4022fd57367899726c3e11d772ad95dbd
@@ -19,7 +19,7 @@ check(mtn("commit", "--rcfile=changelog.
 
 writefile("_MTN/log", "cancel hint removed")
 check(mtn("commit", "--rcfile=changelog.lua"), 1, false, true)
-check(qgrep("Commit cancelled.", "stderr"))
+check(qgrep("commit cancelled.", "stderr"))
 check(not exists("_MTN/commit"))
 check(readfile("_MTN/log") == "changelog modified, cancel hint removed\n")
 
============================================================
--- test/func/clone_aborts_on_branch_pattern_in_uri/__driver__.lua	960b48a9f83ceb2caad655e07abf084cc5ad4f0a
+++ test/func/clone_aborts_on_branch_pattern_in_uri/__driver__.lua	bf16d8dcec86e4ae012d1c6078082f9d13a9fd80
@@ -13,7 +13,7 @@ check(nodb_mtn("clone", "some-server", "
 
 -- the branch option is invalid in non-URI mode
 check(nodb_mtn("clone", "some-server", "mybranch", "--branch=mybranch"), 1, false, true)
-check(qgrep("the --branch option is only valid with an URI to clone", "stderr"))
+check(qgrep("the '--branch' option is only valid with an URI to clone", "stderr"))
 
 -- finally, this should succeed
 check(nodb_mtn("clone", testURI, "--branch=mybranch"), 0, false, false)