1265 lines
78 KiB
HTML
1265 lines
78 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: Generate differences between paths.</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><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>Generate differences between paths.<br>
|
|
<small>
|
|
[<a class="el" href="group__clnt__wc.html">Client working copy management</a>]</small>
|
|
</h1><table border="0" cellpadding="0" cellspacing="0">
|
|
<tr><td></td></tr>
|
|
<tr><td colspan="2"><br><h2>Functions</h2></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="group__Diff.html#gb6d98080d85b7240eb5b7a62e54364d9">svn_client_diff4</a> (const apr_array_header_t *diff_options, const char *path1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *path2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, const char *relative_to_dir, <a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> depth, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, const apr_array_header_t *changelists, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Produce diff output which describes the delta between <em>path1/<em>revision1</em> and</em> <em>path2/<em>revision2</em>.</em> <a href="#gb6d98080d85b7240eb5b7a62e54364d9"></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="group__Diff.html#g577436800ecab2d841f87fb1237cc192">svn_client_diff3</a> (const apr_array_header_t *diff_options, const char *path1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *path2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#gb6d98080d85b7240eb5b7a62e54364d9" title="Produce diff output which describes the delta between path1/revision1 and path2/revision2...">svn_client_diff4()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_empty</code>. <a href="#g577436800ecab2d841f87fb1237cc192"></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="group__Diff.html#gf82b2cf5441afdd8287a44f2ee7b8fe8">svn_client_diff2</a> (const apr_array_header_t *diff_options, const char *path1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *path2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_content_type, apr_file_t *outfile, apr_file_t *errfile, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#g577436800ecab2d841f87fb1237cc192" title="Similar to svn_client_diff4(), but with changelists passed as NULL, and depth set...">svn_client_diff3()</a>, but with <em>header_encoding</em> set to <code>APR_LOCALE_CHARSET</code>. <a href="#gf82b2cf5441afdd8287a44f2ee7b8fe8"></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="group__Diff.html#g6aff72544fdae31a12a3cb878c26a990">svn_client_diff</a> (const apr_array_header_t *diff_options, const char *path1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *path2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, apr_file_t *outfile, apr_file_t *errfile, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#gf82b2cf5441afdd8287a44f2ee7b8fe8" title="Similar to svn_client_diff3(), but with header_encoding set to APR_LOCALE_CHARSET...">svn_client_diff2()</a>, but with <em>ignore_content_type</em> always set to FALSE. <a href="#g6aff72544fdae31a12a3cb878c26a990"></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="group__Diff.html#g4c84eb846c68740c0ae5ca91e486187c">svn_client_diff_peg4</a> (const apr_array_header_t *diff_options, const char *path, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *start_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *end_revision, const char *relative_to_dir, <a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> depth, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, const apr_array_header_t *changelists, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Produce diff output which describes the delta between the filesystem object <em>path</em> in peg revision <em>peg_revision</em>, as it changed between <em>start_revision</em> and <em>end_revision</em>. <a href="#g4c84eb846c68740c0ae5ca91e486187c"></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="group__Diff.html#g804245541ec5c4d6d0de98823a520406">svn_client_diff_peg3</a> (const apr_array_header_t *diff_options, const char *path, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *start_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *end_revision, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#g4c84eb846c68740c0ae5ca91e486187c" title="Produce diff output which describes the delta between the filesystem object path...">svn_client_diff_peg4()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>. <a href="#g804245541ec5c4d6d0de98823a520406"></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="group__Diff.html#gf11de894d0fb0143310e99b4cb1b21e8">svn_client_diff_peg2</a> (const apr_array_header_t *diff_options, const char *path, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *start_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *end_revision, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_content_type, apr_file_t *outfile, apr_file_t *errfile, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#g804245541ec5c4d6d0de98823a520406" title="Similar to svn_client_diff_peg4(), but with changelists passed as NULL, and depth...">svn_client_diff_peg3()</a>, but with <em>header_encoding</em> set to <code>APR_LOCALE_CHARSET</code>. <a href="#gf11de894d0fb0143310e99b4cb1b21e8"></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="group__Diff.html#g7778ed98279c01b7da197ef7e6fbae32">svn_client_diff_peg</a> (const apr_array_header_t *diff_options, const char *path, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *start_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *end_revision, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> no_diff_deleted, apr_file_t *outfile, apr_file_t *errfile, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#gf11de894d0fb0143310e99b4cb1b21e8" title="Similar to svn_client_diff_peg3(), but with header_encoding set to APR_LOCALE_CHARSET...">svn_client_diff_peg2()</a>, but with <em>ignore_content_type</em> always set to FALSE. <a href="#g7778ed98279c01b7da197ef7e6fbae32"></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="group__Diff.html#gf2f4bb488747131309cce8ce9159a0ce">svn_client_diff_summarize2</a> (const char *path1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *path2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, <a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> depth, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, const apr_array_header_t *changelists, <a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> summarize_func, void *summarize_baton, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Produce a diff summary which lists the changed items between <em>path1/<em>revision1</em> and</em> <em>path2/<em>revision2</em> without</em> creating text deltas. <a href="#gf2f4bb488747131309cce8ce9159a0ce"></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="group__Diff.html#g67b584b503a81df3d269597940a77dd4">svn_client_diff_summarize</a> (const char *path1, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision1, const char *path2, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *revision2, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> summarize_func, void *summarize_baton, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#gf2f4bb488747131309cce8ce9159a0ce" title="Produce a diff summary which lists the changed items between path1/revision1 and...">svn_client_diff_summarize2()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>. <a href="#g67b584b503a81df3d269597940a77dd4"></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="group__Diff.html#gc939eeda1fb9c0fd6da152989ccf504b">svn_client_diff_summarize_peg2</a> (const char *path, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *start_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *end_revision, <a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> depth, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, const apr_array_header_t *changelists, <a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> summarize_func, void *summarize_baton, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Produce a diff summary which lists the changed items between the filesystem object <em>path</em> in peg revision <em>peg_revision</em>, as it changed between <em>start_revision</em> and <em>end_revision</em>. <a href="#gc939eeda1fb9c0fd6da152989ccf504b"></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="group__Diff.html#g00407f7dd25eb0ac7737e598b1f85c2a">svn_client_diff_summarize_peg</a> (const char *path, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *peg_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *start_revision, const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> *end_revision, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> recurse, <a class="el" href="svn__types_8h.html#22b35baddc4213c688d1bb12feea1024">svn_boolean_t</a> ignore_ancestry, <a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> summarize_func, void *summarize_baton, <a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> *ctx, apr_pool_t *pool)</td></tr>
|
|
|
|
<tr><td class="mdescLeft"> </td><td class="mdescRight">Similar to <a class="el" href="group__Diff.html#gc939eeda1fb9c0fd6da152989ccf504b" title="Produce a diff summary which lists the changed items between the filesystem object...">svn_client_diff_summarize_peg2()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>. <a href="#g00407f7dd25eb0ac7737e598b1f85c2a"></a><br></td></tr>
|
|
</table>
|
|
<hr><h2>Function Documentation</h2>
|
|
<a class="anchor" name="g6aff72544fdae31a12a3cb878c26a990"></a><!-- doxytag: member="svn_client.h::svn_client_diff" ref="g6aff72544fdae31a12a3cb878c26a990" args="(const apr_array_header_t *diff_options, const char *path1, const svn_opt_revision_t *revision1, const char *path2, const svn_opt_revision_t *revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t *outfile, apr_file_t *errfile, svn_client_ctx_t *ctx, 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_client_diff </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</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>recurse</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>ignore_ancestry</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>no_diff_deleted</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#gf82b2cf5441afdd8287a44f2ee7b8fe8" title="Similar to svn_client_diff3(), but with header_encoding set to APR_LOCALE_CHARSET...">svn_client_diff2()</a>, but with <em>ignore_content_type</em> always set to FALSE.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000049">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.0 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gf82b2cf5441afdd8287a44f2ee7b8fe8"></a><!-- doxytag: member="svn_client.h::svn_client_diff2" ref="gf82b2cf5441afdd8287a44f2ee7b8fe8" args="(const apr_array_header_t *diff_options, const char *path1, const svn_opt_revision_t *revision1, const char *path2, const svn_opt_revision_t *revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t *outfile, apr_file_t *errfile, svn_client_ctx_t *ctx, 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_client_diff2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</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>recurse</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>ignore_ancestry</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>no_diff_deleted</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>ignore_content_type</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#g577436800ecab2d841f87fb1237cc192" title="Similar to svn_client_diff4(), but with changelists passed as NULL, and depth set...">svn_client_diff3()</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#_deprecated000048">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.2 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.2. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g577436800ecab2d841f87fb1237cc192"></a><!-- doxytag: member="svn_client.h::svn_client_diff3" ref="g577436800ecab2d841f87fb1237cc192" args="(const apr_array_header_t *diff_options, const char *path1, const svn_opt_revision_t *revision1, const char *path2, const svn_opt_revision_t *revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, svn_client_ctx_t *ctx, 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_client_diff3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</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>recurse</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>ignore_ancestry</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>no_diff_deleted</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>ignore_content_type</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_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#gb6d98080d85b7240eb5b7a62e54364d9" title="Produce diff output which describes the delta between path1/revision1 and path2/revision2...">svn_client_diff4()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_empty</code>.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000047">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.4 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.3. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gb6d98080d85b7240eb5b7a62e54364d9"></a><!-- doxytag: member="svn_client.h::svn_client_diff4" ref="gb6d98080d85b7240eb5b7a62e54364d9" args="(const apr_array_header_t *diff_options, const char *path1, const svn_opt_revision_t *revision1, const char *path2, const svn_opt_revision_t *revision2, const char *relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, const apr_array_header_t *changelists, svn_client_ctx_t *ctx, 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_client_diff4 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</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#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> </td>
|
|
<td class="paramname"> <em>depth</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>ignore_ancestry</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>no_diff_deleted</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>ignore_content_type</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_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>changelists</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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>
|
|
Produce diff output which describes the delta between <em>path1/<em>revision1</em> and</em> <em>path2/<em>revision2</em>.</em>
|
|
<p>
|
|
Print the output of the diff to <em>outfile</em>, and any errors to <em>errfile</em>. <em>path1</em> and <em>path2</em> can be either working-copy paths or URLs.<p>
|
|
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 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.<p>
|
|
If either <em>revision1</em> or <em>revision2</em> has an `unspecified' or unrecognized `kind', return <code>SVN_ERR_CLIENT_BAD_REVISION</code>.<p>
|
|
<em>path1</em> and <em>path2</em> must both represent the same node kind -- that is, if <em>path1</em> is a directory, <em>path2</em> must also be, and if <em>path1</em> is a file, <em>path2</em> must also be.<p>
|
|
If <em>depth</em> is <code>svn_depth_infinity</code>, diff fully recursively. Else if it is <code>svn_depth_immediates</code>, diff the named paths and their file children (if any), and diff properties of subdirectories, but do not descend further into the subdirectories. Else if <code>svn_depth_files</code>, behave as if for <code>svn_depth_immediates</code> except don't diff properties of subdirectories. If <code>svn_depth_empty</code>, diff exactly the named paths but nothing underneath them.<p>
|
|
Use <em>ignore_ancestry</em> to control whether or not items being diffed will be checked for relatedness first. Unrelated items are typically transmitted to the editor as a deletion of one thing and the addition of another, but if this flag is TRUE, unrelated items will be diffed as if they were related.<p>
|
|
If <em>no_diff_deleted</em> is TRUE, then no diff output will be generated on deleted files.<p>
|
|
Generated headers are encoded using <em>header_encoding</em>.<p>
|
|
Diff output will not be generated for binary files, unless <em>ignore_content_type</em> is TRUE, in which case diffs will be shown regardless of the content types.<p>
|
|
<em>diff_options</em> (an array of <code>const char *</code>) is used to pass additional command line options to the diff processes invoked to compare files.<p>
|
|
The authentication baton cached in <em>ctx</em> is used to communicate with the repository.<p>
|
|
<em>changelists</em> is an array of <code>const char *</code> changelist names, used as a restrictive filter on items whose differences are reported; that is, don't generate diffs about any item unless it's a member of one of those changelists. If <em>changelists</em> is empty (or altogether <code>NULL</code>), no changelist filtering occurs.<p>
|
|
<dl class="note" compact><dt><b>Note:</b></dt><dd>Changelist filtering only applies to diffs in which at least one side of the diff represents working copy data.<p>
|
|
<em>header_encoding</em> doesn't affect headers generated by external diff programs.<p>
|
|
<em>relative_to_dir</em> doesn't affect the path index generated by external diff programs.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g7778ed98279c01b7da197ef7e6fbae32"></a><!-- doxytag: member="svn_client.h::svn_client_diff_peg" ref="g7778ed98279c01b7da197ef7e6fbae32" args="(const apr_array_header_t *diff_options, const char *path, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start_revision, const svn_opt_revision_t *end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, apr_file_t *outfile, apr_file_t *errfile, svn_client_ctx_t *ctx, 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_client_diff_peg </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>start_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>end_revision</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>recurse</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>ignore_ancestry</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>no_diff_deleted</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#gf11de894d0fb0143310e99b4cb1b21e8" title="Similar to svn_client_diff_peg3(), but with header_encoding set to APR_LOCALE_CHARSET...">svn_client_diff_peg2()</a>, but with <em>ignore_content_type</em> always set to FALSE.
|
|
<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.1. </dd></dl>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000052">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.1 API. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gf11de894d0fb0143310e99b4cb1b21e8"></a><!-- doxytag: member="svn_client.h::svn_client_diff_peg2" ref="gf11de894d0fb0143310e99b4cb1b21e8" args="(const apr_array_header_t *diff_options, const char *path, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start_revision, const svn_opt_revision_t *end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, apr_file_t *outfile, apr_file_t *errfile, svn_client_ctx_t *ctx, 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_client_diff_peg2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>start_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>end_revision</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>recurse</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>ignore_ancestry</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>no_diff_deleted</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>ignore_content_type</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#g804245541ec5c4d6d0de98823a520406" title="Similar to svn_client_diff_peg4(), but with changelists passed as NULL, and depth...">svn_client_diff_peg3()</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#_deprecated000051">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.2 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.2. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g804245541ec5c4d6d0de98823a520406"></a><!-- doxytag: member="svn_client.h::svn_client_diff_peg3" ref="g804245541ec5c4d6d0de98823a520406" args="(const apr_array_header_t *diff_options, const char *path, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start_revision, const svn_opt_revision_t *end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, svn_client_ctx_t *ctx, 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_client_diff_peg3 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>start_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>end_revision</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>recurse</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>ignore_ancestry</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>no_diff_deleted</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>ignore_content_type</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_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#g4c84eb846c68740c0ae5ca91e486187c" title="Produce diff output which describes the delta between the filesystem object path...">svn_client_diff_peg4()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000050">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.4 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.3. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g4c84eb846c68740c0ae5ca91e486187c"></a><!-- doxytag: member="svn_client.h::svn_client_diff_peg4" ref="g4c84eb846c68740c0ae5ca91e486187c" args="(const apr_array_header_t *diff_options, const char *path, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start_revision, const svn_opt_revision_t *end_revision, const char *relative_to_dir, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t no_diff_deleted, svn_boolean_t ignore_content_type, const char *header_encoding, apr_file_t *outfile, apr_file_t *errfile, const apr_array_header_t *changelists, svn_client_ctx_t *ctx, 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_client_diff_peg4 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>diff_options</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>start_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>end_revision</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#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> </td>
|
|
<td class="paramname"> <em>depth</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>ignore_ancestry</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>no_diff_deleted</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>ignore_content_type</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_file_t * </td>
|
|
<td class="paramname"> <em>outfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">apr_file_t * </td>
|
|
<td class="paramname"> <em>errfile</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>changelists</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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>
|
|
Produce diff output which describes the delta between the filesystem object <em>path</em> in peg revision <em>peg_revision</em>, as it changed between <em>start_revision</em> and <em>end_revision</em>.
|
|
<p>
|
|
<em>path</em> can be either a working-copy path or URL.<p>
|
|
If <em>peg_revision</em> is <code>svn_opt_revision_unspecified</code>, behave identically to <a class="el" href="group__Diff.html#gb6d98080d85b7240eb5b7a62e54364d9" title="Produce diff output which describes the delta between path1/revision1 and path2/revision2...">svn_client_diff4()</a>, using <em>path</em> for both of that function's <em>path1</em> and <em>path2</em> argments.<p>
|
|
All other options are handled identically to <a class="el" href="group__Diff.html#gb6d98080d85b7240eb5b7a62e54364d9" title="Produce diff output which describes the delta between path1/revision1 and path2/revision2...">svn_client_diff4()</a>.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g67b584b503a81df3d269597940a77dd4"></a><!-- doxytag: member="svn_client.h::svn_client_diff_summarize" ref="g67b584b503a81df3d269597940a77dd4" args="(const char *path1, const svn_opt_revision_t *revision1, const char *path2, const svn_opt_revision_t *revision2, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void *summarize_baton, svn_client_ctx_t *ctx, 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_client_diff_summarize </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</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>recurse</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>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> </td>
|
|
<td class="paramname"> <em>summarize_func</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>summarize_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#gf2f4bb488747131309cce8ce9159a0ce" title="Produce a diff summary which lists the changed items between path1/revision1 and...">svn_client_diff_summarize2()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000053">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.4 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gf2f4bb488747131309cce8ce9159a0ce"></a><!-- doxytag: member="svn_client.h::svn_client_diff_summarize2" ref="gf2f4bb488747131309cce8ce9159a0ce" args="(const char *path1, const svn_opt_revision_t *revision1, const char *path2, const svn_opt_revision_t *revision2, svn_depth_t depth, svn_boolean_t ignore_ancestry, const apr_array_header_t *changelists, svn_client_diff_summarize_func_t summarize_func, void *summarize_baton, svn_client_ctx_t *ctx, 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_client_diff_summarize2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision1</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>revision2</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> </td>
|
|
<td class="paramname"> <em>depth</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>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>changelists</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> </td>
|
|
<td class="paramname"> <em>summarize_func</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>summarize_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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>
|
|
Produce a diff summary which lists the changed items between <em>path1/<em>revision1</em> and</em> <em>path2/<em>revision2</em> without</em> creating text deltas.
|
|
<p>
|
|
<em>path1</em> and <em>path2</em> can be either working-copy paths or URLs.<p>
|
|
The function may report false positives if <em>ignore_ancestry</em> is false, since a file might have been modified between two revisions, but still have the same contents.<p>
|
|
Calls <em>summarize_func</em> with <em>summarize_baton</em> for each difference with a <code><a class="el" href="structsvn__client__diff__summarize__t.html" title="A struct that describes the diff of an item.">svn_client_diff_summarize_t</a></code> structure describing the difference.<p>
|
|
See <a class="el" href="group__Diff.html#gb6d98080d85b7240eb5b7a62e54364d9" title="Produce diff output which describes the delta between path1/revision1 and path2/revision2...">svn_client_diff4()</a> for a description of the other parameters.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="g00407f7dd25eb0ac7737e598b1f85c2a"></a><!-- doxytag: member="svn_client.h::svn_client_diff_summarize_peg" ref="g00407f7dd25eb0ac7737e598b1f85c2a" args="(const char *path, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start_revision, const svn_opt_revision_t *end_revision, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_client_diff_summarize_func_t summarize_func, void *summarize_baton, svn_client_ctx_t *ctx, 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_client_diff_summarize_peg </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>start_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>end_revision</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>recurse</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>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> </td>
|
|
<td class="paramname"> <em>summarize_func</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>summarize_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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="group__Diff.html#gc939eeda1fb9c0fd6da152989ccf504b" title="Produce a diff summary which lists the changed items between the filesystem object...">svn_client_diff_summarize_peg2()</a>, but with <em>changelists</em> passed as <code>NULL</code>, and <em>depth</em> set according to <em>recurse:</em> if <em>recurse</em> is TRUE, set <em>depth</em> to <code>svn_depth_infinity</code>, if <em>recurse</em> is FALSE, set <em>depth</em> to <code>svn_depth_files</code>.
|
|
<p>
|
|
<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000054">Deprecated:</a></b></dt><dd>Provided for backward compatibility with the 1.4 API.</dd></dl>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.4. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
<a class="anchor" name="gc939eeda1fb9c0fd6da152989ccf504b"></a><!-- doxytag: member="svn_client.h::svn_client_diff_summarize_peg2" ref="gc939eeda1fb9c0fd6da152989ccf504b" args="(const char *path, const svn_opt_revision_t *peg_revision, const svn_opt_revision_t *start_revision, const svn_opt_revision_t *end_revision, svn_depth_t depth, svn_boolean_t ignore_ancestry, const apr_array_header_t *changelists, svn_client_diff_summarize_func_t summarize_func, void *summarize_baton, svn_client_ctx_t *ctx, 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_client_diff_summarize_peg2 </td>
|
|
<td>(</td>
|
|
<td class="paramtype">const char * </td>
|
|
<td class="paramname"> <em>path</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>peg_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>start_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const <a class="el" href="structsvn__opt__revision__t.html">svn_opt_revision_t</a> * </td>
|
|
<td class="paramname"> <em>end_revision</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="svn__types_8h.html#21dd8b080111fa6fb5d59156299f3a2c">svn_depth_t</a> </td>
|
|
<td class="paramname"> <em>depth</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>ignore_ancestry</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">const apr_array_header_t * </td>
|
|
<td class="paramname"> <em>changelists</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="group__clnt__diff.html#gf9a4030e5c1c4d914e2f513fa1bd5f58">svn_client_diff_summarize_func_t</a> </td>
|
|
<td class="paramname"> <em>summarize_func</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype">void * </td>
|
|
<td class="paramname"> <em>summarize_baton</em>, </td>
|
|
</tr>
|
|
<tr>
|
|
<td class="paramkey"></td>
|
|
<td></td>
|
|
<td class="paramtype"><a class="el" href="structsvn__client__ctx__t.html">svn_client_ctx_t</a> * </td>
|
|
<td class="paramname"> <em>ctx</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>
|
|
Produce a diff summary which lists the changed items between the filesystem object <em>path</em> in peg revision <em>peg_revision</em>, as it changed between <em>start_revision</em> and <em>end_revision</em>.
|
|
<p>
|
|
<em>path</em> can be either a working-copy path or URL.<p>
|
|
If <em>peg_revision</em> is <code>svn_opt_revision_unspecified</code>, behave identically to <a class="el" href="group__Diff.html#gf2f4bb488747131309cce8ce9159a0ce" title="Produce a diff summary which lists the changed items between path1/revision1 and...">svn_client_diff_summarize2()</a>, using <em>path</em> for both of that function's <em>path1</em> and <em>path2</em> argments.<p>
|
|
The function may report false positives if <em>ignore_ancestry</em> is false, as described in the documentation for <a class="el" href="group__Diff.html#gf2f4bb488747131309cce8ce9159a0ce" title="Produce a diff summary which lists the changed items between path1/revision1 and...">svn_client_diff_summarize2()</a>.<p>
|
|
Call <em>summarize_func</em> with <em>summarize_baton</em> for each difference with a <code><a class="el" href="structsvn__client__diff__summarize__t.html" title="A struct that describes the diff of an item.">svn_client_diff_summarize_t</a></code> structure describing the difference.<p>
|
|
See <a class="el" href="group__Diff.html#g4c84eb846c68740c0ae5ca91e486187c" title="Produce diff output which describes the delta between the filesystem object path...">svn_client_diff_peg4()</a> for a description of the other parameters.<p>
|
|
<dl class="since" compact><dt><b>Since:</b></dt><dd>New in 1.5. </dd></dl>
|
|
|
|
</div>
|
|
</div><p>
|
|
</div>
|
|
<hr size="1"><address style="text-align: right;"><small>Generated on Fri Oct 24 16:18:29 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>
|