Checkout
hwright
committed
on 16 Sep 11
Make the client diff output streamy, rather than requiring an APR file.
(Our own consumer of this API just uses stdout, so this doesn't have… Show more
Make the client diff output streamy, rather than requiring an APR file.

(Our own consumer of this API just uses stdout, so this doesn't have much

effect there.)

* subversion/include/svn_client.h

 (svn_client_diff6): New.

 (svn_client_diff5): Deprecate.

 (svn_client_diff_peg6): New.

 (svn_client_diff_peg5): Deprecate.

* subversion/svn/diff-cmd.c

 (svn_cl__diff): Update callers.

* subversion/libsvn_client/deprecated.c

 (svn_client_diff5, svn_client_diff_peg5): New deprecation wrappers.

* subversion/libsvn_client/diff.c

 (file_printf_from_utf8): Remove.

 (display_mergeinfo_diff, display_prop_diffs): Accept and use a stream

   instead of a file.

 (diff_cmd_baton): Change file handles to streams.

 (diff_content_changed): Use streams, and create a temp file for interfacing

   with an external diff tool.

 (diff_file_deleted): Update params.

 (svn_client_diff6): Renamed and updated from svn_client_diff5().

 (svn_client_diff_peg6): Renamed and updated from svn_client_diff_peg5().

Show less