[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Diff Project --invoke-diff-cmd part

From: Gabriela Gibson <gabriela.gibson_at_gmail.com>
Date: Mon, 29 Apr 2013 21:31:09 +0100

Take two.

Thanks for looking!


Add new diff option "--invoke-diff-cmd" which allows the user to
define a custom command line or config file entry for an external
diff program.

* subversion/include/svn_client.h
    (svn_client_diff6): Deprecate. Add new Doxygen comment.
    (svn_client_diff7): Add new Doxygen comment.
    (svn_client_diff7): New function.
    (svn_client_diff_peg_6): Deprecate. Refresh Doxygen comment.
    (svn_client_diff_peg_7): New function.

* subversion/include/svn_config.h

* subversion/include/svn_io.h
    (svn_io_create_custom_diff_cmd): New function.
    (svn_io_run_external_diff): New function.

* subversion/libsvn_client/deprecated.c
    (svn_client_diff6): Deprecate.
    (svn_client_diff_peg6): Deprecate.

* subversion/libsvn_client/diff.c
    (struct diff_cmd_baton): New variable.

    (diff_content_changed): Call svn_io_run_external_diff if
    --invoke-diff-cmd option was specied, otherwise retain previous

    (set_up_diff_cmd_and_options): Apply invoke-diff-cmd option
    preferentially. Old behavior unchanged.
    (svn_client_diff_peg_7): New function.

    (svn_client_diff6): Deprecate.
    (svn_client_diff7): New function.

* subversion/libsvn_subr/config_file.c
    (svn_config_ensure): Add help text.

* subversion/libsvn_subr/io.c
    (svn_io_create_custom_diff_cmd): New function.
    (svn_io_run_external_diff): New function.

* subversion/svn/cl.h
    (struct svn_cl__opt_state_t): New struct member.
    (struct svn_cl__opt_state_t.diff): New struct member.

* subversion/svn/diff-cmd.c
    (svn_cl__diff): Modify call to deprecated function.

* subversion/svn/svn.c
    (svn_cl__options[]): New variable and help info.
    (svn_cl__cmd_table[]): New variable.
    (sub_main): Add exclusiveness condition. Expand if condition.

Received on 2013-04-29 22:31:41 CEST

This is an archived mail posted to the Subversion Dev mailing list.