Checkout
Julian Foad
committed
on 23 Jan 18
Expose the 'pretty_print_mergeinfo' flag of svn_diff__display_prop_diffs()
up through higher APIs.

Partly because disabling that should hel… Show more
Expose the 'pretty_print_mergeinfo' flag of svn_diff__display_prop_diffs()

up through higher APIs.

Partly because disabling that should help me produce patches that are

compatible with 'svn patch'. Partly because it's the Right Thing to do.

* subversion/include/svn_client.h

 subversion/libsvn_client/deprecated.c

 (svn_client_diff7,

  svn_client_diff_peg7): New, adding a 'pretty_print_mergeinfo' parameter.

 (svn_client_diff6,

  svn_client_diff_peg6): Deprecate.

* subversion/libsvn_client/diff.c

 (display_prop_diffs,

  diff_writer_info_t,

  diff_props_changed): Take and pass on 'pretty_print_mergeinfo' parameter.

 (svn_client_diff7,

  svn_client_diff_peg7): Rename from '...6'. Take and pass on a

   'pretty_print_mergeinfo' parameter.

* subversion/svn/diff-cmd.c

 (svn_cl__diff): Use new API, passing TRUE for 'pretty_print_mergeinfo'.

Show less