1478 lines
87 KiB
HTML
1478 lines
87 KiB
HTML
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
|
<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
|
|
<title>Subversion: svn_diff.h File Reference</title>
|
|
<link href="doxygen.css" rel="stylesheet" type="text/css">
|
|
<link href="tabs.css" rel="stylesheet" type="text/css">
|
|
</head><body>
|
|
<!-- Generated by Doxygen 1.5.6 -->
|
|
<div class="navigation" id="top">
|
|
<div class="tabs">
|
|
<ul>
|
|
<li><a href="index.html"><span>Main Page</span></a></li>
|
|
<li><a href="pages.html"><span>Related Pages</span></a></li>
|
|
<li><a href="modules.html"><span>Modules</span></a></li>
|
|
<li><a href="annotated.html"><span>Data Structures</span></a></li>
|
|
<li class="current"><a href="files.html"><span>Files</span></a></li>
|
|
<li>
|
|
<form action="search.php" method="get">
|
|
<table cellspacing="0" cellpadding="0" border="0">
|
|
<tr>
|
|
<td><label> <u>S</u>earch for </label></td>
|
|
<td><input type="text" name="query" value="" size="20" accesskey="s"/></td>
|
|
</tr>
|
|
</table>
|
|
</form>
|
|
</li>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
<div class="contents">
|
|
<h1>svn_diff.h File Reference</h1>Contextual diffing. <a href="#_details">More...</a>
|
|
<p>
|
|
<code>#include <apr.h></code><br>
|
|
<code>#include <apr_pools.h></code><br>
|
|
<code>#include <apr_file_io.h></code><br>
|
|
<code>#include "<a class="el" href="svn__types_8h-source.html">svn_types.h</a>"</code><br>
|
|
<code>#include "<a class="el" href="svn__error_8h-source.html">svn_error.h</a>"</code><br>
|
|
|
|
<p>
|
|
<a href="svn__diff_8h-source.html">Go to the source code of this file.</a><table border="0" cellpadding="0" cellspacing="0">
|
|
<tr><td></td></tr>
|
|
<tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top">struct </td><td class="memItemRight" valign="bottom"><a class="el" href="structsvn__diff__fns__t.html">svn_diff_fns_t</a></td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">A vtable for reading data from the three datasources. <a href="structsvn__diff__fns__t.html#_details">More...</a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top">struct </td><td class="memItemRight" valign="bottom"><a class="el" href="structsvn__diff__output__fns__t.html">svn_diff_output_fns_t</a></td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">A vtable for displaying (or consuming) differences between datasources. <a href="structsvn__diff__output__fns__t.html#_details">More...</a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top">struct </td><td class="memItemRight" valign="bottom"><a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a></td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Options to control the behaviour of the file diff routines. <a href="structsvn__diff__file__options__t.html#_details">More...</a><br></td></tr>
|
|
<tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a></td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">An opaque type that represents a difference between either two or three datasources. <a href="#b43107714d2128d68a2dac688b8dc4d3"></a><br></td></tr>
|
|
<tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top">enum </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#8821c640a150d0ddead17596dabc26e1">svn_diff_datasource_e</a> { <br>
|
|
<a class="el" href="svn__diff_8h.html#8821c640a150d0ddead17596dabc26e12c93024afeed0db34a49efe068bfe971">svn_diff_datasource_original</a>,
|
|
<br>
|
|
<a class="el" href="svn__diff_8h.html#8821c640a150d0ddead17596dabc26e19b7f628adc881587defb639c58dfbe3b">svn_diff_datasource_modified</a>,
|
|
<br>
|
|
<a class="el" href="svn__diff_8h.html#8821c640a150d0ddead17596dabc26e1378abbd6e8fd3b09ced12f164dcbe96c">svn_diff_datasource_latest</a>,
|
|
<br>
|
|
<a class="el" href="svn__diff_8h.html#8821c640a150d0ddead17596dabc26e133aa2f311918f0bab2834760e2344c13">svn_diff_datasource_ancestor</a>
|
|
<br>
|
|
}</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">There are four types of datasources. <a href="svn__diff_8h.html#8821c640a150d0ddead17596dabc26e1">More...</a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top">enum </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#89e4b15ecac2afd0b42cb3f1988b1f65">svn_diff_file_ignore_space_t</a> { <br>
|
|
<a class="el" href="svn__diff_8h.html#89e4b15ecac2afd0b42cb3f1988b1f656f0057c381650cd32dbb062e40dbcba5">svn_diff_file_ignore_space_none</a>,
|
|
<br>
|
|
<a class="el" href="svn__diff_8h.html#89e4b15ecac2afd0b42cb3f1988b1f65d2a384001d7174e6767d1978e7429d8b">svn_diff_file_ignore_space_change</a>,
|
|
<br>
|
|
<a class="el" href="svn__diff_8h.html#89e4b15ecac2afd0b42cb3f1988b1f654579ba57b0e155e1a973ab20b6803134">svn_diff_file_ignore_space_all</a>
|
|
<br>
|
|
}</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">To what extent whitespace should be ignored when comparing lines. <a href="svn__diff_8h.html#89e4b15ecac2afd0b42cb3f1988b1f65">More...</a><br></td></tr>
|
|
<tr><td colspan="2"><br><h2>Functions</h2></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structsvn__version__t.html">svn_version_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#5a58195c4a4f8cac78ed0c1f0a3d4975">svn_diff_version</a> (void)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Get libsvn_diff version information. <a href="#5a58195c4a4f8cac78ed0c1f0a3d4975"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#3fae3c023184611010ad555b68e4a4d6">svn_diff_diff</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, void *diff_baton, const <a class="el" href="structsvn__diff__fns__t.html">svn_diff_fns_t</a> *diff_fns, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Given a vtable of <em>diff_fns/<em>diff_baton</em> for</em> reading datasources, return a diff object in <em>*diff</em> that represents a difference between an "original" and "modified" datasource. <a href="#3fae3c023184611010ad555b68e4a4d6"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#073245ac36a026c2c69b3ca156652894">svn_diff_diff3</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, void *diff_baton, const <a class="el" href="structsvn__diff__fns__t.html">svn_diff_fns_t</a> *diff_fns, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Given a vtable of <em>diff_fns/<em>diff_baton</em> for</em> reading datasources, return a diff object in <em>*diff</em> that represents a difference between three datasources: "original", "modified", and "latest". <a href="#073245ac36a026c2c69b3ca156652894"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#f0081fa1853b30f374a59df8412fae44">svn_diff_diff4</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, void *diff_baton, const <a class="el" href="structsvn__diff__fns__t.html">svn_diff_fns_t</a> *diff_fns, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Given a vtable of <em>diff_fns/<em>diff_baton</em> for</em> reading datasources, return a diff object in <em>*diff</em> that represents a difference between two datasources: "original" and "latest", adjusted to become a full difference between "original", "modified" and "latest" using "ancestor". <a href="#f0081fa1853b30f374a59df8412fae44"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#d85bfdef30f7ff1e340aeaa51a40ac31">svn_diff_contains_conflicts</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Determine if a diff object contains conflicts. <a href="#d85bfdef30f7ff1e340aeaa51a40ac31"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#77596c94cc8567ddc31988482ebde563">svn_diff_contains_diffs</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Determine if a diff object contains actual differences between the datasources. <a href="#77596c94cc8567ddc31988482ebde563"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="5d7485d61ab944a9a994eb18d8c9a9c5"></a><!-- doxytag: member="svn_diff.h::svn_diff_output" ref="5d7485d61ab944a9a994eb18d8c9a9c5" args="(svn_diff_t *diff, void *output_baton, const svn_diff_output_fns_t *output_fns)" -->
|
|
<a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#5d7485d61ab944a9a994eb18d8c9a9c5">svn_diff_output</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff, void *output_baton, const <a class="el" href="structsvn__diff__output__fns__t.html">svn_diff_output_fns_t</a> *output_fns)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Given a vtable of <em>output_fns/<em>output_baton</em> for</em> consuming differences, output the differences in <em>diff</em>. <br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#796298bb5b2498c8812061b3d014266c">svn_diff_file_options_create</a> (apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Allocate a <code><a class="el" href="structsvn__diff__file__options__t.html" title="Options to control the behaviour of the file diff routines.">svn_diff_file_options_t</a></code> structure in <em>pool</em>, initializing it with default values. <a href="#796298bb5b2498c8812061b3d014266c"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#212d408eee817f2193737fa4e8307a9e">svn_diff_file_options_parse</a> (<a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> *options, const apr_array_header_t *args, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Parse <em>args</em>, an array of <code>const char *</code> command line switches and adjust <em>options</em> accordingly. <a href="#212d408eee817f2193737fa4e8307a9e"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#1b7edd26b59f2a43436d53573526ca8f">svn_diff_file_diff_2</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const char *original, const char *modified, const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> *options, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">A convenience function to produce a diff between two files. <a href="#1b7edd26b59f2a43436d53573526ca8f"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#553e2f229b56443b1f95a2590a3fb106">svn_diff_file_diff</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const char *original, const char *modified, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to svn_file_diff_2(), but with <em>options</em> set to a struct with default options. <a href="#553e2f229b56443b1f95a2590a3fb106"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#d62b844109d8db86b08fdf12714e818e">svn_diff_file_diff3_2</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const char *original, const char *modified, const char *latest, const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> *options, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">A convenience function to produce a diff between three files. <a href="#d62b844109d8db86b08fdf12714e818e"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#f012ea2f88946fdf414a44e3be7ea01a">svn_diff_file_diff3</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const char *original, const char *modified, const char *latest, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="svn__diff_8h.html#d62b844109d8db86b08fdf12714e818e" title="A convenience function to produce a diff between three files.">svn_diff_file_diff3_2()</a>, but with <em>options</em> set to a struct with default options. <a href="#f012ea2f88946fdf414a44e3be7ea01a"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#2186ee46804624aa3713e1c883192ad4">svn_diff_file_diff4_2</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const char *original, const char *modified, const char *latest, const char *ancestor, const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> *options, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">A convenience function to produce a diff between four files. <a href="#2186ee46804624aa3713e1c883192ad4"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#68fa15b2ab1fe6ef680704510615dfd1">svn_diff_file_diff4</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const char *original, const char *modified, const char *latest, const char *ancestor, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Simliar to svn_file_diff4_2(), but with <em>options</em> set to a struct with default options. <a href="#68fa15b2ab1fe6ef680704510615dfd1"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#968422a5b6476ff9af8bbdbcd823b5e6">svn_diff_file_output_unified3</a> (<a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> *output_stream, <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff, const char *original_path, const char *modified_path, const char *original_header, const char *modified_header, const char *header_encoding, const char *relative_to_dir, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> show_c_function, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">A convenience function to produce unified diff output from the diff generated by <a class="el" href="svn__diff_8h.html#553e2f229b56443b1f95a2590a3fb106" title="Similar to svn_file_diff_2(), but with options set to a struct with default options...">svn_diff_file_diff()</a>. <a href="#968422a5b6476ff9af8bbdbcd823b5e6"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#5f1c4c2f8079afd3318693d56491c76c">svn_diff_file_output_unified2</a> (<a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> *output_stream, <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff, const char *original_path, const char *modified_path, const char *original_header, const char *modified_header, const char *header_encoding, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="svn__diff_8h.html#968422a5b6476ff9af8bbdbcd823b5e6" title="A convenience function to produce unified diff output from the diff generated by...">svn_diff_file_output_unified3()</a>, but with <em>relative_to_dir</em> set to NULL and <em>show_c_function</em> to false. <a href="#5f1c4c2f8079afd3318693d56491c76c"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#251f5e2150be81e24b6e27eebd66c6d8">svn_diff_file_output_unified</a> (<a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> *output_stream, <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff, const char *original_path, const char *modified_path, const char *original_header, const char *modified_header, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="svn__diff_8h.html#5f1c4c2f8079afd3318693d56491c76c" title="Similar to svn_diff_file_output_unified3(), but with relative_to_dir set to NULL...">svn_diff_file_output_unified2()</a>, but with <em>header_encoding</em> set to <code>APR_LOCALE_CHARSET</code>. <a href="#251f5e2150be81e24b6e27eebd66c6d8"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#35d61f33b5756908d3fe16a88ba1b660">svn_diff_file_output_merge</a> (<a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> *output_stream, <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff, const char *original_path, const char *modified_path, const char *latest_path, const char *conflict_original, const char *conflict_modified, const char *conflict_latest, const char *conflict_separator, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> display_original_in_conflict, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> display_resolved_conflicts, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">A convenience function to produce diff3 output from the diff generated by <a class="el" href="svn__diff_8h.html#f012ea2f88946fdf414a44e3be7ea01a" title="Similar to svn_diff_file_diff3_2(), but with options set to a struct with default...">svn_diff_file_diff3()</a>. <a href="#35d61f33b5756908d3fe16a88ba1b660"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#273f5960c32443cdb304f4cc5dedf9ca">svn_diff_mem_string_diff</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *original, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *modified, const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> *options, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Generate <em>diff</em> output from the <em>original</em> and <em>modified</em> in-memory strings. <a href="#273f5960c32443cdb304f4cc5dedf9ca"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#6b9c514fb18f22f7aee96f4b1f065bac">svn_diff_mem_string_diff3</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *original, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *modified, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *latest, const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> *options, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Generate <em>diff</em> output from the <em>orginal</em>, <em>modified</em> and <em>latest</em> in-memory strings. <a href="#6b9c514fb18f22f7aee96f4b1f065bac"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#503bbc1503bbc8d657ee30e1b7cb0ffa">svn_diff_mem_string_diff4</a> (<a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> **diff, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *original, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *modified, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *latest, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *ancestor, const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> *options, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Generate <em>diff</em> output from the <em>original</em>, <em>modified</em> and <em>latest</em> in-memory strings, using <em>ancestor</em>. <a href="#503bbc1503bbc8d657ee30e1b7cb0ffa"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#e2ba9764f3ef6d9d87b13f16ab9b1f43">svn_diff_mem_string_output_unified</a> (<a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> *output_stream, <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff, const char *original_header, const char *modified_header, const char *header_encoding, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *original, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *modified, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Outputs the <em>diff</em> object generated by <a class="el" href="svn__diff_8h.html#273f5960c32443cdb304f4cc5dedf9ca" title="Generate diff output from the original and modified in-memory strings.">svn_diff_mem_string_diff()</a> in unified diff format on <em>output_stream</em>, using <em>original</em> and <em>modified</em> for the text in the output. <a href="#e2ba9764f3ef6d9d87b13f16ab9b1f43"></a><br></td></tr>
|
|
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structsvn__error__t.html">svn_error_t</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="svn__diff_8h.html#c473496b2d0a5334c518bafeb4966e59">svn_diff_mem_string_output_merge</a> (<a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> *output_stream, <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> *diff, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *original, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *modified, const <a class="el" href="structsvn__string__t.html">svn_string_t</a> *latest, const char *conflict_original, const char *conflict_modified, const char *conflict_latest, const char *conflict_separator, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> display_original_in_conflict, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> display_resolved_conflicts, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Output the <em>diff</em> generated by <a class="el" href="svn__diff_8h.html#6b9c514fb18f22f7aee96f4b1f065bac" title="Generate diff output from the orginal, modified and latest in-memory strings.">svn_diff_mem_string_diff3()</a> in diff3 format on <em>output_stream</em>, using <em>original</em>, <em>modified</em> and <em>latest</em> for content changes. <a href="#c473496b2d0a5334c518bafeb4966e59"></a><br></td></tr>
|
|
</table>
|
|
<hr><a name="_details"></a><h2>Detailed Description</h2>
|
|
Contextual diffing.
|
|
<p>
|
|
This is an internalized library for performing contextual diffs between sources of data.<p>
|
|
<dl class="note" compact><dt><b>Note:</b></dt><dd>This is different than Subversion's binary-diffing engine. That API lives in <code><a class="el" href="svn__delta_8h.html" title="Delta-parsing.">svn_delta.h</a></code> -- see the "text deltas" section. A "text delta" is way of representing precise binary diffs between strings of data. The Subversion client and server send text deltas to one another during updates and commits.</dd></dl>
|
|
This API, however, is (or will be) used for performing *contextual* merges between files in the working copy. During an update or merge, 3-way file merging is needed. And 'svn diff' needs to show the differences between 2 files.<p>
|
|
The nice thing about this API is that it's very general. It operates on any source of data (a "datasource") and calculates contextual differences on "tokens" within the data. In our particular usage, the datasources are files and the tokens are lines. But the possibilities are endless.
|
|
<p>Definition in file <a class="el" href="svn__diff_8h-source.html">svn_diff.h</a>.</p>
|
|
<hr><h2>Typedef Documentation</h2>
|
|
<a class="anchor" name="b43107714d2128d68a2dac688b8dc4d3"></a><!-- doxytag: member="svn_diff.h::svn_diff_t" ref="b43107714d2128d68a2dac688b8dc4d3" args="" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname">typedef struct <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> <a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> </td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
An opaque type that represents a difference between either two or three datasources.
|
|
<p>
|
|
This object is returned by <a class="el" href="svn__diff_8h.html#3fae3c023184611010ad555b68e4a4d6" title="Given a vtable of diff_fns/diff_baton for reading datasources, return a diff object...">svn_diff_diff()</a>, <a class="el" href="svn__diff_8h.html#073245ac36a026c2c69b3ca156652894" title="Given a vtable of diff_fns/diff_baton for reading datasources, return a diff object...">svn_diff_diff3()</a> and <a class="el" href="svn__diff_8h.html#f0081fa1853b30f374a59df8412fae44" title="Given a vtable of diff_fns/diff_baton for reading datasources, return a diff object...">svn_diff_diff4()</a>, and consumed by a number of other routines.
|
|
<p>Definition at line <a class="el" href="svn__diff_8h-source.html#l00076">76</a> of file <a class="el" href="svn__diff_8h-source.html">svn_diff.h</a>.</p>
|
|
|
|
</div>
|
|
</div><p>
|
|
<hr><h2>Enumeration Type Documentation</h2>
|
|
<a class="anchor" name="8821c640a150d0ddead17596dabc26e1"></a><!-- doxytag: member="svn_diff.h::svn_diff_datasource_e" ref="8821c640a150d0ddead17596dabc26e1" args="" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname">enum <a class="el" href="svn__diff_8h.html#8821c640a150d0ddead17596dabc26e1">svn_diff_datasource_e</a> </td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
There are four types of datasources.
|
|
<p>
|
|
In GNU diff3 terminology, the first three types correspond to the phrases "older", "mine", and "yours". <dl compact><dt><b>Enumerator: </b></dt><dd>
|
|
<table border="0" cellspacing="2" cellpadding="0">
|
|
<tr><td valign="top"><em><a class="anchor" name="8821c640a150d0ddead17596dabc26e12c93024afeed0db34a49efe068bfe971"></a><!-- doxytag: member="svn_diff_datasource_original" ref="8821c640a150d0ddead17596dabc26e12c93024afeed0db34a49efe068bfe971" args="" -->svn_diff_datasource_original</em> </td><td>
|
|
The oldest form of the data.
|
|
<p>
|
|
</td></tr>
|
|
<tr><td valign="top"><em><a class="anchor" name="8821c640a150d0ddead17596dabc26e19b7f628adc881587defb639c58dfbe3b"></a><!-- doxytag: member="svn_diff_datasource_modified" ref="8821c640a150d0ddead17596dabc26e19b7f628adc881587defb639c58dfbe3b" args="" -->svn_diff_datasource_modified</em> </td><td>
|
|
The same data, but potentially changed by the user.
|
|
<p>
|
|
</td></tr>
|
|
<tr><td valign="top"><em><a class="anchor" name="8821c640a150d0ddead17596dabc26e1378abbd6e8fd3b09ced12f164dcbe96c"></a><!-- doxytag: member="svn_diff_datasource_latest" ref="8821c640a150d0ddead17596dabc26e1378abbd6e8fd3b09ced12f164dcbe96c" args="" -->svn_diff_datasource_latest</em> </td><td>
|
|
The latest version of the data, possibly different than the user's modified version. </td></tr>
|
|
<tr><td valign="top"><em><a class="anchor" name="8821c640a150d0ddead17596dabc26e133aa2f311918f0bab2834760e2344c13"></a><!-- doxytag: member="svn_diff_datasource_ancestor" ref="8821c640a150d0ddead17596dabc26e133aa2f311918f0bab2834760e2344c13" args="" -->svn_diff_datasource_ancestor</em> </td><td>
|
|
The common ancestor of original and modified.
|
|
<p>
|
|
</td></tr>
|
|
</table>
|
|
</dl>
|
|
|
|
<p>Definition at line <a class="el" href="svn__diff_8h-source.html#l00083">83</a> of file <a class="el" href="svn__diff_8h-source.html">svn_diff.h</a>.</p>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="89e4b15ecac2afd0b42cb3f1988b1f65"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_ignore_space_t" ref="89e4b15ecac2afd0b42cb3f1988b1f65" args="" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname">enum <a class="el" href="svn__diff_8h.html#89e4b15ecac2afd0b42cb3f1988b1f65">svn_diff_file_ignore_space_t</a> </td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
To what extent whitespace should be ignored when comparing lines.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4. </dd></dl>
|
|
<dl compact><dt><b>Enumerator: </b></dt><dd>
|
|
<table border="0" cellspacing="2" cellpadding="0">
|
|
<tr><td valign="top"><em><a class="anchor" name="89e4b15ecac2afd0b42cb3f1988b1f656f0057c381650cd32dbb062e40dbcba5"></a><!-- doxytag: member="svn_diff_file_ignore_space_none" ref="89e4b15ecac2afd0b42cb3f1988b1f656f0057c381650cd32dbb062e40dbcba5" args="" -->svn_diff_file_ignore_space_none</em> </td><td>
|
|
Ignore no whitespace.
|
|
<p>
|
|
</td></tr>
|
|
<tr><td valign="top"><em><a class="anchor" name="89e4b15ecac2afd0b42cb3f1988b1f65d2a384001d7174e6767d1978e7429d8b"></a><!-- doxytag: member="svn_diff_file_ignore_space_change" ref="89e4b15ecac2afd0b42cb3f1988b1f65d2a384001d7174e6767d1978e7429d8b" args="" -->svn_diff_file_ignore_space_change</em> </td><td>
|
|
Ignore changes in sequences of whitespace characters, treating each sequence of whitespace characters as a single space.
|
|
<p>
|
|
</td></tr>
|
|
<tr><td valign="top"><em><a class="anchor" name="89e4b15ecac2afd0b42cb3f1988b1f654579ba57b0e155e1a973ab20b6803134"></a><!-- doxytag: member="svn_diff_file_ignore_space_all" ref="89e4b15ecac2afd0b42cb3f1988b1f654579ba57b0e155e1a973ab20b6803134" args="" -->svn_diff_file_ignore_space_all</em> </td><td>
|
|
Ignore all whitespace characters.
|
|
<p>
|
|
</td></tr>
|
|
</table>
|
|
</dl>
|
|
|
|
<p>Definition at line <a class="el" href="svn__diff_8h-source.html#l00309">309</a> of file <a class="el" href="svn__diff_8h-source.html">svn_diff.h</a>.</p>
|
|
|
|
</div>
|
|
</div><p>
|
|
<hr><h2>Function Documentation</h2>
|
|
<a class="anchor" name="d85bfdef30f7ff1e340aeaa51a40ac31"></a><!-- doxytag: member="svn_diff.h::svn_diff_contains_conflicts" ref="d85bfdef30f7ff1e340aeaa51a40ac31" args="(svn_diff_t *diff)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> svn_diff_contains_conflicts </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em> </td>
|
|
<td> ) </td>
|
|
<td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Determine if a diff object contains conflicts.
|
|
<p>
|
|
If it does, return <code>TRUE</code>, else return <code>FALSE</code>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="77596c94cc8567ddc31988482ebde563"></a><!-- doxytag: member="svn_diff.h::svn_diff_contains_diffs" ref="77596c94cc8567ddc31988482ebde563" args="(svn_diff_t *diff)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> svn_diff_contains_diffs </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em> </td>
|
|
<td> ) </td>
|
|
<td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Determine if a diff object contains actual differences between the datasources.
|
|
<p>
|
|
If so, return <code>TRUE</code>, else return <code>FALSE</code>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="3fae3c023184611010ad555b68e4a4d6"></a><!-- doxytag: member="svn_diff.h::svn_diff_diff" ref="3fae3c023184611010ad555b68e4a4d6" args="(svn_diff_t **diff, void *diff_baton, const svn_diff_fns_t *diff_fns, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_diff </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>diff_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__fns__t.html">svn_diff_fns_t</a> * </td>
|
|
<td class="paramname"> <em>diff_fns</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Given a vtable of <em>diff_fns/<em>diff_baton</em> for</em> reading datasources, return a diff object in <em>*diff</em> that represents a difference between an "original" and "modified" datasource.
|
|
<p>
|
|
Do all allocation in <em>pool</em>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="073245ac36a026c2c69b3ca156652894"></a><!-- doxytag: member="svn_diff.h::svn_diff_diff3" ref="073245ac36a026c2c69b3ca156652894" args="(svn_diff_t **diff, void *diff_baton, const svn_diff_fns_t *diff_fns, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_diff3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>diff_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__fns__t.html">svn_diff_fns_t</a> * </td>
|
|
<td class="paramname"> <em>diff_fns</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Given a vtable of <em>diff_fns/<em>diff_baton</em> for</em> reading datasources, return a diff object in <em>*diff</em> that represents a difference between three datasources: "original", "modified", and "latest".
|
|
<p>
|
|
Do all allocation in <em>pool</em>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="f0081fa1853b30f374a59df8412fae44"></a><!-- doxytag: member="svn_diff.h::svn_diff_diff4" ref="f0081fa1853b30f374a59df8412fae44" args="(svn_diff_t **diff, void *diff_baton, const svn_diff_fns_t *diff_fns, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_diff4 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>diff_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__fns__t.html">svn_diff_fns_t</a> * </td>
|
|
<td class="paramname"> <em>diff_fns</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Given a vtable of <em>diff_fns/<em>diff_baton</em> for</em> reading datasources, return a diff object in <em>*diff</em> that represents a difference between two datasources: "original" and "latest", adjusted to become a full difference between "original", "modified" and "latest" using "ancestor".
|
|
<p>
|
|
Do all allocation in <em>pool</em>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="553e2f229b56443b1f95a2590a3fb106"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_diff" ref="553e2f229b56443b1f95a2590a3fb106" args="(svn_diff_t **diff, const char *original, const char *modified, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_diff </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to svn_file_diff_2(), but with <em>options</em> set to a struct with default options.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000094">Deprecated:</a></b></dt><dd>Provided for backwards compatibility with the 1.3 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="f012ea2f88946fdf414a44e3be7ea01a"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_diff3" ref="f012ea2f88946fdf414a44e3be7ea01a" args="(svn_diff_t **diff, const char *original, const char *modified, const char *latest, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_diff3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to <a class="el" href="svn__diff_8h.html#d62b844109d8db86b08fdf12714e818e" title="A convenience function to produce a diff between three files.">svn_diff_file_diff3_2()</a>, but with <em>options</em> set to a struct with default options.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000095">Deprecated:</a></b></dt><dd>Provided for backwards compatibility with the 1.3 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="d62b844109d8db86b08fdf12714e818e"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_diff3_2" ref="d62b844109d8db86b08fdf12714e818e" args="(svn_diff_t **diff, const char *original, const char *modified, const char *latest, const svn_diff_file_options_t *options, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_diff3_2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td>
|
|
<td class="paramname"> <em>options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
A convenience function to produce a diff between three files.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4.</dd></dl>
|
|
Return a diff object in <em>*diff</em> (allocated from <em>pool</em>) that represents the difference between an <em>original</em> file, <em>modified</em> file, and <em>latest</em> file.<p>
|
|
Compare lines according to the relevant fields of <em>options</em>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="68fa15b2ab1fe6ef680704510615dfd1"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_diff4" ref="68fa15b2ab1fe6ef680704510615dfd1" args="(svn_diff_t **diff, const char *original, const char *modified, const char *latest, const char *ancestor, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_diff4 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>ancestor</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Simliar to svn_file_diff4_2(), but with <em>options</em> set to a struct with default options.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000096">Deprecated:</a></b></dt><dd>Provided for backwards compatibility with the 1.3 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="2186ee46804624aa3713e1c883192ad4"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_diff4_2" ref="2186ee46804624aa3713e1c883192ad4" args="(svn_diff_t **diff, const char *original, const char *modified, const char *latest, const char *ancestor, const svn_diff_file_options_t *options, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_diff4_2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>ancestor</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td>
|
|
<td class="paramname"> <em>options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
A convenience function to produce a diff between four files.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4.</dd></dl>
|
|
Return a diff object in <em>*diff</em> (allocated from <em>pool</em>) that represents the difference between an <em>original</em> file, <em>modified</em> file, <em>latest</em> and <em>ancestor</em> file. (The file arguments must be full paths to the files.)<p>
|
|
Compare lines according to the relevant fields of <em>options</em>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="1b7edd26b59f2a43436d53573526ca8f"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_diff_2" ref="1b7edd26b59f2a43436d53573526ca8f" args="(svn_diff_t **diff, const char *original, const char *modified, const svn_diff_file_options_t *options, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_diff_2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td>
|
|
<td class="paramname"> <em>options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
A convenience function to produce a diff between two files.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4.</dd></dl>
|
|
Return a diff object in <em>*diff</em> (allocated from <em>pool</em>) that represents the difference between an <em>original</em> file and <em>modified</em> file. (The file arguments must be full paths to the files.)<p>
|
|
Compare lines according to the relevant fields of <em>options</em>.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="796298bb5b2498c8812061b3d014266c"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_options_create" ref="796298bb5b2498c8812061b3d014266c" args="(apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a>* svn_diff_file_options_create </td>
|
|
<td>(</td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em> </td>
|
|
<td> ) </td>
|
|
<td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Allocate a <code><a class="el" href="structsvn__diff__file__options__t.html" title="Options to control the behaviour of the file diff routines.">svn_diff_file_options_t</a></code> structure in <em>pool</em>, initializing it with default values.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="212d408eee817f2193737fa4e8307a9e"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_options_parse" ref="212d408eee817f2193737fa4e8307a9e" args="(svn_diff_file_options_t *options, const apr_array_header_t *args, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_options_parse </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td>
|
|
<td class="paramname"> <em>options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>args</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Parse <em>args</em>, an array of <code>const char *</code> command line switches and adjust <em>options</em> accordingly.
|
|
<p>
|
|
<em>options</em> is assumed to be initialized with default values. <em>pool</em> is used for temporary allocation.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4.</dd></dl>
|
|
The following options are supported:<ul>
|
|
<li>--ignore-space-change, -b</li><li>--ignore-all-space, -w</li><li>--ignore-eol-style</li><li>--unified, -u (for compatibility, does nothing). </li></ul>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="35d61f33b5756908d3fe16a88ba1b660"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_output_merge" ref="35d61f33b5756908d3fe16a88ba1b660" args="(svn_stream_t *output_stream, svn_diff_t *diff, const char *original_path, const char *modified_path, const char *latest_path, const char *conflict_original, const char *conflict_modified, const char *conflict_latest, const char *conflict_separator, svn_boolean_t display_original_in_conflict, svn_boolean_t display_resolved_conflicts, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_output_merge </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> * </td>
|
|
<td class="paramname"> <em>output_stream</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>latest_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_separator</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>display_original_in_conflict</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>display_resolved_conflicts</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
A convenience function to produce diff3 output from the diff generated by <a class="el" href="svn__diff_8h.html#f012ea2f88946fdf414a44e3be7ea01a" title="Similar to svn_diff_file_diff3_2(), but with options set to a struct with default...">svn_diff_file_diff3()</a>.
|
|
<p>
|
|
Output a <em>diff</em> between <em>original_path</em>, <em>modified_path</em> and <em>latest_path</em> in merged format to <em>output_stream</em>. Optionally supply <em>conflict_modified</em>, <em>conflict_original</em>, <em>conflict_separator</em> and/or <em>conflict_latest</em> to be displayed as conflict markers in the output. If <em>conflict_original</em>, <em>conflict_modified</em>, <em>conflict_latest</em> and/or <em>conflict_separator</em> is <code>NULL</code>, a default marker will be displayed. Set <em>display_original_in_conflict</em> and <em>display_resolved_conflicts</em> as desired. Note that these options are mutually exclusive.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="251f5e2150be81e24b6e27eebd66c6d8"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_output_unified" ref="251f5e2150be81e24b6e27eebd66c6d8" args="(svn_stream_t *output_stream, svn_diff_t *diff, const char *original_path, const char *modified_path, const char *original_header, const char *modified_header, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_output_unified </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> * </td>
|
|
<td class="paramname"> <em>output_stream</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to <a class="el" href="svn__diff_8h.html#5f1c4c2f8079afd3318693d56491c76c" title="Similar to svn_diff_file_output_unified3(), but with relative_to_dir set to NULL...">svn_diff_file_output_unified2()</a>, but with <em>header_encoding</em> set to <code>APR_LOCALE_CHARSET</code>.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000098">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.2 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="5f1c4c2f8079afd3318693d56491c76c"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_output_unified2" ref="5f1c4c2f8079afd3318693d56491c76c" args="(svn_stream_t *output_stream, svn_diff_t *diff, const char *original_path, const char *modified_path, const char *original_header, const char *modified_header, const char *header_encoding, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_output_unified2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> * </td>
|
|
<td class="paramname"> <em>output_stream</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>header_encoding</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Similar to <a class="el" href="svn__diff_8h.html#968422a5b6476ff9af8bbdbcd823b5e6" title="A convenience function to produce unified diff output from the diff generated by...">svn_diff_file_output_unified3()</a>, but with <em>relative_to_dir</em> set to NULL and <em>show_c_function</em> to false.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000097">Deprecated:</a></b></dt><dd>Provided for backwards compatibility with the 1.3 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="968422a5b6476ff9af8bbdbcd823b5e6"></a><!-- doxytag: member="svn_diff.h::svn_diff_file_output_unified3" ref="968422a5b6476ff9af8bbdbcd823b5e6" args="(svn_stream_t *output_stream, svn_diff_t *diff, const char *original_path, const char *modified_path, const char *original_header, const char *modified_header, const char *header_encoding, const char *relative_to_dir, svn_boolean_t show_c_function, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_file_output_unified3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> * </td>
|
|
<td class="paramname"> <em>output_stream</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>header_encoding</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>relative_to_dir</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>show_c_function</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
A convenience function to produce unified diff output from the diff generated by <a class="el" href="svn__diff_8h.html#553e2f229b56443b1f95a2590a3fb106" title="Similar to svn_file_diff_2(), but with options set to a struct with default options...">svn_diff_file_diff()</a>.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5.</dd></dl>
|
|
Output a <em>diff</em> between <em>original_path</em> and <em>modified_path</em> in unified context diff format to <em>output_stream</em>. Optionally supply <em>original_header</em> and/or <em>modified_header</em> to be displayed in the header of the output. If <em>original_header</em> or <em>modified_header</em> is <code>NULL</code>, a default header will be displayed, consisting of path and last modified time. Output all headers and markers in <em>header_encoding</em>. If <em>relative_to_dir</em> is not <code>NULL</code>, the <em>original_path</em> and <em>modified_path</em> will have the <em>relative_to_dir</em> stripped from the front of the respective paths. If <em>relative_to_dir</em> is <code>NULL</code>, paths will be not be modified. If <em>relative_to_dir</em> is not <code>NULL</code> but <em>relative_to_dir</em> is not a parent path of the target, an error is returned. Finally, if <em>relative_to_dir</em> is a URL, an error will be returned.
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="273f5960c32443cdb304f4cc5dedf9ca"></a><!-- doxytag: member="svn_diff.h::svn_diff_mem_string_diff" ref="273f5960c32443cdb304f4cc5dedf9ca" args="(svn_diff_t **diff, const svn_string_t *original, const svn_string_t *modified, const svn_diff_file_options_t *options, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_mem_string_diff </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td>
|
|
<td class="paramname"> <em>options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Generate <em>diff</em> output from the <em>original</em> and <em>modified</em> in-memory strings.
|
|
<p>
|
|
<em>diff</em> will be allocated from <em>pool</em>.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="6b9c514fb18f22f7aee96f4b1f065bac"></a><!-- doxytag: member="svn_diff.h::svn_diff_mem_string_diff3" ref="6b9c514fb18f22f7aee96f4b1f065bac" args="(svn_diff_t **diff, const svn_string_t *original, const svn_string_t *modified, const svn_string_t *latest, const svn_diff_file_options_t *options, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_mem_string_diff3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td>
|
|
<td class="paramname"> <em>options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Generate <em>diff</em> output from the <em>orginal</em>, <em>modified</em> and <em>latest</em> in-memory strings.
|
|
<p>
|
|
<em>diff</em> will be allocated in <em>pool</em>.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="503bbc1503bbc8d657ee30e1b7cb0ffa"></a><!-- doxytag: member="svn_diff.h::svn_diff_mem_string_diff4" ref="503bbc1503bbc8d657ee30e1b7cb0ffa" args="(svn_diff_t **diff, const svn_string_t *original, const svn_string_t *modified, const svn_string_t *latest, const svn_string_t *ancestor, const svn_diff_file_options_t *options, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_mem_string_diff4 </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> ** </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>ancestor</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__diff__file__options__t.html">svn_diff_file_options_t</a> * </td>
|
|
<td class="paramname"> <em>options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Generate <em>diff</em> output from the <em>original</em>, <em>modified</em> and <em>latest</em> in-memory strings, using <em>ancestor</em>.
|
|
<p>
|
|
<em>diff</em> will be allocated in <em>pool</em>.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="c473496b2d0a5334c518bafeb4966e59"></a><!-- doxytag: member="svn_diff.h::svn_diff_mem_string_output_merge" ref="c473496b2d0a5334c518bafeb4966e59" args="(svn_stream_t *output_stream, svn_diff_t *diff, const svn_string_t *original, const svn_string_t *modified, const svn_string_t *latest, const char *conflict_original, const char *conflict_modified, const char *conflict_latest, const char *conflict_separator, svn_boolean_t display_original_in_conflict, svn_boolean_t display_resolved_conflicts, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_mem_string_output_merge </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> * </td>
|
|
<td class="paramname"> <em>output_stream</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_latest</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>conflict_separator</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>display_original_in_conflict</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> </td>
|
|
<td class="paramname"> <em>display_resolved_conflicts</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Output the <em>diff</em> generated by <a class="el" href="svn__diff_8h.html#6b9c514fb18f22f7aee96f4b1f065bac" title="Generate diff output from the orginal, modified and latest in-memory strings.">svn_diff_mem_string_diff3()</a> in diff3 format on <em>output_stream</em>, using <em>original</em>, <em>modified</em> and <em>latest</em> for content changes.
|
|
<p>
|
|
Use the conflict markers <em>conflict_original</em>, <em>conflict_modified</em>, <em>conflict_latest</em> and <em>conflict_separator</em> or the default one for each of these if <code>NULL</code> is passed.<p>
|
|
Insert the original in the output if <em>display_original_in_conflict</em> is <code>TRUE</code>.<p>
|
|
<dl class="note" compact><dt><b>Note:</b></dt><dd><em>display_original_in_conflict</em> and <em>display_resolved_conflicts</em> are mutually exclusive. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="e2ba9764f3ef6d9d87b13f16ab9b1f43"></a><!-- doxytag: member="svn_diff.h::svn_diff_mem_string_output_unified" ref="e2ba9764f3ef6d9d87b13f16ab9b1f43" args="(svn_stream_t *output_stream, svn_diff_t *diff, const char *original_header, const char *modified_header, const char *header_encoding, const svn_string_t *original, const svn_string_t *modified, apr_pool_t *pool)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname"><a class="el" href="structsvn__error__t.html">svn_error_t</a>* svn_diff_mem_string_output_unified </td>
|
|
<td>(</td>
|
|
<td class="paramtype"><a class="el" href="group__svn__io__byte__streams.html#g06d6291c397e63f895deb92a2c14e6af">svn_stream_t</a> * </td>
|
|
<td class="paramname"> <em>output_stream</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__diff_8h.html#b43107714d2128d68a2dac688b8dc4d3">svn_diff_t</a> * </td>
|
|
<td class="paramname"> <em>diff</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>original_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>modified_header</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>header_encoding</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>original</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__string__t.html">svn_string_t</a> * </td>
|
|
<td class="paramname"> <em>modified</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_pool_t * </td>
|
|
<td class="paramname"> <em>pool</em></td><td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td>)</td>
|
|
<td></td><td></td><td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Outputs the <em>diff</em> object generated by <a class="el" href="svn__diff_8h.html#273f5960c32443cdb304f4cc5dedf9ca" title="Generate diff output from the original and modified in-memory strings.">svn_diff_mem_string_diff()</a> in unified diff format on <em>output_stream</em>, using <em>original</em> and <em>modified</em> for the text in the output.
|
|
<p>
|
|
Outputs the header and markers in <em>header_encoding</em>.<p>
|
|
<em>original_header</em> and <em>modified</em> header are used to fill the field after the "---" and "+++" header markers.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="5a58195c4a4f8cac78ed0c1f0a3d4975"></a><!-- doxytag: member="svn_diff.h::svn_diff_version" ref="5a58195c4a4f8cac78ed0c1f0a3d4975" args="(void)" -->
|
|
<div class="memitem">
|
|
<div class="memproto">
|
|
<table class="memname">
|
|
<tr>
|
|
<td class="memname">const <a class="el" href="structsvn__version__t.html">svn_version_t</a>* svn_diff_version </td>
|
|
<td>(</td>
|
|
<td class="paramtype">void </td>
|
|
<td class="paramname"> </td>
|
|
<td> ) </td>
|
|
<td></td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
<div class="memdoc">
|
|
|
|
<p>
|
|
Get libsvn_diff version information.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.1. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
</div>
|
|
<hr size="1"><address style="text-align: right;"><small>Generated on Fri Oct 24 16:18:26 2008 for Subversion by
|
|
<a href="http://www.doxygen.org/index.html">
|
|
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
|
|
</body>
|
|
</html>
|