| diff_local.c (251886) | diff_local.c (253734) |
|---|---|
| 1/* 2 * diff_local.c: comparing local trees with each other 3 * 4 * ==================================================================== 5 * Licensed to the Apache Software Foundation (ASF) under one 6 * or more contributor license agreements. See the NOTICE file 7 * distributed with this work for additional information 8 * regarding copyright ownership. The ASF licenses this file --- 593 unchanged lines hidden (view full) --- 602 svn_node_kind_t kind2; 603 604 SVN_ERR(svn_io_check_resolved_path(local_abspath1, &kind1, scratch_pool)); 605 SVN_ERR(svn_io_check_resolved_path(local_abspath2, &kind2, scratch_pool)); 606 607 if (kind1 != kind2) 608 return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL, 609 _("'%s' is not the same node kind as '%s'"), | 1/* 2 * diff_local.c: comparing local trees with each other 3 * 4 * ==================================================================== 5 * Licensed to the Apache Software Foundation (ASF) under one 6 * or more contributor license agreements. See the NOTICE file 7 * distributed with this work for additional information 8 * regarding copyright ownership. The ASF licenses this file --- 593 unchanged lines hidden (view full) --- 602 svn_node_kind_t kind2; 603 604 SVN_ERR(svn_io_check_resolved_path(local_abspath1, &kind1, scratch_pool)); 605 SVN_ERR(svn_io_check_resolved_path(local_abspath2, &kind2, scratch_pool)); 606 607 if (kind1 != kind2) 608 return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL, 609 _("'%s' is not the same node kind as '%s'"), |
| 610 local_abspath1, local_abspath2); | 610 svn_dirent_local_style(local_abspath1, 611 scratch_pool), 612 svn_dirent_local_style(local_abspath2, 613 scratch_pool)); |
| 611 612 if (depth == svn_depth_unknown) 613 depth = svn_depth_infinity; 614 615 if (kind1 == svn_node_file) 616 SVN_ERR(do_arbitrary_files_diff(local_abspath1, local_abspath2, 617 svn_dirent_basename(local_abspath1, 618 scratch_pool), 619 FALSE, FALSE, NULL, 620 callbacks, diff_baton, 621 ctx, scratch_pool)); 622 else if (kind1 == svn_node_dir) 623 SVN_ERR(do_arbitrary_dirs_diff(local_abspath1, local_abspath2, 624 NULL, NULL, depth, 625 callbacks, diff_baton, 626 ctx, scratch_pool)); 627 else 628 return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL, 629 _("'%s' is not a file or directory"), | 614 615 if (depth == svn_depth_unknown) 616 depth = svn_depth_infinity; 617 618 if (kind1 == svn_node_file) 619 SVN_ERR(do_arbitrary_files_diff(local_abspath1, local_abspath2, 620 svn_dirent_basename(local_abspath1, 621 scratch_pool), 622 FALSE, FALSE, NULL, 623 callbacks, diff_baton, 624 ctx, scratch_pool)); 625 else if (kind1 == svn_node_dir) 626 SVN_ERR(do_arbitrary_dirs_diff(local_abspath1, local_abspath2, 627 NULL, NULL, depth, 628 callbacks, diff_baton, 629 ctx, scratch_pool)); 630 else 631 return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL, 632 _("'%s' is not a file or directory"), |
| 630 kind1 == svn_node_none ? 631 local_abspath1 : local_abspath2); | 633 kind1 == svn_node_none 634 ? svn_dirent_local_style(local_abspath1, 635 scratch_pool) 636 : svn_dirent_local_style(local_abspath2, 637 scratch_pool)); |
| 632 return SVN_NO_ERROR; 633} | 638 return SVN_NO_ERROR; 639} |