# # # patch "NEWS" # from [dca5b4908744e2d211686fd320913e4326a49fe1] # to [c2ce8b9fb2e8ae74293283aa0d70e2db415e9395] # # patch "cmd_conflicts.cc" # from [47726f1fef74e5141dfb6678e07778d4c08fc15b] # to [6bc6f92f1e233d26271ad61d32fa7d355d35a585] # # patch "cmd_ws_commit.cc" # from [bd3ff76b370c79e138868481e65d1ec37dcf94b8] # to [1ccfaf790bb0726d0c797c230a6c85d67070d7ae] # # patch "merge_conflict.cc" # from [69d21b97a7ad03d8905137bb3f859259f212ce27] # to [bcc2018db31c73b7a6a63135e42095127217951d] # # patch "monotone.texi" # from [b032773ad367b0b784444aded5c2cbe7750b269d] # to [aa8dd053feec75918b3e4f72d85b2605bc2a893b] # # patch "tests/commit_with_--message-file/__driver__.lua" # from [c489098cf8e352319705e1965af1632d06f68316] # to [6ebbb5929bd268fa9bfb990960b54d7ac23cb7da] # ============================================================ --- NEWS dca5b4908744e2d211686fd320913e4326a49fe1 +++ NEWS c2ce8b9fb2e8ae74293283aa0d70e2db415e9395 @@ -52,6 +52,9 @@ - The `mtn_automate' lua function now correctly parses and sets options for executed automate commands. + - The 'commit' command accepts a non-empty _MTN/log as the log + message when '--message-file=_MTN/log' is given. + Bugs fixed - Performance of the log command has been improved significantly. @@ -61,7 +64,7 @@ individual certs are selected from the full list which allows sqlite to use the preferred index. - - In 0.42, a netsync writer would attemts to queue up all outgoing + - In 0.42, a netsync writer would attempt to queue up all outgoing data as soon as it knew what data to send, in a single operation, without servicing the event loop. If there was a large amount of data to send, this would cause very long pauses and sometimes ============================================================ --- cmd_conflicts.cc 47726f1fef74e5141dfb6678e07778d4c08fc15b +++ cmd_conflicts.cc 6bc6f92f1e233d26271ad61d32fa7d355d35a585 @@ -1,4 +1,4 @@ -// Copyright (C) 2008 Stephen Leake +// Copyright (C) 2008, 2009 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- cmd_ws_commit.cc bd3ff76b370c79e138868481e65d1ec37dcf94b8 +++ cmd_ws_commit.cc 1ccfaf790bb0726d0c797c230a6c85d67070d7ae @@ -305,7 +305,7 @@ CMD(revert, "revert", "", CMD_REF(worksp L(FL("skipping existing %s/") % path); } } - + // revert attributes on this node -- this doesn't quite catch all cases: // if the execute bits are manually set on some path that doesn't have // a dormant mtn:execute the execute bits will not be cleared @@ -316,7 +316,7 @@ CMD(revert, "revert", "", CMD_REF(worksp { P(F("reverting %s on %s") % a->first() % path); if (a->second.first) - app.lua.hook_set_attribute(a->first(), path, + app.lua.hook_set_attribute(a->first(), path, a->second.second()); else app.lua.hook_clear_attribute(a->first(), path); @@ -1121,7 +1121,7 @@ CMD(commit, "commit", "ci", CMD_REF(work process_commit_message_args(app.opts, log_message_given, log_message); - E(!(log_message_given && work.has_contents_user_log()), origin::user, + E(!(log_message_given && work.has_contents_user_log() && app.opts.msgfile() != "_MTN/log"), origin::user, F("_MTN/log is non-empty and log message " "was specified on command line\n" "perhaps move or delete _MTN/log,\n" ============================================================ --- merge_conflict.cc 69d21b97a7ad03d8905137bb3f859259f212ce27 +++ merge_conflict.cc bcc2018db31c73b7a6a63135e42095127217951d @@ -1,5 +1,5 @@ // Copyright (C) 2005 Nathaniel Smith -// 2008 Stephen Leake +// 2008, 2009 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -1479,9 +1479,9 @@ namespace resolve_conflicts } } -static char const * const conflicts_mismatch_msg = "conflicts file does not match current conflicts"; -static char const * const conflict_resolution_not_supported_msg = "%s is not a supported conflict resolution for %s"; -static char const * const conflict_extra = "extra chars at end of conflict"; +static char const * const conflicts_mismatch_msg = N_("conflicts file does not match current conflicts"); +static char const * const conflict_resolution_not_supported_msg = N_("%s is not a supported conflict resolution for %s"); +static char const * const conflict_extra = N_("extra chars at end of conflict"); static void read_missing_root_conflicts(basic_io::parser & pars, ============================================================ --- monotone.texi b032773ad367b0b784444aded5c2cbe7750b269d +++ monotone.texi aa8dd053feec75918b3e4f72d85b2605bc2a893b @@ -35,7 +35,7 @@ Copyright @copyright{} 2006 Alex Queiroz @* Copyright @copyright{} 2006, 2007 William Uther @* Copyright @copyright{} 2006, 2007, 2008 Thomas Keller @* -Copyright @copyright{} 2007, 2008 Stephen Leake @* +Copyright @copyright{} 2007 - 2009 Stephen Leake @* This manual is made available under the GNU GPL version 2.0 or greater. See the accompanying file COPYING for details. @@ -3986,7 +3986,7 @@ @section Exporting to GIT email address such as @code{"User Name "}. The git exporter deals with this difference in several ways: @itemize address@hidden address@hidden revisions that don't have any author certs will default to using @code{} for both the author and committer. @item @@ -5049,6 +5049,9 @@ @section Workspace successful, the @file{_MTN/log} file is cleared of all content making it ready for another edit/commit cycle. +If @option{--message-file=_MTN/log} is specified, the contents of address@hidden/log} will be used without confirmation. + If a @option{--branch} option is specified, the @command{commit} command commits to this branch (creating it if necessary). The branch becomes the new default branch of the workspace. ============================================================ --- tests/commit_with_--message-file/__driver__.lua c489098cf8e352319705e1965af1632d06f68316 +++ tests/commit_with_--message-file/__driver__.lua 6ebbb5929bd268fa9bfb990960b54d7ac23cb7da @@ -34,6 +34,16 @@ check(qgrep('out out out', "stdout")) check(indir("alt_wrk", mtn("ls", "certs", tsha)), 0, true, false) check(qgrep('out out out', "stdout")) +-- -------------------- +-- special case; --message-file='_MTN/log' is ok +-- -------------------- + +addfile("input3.txt", "one more file") + +writefile("_MTN/log", "Log entry") + +check(mtn("--branch=testbranch", "commit", "--message-file=_MTN/log"), 0, true, false) + ---------------------- --start with the failures: non existing file ----------------------