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