monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-devel] external diff hook


From: Derek Scherger
Subject: [Monotone-devel] external diff hook
Date: Wed, 21 Jun 2006 21:23:00 -0600
User-agent: Thunderbird 1.5.0.4 (X11/20060605)

Here's a little something I've been using lately. It's a hook definition
that allows monotone to use xxdiff as the external diff tool:

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);
   local new_file = write_to_temporary_file(data_new);

   execute("xxdiff", "-bBw",
        "--title1", "[OLD] " .. file_path, old_file,
        "--title2", "[NEW] " .. file_path, new_file);

   os.remove(old_file);
   os.remove(new_file);
end

Put this in your ~/.monotone/monotonerc or _MTN/monotonerc and invoke
xxdiff with:

        $ mtn diff --external

Cheers,
Derek





reply via email to

[Prev in Thread] Current Thread [Next in Thread]