# # # patch "NEWS" # from [af85eefcea2e435fcdd6e04a48a4922f877e66cf] # to [94f333190db9922d097bcf481a0397914239cce4] # # patch "automate.cc" # from [df936f5d7198e8ac36304a0676e742c06adfd3ed] # to [240c35d1563672b59f932812acc0b6bb4d4775dc] # # patch "monotone.texi" # from [20dc09d46cf88327a730b2f488ca8e7be8185745] # to [29852986ca463e9ed132d7cfb8001ea59ad13b53] # ============================================================ --- NEWS af85eefcea2e435fcdd6e04a48a4922f877e66cf +++ NEWS 94f333190db9922d097bcf481a0397914239cce4 @@ -34,6 +34,11 @@ - New command group 'mtn conflicts *'; provides asynchronous conflict resolutions for merge and propagate. + - New 'automate lua' command with which lua functions, like + monotone hooks, can be called over automate. This is particularily + useful to get user defaults, like ignorable files, branch keys and + passwords, which are managed through one or more monotonerc files. + - 'merge' and 'propagate' accept user commit messages; the 'merge rev rev' or 'propagate branch branch' message will be prefixed to the user message. --no-prefix removes the prefix. ============================================================ --- automate.cc df936f5d7198e8ac36304a0676e742c06adfd3ed +++ automate.cc 240c35d1563672b59f932812acc0b6bb4d4775dc @@ -2276,6 +2276,20 @@ CMD_AUTOMATE(get_workspace_root, "", output << get_current_working_dir() << '\n'; } +// Name: lua +// Arguments: +// A lua function name +// Zero or more function arguments +// Changes: +// 9.0 (added) +// Purpose: +// Execute lua functions and return their results. +// Output format: +// Lua parsable output. +// Error conditions: +// a runtime exception is thrown if the function does not exists, the arguments cannot be parsed +// or the function cannot be executed for some other reason. + CMD_AUTOMATE(lua, "LUA_FUNCTION [ARG1 [ARG2 [...]]]", N_("Executes the given lua function and returns the result"), "", ============================================================ --- monotone.texi 20dc09d46cf88327a730b2f488ca8e7be8185745 +++ monotone.texi 29852986ca463e9ed132d7cfb8001ea59ad13b53 @@ -8045,7 +8045,7 @@ @section Automation @item Updated in: -8.1 +9.0 Added @option{--with-header} option. @@ -9139,7 +9139,7 @@ @section Automation @item Added in: -8.1 +9.0 @item Purpose: @@ -9171,7 +9171,7 @@ @section Automation @item Added in: -8.2 +9.0 @item Purpose: