src/TortoiseMerge/libsvn_diff/svn_diff.h

   1 /**
   2  * @copyright
   3  * ====================================================================
   4  * Copyright (c) 2000-2008 CollabNet.  All rights reserved.
   5  *
   6  * This software is licensed as described in the file COPYING, which
   7  * you should have received as part of this distribution.  The terms
   8  * are also available at http://subversion.tigris.org/license-1.html.
   9  * If newer versions of this license are posted there, you may use a
  10  * newer version instead, at your option.
  11  *
  12  * This software consists of voluntary contributions made by many
  13  * individuals.  For exact contribution history, see the revision
  14  * history and logs, available at http://subversion.tigris.org/.
  15  * ====================================================================
  16  * @endcopyright
  17  *
  18  * @file svn_diff.h
  19  * @brief Contextual diffing.
  20  *
  21  * This is an internalized library for performing contextual diffs
  22  * between sources of data.
  23  *
  24  * @note This is different than Subversion's binary-diffing engine.
  25  * That API lives in @c svn_delta.h -- see the "text deltas" section.  A
  26  * "text delta" is way of representing precise binary diffs between
  27  * strings of data.  The Subversion client and server send text deltas
  28  * to one another during updates and commits.
  29  *
  30  * This API, however, is (or will be) used for performing *contextual*
  31  * merges between files in the working copy.  During an update or
  32  * merge, 3-way file merging is needed.  And 'svn diff' needs to show
  33  * the differences between 2 files.
  34  *
  35  * The nice thing about this API is that it's very general.  It
  36  * operates on any source of data (a "datasource") and calculates
  37  * contextual differences on "tokens" within the data.  In our
  38  * particular usage, the datasources are files and the tokens are
  39  * lines.  But the possibilities are endless.
  40  */
  41
  42
  43 #ifndef SVN_DIFF_H
  44 #define SVN_DIFF_H
  45
  46 #include <apr.h>
  47 #include <apr_pools.h>
  48 #include <apr_file_io.h>
  49
  50 #include "svn_types.h"
  51 #include "svn_error.h"
  52 #include "svn_pools.h"
  53 //#include "svn_version.h"
  54
  55 #ifdef __cplusplus
  56 extern "C" {
  57 #endif /* __cplusplus */
  58
  59
  60
  61 /**
  62  * Get libsvn_diff version information.
  63  *
  64  * @since New in 1.1.
  65  */
  66 const svn_version_t *
  67 svn_diff_version(void);
  68
  69
  70 /* Diffs. */
  71
  72 /** An opaque type that represents a difference between either two or
  73  * three datasources.   This object is returned by svn_diff_diff(),
  74  * svn_diff_diff3() and svn_diff_diff4(), and consumed by a number of
  75  * other routines.
  76  */
  77 typedef struct svn_diff_t svn_diff_t;
  78
  79 /**
  80  * There are four types of datasources.  In GNU diff3 terminology,
  81  * the first three types correspond to the phrases "older", "mine",
  82  * and "yours".
  83  */
  84 typedef enum svn_diff_datasource_e
  85 {
  86   /** The oldest form of the data. */
  87   svn_diff_datasource_original,
  88
  89   /** The same data, but potentially changed by the user. */
  90   svn_diff_datasource_modified,
  91
  92   /** The latest version of the data, possibly different than the
  93    * user's modified version.
  94    */
  95   svn_diff_datasource_latest,
  96
  97   /** The common ancestor of original and modified. */
  98   svn_diff_datasource_ancestor
  99
 100 } svn_diff_datasource_e;
 101
 102
 103 /** A vtable for reading data from the three datasources. */
 104 typedef struct svn_diff_fns_t
 105 {
 106   /** Open the datasource of type @a datasource. */
 107   svn_error_t *(*datasource_open)(void *diff_baton,
 108                                   svn_diff_datasource_e datasource);
 109
 110   /** Close the datasource of type @a datasource. */
 111   svn_error_t *(*datasource_close)(void *diff_baton,
 112                                    svn_diff_datasource_e datasource);
 113
 114   /** Get the next "token" from the datasource of type @a datasource.
 115    *  Return a "token" in @a *token.   Return a hash of "token" in @a *hash.
 116    *  Leave @a token and @a hash untouched when the datasource is exhausted.
 117    */
 118   svn_error_t *(*datasource_get_next_token)(apr_uint32_t *hash, void **token,
 119                                             void *diff_baton,
 120                                             svn_diff_datasource_e datasource);
 121
 122   /** A function for ordering the tokens, resembling 'strcmp' in functionality.
 123    * @a compare should contain the return value of the comparison:
 124    * If @a ltoken and @a rtoken are "equal", return 0.  If @a ltoken is
 125    * "less than" @a rtoken, return a number < 0.  If @a ltoken  is
 126    * "greater than" @a rtoken, return a number > 0.
 127    */
 128   svn_error_t *(*token_compare)(void *diff_baton,
 129                                 void *ltoken,
 130                                 void *rtoken,
 131                                 int *compare);
 132
 133   /** Free @a token from memory, the diff algorithm is done with it. */
 134   void (*token_discard)(void *diff_baton,
 135                         void *token);
 136
 137   /** Free *all* tokens from memory, they're no longer needed. */
 138   void (*token_discard_all)(void *diff_baton);
 139 } svn_diff_fns_t;
 140
 141
 142 /* The Main Events */
 143
 144 /** Given a vtable of @a diff_fns/@a diff_baton for reading datasources,
 145  * return a diff object in @a *diff that represents a difference between
 146  * an "original" and "modified" datasource.  Do all allocation in @a pool.
 147  */
 148 svn_error_t *
 149 svn_diff_diff(svn_diff_t **diff,
 150               void *diff_baton,
 151               const svn_diff_fns_t *diff_fns,
 152               apr_pool_t *pool);
 153
 154 /** Given a vtable of @a diff_fns/@a diff_baton for reading datasources,
 155  * return a diff object in @a *diff that represents a difference between
 156  * three datasources: "original", "modified", and "latest".  Do all
 157  * allocation in @a pool.
 158  */
 159 svn_error_t *
 160 svn_diff_diff3(svn_diff_t **diff,
 161                void *diff_baton,
 162                const svn_diff_fns_t *diff_fns,
 163                apr_pool_t *pool);
 164
 165 /** Given a vtable of @a diff_fns/@a diff_baton for reading datasources,
 166  * return a diff object in @a *diff that represents a difference between
 167  * two datasources: "original" and "latest", adjusted to become a full
 168  * difference between "original", "modified" and "latest" using "ancestor".
 169  * Do all allocation in @a pool.
 170  */
 171 svn_error_t *
 172 svn_diff_diff4(svn_diff_t **diff,
 173                void *diff_baton,
 174                const svn_diff_fns_t *diff_fns,
 175                apr_pool_t *pool);
 176
 177 \f
 178 /* Utility functions */
 179
 180 /** Determine if a diff object contains conflicts.  If it does, return
 181  * @c TRUE, else return @c FALSE.
 182  */
 183 svn_boolean_t
 184 svn_diff_contains_conflicts(svn_diff_t *diff);
 185
 186
 187 /** Determine if a diff object contains actual differences between the
 188  * datasources.  If so, return @c TRUE, else return @c FALSE.
 189  */
 190 svn_boolean_t
 191 svn_diff_contains_diffs(svn_diff_t *diff);
 192
 193
 194
 195 \f
 196 /* Displaying Diffs */
 197
 198 /** A vtable for displaying (or consuming) differences between datasources.
 199  *
 200  * Differences, similarities, and conflicts are described by lining up
 201  * "ranges" of data.
 202  *
 203  * @note These callbacks describe data ranges in units of "tokens".
 204  * A "token" is whatever you've defined it to be in your datasource
 205  * @c svn_diff_fns_t vtable.
 206  */
 207 typedef struct svn_diff_output_fns_t
 208 {
 209   /* Two-way and three-way diffs both call the first two output functions: */
 210
 211   /**
 212    * If doing a two-way diff, then an *identical* data range was found
 213    * between the "original" and "modified" datasources.  Specifically,
 214    * the match starts at @a original_start and goes for @a original_length
 215    * tokens in the original data, and at @a modified_start for
 216    * @a modified_length tokens in the modified data.
 217    *
 218    * If doing a three-way diff, then all three datasources have
 219    * matching data ranges.  The range @a latest_start, @a latest_length in
 220    * the "latest" datasource is identical to the range @a original_start,
 221    * @a original_length in the original data, and is also identical to
 222    * the range @a modified_start, @a modified_length in the modified data.
 223    */
 224   svn_error_t *(*output_common)(void *output_baton,
 225                                 apr_off_t original_start,
 226                                 apr_off_t original_length,
 227                                 apr_off_t modified_start,
 228                                 apr_off_t modified_length,
 229                                 apr_off_t latest_start,
 230                                 apr_off_t latest_length);
 231
 232   /**
 233    * If doing a two-way diff, then an *conflicting* data range was found
 234    * between the "original" and "modified" datasources.  Specifically,
 235    * the conflict starts at @a original_start and goes for @a original_length
 236    * tokens in the original data, and at @a modified_start for
 237    * @a modified_length tokens in the modified data.
 238    *
 239    * If doing a three-way diff, then an identical data range was discovered
 240    * between the "original" and "latest" datasources, but this conflicts with
 241    * a range in the "modified" datasource.
 242    */
 243   svn_error_t *(*output_diff_modified)(void *output_baton,
 244                                        apr_off_t original_start,
 245                                        apr_off_t original_length,
 246                                        apr_off_t modified_start,
 247                                        apr_off_t modified_length,
 248                                        apr_off_t latest_start,
 249                                        apr_off_t latest_length);
 250
 251   /* ------ The following callbacks are used by three-way diffs only --- */
 252
 253   /** An identical data range was discovered between the "original" and
 254    * "modified" datasources, but this conflicts with a range in the
 255    * "latest" datasource.
 256    */
 257   svn_error_t *(*output_diff_latest)(void *output_baton,
 258                                      apr_off_t original_start,
 259                                      apr_off_t original_length,
 260                                      apr_off_t modified_start,
 261                                      apr_off_t modified_length,
 262                                      apr_off_t latest_start,
 263                                      apr_off_t latest_length);
 264
 265   /** An identical data range was discovered between the "modified" and
 266    * "latest" datasources, but this conflicts with a range in the
 267    * "original" datasource.
 268    */
 269   svn_error_t *(*output_diff_common)(void *output_baton,
 270                                      apr_off_t original_start,
 271                                      apr_off_t original_length,
 272                                      apr_off_t modified_start,
 273                                      apr_off_t modified_length,
 274                                      apr_off_t latest_start,
 275                                      apr_off_t latest_length);
 276
 277   /** All three datasources have conflicting data ranges.  The range
 278    * @a latest_start, @a latest_length in the "latest" datasource conflicts
 279    * with the range @a original_start, @a original_length in the "original"
 280    * datasource, and also conflicts with the range @a modified_start,
 281    * @a modified_length in the "modified" datasource.
 282    * If there are common ranges in the "modified" and "latest" datasources
 283    * in this conflicting range, @a resolved_diff will contain a diff
 284    * which can be used to retrieve the common and conflicting ranges.
 285    */
 286   svn_error_t *(*output_conflict)(void *output_baton,
 287                                   apr_off_t original_start,
 288                                   apr_off_t original_length,
 289                                   apr_off_t modified_start,
 290                                   apr_off_t modified_length,
 291                                   apr_off_t latest_start,
 292                                   apr_off_t latest_length,
 293                                   svn_diff_t *resolved_diff);
 294 } svn_diff_output_fns_t;
 295
 296 /** Style for displaying conflicts during diff3 output.
 297  *
 298  * @since New in 1.6.
 299  */
 300 typedef enum svn_diff_conflict_display_style_t
 301 {
 302   /** Display modified and latest, with conflict markers. */
 303   svn_diff_conflict_display_modified_latest,
 304
 305   /** Like svn_diff_conflict_display_modified_latest, but with an
 306       extra effort to identify common sequences between modified and
 307       latest. */
 308   svn_diff_conflict_display_resolved_modified_latest,
 309
 310   /** Display modified, original, and latest, with conflict
 311       markers. */
 312   svn_diff_conflict_display_modified_original_latest,
 313
 314   /** Just display modified, with no markers. */
 315   svn_diff_conflict_display_modified,
 316
 317   /** Just display latest, with no markers. */
 318   svn_diff_conflict_display_latest,
 319
 320   /** Like svn_diff_conflict_display_modified_original_latest, but
 321       *only* showing conflicts. */
 322   svn_diff_conflict_display_only_conflicts
 323 } svn_diff_conflict_display_style_t;
 324
 325
 326 /** Given a vtable of @a output_fns/@a output_baton for consuming
 327  * differences, output the differences in @a diff.
 328  */
 329 svn_error_t *
 330 svn_diff_output(svn_diff_t *diff,
 331                 void *output_baton,
 332                 const svn_diff_output_fns_t *output_fns);
 333
 334
 335 \f
 336 /* Diffs on files */
 337
 338 /** To what extent whitespace should be ignored when comparing lines.
 339  *
 340  * @since New in 1.4.
 341  */
 342 typedef enum svn_diff_file_ignore_space_t
 343 {
 344   /** Ignore no whitespace. */
 345   svn_diff_file_ignore_space_none,
 346
 347   /** Ignore changes in sequences of whitespace characters, treating each
 348    * sequence of whitespace characters as a single space. */
 349   svn_diff_file_ignore_space_change,
 350
 351   /** Ignore all whitespace characters. */
 352   svn_diff_file_ignore_space_all
 353 } svn_diff_file_ignore_space_t;
 354
 355 /** Options to control the behaviour of the file diff routines.
 356  *
 357  * @since New in 1.4.
 358  *
 359  * @note This structure may be extended in the future, so to preserve binary
 360  * compatibility, users must not allocate structs of this type themselves.
 361  * @see svn_diff_file_options_create().
 362  *
 363  * @note Although its name suggests otherwise, this structure is used to
 364  *       pass options to file as well as in-memory diff functions.
 365  */
 366 typedef struct svn_diff_file_options_t
 367 {
 368   /** To what extent whitespace should be ignored when comparing lines.
 369    * The default is @c svn_diff_file_ignore_space_none. */
 370   svn_diff_file_ignore_space_t ignore_space;
 371   /** Whether to treat all end-of-line markers the same when comparing lines.
 372    * The default is @c FALSE. */
 373   svn_boolean_t ignore_eol_style;
 374   /** Whether the '@@' lines of the unified diff output should include a prefix
 375     * of the nearest preceding line that starts with a character that might be
 376     * the initial character of a C language identifier.  The default is
 377     * @c FALSE.
 378     */
 379   svn_boolean_t show_c_function;
 380 } svn_diff_file_options_t;
 381
 382 /** Allocate a @c svn_diff_file_options_t structure in @a pool, initializing
 383  * it with default values.
 384  *
 385  * @since New in 1.4.
 386  */
 387 svn_diff_file_options_t *
 388 svn_diff_file_options_create(apr_pool_t *pool);
 389
 390 /**
 391  * Parse @a args, an array of <tt>const char *</tt> command line switches
 392  * and adjust @a options accordingly.  @a options is assumed to be initialized
 393  * with default values.  @a pool is used for temporary allocation.
 394  *
 395  * @since New in 1.4.
 396  *
 397  * The following options are supported:
 398  * - --ignore-space-change, -b
 399  * - --ignore-all-space, -w
 400  * - --ignore-eol-style
 401  * - --unified, -u (for compatibility, does nothing).
 402  */
 403 #if 0
 404 svn_error_t *
 405 svn_diff_file_options_parse(svn_diff_file_options_t *options,
 406                             const apr_array_header_t *args,
 407                             apr_pool_t *pool);
 408 #endif
 409
 410 /** A convenience function to produce a diff between two files.
 411  *
 412  * @since New in 1.4.
 413  *
 414  * Return a diff object in @a *diff (allocated from @a pool) that represents
 415  * the difference between an @a original file and @a modified file.
 416  * (The file arguments must be full paths to the files.)
 417  *
 418  * Compare lines according to the relevant fields of @a options.
 419  */
 420 svn_error_t *
 421 svn_diff_file_diff_2(svn_diff_t **diff,
 422                      const char *original,
 423                      const char *modified,
 424                      const svn_diff_file_options_t *options,
 425                      apr_pool_t *pool);
 426
 427 /** Similar to svn_file_diff_2(), but with @a options set to a struct with
 428  * default options.
 429  *
 430  * @deprecated Provided for backwards compatibility with the 1.3 API.
 431  */
 432 SVN_DEPRECATED
 433 svn_error_t *
 434 svn_diff_file_diff(svn_diff_t **diff,
 435                    const char *original,
 436                    const char *modified,
 437                    apr_pool_t *pool);
 438
 439 /** A convenience function to produce a diff between three files.
 440  *
 441  * @since New in 1.4.
 442  *
 443  * Return a diff object in @a *diff (allocated from @a pool) that represents
 444  * the difference between an @a original file, @a modified file, and @a latest
 445  * file.
 446  *
 447  * Compare lines according to the relevant fields of @a options.
 448  */
 449 svn_error_t *
 450 svn_diff_file_diff3_2(svn_diff_t **diff,
 451                       const char *original,
 452                       const char *modified,
 453                       const char *latest,
 454                       const svn_diff_file_options_t *options,
 455                       apr_pool_t *pool);
 456
 457 /** Similar to svn_diff_file_diff3_2(), but with @a options set to a struct
 458  * with default options.
 459  *
 460  * @deprecated Provided for backwards compatibility with the 1.3 API.
 461  */
 462 SVN_DEPRECATED
 463 svn_error_t *
 464 svn_diff_file_diff3(svn_diff_t **diff,
 465                     const char *original,
 466                     const char *modified,
 467                     const char *latest,
 468                     apr_pool_t *pool);
 469
 470 /** A convenience function to produce a diff between four files.
 471  *
 472  * @since New in 1.4.
 473  *
 474  * Return a diff object in @a *diff (allocated from @a pool) that represents
 475  * the difference between an @a original file, @a modified file, @a latest
 476  * and @a ancestor file. (The file arguments must be full paths to the files.)
 477  *
 478  * Compare lines according to the relevant fields of @a options.
 479  */
 480 svn_error_t *
 481 svn_diff_file_diff4_2(svn_diff_t **diff,
 482                       const char *original,
 483                       const char *modified,
 484                       const char *latest,
 485                       const char *ancestor,
 486                       const svn_diff_file_options_t *options,
 487                       apr_pool_t *pool);
 488
 489 /** Simliar to svn_file_diff4_2(), but with @a options set to a struct with
 490  * default options.
 491  *
 492  * @deprecated Provided for backwards compatibility with the 1.3 API.
 493  */
 494 SVN_DEPRECATED
 495 svn_error_t *
 496 svn_diff_file_diff4(svn_diff_t **diff,
 497                     const char *original,
 498                     const char *modified,
 499                     const char *latest,
 500                     const char *ancestor,
 501                     apr_pool_t *pool);
 502
 503 /** A convenience function to produce unified diff output from the
 504  * diff generated by svn_diff_file_diff().
 505  *
 506  * @since New in 1.5.
 507  *
 508  * Output a @a diff between @a original_path and @a modified_path in unified
 509  * context diff format to @a output_stream.  Optionally supply
 510  * @a original_header and/or @a modified_header to be displayed in the header
 511  * of the output.  If @a original_header or @a modified_header is @c NULL, a
 512  * default header will be displayed, consisting of path and last modified time.
 513  * Output all headers and markers in @a header_encoding.  If @a relative_to_dir
 514  * is not @c NULL, the @a original_path and @a modified_path will have the
 515  * @a relative_to_dir stripped from the front of the respective paths.  If
 516  * @a relative_to_dir is @c NULL, paths will be not be modified.  If
 517  * @a relative_to_dir is not @c NULL but @a relative_to_dir is not a parent
 518  * path of the target, an error is returned. Finally, if @a relative_to_dir
 519  * is a URL, an error will be returned.
 520  */
 521 svn_error_t *
 522 svn_diff_file_output_unified3(svn_stream_t *output_stream,
 523                               svn_diff_t *diff,
 524                               const char *original_path,
 525                               const char *modified_path,
 526                               const char *original_header,
 527                               const char *modified_header,
 528                               const char *header_encoding,
 529                               const char *relative_to_dir,
 530                               svn_boolean_t show_c_function,
 531                               apr_pool_t *pool);
 532
 533 /** Similar to svn_diff_file_output_unified3(), but with @a relative_to_dir
 534  * set to NULL and @a show_c_function to false.
 535  *
 536  * @deprecated Provided for backwards compatibility with the 1.3 API.
 537  */
 538 SVN_DEPRECATED
 539 svn_error_t *
 540 svn_diff_file_output_unified2(svn_stream_t *output_stream,
 541                               svn_diff_t *diff,
 542                               const char *original_path,
 543                               const char *modified_path,
 544                               const char *original_header,
 545                               const char *modified_header,
 546                               const char *header_encoding,
 547                               apr_pool_t *pool);
 548
 549 /** Similar to svn_diff_file_output_unified2(), but with @a header_encoding
 550  * set to @c APR_LOCALE_CHARSET.
 551  *
 552  * @deprecated Provided for backward compatibility with the 1.2 API.
 553  */
 554 SVN_DEPRECATED
 555 svn_error_t *
 556 svn_diff_file_output_unified(svn_stream_t *output_stream,
 557                              svn_diff_t *diff,
 558                              const char *original_path,
 559                              const char *modified_path,
 560                              const char *original_header,
 561                              const char *modified_header,
 562                              apr_pool_t *pool);
 563
 564
 565 /** A convenience function to produce diff3 output from the
 566  * diff generated by svn_diff_file_diff3().
 567  *
 568  * Output a @a diff between @a original_path, @a modified_path and
 569  * @a latest_path in merged format to @a output_stream.  Optionally supply
 570  * @a conflict_modified, @a conflict_original, @a conflict_separator and/or
 571  * @a conflict_latest to be displayed as conflict markers in the output.
 572  * If @a conflict_original, @a conflict_modified, @a conflict_latest and/or
 573  * @a conflict_separator is @c NULL, a default marker will be displayed.
 574  * @a conflict_style dictates how conflicts are displayed.
 575  *
 576  * @since New in 1.6.
 577  */
 578 svn_error_t *
 579 svn_diff_file_output_merge2(svn_stream_t *output_stream,
 580                             svn_diff_t *diff,
 581                             const char *original_path,
 582                             const char *modified_path,
 583                             const char *latest_path,
 584                             const char *conflict_original,
 585                             const char *conflict_modified,
 586                             const char *conflict_latest,
 587                             const char *conflict_separator,
 588                             svn_diff_conflict_display_style_t conflict_style,
 589                             apr_pool_t *pool);
 590
 591
 592 /** Similar to svn_diff_file_output_merge2, but with @a
 593  * display_original_in_conflict and @a display_resolved_conflicts
 594  * booleans instead of the @a conflict_style enum.
 595  *
 596  * If both booleans are false, acts like
 597  * svn_diff_conflict_display_modified_latest; if @a
 598  * display_original_in_conflict is true, acts like
 599  * svn_diff_conflict_display_modified_original_latest; if @a
 600  * display_resolved_conflicts is true, acts like
 601  * svn_diff_conflict_display_resolved_modified_latest.  The booleans
 602  * may not both be true.
 603  *
 604  * @deprecated Provided for backward compatibility with the 1.5 API.
 605  */
 606 SVN_DEPRECATED
 607 svn_error_t *
 608 svn_diff_file_output_merge(svn_stream_t *output_stream,
 609                            svn_diff_t *diff,
 610                            const char *original_path,
 611                            const char *modified_path,
 612                            const char *latest_path,
 613                            const char *conflict_original,
 614                            const char *conflict_modified,
 615                            const char *conflict_latest,
 616                            const char *conflict_separator,
 617                            svn_boolean_t display_original_in_conflict,
 618                            svn_boolean_t display_resolved_conflicts,
 619                            apr_pool_t *pool);
 620
 621
 622 \f
 623 /* Diffs on in-memory structures */
 624
 625 /** Generate @a diff output from the @a original and @a modified
 626  * in-memory strings.  @a diff will be allocated from @a pool.
 627  *
 628  * @since New in 1.5.
 629  */
 630 #if 0
 631 svn_error_t *
 632 svn_diff_mem_string_diff(svn_diff_t **diff,
 633                          const svn_string_t *original,
 634                          const svn_string_t *modified,
 635                          const svn_diff_file_options_t *options,
 636                          apr_pool_t *pool);
 637
 638 #endif
 639 /** Generate @a diff output from the @a orginal, @a modified and @a latest
 640  * in-memory strings.  @a diff will be allocated in @a pool.
 641  *
 642  * @since New in 1.5.
 643  */
 644 #if 0
 645 svn_error_t *
 646 svn_diff_mem_string_diff3(svn_diff_t **diff,
 647                           const svn_string_t *original,
 648                           const svn_string_t *modified,
 649                           const svn_string_t *latest,
 650                           const svn_diff_file_options_t *options,
 651                           apr_pool_t *pool);
 652 #endif
 653
 654 /** Generate @a diff output from the @a original, @a modified and @a latest
 655  * in-memory strings, using @a ancestor.  @a diff will be allocated in @a pool.
 656  *
 657  * @since New in 1.5.
 658  */
 659 #if 0
 660 svn_error_t *
 661 svn_diff_mem_string_diff4(svn_diff_t **diff,
 662                           const svn_string_t *original,
 663                           const svn_string_t *modified,
 664                           const svn_string_t *latest,
 665                           const svn_string_t *ancestor,
 666                           const svn_diff_file_options_t *options,
 667                           apr_pool_t *pool);
 668 #endif
 669
 670 /** Outputs the @a diff object generated by svn_diff_mem_string_diff()
 671  * in unified diff format on @a output_stream, using @a original
 672  * and @a modified for the text in the output.
 673  * Outputs the header and markers in @a header_encoding.
 674  *
 675  * @a original_header and @a modified header are
 676  * used to fill the field after the "---" and "+++" header markers.
 677  *
 678  * @since New in 1.5.
 679  */
 680 #if 0
 681 svn_error_t *
 682 svn_diff_mem_string_output_unified(svn_stream_t *output_stream,
 683                                    svn_diff_t *diff,
 684                                    const char *original_header,
 685                                    const char *modified_header,
 686                                    const char *header_encoding,
 687                                    const svn_string_t *original,
 688                                    const svn_string_t *modified,
 689                                    apr_pool_t *pool);
 690 #endif
 691 /** Output the @a diff generated by svn_diff_mem_string_diff3() in diff3
 692  * format on @a output_stream, using @a original, @a modified and @a latest
 693  * for content changes.
 694  *
 695  * Use the conflict markers @a conflict_original, @a conflict_modified,
 696  * @a conflict_latest and @a conflict_separator or the default one for
 697  * each of these if @c NULL is passed.
 698  *
 699  * @a conflict_style dictates how conflicts are displayed.
 700  *
 701  * @since New in 1.6.
 702  */
 703 #if 0
 704 svn_error_t *
 705 svn_diff_mem_string_output_merge2(svn_stream_t *output_stream,
 706                                   svn_diff_t *diff,
 707                                   const svn_string_t *original,
 708                                   const svn_string_t *modified,
 709                                   const svn_string_t *latest,
 710                                   const char *conflict_original,
 711                                   const char *conflict_modified,
 712                                   const char *conflict_latest,
 713                                   const char *conflict_separator,
 714                                   svn_diff_conflict_display_style_t style,
 715                                   apr_pool_t *pool);
 716 #endif
 717 /** Similar to svn_diff_mem_string_output_merge2, but with @a
 718  * display_original_in_conflict and @a display_resolved_conflicts
 719  * booleans instead of the @a conflict_style enum.
 720  *
 721  * If both booleans are false, acts like
 722  * svn_diff_conflict_display_modified_latest; if @a
 723  * display_original_in_conflict is true, acts like
 724  * svn_diff_conflict_display_modified_original_latest; if @a
 725  * display_resolved_conflicts is true, acts like
 726  * svn_diff_conflict_display_resolved_modified_latest.  The booleans
 727  * may not both be true.
 728  *
 729  * @deprecated Provided for backward compatibility with the 1.5 API.
 730  */
 731 #if 0
 732 SVN_DEPRECATED
 733 svn_error_t *
 734 svn_diff_mem_string_output_merge(svn_stream_t *output_stream,
 735                                  svn_diff_t *diff,
 736                                  const svn_string_t *original,
 737                                  const svn_string_t *modified,
 738                                  const svn_string_t *latest,
 739                                  const char *conflict_original,
 740                                  const char *conflict_modified,
 741                                  const char *conflict_latest,
 742                                  const char *conflict_separator,
 743                                  svn_boolean_t display_original_in_conflict,
 744                                  svn_boolean_t display_resolved_conflicts,
 745                                  apr_pool_t *pool);
 746
 747 #endif
 748 #ifdef __cplusplus
 749 }
 750 #endif /* __cplusplus */
 751
 752 #endif /* SVN_DIFF_H */