[Monotone-devel] Vim merging tweaks

[Matthew A. Nicholson]

Here are some tweaks to the vim/gvim merging functionality.
--
Matthew A. Nicholson
Digium

# 
# patch "std_hooks.lua"
#  from [072c95bc58425ade43dc08e8361c7aca49275dd4]
#    to [5a2d83cfdb50cced117327ad0395bc68b33d9000]
# 
--- std_hooks.lua
+++ std_hooks.lua
@@ -363,6 +363,9 @@
          cmd = merge2_emacs_cmd ("emacs", lfile, rfile, outfile) 
       end
    elseif string.find(editor, "vim") ~= nil then
+      io.write (string.format("\nWARNING: 'vim' was choosen to perform 
external 2-way merge.\n"..
+          "You should merge all changes to *LEFT* file due to limitation of 
program\n"..
+          "arguments.\n\n")) 
       if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then
          cmd = merge2_vim_cmd ("gvim", lfile, rfile, outfile) 
       elseif program_exists_in_path ("vim") then 
@@ -450,10 +453,13 @@
          cmd = merge3_emacs_cmd ("emacs", lfile, afile, rfile, outfile) 
       end
    elseif string.find(editor, "vim") ~= nil then
+      io.write (string.format("\nWARNING: 'vim' was choosen to perform 
external 2-way merge.\n"..
+          "You should merge all changes to *LEFT* file due to limitation of 
program\n"..
+          "arguments.  The order of the files is ancestor, left, right.\n\n")) 
       if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then 
-         cmd = merge3_vim_cmd ("gvim", lfile, afile, rfile, outfile) 
+         cmd = merge3_vim_cmd ("gvim", afile, lfile, rfile, outfile) 
       elseif program_exists_in_path ("vim") then 
-         cmd = merge3_vim_cmd ("vim", lfile, afile, rfile, outfile) 
+         cmd = merge3_vim_cmd ("vim", afile, lfile, rfile, outfile) 
       end
    elseif program_exists_in_path ("meld") then 
       tbl.meld_exists = true