[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.string-sanitization: 7afccf
|
From: |
code |
|
Subject: |
[Monotone-commits-diffs] net.venge.monotone.string-sanitization: 7afccf57eeb078b8d12ea6e9bb567f50926195cc |
|
Date: |
Sat, 26 Feb 2011 13:43:01 +0100 (CET) |
revision: 7afccf57eeb078b8d12ea6e9bb567f50926195cc
date: 2011-02-26T12:36:31
author: Richard Levitte <address@hidden>
branch: net.venge.monotone.string-sanitization
changelog:
Fix all the tests that were affected by the change with quotes.
The automate_log test was interesting, as it showed the nul revision as
nothing (rather than the quoted empty string), and pointed out that a
different message would probably be clearer. Hence the change in
src/cmd_diff_log.cc.
* src/cmd_diff_log.cc (log_common): Change the code to check if we have a
nul revision id, and in that case, warn that this is the case rather
than complaining about a parent revision that can't even exist.
* test/func/annotate_ignores_untrusted_certs/__driver__.lua,
test/func/annotate_with_human_output/__driver__.lua (revs),
test/func/automate_log/__driver__.lua (revs),
test/func/change_workspace/__driver__.lua,
test/func/key_files_deleted_securely/__driver__.lua (line),
test/func/log_recognizes_invalid_workspace_parent/__driver__.lua (rev),
test/func/netsync_dry_run/__driver__.lua (baserev),
test/func/resolve_conflicts_all_resolutions/merge-1 (mtn),
test/func/resolve_conflicts_content/merge-1 (mtn),
test/func/resolve_conflicts_duplicate_name/merge-1 (mtn),
test/func/resolve_conflicts_duplicate_name_directory/__driver__.lua
(base), test/func/resolve_conflicts_orphaned_file/__driver__.lua
(base), test/func/resolve_conflicts_propagate/propagate-1 (mtn),
test/func/resolve_conflicts_read_all/missing-root_left (mtn),
test/func/resolve_conflicts_read_all/missing-root_right (mtn),
test/func/resolve_conflicts_read_all/orphaned-add_left (mtn),
test/func/resolve_conflicts_read_all/orphaned-add_right (mtn),
test/func/resolve_conflicts_read_all/orphaned-rename_left (mtn),
test/func/resolve_conflicts_read_all/orphaned-rename_right (mtn),
test/func/wrong_options_override_workspace_options/__driver__.lua: All
the tests affected. Quotes were added (mostly) or removed (in fewer
cases).
manifest:
format_version "1"
new_manifest [fa0ec2c221188820cd2b09a25b02b0c7b3f88827]
old_revision [abc4fbb5cdaf61c8417be7d4d487dc21379b14c8]
patch "src/cmd_diff_log.cc"
from [39f108bc1d798d8525503ea5cfa693188a378fab]
to [6afaa63057f6ed5995113cf312ff99eccc189700]
patch "test/func/annotate_ignores_untrusted_certs/__driver__.lua"
from [dc4cfd5f549e5d23eb2fc7c5e0b6289dab47e42f]
to [027b41accdd07fabd749f1b7569e9f51f00b24c7]
patch "test/func/annotate_with_human_output/__driver__.lua"
from [ceb9a26ab253055919967422d7ab901ea876d1c9]
to [03f33abac651dc0a53804bc008ff6ec53538e132]
patch "test/func/automate_log/__driver__.lua"
from [b5a1679367ffd0d504be13ba9d5032b15535adb9]
to [58b89a2de80cf56d9bdc3983123aecf71b9475d0]
patch "test/func/change_workspace/__driver__.lua"
from [b25c7d5a291a8458222455b0f6e8ac386825a8b2]
to [9c4c0377971bd50fc7c7f0891b169e1bd0b1af6e]
patch "test/func/key_files_deleted_securely/__driver__.lua"
from [32c966ddf01fecc55953f88f23d934da87de1abd]
to [6f7b8360055656e52199f7f4f6335275789686d4]
patch "test/func/log_recognizes_invalid_workspace_parent/__driver__.lua"
from [6f35ab85a83153a157bbefff0e3f65c9a5dbb0b0]
to [1ab769fb5877b47410f674a70dd9d118020a799b]
patch "test/func/netsync_dry_run/__driver__.lua"
from [c298f0f823a8418cb4aaaa2715b0378987ac0c35]
to [833bc5c1b3d3a02f9dd1a63ae9e4207c39ceac04]
patch "test/func/resolve_conflicts_all_resolutions/merge-1"
from [4026a57330dfa66af8afa0eccd8aad978793991d]
to [49360eef0e838ef3cb1060f85d64e98ff7293f3f]
patch "test/func/resolve_conflicts_content/merge-1"
from [0a6aa4e9b65e60ab29cdd4c6467e9c4e7cc51dd4]
to [785cf99f2a1fac5e84694b296beca46aea751e73]
patch "test/func/resolve_conflicts_duplicate_name/merge-1"
from [96a1dee6eedb48a6bc82c02c6b940824d81c7d44]
to [81ee0df6149d9bf56208e4b78260ed0fd424197f]
patch "test/func/resolve_conflicts_duplicate_name_directory/__driver__.lua"
from [66f49383b58f91df46e01e08536435bf0e26aa5d]
to [b789edc3c43d913f7d057918c5c37fd618ed5a54]
patch "test/func/resolve_conflicts_orphaned_file/__driver__.lua"
from [fd4271398f08816fb75402094c5320bbd57b2616]
to [fe6a4618be2793d18ee2f97adf94cd564763164f]
patch "test/func/resolve_conflicts_propagate/propagate-1"
from [b99435dfefbfda234d6fa35b2762eaf767cd1081]
to [879b98186278ff4543ac2d5c091cca7913cdaf74]
patch "test/func/resolve_conflicts_read_all/missing-root_left"
from [09a9ca0a21242133b294121ed97973c4bbb20c49]
to [df6d7b92a33c233288c3e36d7da41ccc3d4f3192]
patch "test/func/resolve_conflicts_read_all/missing-root_right"
from [8fac84c4bd01af269c29280eddbee8d70583e07f]
to [6581cba2ad9abc989aafa7bda2e764c055cd558b]
patch "test/func/resolve_conflicts_read_all/orphaned-add_left"
from [3b33412a97a5afe1e8b3156aea17e00ef0d0e919]
to [218ee7343efa83fd3e7c0d9e2db3b1f460f7baa3]
patch "test/func/resolve_conflicts_read_all/orphaned-add_right"
from [3b33412a97a5afe1e8b3156aea17e00ef0d0e919]
to [218ee7343efa83fd3e7c0d9e2db3b1f460f7baa3]
patch "test/func/resolve_conflicts_read_all/orphaned-rename_left"
from [3b33412a97a5afe1e8b3156aea17e00ef0d0e919]
to [218ee7343efa83fd3e7c0d9e2db3b1f460f7baa3]
patch "test/func/resolve_conflicts_read_all/orphaned-rename_right"
from [1417be342db3cf881af2b08633c0b40ae928ad07]
to [4743330e43812d0b9722f8b3fda9d5a13857a66a]
patch "test/func/wrong_options_override_workspace_options/__driver__.lua"
from [2eca2a366ffcfaf6b8cf9d33b52ca06e55c4fa7c]
to [a01b7c2fb76621f7e8b679e2db012eaaa7b984e0]
============================================================
--- src/cmd_diff_log.cc 39f108bc1d798d8525503ea5cfa693188a378fab
+++ src/cmd_diff_log.cc 6afaa63057f6ed5995113cf312ff99eccc189700
@@ -666,12 +666,16 @@ log_common (app_state & app,
i != rev.edges.end(); i++)
{
revision_id rid = edge_old_revision(i);
- E(db.revision_exists(rid), origin::user,
- F("workspace parent revision %s not found - "
- "did you specify a wrong database?") % rid);
- starting_revs.insert(rid);
- if (i == rev.edges.begin())
- first_rid = rid;
+ if ((FL("%s") % rid).str().empty()) {
+ W(F("workspace has no parent revision, probably an empty branch"));
+ } else {
+ E(db.revision_exists(rid), origin::user,
+ F("workspace parent revision %s not found - "
+ "did you specify a wrong database?") % rid);
+ starting_revs.insert(rid);
+ if (i == rev.edges.begin())
+ first_rid = rid;
+ }
}
}
else if (!app.opts.from.empty())
============================================================
--- test/func/annotate_with_human_output/__driver__.lua ceb9a26ab253055919967422d7ab901ea876d1c9
+++ test/func/annotate_with_human_output/__driver__.lua 03f33abac651dc0a53804bc008ff6ec53538e132
@@ -10,8 +10,8 @@ rev2 = base_revision()
commit()
rev2 = base_revision()
-rev1_line = string.format("%s.. by tester", rev1:sub(0, 8))
-rev2_line = string.format("%s.. by tester", rev2:sub(0, 8))
+rev1_line = string.format("%s.. by 'tester'", rev1:sub(0, 8))
+rev2_line = string.format("%s.. by 'tester'", rev2:sub(0, 8))
check(mtn("annotate", "foo"), 0, true, false)
check(greplines("stdout", {rev1_line, rev2_line, rev1_line, rev2_line}))
============================================================
--- test/func/wrong_options_override_workspace_options/__driver__.lua 2eca2a366ffcfaf6b8cf9d33b52ca06e55c4fa7c
+++ test/func/wrong_options_override_workspace_options/__driver__.lua a01b7c2fb76621f7e8b679e2db012eaaa7b984e0
@@ -15,7 +15,7 @@ check(mtn_ws_opts("status", "-d", "baz")
-- try to check the status and supply a non-existing database argument
check(mtn_ws_opts("status", "-d", "baz"), 1, false, true)
-check(qgrep("baz does not exist", "stderr"))
+check(qgrep("baz' does not exist", "stderr"))
-- this should succeed if the original database is still set
check(mtn_ws_opts("commit", "-m", "test"), 0, false, false)
============================================================
--- test/func/resolve_conflicts_content/merge-1 0a6aa4e9b65e60ab29cdd4c6467e9c4e7cc51dd4
+++ test/func/resolve_conflicts_content/merge-1 785cf99f2a1fac5e84694b296beca46aea751e73
@@ -1,8 +1,8 @@ mtn: [right] eccae629399090f99632cf9e9cc
mtn: [left] fe616087506ae4e770e4a51e091e4c338b2f176d
mtn: [right] eccae629399090f99632cf9e9cc7156af2d238fb
-mtn: merged files/bar, files/bar
-mtn: replacing content of files/baz, files/baz with _MTN/result/baz
-mtn: replacing content of files/foo, files/foo with files/foo
-mtn: replacing content of files/inter1, files/inter1 with _MTN/resolutions/files/inter1
-mtn: replacing content of files/inter2, files/inter2 with _MTN/resolutions/inter_merged
+mtn: merged 'files/bar', 'files/bar'
+mtn: replacing content of 'files/baz', 'files/baz' with '_MTN/result/baz'
+mtn: replacing content of 'files/foo', 'files/foo' with 'files/foo'
+mtn: replacing content of 'files/inter1', 'files/inter1' with '_MTN/resolutions/files/inter1'
+mtn: replacing content of 'files/inter2', 'files/inter2' with '_MTN/resolutions/inter_merged'
mtn: [merged] b221355d26015cd04668aa4587cff8068e4646a2
============================================================
--- test/func/resolve_conflicts_all_resolutions/merge-1 4026a57330dfa66af8afa0eccd8aad978793991d
+++ test/func/resolve_conflicts_all_resolutions/merge-1 49360eef0e838ef3cb1060f85d64e98ff7293f3f
@@ -1,16 +1,16 @@ mtn: [right] ceb209a91e2b1d381c0b9321d63
mtn: [left] 30fb5dd7fe7e8ba58f6fc604518f25fef793e365
mtn: [right] ceb209a91e2b1d381c0b9321d63f2d3c6558166f
-mtn: dropping checkout_left.sh
-mtn: replacing content of checkout_left.sh with resolutions/checkout_left.sh
-mtn: replacing content of checkout_right.sh with resolutions/checkout_right.sh
-mtn: dropping checkout_right.sh
-mtn: dropping gui_left.sh
-mtn: keeping gui_left.sh
-mtn: keeping gui_right.sh
-mtn: dropping gui_right.sh
-mtn: renaming thermostat.c to thermostat-westinghouse.c
-mtn: renaming thermostat.c to thermostat-honeywell.c
-mtn: replacing content of interactive_file, interactive_file with _MTN/resolutions/interactive_file
-mtn: merged simple_file, simple_file
-mtn: replacing content of user_file, user_file with resolutions/user_file
+mtn: dropping 'checkout_left.sh'
+mtn: replacing content of 'checkout_left.sh' with 'resolutions/checkout_left.sh'
+mtn: replacing content of 'checkout_right.sh' with 'resolutions/checkout_right.sh'
+mtn: dropping 'checkout_right.sh'
+mtn: dropping 'gui_left.sh'
+mtn: keeping 'gui_left.sh'
+mtn: keeping 'gui_right.sh'
+mtn: dropping 'gui_right.sh'
+mtn: renaming 'thermostat.c' to 'thermostat-westinghouse.c'
+mtn: renaming 'thermostat.c' to 'thermostat-honeywell.c'
+mtn: replacing content of 'interactive_file', 'interactive_file' with '_MTN/resolutions/interactive_file'
+mtn: merged 'simple_file', 'simple_file'
+mtn: replacing content of 'user_file', 'user_file' with 'resolutions/user_file'
mtn: [merged] 6363bd08ae08d7e57067ba6476f76417c72f1a25
============================================================
--- test/func/resolve_conflicts_duplicate_name/merge-1 96a1dee6eedb48a6bc82c02c6b940824d81c7d44
+++ test/func/resolve_conflicts_duplicate_name/merge-1 81ee0df6149d9bf56208e4b78260ed0fd424197f
@@ -3,8 +3,8 @@ mtn: [right] d5f1dd136c86b5bbd5e71b0c336
mtn: calculating best pair of heads to merge next
mtn: [left] 1337cb1059c4bc3e376b14381b43e9383c654da1
mtn: [right] d5f1dd136c86b5bbd5e71b0c3365667e328af492
-mtn: dropping checkout.sh
-mtn: replacing content of checkout.sh with _MTN/resolutions/checkout.sh
-mtn: renaming thermostat.c to thermostat-westinghouse.c
-mtn: renaming thermostat.c to thermostat-honeywell.c
+mtn: dropping 'checkout.sh'
+mtn: replacing content of 'checkout.sh' with '_MTN/resolutions/checkout.sh'
+mtn: renaming 'thermostat.c' to 'thermostat-westinghouse.c'
+mtn: renaming 'thermostat.c' to 'thermostat-honeywell.c'
mtn: [merged] 14964233a7361ada1ba962f7863d4fee12f30df7
============================================================
--- test/func/resolve_conflicts_read_all/missing-root_left 09a9ca0a21242133b294121ed97973c4bbb20c49
+++ test/func/resolve_conflicts_read_all/missing-root_left df6d7b92a33c233288c3e36d7da41ccc3d4f3192
@@ -1,4 +1,4 @@
-mtn: orphaned node bar
+mtn: orphaned node 'bar'
mtn: warning: 1 conflict with no supported resolutions.
mtn: conflict: missing root directory
mtn: directory 'foo' pivoted to root on the left
============================================================
--- test/func/resolve_conflicts_read_all/missing-root_right 8fac84c4bd01af269c29280eddbee8d70583e07f
+++ test/func/resolve_conflicts_read_all/missing-root_right 6581cba2ad9abc989aafa7bda2e764c055cd558b
@@ -1,4 +1,4 @@
-mtn: orphaned node
+mtn: orphaned node ''
mtn: warning: 1 conflict with no supported resolutions.
mtn: conflict: missing root directory
mtn: directory 'foo' deleted on the left
============================================================
--- test/func/resolve_conflicts_read_all/orphaned-add_left 3b33412a97a5afe1e8b3156aea17e00ef0d0e919
+++ test/func/resolve_conflicts_read_all/orphaned-add_left 218ee7343efa83fd3e7c0d9e2db3b1f460f7baa3
@@ -1 +1 @@
-mtn: orphaned node foo/baz
+mtn: orphaned node 'foo/baz'
============================================================
--- test/func/resolve_conflicts_read_all/orphaned-add_right 3b33412a97a5afe1e8b3156aea17e00ef0d0e919
+++ test/func/resolve_conflicts_read_all/orphaned-add_right 218ee7343efa83fd3e7c0d9e2db3b1f460f7baa3
@@ -1 +1 @@
-mtn: orphaned node foo/baz
+mtn: orphaned node 'foo/baz'
============================================================
--- test/func/resolve_conflicts_read_all/orphaned-rename_left 3b33412a97a5afe1e8b3156aea17e00ef0d0e919
+++ test/func/resolve_conflicts_read_all/orphaned-rename_left 218ee7343efa83fd3e7c0d9e2db3b1f460f7baa3
@@ -1 +1 @@
-mtn: orphaned node foo/baz
+mtn: orphaned node 'foo/baz'
============================================================
--- test/func/resolve_conflicts_read_all/orphaned-rename_right 1417be342db3cf881af2b08633c0b40ae928ad07
+++ test/func/resolve_conflicts_read_all/orphaned-rename_right 4743330e43812d0b9722f8b3fda9d5a13857a66a
@@ -1 +1 @@
-mtn: orphaned node bar
+mtn: orphaned node 'bar'
============================================================
--- test/func/resolve_conflicts_propagate/propagate-1 b99435dfefbfda234d6fa35b2762eaf767cd1081
+++ test/func/resolve_conflicts_propagate/propagate-1 879b98186278ff4543ac2d5c091cca7913cdaf74
@@ -1,8 +1,8 @@ mtn: [right] d5f1dd136c86b5bbd5e71b0c336
mtn: propagating abe_branch -> beth_branch
mtn: [left] 1337cb1059c4bc3e376b14381b43e9383c654da1
mtn: [right] d5f1dd136c86b5bbd5e71b0c3365667e328af492
-mtn: dropping checkout.sh
-mtn: replacing content of checkout.sh with checkout.sh
-mtn: renaming thermostat.c to thermostat-westinghouse.c
-mtn: renaming thermostat.c to thermostat-honeywell.c
+mtn: dropping 'checkout.sh'
+mtn: replacing content of 'checkout.sh' with 'checkout.sh'
+mtn: renaming 'thermostat.c' to 'thermostat-westinghouse.c'
+mtn: renaming 'thermostat.c' to 'thermostat-honeywell.c'
mtn: [merged] a74c964afba9c299c81ec404e5233ad6faffadc1
============================================================
--- test/func/resolve_conflicts_orphaned_file/__driver__.lua fd4271398f08816fb75402094c5320bbd57b2616
+++ test/func/resolve_conflicts_orphaned_file/__driver__.lua fe6a4618be2793d18ee2f97adf94cd564763164f
@@ -32,7 +32,7 @@ check(mtn("conflicts", "show_first"), 0,
-- Check suggested resolutions for orphaned directory
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(samelines("stderr", {"mtn: orphaned node stuff/dir1",
+check(samelines("stderr", {"mtn: orphaned node 'stuff/dir1'",
"mtn: possible resolutions:",
"mtn: resolve_first drop",
"mtn: resolve_first rename \"file_name\""}))
@@ -46,19 +46,19 @@ check(mtn("conflicts", "show_first"), 0,
-- stuff/dir2 => dropped (later gives error due to not empty)
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/dir2", "stderr"));
+check(qgrep("orphaned node 'stuff/dir2'", "stderr"));
check(mtn("conflicts", "resolve_first", "drop"), 0, nil, nil)
-- stuff/dir3 => dropped
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/dir3", "stderr"));
+check(qgrep("orphaned node 'stuff/dir3'", "stderr"));
check(mtn("conflicts", "resolve_first", "drop"), 0, nil, nil)
-- Check suggested resolutions for orphaned file
check(mtn("conflicts", "show_first"), 0, nil, true)
canonicalize("stderr")
check(
-"mtn: orphaned node stuff/file2\n" ..
+"mtn: orphaned node 'stuff/file2'\n" ..
"mtn: possible resolutions:\n" ..
"mtn: resolve_first drop\n" ..
"mtn: resolve_first rename \"file_name\"\n" == readfile("stderr"))
@@ -68,11 +68,11 @@ check(mtn("conflicts", "show_first"), 0,
-- stuff/file3 => dropped
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/file3", "stderr"));
+check(qgrep("orphaned node 'stuff/file3'", "stderr"));
check(mtn("conflicts", "resolve_first", "drop"), 0, nil, nil)
check(mtn("merge", "--resolve-conflicts"), 1, nil, true)
-check(qgrep("directory stuff/dir2; it is not empty", "stderr"));
+check(qgrep("directory 'stuff/dir2'; it is not empty", "stderr"));
check(mtn("drop", "stuff/dir2/file5"), 0, nil, false)
commit("testbranch", "right 2")
@@ -83,23 +83,23 @@ check(mtn("conflicts", "show_first"), 0,
check(samelines("stderr", {"mtn: 5 conflicts with supported resolutions.",
"mtn: stored in '_MTN/conflicts'"}))
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/dir1", "stderr"));
+check(qgrep("orphaned node 'stuff/dir1'", "stderr"));
check(mtn("conflicts", "resolve_first", "rename", "dir1"), 0, nil, nil)
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/dir2", "stderr"));
+check(qgrep("orphaned node 'stuff/dir2'", "stderr"));
check(mtn("conflicts", "resolve_first", "drop"), 0, nil, nil)
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/dir3", "stderr"));
+check(qgrep("orphaned node 'stuff/dir3'", "stderr"));
check(mtn("conflicts", "resolve_first", "drop"), 0, nil, nil)
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/file2", "stderr"));
+check(qgrep("orphaned node 'stuff/file2'", "stderr"));
check(mtn("conflicts", "resolve_first", "rename", "file2"), 0, nil, nil)
check(mtn("conflicts", "show_first"), 0, nil, true)
-check(qgrep("orphaned node stuff/file3", "stderr"));
+check(qgrep("orphaned node 'stuff/file3'", "stderr"));
check(mtn("conflicts", "resolve_first", "drop"), 0, nil, nil)
check(mtn("merge", "--resolve-conflicts"), 0, nil, true)
============================================================
--- test/func/resolve_conflicts_duplicate_name_directory/__driver__.lua 66f49383b58f91df46e01e08536435bf0e26aa5d
+++ test/func/resolve_conflicts_duplicate_name_directory/__driver__.lua b789edc3c43d913f7d057918c5c37fd618ed5a54
@@ -37,7 +37,7 @@ check(mtn("merge", "--resolve-conflicts"
check(mtn("conflicts", "resolve_first_right", "rename", "gui"), 0, nil, nil)
check(mtn("merge", "--resolve-conflicts"), 1, nil, true)
-check(qgrep("misuse: can't drop gui; not empty", "stderr"))
+check(qgrep("misuse: can't drop 'gui'; not empty", "stderr"))
-- Start again, use renames for both sides
check(mtn("conflicts", "clean"), 0, nil, true)
============================================================
--- test/func/change_workspace/__driver__.lua b25c7d5a291a8458222455b0f6e8ac386825a8b2
+++ test/func/change_workspace/__driver__.lua 9c4c0377971bd50fc7c7f0891b169e1bd0b1af6e
@@ -23,6 +23,6 @@ check(mtn("get_branch", "other"), 0, fal
mkdir("other")
check(mtn("get_branch", "other"), 0, false, true)
-check(qgrep("directory .*/other is not a workspace", "stderr"))
+check(qgrep("directory '.*/other' is not a workspace", "stderr"))
-- end of file
============================================================
--- test/func/log_recognizes_invalid_workspace_parent/__driver__.lua 6f35ab85a83153a157bbefff0e3f65c9a5dbb0b0
+++ test/func/log_recognizes_invalid_workspace_parent/__driver__.lua 1ab769fb5877b47410f674a70dd9d118020a799b
@@ -15,7 +15,7 @@ check(qgrep(
check(mtn("log"), 1, false, true)
check(qgrep(
- "workspace parent revision '0000000000000000000000000000000000000002' not found",
+ "workspace parent revision 0000000000000000000000000000000000000002 not found",
"stderr"
))
============================================================
--- test/func/automate_log/__driver__.lua b5a1679367ffd0d504be13ba9d5032b15535adb9
+++ test/func/automate_log/__driver__.lua 58b89a2de80cf56d9bdc3983123aecf71b9475d0
@@ -4,7 +4,7 @@ check(mtn("automate", "log"), 1, false,
-- empty branch
check(mtn("automate", "log"), 1, false, true)
-check(qgrep("misuse: workspace parent revision '' not found", "stderr"))
+check(qgrep("warning: workspace has no parent revision,", "stderr"))
includecommon("automate_ancestry.lua")
includecommon("automate_stdio.lua")
============================================================
--- test/func/annotate_ignores_untrusted_certs/__driver__.lua dc4cfd5f549e5d23eb2fc7c5e0b6289dab47e42f
+++ test/func/annotate_ignores_untrusted_certs/__driver__.lua 027b41accdd07fabd749f1b7569e9f51f00b24c7
@@ -11,7 +11,7 @@ check(mtn("annotate", "foo", "--rcfile",
shortrev=string.sub(rev, 1, 8)..".."
check(mtn("annotate", "foo", "--rcfile", "date_untrusted.lua"), 0, true, false)
-check(qgrep("^" .. shortrev .. " by tester: ", "stdout"))
+check(qgrep("^" .. shortrev .. " by 'tester': ", "stdout"))
check(mtn("annotate", "foo", "--rcfile", "author_untrusted.lua"), 0, true, false)
check(qgrep("^" .. shortrev .. " [0-9]{4}(-[0-9]{2}){2}T[0-9]{2}(:[0-9]{2}){2}: ", "stdout"))
============================================================
--- test/func/key_files_deleted_securely/__driver__.lua 32c966ddf01fecc55953f88f23d934da87de1abd
+++ test/func/key_files_deleted_securely/__driver__.lua 6f7b8360055656e52199f7f4f6335275789686d4
@@ -16,7 +16,7 @@ check(mtn("dropkey", keyid1), 1, false,
check(rename("keys/foobar."..keyid2, "keys/foobar"))
check(mtn("dropkey", keyid1), 1, false, true)
-check(qgrep("expected key with id '" ..keyid1.."' in key file", "stderr"))
+check(qgrep("expected key with id " ..keyid1.." in key file", "stderr"))
-- if the conflicting key is gone, ensure that dropkey properly deletes
-- the old key file, even if it has no keyid suffixed
============================================================
--- test/func/netsync_dry_run/__driver__.lua c298f0f823a8418cb4aaaa2715b0378987ac0c35
+++ test/func/netsync_dry_run/__driver__.lua 833bc5c1b3d3a02f9dd1a63ae9e4207c39ceac04
@@ -35,14 +35,14 @@ check(qgrep("send 1 revision", "stdout")
srv2:push({"--dry-run", "*"}, 3, 0, true)
check(qgrep("send 4 certs and 0 keys", "stdout"))
check(qgrep("send 1 revision", "stdout"))
-check(qgrep("1 in branch secondbranch", "stdout"))
+check(qgrep("1 in branch 'secondbranch'", "stdout"))
check(not qgrep("receive", "stdout"))
srv2:sync({"--dry-run", "*"}, 3, 0, true)
check(qgrep("receive 1 revisions, 4 certs, and 0 keys", "stdout"))
check(qgrep("send 4 certs and 0 keys", "stdout"))
check(qgrep("send 1 revision", "stdout"))
-check(qgrep("1 in branch secondbranch", "stdout"))
+check(qgrep("1 in branch 'secondbranch'", "stdout"))
srv2:sync({"*"}, 3, 0, true)
srv2:sync({"--dry-run", "*"}, 3, 0, true)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.string-sanitization: 7afccf57eeb078b8d12ea6e9bb567f50926195cc,
code <=