# 
# patch "ChangeLog"
#  from [098f931c622ef79fe7cc8f389d4851fe9599541f]
#    to [83b2e191966842d4d5c5fce1b20aa82d97bd5e8d]
# 
# patch "revision.cc"
#  from [dab8f8c33fc1b34f01958d267e98164a96e52738]
#    to [f9c7fd64e999ea82f190e9f67fd27caabce6e5b4]
# 
# patch "std_hooks.lua"
#  from [9b1a27e30129929aa366223e51f1c11ec918fc93]
#    to [654ddd47221d379c6548ed9b3a41a8441cb31fd5]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,11 @@
+2005-06-24  Nathaniel Smith  <address@hidden>
+
+	* std_hooks.lua (get_preferred_merge2_command)
+	(get_preferred_merge3_command): Move meld to the bottom of the
+	default merge tool search order.  Also, use xemacs if it appears
+	in $EDITOR, otherwise use emacs.
+	* revision.cc (check_sane_history): Remove stale comment.
+
 2005-06-24  Matt Johnston  <address@hidden>
 
 	* transforms.{cc,hh}: combine gzip and base64 in one
--- revision.cc
+++ revision.cc
@@ -137,8 +137,6 @@
   std::set<revision_id> frontier;
   frontier.insert(child_id);
     
-  // FIXME: if we don't check the LCA already, check it.
-
   while (depth-- > 0)
     {
       std::set<revision_id> next_frontier;
--- std_hooks.lua
+++ std_hooks.lua
@@ -349,28 +349,26 @@
    
    if program_exists_in_path("kdiff3") then
       cmd =   merge2_kdiff3_cmd (left_path, right_path, merged_path, lfile, rfile, outfile) 
+   elseif program_exists_in_path ("xxdiff") then 
+      cmd = merge2_xxdiff_cmd (left_path, right_path, merged_path, lfile, rfile, outfile) 
+   elseif string.find(editor, "emacs") ~= nil or string.find(editor, "gnu") ~= nil then 
+      if string.find(editor, "xemacs") and program_exists_in_path("xemacs") then
+         cmd = merge2_emacs_cmd ("xemacs", lfile, rfile, outfile) 
+      elseif program_exists_in_path("emacs") then
+         cmd = merge2_emacs_cmd ("emacs", lfile, rfile, outfile) 
+      end
+   elseif string.find(editor, "vim") ~= nil then
+      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 
+         cmd = merge2_vim_cmd ("vim", lfile, rfile, outfile) 
+      end
    elseif program_exists_in_path ("meld") then 
       tbl.meld_exists = true 
       io.write (string.format("\nWARNING: 'meld' 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")) 
       cmd = merge2_meld_cmd (lfile, rfile) 
-   elseif program_exists_in_path ("xxdiff") then 
-      cmd = merge2_xxdiff_cmd (left_path, right_path, merged_path, lfile, rfile, outfile) 
-   else
-     if string.find(editor, "emacs") ~= nil or string.find(editor, "gnu") ~= nil then 
-       if program_exists_in_path ("emacs") then 
-          cmd = merge2_emacs_cmd ("emacs", lfile, rfile, outfile) 
-       elseif program_exists_in_path ("xemacs") then 
-          cmd = merge2_emacs_cmd ("xemacs", lfile, rfile, outfile) 
-       end
-     elseif string.find(editor, "vim") ~= nil then
-       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 
-          cmd = merge2_vim_cmd ("vim", lfile, rfile, outfile) 
-       end
-     end
    end 
    return cmd 
 end 
@@ -438,29 +436,26 @@
 
    if program_exists_in_path("kdiff3") then
       cmd = merge3_kdiff3_cmd (left_path, anc_path, right_path, merged_path, lfile, afile, rfile, outfile) 
+   elseif program_exists_in_path ("xxdiff") then 
+      cmd = merge3_xxdiff_cmd (left_path, anc_path, right_path, merged_path, lfile, afile, rfile, outfile) 
+   elseif string.find(editor, "emacs") ~= nil or string.find(editor, "gnu") ~= nil then 
+      if string.find(editor, "xemacs") and program_exists_in_path ("xemacs") then 
+         cmd = merge3_emacs_cmd ("xemacs", lfile, afile, rfile, outfile) 
+      elseif program_exists_in_path ("emacs") then 
+         cmd = merge3_emacs_cmd ("emacs", lfile, afile, rfile, outfile) 
+      end
+   elseif string.find(editor, "vim") ~= nil then
+      if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then 
+         cmd = merge3_vim_cmd ("gvim", lfile, afile, rfile, outfile) 
+      elseif program_exists_in_path ("vim") then 
+         cmd = merge3_vim_cmd ("vim", lfile, afile, rfile, outfile) 
+      end
    elseif program_exists_in_path ("meld") then 
       tbl.meld_exists = true 
       io.write (string.format("\nWARNING: 'meld' was choosen to perform external 3-way merge.\n"..
           "You should merge all changes to *CENTER* file due to limitation of program\n"..
           "arguments.\n\n")) 
       cmd = merge3_meld_cmd (lfile, afile, rfile) 
-   elseif program_exists_in_path ("xxdiff") then 
-      cmd = merge3_xxdiff_cmd (left_path, anc_path, right_path, merged_path, lfile, afile, rfile, outfile) 
-   else 
-     -- prefer emacs/xemacs
-     if string.find(editor, "emacs") ~= nil or string.find(editor, "gnu") ~= nil then 
-       if program_exists_in_path ("xemacs") then 
-          cmd = merge3_emacs_cmd ("xemacs", lfile, afile, rfile, outfile) 
-       elseif program_exists_in_path ("emacs") then 
-          cmd = merge3_emacs_cmd ("emacs", lfile, afile, rfile, outfile) 
-       end
-     elseif string.find(editor, "vim") ~= nil then  -- prefer vim
-       if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then 
-          cmd = merge3_vim_cmd ("gvim", lfile, afile, rfile, outfile) 
-       elseif program_exists_in_path ("vim") then 
-          cmd = merge3_vim_cmd ("vim", lfile, afile, rfile, outfile) 
-       end
-     end
    end 
    
    return cmd 
@@ -569,7 +564,7 @@
       return os.date("%FT%T", t)
    end
    
-	 -- today don't uses the time
+         -- today don't uses the time
    if str == "today"
    then
       local t = os.time(os.date('!*t'))
@@ -599,7 +594,7 @@
       if trans[type] <= 3600
       then
         return os.date("%FT%T", t - (n * trans[type]))
-      else	
+      else      
         return os.date("%F", t - (n * trans[type]))
       end
    end