[Monotone-commits-diffs] Revision 8dee89fdbaccce3ec9317e12d10620298d84ed3e

[monotone]

-----------------------------------------------------------------
Revision: 8dee89fdbaccce3ec9317e12d10620298d84ed3e
Ancestor: 2c90f4940166d4a3adfe9b9f1a463475ebcc1f5a
Author: address@hidden
Date: 2005-07-17T05:47:57
Branch: net.venge.monotone

Modified files:
        ChangeLog app_state.cc app_state.hh commands.cc
        diff_patch.cc diff_patch.hh lua.cc lua.hh monotone.cc
        monotone.texi options.hh std_hooks.lua tests/t_crlf.at
        tests/t_restrictions.at vocab.hh

ChangeLog: 

2005-07-16  Vladimir Vukicevic  <address@hidden>

        * lua.{cc,hh} (hook_external_diff): New hook.
        * std_hooks.lua (external_diff): Add default definition.
        * monotone.texi (Hooks): Document external_diff hook.
        * app_state.{cc,hh}, options.hh, monotone.cc: Add --context,
        --external, --unified, --diff-args options.
        * commands.cc (do_external_diff): New function.
        (dump_diffs): Put a == line between each file's diffs.
        Pass file_ids of pre- and post-states to make_diff.
        (diff): Take new options.
        (cdiff): Remove.
        * diff_patch.{cc,hh} (make_diff): Print file ids in diff file
        headers.
        (unidiff_append_test): Update.
        (enum diff_type): Move to...
        * vocab.hh: ...here.
        * tests/t_restrictions.at, tests/t_crlf.at: Update.

txt7FJ66tCd6l.txt
Description: Diff [2c90f4940166d4a3adfe9b9f1a463475ebcc1f5a] -> [8dee89fdbaccce3ec9317e12d10620298d84ed3e]