| /* diff4.c -- test driver for 4-way text merges |
| * |
| * ==================================================================== |
| * Licensed to the Apache Software Foundation (ASF) under one |
| * or more contributor license agreements. See the NOTICE file |
| * distributed with this work for additional information |
| * regarding copyright ownership. The ASF licenses this file |
| * to you under the Apache License, Version 2.0 (the |
| * "License"); you may not use this file except in compliance |
| * with the License. You may obtain a copy of the License at |
| * |
| * http://www.apache.org/licenses/LICENSE-2.0 |
| * |
| * Unless required by applicable law or agreed to in writing, |
| * software distributed under the License is distributed on an |
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| * KIND, either express or implied. See the License for the |
| * specific language governing permissions and limitations |
| * under the License. |
| * ==================================================================== |
| */ |
| |
| |
| #include <apr.h> |
| #include <apr_general.h> |
| #include <apr_file_io.h> |
| |
| #include "svn_pools.h" |
| #include "svn_diff.h" |
| #include "svn_io.h" |
| |
| |
| static svn_error_t * |
| do_diff4(svn_stream_t *ostream, |
| const char *original, |
| const char *modified, |
| const char *latest, |
| const char *ancestor, |
| apr_pool_t *pool) |
| { |
| svn_diff_t *diff; |
| |
| SVN_ERR(svn_diff_file_diff4_2(&diff, original, modified, latest, ancestor, |
| svn_diff_file_options_create(pool), pool)); |
| SVN_ERR(svn_diff_file_output_merge3(ostream, diff, |
| original, modified, latest, |
| NULL, NULL, NULL, NULL, |
| svn_diff_conflict_display_modified_latest, |
| NULL, NULL, /* cancel */ |
| pool)); |
| |
| return NULL; |
| } |
| |
| int main(int argc, char *argv[]) |
| { |
| apr_pool_t *pool; |
| svn_stream_t *ostream; |
| int rc = 0; |
| svn_error_t *svn_err; |
| |
| apr_initialize(); |
| |
| pool = svn_pool_create(NULL); |
| |
| svn_err = svn_stream_for_stdout(&ostream, pool); |
| if (svn_err) |
| { |
| svn_handle_error2(svn_err, stdout, FALSE, "diff4: "); |
| rc = 2; |
| } |
| else if (argc == 5) |
| { |
| svn_err = do_diff4(ostream, |
| argv[2], argv[1], argv[3], argv[4], |
| pool); |
| if (svn_err != NULL) |
| { |
| svn_handle_error2(svn_err, stdout, FALSE, "diff4: "); |
| rc = 2; |
| } |
| } |
| else |
| { |
| svn_error_clear(svn_stream_printf |
| (ostream, pool, "Usage: %s <mine> <older> <yours> <ancestor>\n", |
| argv[0])); |
| rc = 2; |
| } |
| |
| apr_terminate(); |
| |
| return rc; |
| } |