[Monotone-commits-diffs] net.venge.monotone: 1b4cb4095e19e42e7b3d16a25106fd28bf2b58d8

[code]

revision:            1b4cb4095e19e42e7b3d16a25106fd28bf2b58d8
date:                2011-02-10T06:30:18
author:              address@hidden
branch:              net.venge.monotone
changelog:
update two contrib files

* contrib/extra-commands.lua: delete old warnings about 'not in main branch', 
add comments about new features that provide similar functionality.

* contrib/lua-mode.el (lua-page-marker): minor update

manifest:
format_version "1"

new_manifest [fe60d1a3c85aa23a5f0b9e375e90a60041a38fbc]

old_revision [046dc30d4daa08782a3d6b6947db6f9dc1387614]

patch "contrib/extra-commands.lua"
 from [bbc31f3f036d07ac810c500c4122847e1cc83683]
   to [3d0fa49d06310886694ee438963439e673dcd406]

patch "contrib/lua-mode.el"
 from [662aae14a3b91577fea5e950acdbadfe3584504a]
   to [cc72a5b3d8a9909c4466f4b3718822f6208b5ede]
============================================================
--- contrib/lua-mode.el	662aae14a3b91577fea5e950acdbadfe3584504a
+++ contrib/lua-mode.el	cc72a5b3d8a9909c4466f4b3718822f6208b5ede
@@ -1,7 +1,7 @@
 ;; Major mode for editing Lua files.
 ;; For info on Lua, see http://www.lua.org/
 ;;
-;; Copyright (C) 2007 Stephen Leake
+;; Copyright (C) 2007, 2011 Stephen Leake
 ;;
 ;; Author   : Stephen Leake <address@hidden>
 ;; Web Site : http://www.stephe-leake.org/
@@ -130,7 +130,8 @@ Keybindings:
               (line-beginning-position) (point)))))
 
 ;;; pages
-(defconst lua-page-marker "----------" ; exactly 10 dashes
+(defconst lua-page-marker
+  "\\(----------\\|^function\\)" ; exactly 10 dashes, or a function
   "Lua page delimiter.")
 
 (defun lua-prev-page ()
============================================================
--- contrib/extra-commands.lua	bbc31f3f036d07ac810c500c4122847e1cc83683
+++ contrib/extra-commands.lua	3d0fa49d06310886694ee438963439e673dcd406
@@ -1,26 +1,9 @@
--- WARNING: this feature is not available in the mainline yet
--- you can find it in net.venge.monotone.ws_automate
-
--- include this in your monotonerc file to gain the extra commands.
-
--- Not all of the automate commands used by this lua code are committed
--- to trunk at present.  As such this should currently be treated as
--- sample code, not working commands.
-
-if alias_command == nil then
-    -- If we're using an older version of monotone that cannot handle lua commands
-    -- then turn make sure we don't error.
-    function alias_command(...) print("Warning: alias_command() not available in this version of Monotone.") end
-end
-
-if mtn_automate == nil or register_command == nil then
-    function register_command(...) print("Warning: register_command() not available in this version of Monotone.") end
-end
-
 alias_command("annotate", "blame")
 alias_command("annotate", "praise")
 
 function net_update(...)
+    -- could use 'mtn pull --update', or add --update to get_default_command_options for 'pull'
+    
     result, output = mtn_automate("get_option", "branch")	-- make sure we have a valid workspace
     if not result then
         print("Error from mtn automate call to get_option: ", ouput)
@@ -94,6 +77,8 @@ function merge_update(...)
 alias_command("net_commit", "nci")
 
 function merge_update(...)
+    -- could use 'mtn merge --update', or add --update to get_default_command_options for 'merge'
+    
     result, output = mtn_automate("get_option", "branch")	-- make sure we have a valid workspace
     if not result then
         print("Error from mtn_automate call to get_option: ", output)