[Monotone-commits-diffs] net.venge.monotone: 83ae9d988242e19336bc65a5b3b084d244932ff8

[code]

revision:            83ae9d988242e19336bc65a5b3b084d244932ff8
date:                2013-02-26T19:25:37
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone
changelog:
Specify 'b' at the end of the mode string for 'io.open'

Lua 5.2 checks and enforces the mode string which caused the following
error to occur:

        invalid mode 'wb+' (should match '[rwa]%+?b?')

manifest:
format_version "1"

new_manifest [8019196ca4eb1fc95ced7fcca3594bdb43d70c11]

old_revision [5348bb00441cf134154ff8476be2587589f08451]

patch "src/std_hooks.lua"
 from [6b28a0546b7c608cc23ba36e901ed532022ad5a2]
   to [54ec386116ab1377c7d1c3d9093dfb7e9eb81358]
============================================================
--- src/std_hooks.lua	6b28a0546b7c608cc23ba36e901ed532022ad5a2
+++ src/std_hooks.lua	54ec386116ab1377c7d1c3d9093dfb7e9eb81358
@@ -941,10 +941,10 @@ function merge3 (anc_path, left_path, ri
    tbl.rfile = nil
    tbl.outfile = nil
    tbl.meld_exists = false
-   tbl.lfile = write_to_temporary_file (left, "left", "rb+")
-   tbl.afile = write_to_temporary_file (ancestor, "ancestor", "rb+")
-   tbl.rfile = write_to_temporary_file (right, "right", "rb+")
-   tbl.outfile = write_to_temporary_file ("", "merged", "rb+")
+   tbl.lfile = write_to_temporary_file (left, "left", "r+b")
+   tbl.afile = write_to_temporary_file (ancestor, "ancestor", "r+b")
+   tbl.rfile = write_to_temporary_file (right, "right", "r+b")
+   tbl.outfile = write_to_temporary_file ("", "merged", "r+b")
 
    if tbl.lfile ~= nil and tbl.rfile ~= nil and tbl.afile ~= nil and tbl.outfile ~= nil
    then
@@ -1082,8 +1082,8 @@ function external_diff(file_path, data_o
 
 -- default external diff, works for gnu diff
 function external_diff(file_path, data_old, data_new, is_binary, diff_args, rev_old, rev_new)
-   local old_file = write_to_temporary_file(data_old, nil, "rb+");
-   local new_file = write_to_temporary_file(data_new, nil, "rb+");
+   local old_file = write_to_temporary_file(data_old, nil, "r+b");
+   local new_file = write_to_temporary_file(data_new, nil, "r+b");
 
    if diff_args == nil then diff_args = external_diff_default_args end
    execute("diff", diff_args, "--label", file_path .. "\told", old_file, "--label", file_path .. "\tnew", new_file);