# 
# patch "ChangeLog"
#  from [6c22470118e05866034fe7125f5fd501a97d83bd]
#    to [761dffa3c2dd2a94f3b63799d8373209e724d6a4]
# 
# patch "lua.cc"
#  from [967b4c4db84bd37752ed438eb7b424a6fd9dccc6]
#    to [fcf33cbb382a9b9a2865add041025a7a0ffcbf03]
# 
# patch "monotone.texi"
#  from [f6e0d0aba6a6e438cc906c64c1f0e8b69a2d2f83]
#    to [c6cf6ff6241455390dc7ca68bfd00f45f04e9537]
# 
# patch "std_hooks.lua"
#  from [8f062ef9dfe49877d8399a7e5389fd9872f96505]
#    to [f0bb2bbde4e06967caeb0ff0216eb1721a363f20]
# 
========================================================================
--- ChangeLog	6c22470118e05866034fe7125f5fd501a97d83bd
+++ ChangeLog	761dffa3c2dd2a94f3b63799d8373209e724d6a4
@@ -1,5 +1,10 @@
 2005-11-10  Timothy Brownawell  <address@hidden>
 
+	* lua.cc, std_hooks.lua, monotone.texi: basic_io parser for lua is
+	now called parse_basic_io
+
+2005-11-10  Timothy Brownawell  <address@hidden>
+
 	* monotone.texi: document parse_basicio in the
 	"Additional Lua Functions" section
 
========================================================================
--- lua.cc	967b4c4db84bd37752ed438eb7b424a6fd9dccc6
+++ lua.cc	fcf33cbb382a9b9a2865add041025a7a0ffcbf03
@@ -681,12 +681,12 @@
   }
 
   static int
-  monotone_parse_basicio_for_lua(lua_State *L)
+  monotone_parse_basic_io_for_lua(lua_State *L)
   {
     vector<pair<string, vector<string> > > res;
     const char *str = lua_tostring(L, -1);
     std::istringstream iss(str);
-    basic_io::input_source in(iss, "monotone_parse_basicio_for_lua");
+    basic_io::input_source in(iss, "monotone_parse_basic_io_for_lua");
     basic_io::tokenizer tok(in);
     try
       {
@@ -702,7 +702,7 @@
                 break;
               case basic_io::TOK_STRING:
               case basic_io::TOK_HEX:
-                E(!res.empty(), boost::format("bad input to parse_basicio"));
+                E(!res.empty(), boost::format("bad input to parse_basic_io"));
                 res.back().second.push_back(got);
                 break;
               default:
@@ -772,7 +772,7 @@
   lua_register(st, "includedir", monotone_includedir_for_lua);
   lua_register(st, "gettext", monotone_gettext_for_lua);
   lua_register(st, "get_confdir", monotone_get_confdir_for_lua);
-  lua_register(st, "parse_basicio", monotone_parse_basicio_for_lua);
+  lua_register(st, "parse_basic_io", monotone_parse_basic_io_for_lua);
 
   // add regex functions:
   lua_newtable(st);
========================================================================
--- monotone.texi	f6e0d0aba6a6e438cc906c64c1f0e8b69a2d2f83
+++ monotone.texi	c6cf6ff6241455390dc7ca68bfd00f45f04e9537
@@ -6374,7 +6374,7 @@
 process.
 The exit code is meaningful only if the result value is 0.
 
address@hidden parse_basicio(@var{data})
address@hidden parse_basic_io(@var{data})
 
 Parse the string @var{data}, which should be in basic_io format. It returns nil
 if it can't parse the string; otherwise it returns a table. This will be a list
========================================================================
--- std_hooks.lua	8f062ef9dfe49877d8399a7e5389fd9872f96505
+++ std_hooks.lua	f0bb2bbde4e06967caeb0ff0216eb1721a363f20
@@ -800,7 +800,7 @@
    local permfile = io.open(get_confdir() .. "/read-permissions", "r")
    if (permfile == nil) then return false end
    local dat = permfile:read("*a")
-   local res = parse_basicio(dat)
+   local res = parse_basic_io(dat)
    if res == nil then
       io.stderr:write("file read-permissions cannot be parsed\n")
       return false