[Monotone-commits-diffs] Revision 3a6eaf635f8f0152db543db6391edd596b2ee73e

[monotone]

-----------------------------------------------------------------
Revision: 3a6eaf635f8f0152db543db6391edd596b2ee73e
Ancestor: fa5014ac3233ccbe6c1de0e3f95237e4833b69f4
Author: address@hidden
Date: 05/13/10 06:18:41
Branch: net.venge.monotone.experiment.changelog-editor

Renamed entries:
        tests/commit_using__MTN_log/commit_log.lua to 
tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_log_modified_return.lua to 
tests/commit_using__MTN_log/commit_confirmed.lua
Modified files:
        cmd_ws_commit.cc tests/changelog_editor/__driver__.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_using__MTN_log/commit_cancelled.lua work.cc
        work.hh

ChangeLog: 

preserve user_log_message from edit_comment hook in case commit fails

 * cmd_ws_commit.cc (get_log_message_interactively): add check for _MTN/commit
   and fail if it contains anything; save the full_message from the edit_comment
   hook to _MTN/commit before attempting to read it; clear _MTN/commit when the
   commit was explicitly cancelled and when everything has been read
   successfully

 * tests/changelog_editor/__driver__.lua: add tests for absence/presence of
   _MTN/commit after successful and failed commits; test that commit aborts and
   doesn't modify a previous _MTN/commit

 * tests/commit_using__MTN_log/__driver__.lua: enable previous "magic" line
   checks but invert them to adapt to the new "cancel" line;

 * tests/commit_using__MTN_log/commit_log.lua: rename to ...
 * tests/commit_using__MTN_log/commit_cancelled.lua: ... this and remove the
   cancel line to cancel the commit

 * tests/commit_using__MTN_log/commit_log_modified_return.lua: rename to ...
 * tests/commit_using__MTN_log/commit_confirmed.lua: ... this

 * work.{cc,hh} (commit_file_name, get_commit_path, load_commit_text,
   save_commit_text, clear_commit_text): add functions to preserve changelog
   message in case commit fails with missing headers or other problems

txtX0IkwtrN3u.txt
Description: Diff [fa5014ac3233ccbe6c1de0e3f95237e4833b69f4] -> [3a6eaf635f8f0152db543db6391edd596b2ee73e]