# # # patch "tests/commit_default_editor/__driver__.lua" # from [bd9602333701123fd2c65f288d463cb82ade4d8b] # to [4652db17cba1b4d6ec65b55cd8f380a41d9da0af] # # patch "tests/commit_default_editor/test_hooks.lua" # from [acc4afeabd22d8a4dbe2329ca5907202d875b89f] # to [9f2efaa4caa0b85170634445f0d1806646bab7d5] # # patch "tests/commit_writes_message_back_to__MTN_log/my_hook.lua" # from [2a7cb74c1a3c220ce8f4446357d87f70e8988e22] # to [72229605707cf8d7fbe58e564fad20f36824181f] # # patch "tests/i18n_commit_messages/extra_hooks.lua" # from [d80fb2f538a58b7ba6430e6b8af6305edaa2abb8] # to [8f07865cadffc5e59839e2edec154f20f702ed19] # ============================================================ --- tests/commit_writes_message_back_to__MTN_log/my_hook.lua 2a7cb74c1a3c220ce8f4446357d87f70e8988e22 +++ tests/commit_writes_message_back_to__MTN_log/my_hook.lua 72229605707cf8d7fbe58e564fad20f36824181f @@ -1,3 +1,3 @@ function edit_comment(user_log_file) function edit_comment(user_log_file) - return string.gsub(user_log_file, "\nChangelog: \n\n\n", "\nChangelog: \n\nfoobar\n") + return "foobar\n" .. user_log_file end ============================================================ --- tests/i18n_commit_messages/extra_hooks.lua d80fb2f538a58b7ba6430e6b8af6305edaa2abb8 +++ tests/i18n_commit_messages/extra_hooks.lua 8f07865cadffc5e59839e2edec154f20f702ed19 @@ -16,11 +16,11 @@ function edit_comment(user_log_message) io.write("EDIT: BASE BAD\n") end - if string.find(user_log_message, "\nChangelog: \n\n\n") ~= nil then + if string.find(user_log_message, "\n\n\n*** REMOVE THIS LINE") ~= nil then io.write("EDIT: MSG NONESUCH\n") - return string.gsub(user_log_message, "\nChangelog: \n\n\n", "\nChangelog: \n\n" .. wanted .. "\n") + return wanted .. user_log_message else - if string.find(user_log_message, "\nChangelog: \n\n" .. wanted .. "\n") ~= nil then + if string.find(user_log_message, wanted .. "\n\n*** REMOVE THIS LINE") ~= nil then io.write("EDIT: MSG GOOD\n") else io.write("EDIT: MSG BAD\n") ============================================================ --- tests/commit_default_editor/__driver__.lua bd9602333701123fd2c65f288d463cb82ade4d8b +++ tests/commit_default_editor/__driver__.lua 4652db17cba1b4d6ec65b55cd8f380a41d9da0af @@ -12,8 +12,4 @@ check(mtn("--branch", "testbranch", "com -- and provides a fake "editor" executable check(mtn("--branch", "testbranch", "commit", "--date-format", "foo"), 0, false, true) - -if ostype ~= "Windows" then - -- date parsing never works on Win32, so warning is suppressed - check(qgrep("warning: date format 'foo' cannot be parsed; using default instead", "stderr")) -end +check(qgrep("warning: date format 'foo' cannot be parsed; using default instead", "stderr")) ============================================================ --- tests/commit_default_editor/test_hooks.lua acc4afeabd22d8a4dbe2329ca5907202d875b89f +++ tests/commit_default_editor/test_hooks.lua 9f2efaa4caa0b85170634445f0d1806646bab7d5 @@ -10,7 +10,7 @@ function execute(path,...) text = tmp:read("*a") io.close(tmp) - text = string.gsub(text, "\nChangelog: \n\n\n", "\nChangelog: \n\nHello\n") + text = "Hello" .. text tmp = io.open(tname, "w") tmp:write(text)