[Monotone-commits-diffs] Revision b7e5c76bfc260f9371c4eff1579cae080fcda3f6

[monotone]

-----------------------------------------------------------------
Revision: b7e5c76bfc260f9371c4eff1579cae080fcda3f6
Ancestor: ba8df64db03bef1ba6b94fab7f52046b13a47f6a
Author: address@hidden
Date: 2006-07-06T07:45:37
Branch: net.venge.monotone.diff-p

Added files:
        tests/diff_output_formats/__driver__.lua
        tests/diff_output_formats/hello.cd
        tests/diff_output_formats/hello.cdp
        tests/diff_output_formats/hello.dst
        tests/diff_output_formats/hello.src
        tests/diff_output_formats/hello.ud
        tests/diff_output_formats/hello.udp
Added directories:
        tests/diff_output_formats
Modified files:
        app_state.cc app_state.hh cmd_diff_log.cc cmd_files.cc
        diff_patch.cc diff_patch.hh lua_hooks.cc lua_hooks.hh
        monotone.cc monotone.texi options.hh std_hooks.lua
        tests/test_hooks.lua testsuite.lua

ChangeLog: 

Initial cut of support for diff -p.  Also allows diff -c/-u as shorthand for
--context/--unified, and makes -v synonymous with --verbose.

        * diff_patch.cc: Refactor common variables from
        unidiff_hunk_writer and ctxdiff_hunk_writer to hunk_consumer.
        Add an app_state reference to this object.  Add new function
        hunk_consumer::find_encloser.  Use find_encloser in all
        flush_hunk implementations.  Replace make_diff's diff_type
        argument with an app_state reference, and pass that along to
        hunk_writer constructors.  Delete unidiff_append_test which can
        no longer work (as it has no app_state to provide).
        * lua_hooks.cc, lua_hooks.hh (patternmatch, hook_get_encloser_pattern):
        New hooks.
        * diff_patch.hh: Update prototype of make_diff.
        * options.hh: Add OPT_SHOW_ENCLOSER.
        * app_state.cc, app_state.hh: Add diff_show_encloser boolean.
        * cmd_diff_log.cc (dump_diffs): Kill diff_type argument.
        (CMD(diff)): Accept OPT_SHOW_ENCLOSER.  Use app.diff_format
        directly.
        * monotone.cc (coptions): Add -c as short form of --context,
        -u as short form of --unified, -v as short form of verbose.  Add
        --show-encloser with short form -p, and --show-c-function as GNU-diff
        compatibility alias.
        (cpp_main): Handle OPT_SHOW_ENCLOSER.
        * monotone.texi: Update documentation of mtn diff.  Document
        get_encloser_pattern diff.
        * std_hooks.lua, tests/test_hooks.lua: Add default for
        get_encloser_pattern.
        * cmd_files.cc: Add new debug command 'fdiff'.
        * tests/diff_output_formats: New test, content lifted from
        the no-longer-working unidiff_append_test() in diff_patch.cc.
        * testsuite.lua: Update.

txtZntjp8V6bi.txt
Description: Diff [ba8df64db03bef1ba6b94fab7f52046b13a47f6a] -> [b7e5c76bfc260f9371c4eff1579cae080fcda3f6]