Changeset 58234 in vbox for trunk/src/apps/svnsync-vbox
- Timestamp:
- Oct 14, 2015 12:34:53 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 103398
- Location:
- trunk/src/apps/svnsync-vbox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/apps/svnsync-vbox/Makefile
r44528 r58234 3 3 # 4 4 # 5 # Copyright (C) 2006-201 0Oracle Corporation5 # Copyright (C) 2006-2015 Oracle Corporation 6 6 # 7 7 # This file is part of VirtualBox Open Source Edition (OSE), as … … 19 19 DEFS = -DVBOX -D_FILE_OFFSET_BITS=64 20 20 INCS = -I. -I/usr/include/subversion-1 -I/usr/include/apr-1.0 21 LIBS = -lsvn_ra-1 -lsvn_ra_neon-1 -lsvn_ra_local-1 \ 22 -lsvn_repos-1 -lsvn_fs-1 -lsvn_fs_base-1 -lsvn_fs_fs-1 -lsvn_delta-1 \ 23 -lsvn_subr-1 -lneon -lapr-1 -laprutil-1 21 LIBS = -lsvn_ra-1 -lsvn_ra_local-1 \ 22 -lsvn_repos-1 -lsvn_fs-1 -lsvn_delta-1 \ 23 -lsvn_subr-1 -lapr-1 -laprutil-1 \ 24 -ldb 24 25 25 26 all: svnsync-vbox -
trunk/src/apps/svnsync-vbox/main.c
r48253 r58234 20 20 21 21 #ifdef VBOX 22 #include <svn_version.h> 22 23 #include <svn_cmdline.h> 23 24 #include <svn_config.h> … … 278 279 apr_hash_t *props; 279 280 svn_string_t *value; 280 281 SVN_ERR(svn_ra_get_file(session, path, revision, NULL, NULL, &props, pool)); 281 svn_node_kind_t nodekind; 282 283 SVN_ERR(svn_ra_check_path(session, path, revision, &nodekind, pool)); 284 if (nodekind == svn_node_file) 285 SVN_ERR(svn_ra_get_file(session, path, revision, NULL, NULL, &props, pool)); 286 else 287 SVN_ERR(svn_ra_get_dir2(session, NULL, NULL, &props, path, revision, 0, pool)); 282 288 value = apr_hash_get(props, SVNSYNC_PROP_PROCESS, APR_HASH_KEY_STRING); 283 289 if (value) … … 372 378 else 373 379 { 380 #ifdef VBOX 381 SVN_ERR(svn_ra_change_rev_prop2(session, 0, SVNSYNC_PROP_LOCK, 382 NULL, mylocktoken, subpool)); 383 #else /* !VBOX */ 374 384 SVN_ERR(svn_ra_change_rev_prop(session, 0, SVNSYNC_PROP_LOCK, 375 385 mylocktoken, subpool)); 386 #endif /* !VBOX */ 376 387 } 377 388 } … … 404 415 err = func(session, baton, pool); 405 416 417 #ifdef VBOX 418 err2 = svn_ra_change_rev_prop2(session, 0, SVNSYNC_PROP_LOCK, NULL, NULL, pool); 419 #else /* !VBOX */ 406 420 err2 = svn_ra_change_rev_prop(session, 0, SVNSYNC_PROP_LOCK, NULL, pool); 421 #endif /* !VBOX */ 407 422 if (err2 && err) 408 423 { … … 520 535 if (strncmp(key, SVN_PROP_REVISION_AUTHOR, 521 536 sizeof(SVN_PROP_REVISION_AUTHOR) - 1)) 522 SVN_ERR(svn_ra_change_rev_prop (to_session, rev_to, key, val, subpool));537 SVN_ERR(svn_ra_change_rev_prop2(to_session, rev_to, key, NULL, val, subpool)); 523 538 #else /* !VBOX */ 524 539 SVN_ERR(svn_ra_change_rev_prop(to_session, rev, key, val, subpool)); … … 542 557 543 558 #ifdef VBOX 544 SVN_ERR(svn_ra_change_rev_prop (to_session, rev_to, name, NULL,545 subpool));559 SVN_ERR(svn_ra_change_rev_prop2(to_session, rev_to, name, NULL, NULL, 560 subpool)); 546 561 #else /* !VBOX */ 547 562 SVN_ERR(svn_ra_change_rev_prop(to_session, rev, name, NULL, … … 827 842 DX(fprintf(stderr, "init change_file_prop %s\n", name);) 828 843 DX(fprintf(stderr, " %s\n", fb->process ? "EXPORT" : "IGNORE");) 829 if (svn_property_kind (NULL,name) != svn_prop_regular_kind)844 if (svn_property_kind2(name) != svn_prop_regular_kind) 830 845 return SVN_NO_ERROR; 831 846 if (!strcmp(name, "cvs2svn:cvs-rev")) … … 862 877 DX(fprintf(stderr, "init change_dir_prop %s\n", name);) 863 878 DX(fprintf(stderr, " %s\n", db->process ? "EXPORT" : "IGNORE");) 864 if (svn_property_kind (NULL,name) != svn_prop_regular_kind)879 if (svn_property_kind2(name) != svn_prop_regular_kind) 865 880 return SVN_NO_ERROR; 866 881 if (!strcmp(name, "cvs2svn:cvs-rev")) … … 1026 1041 1027 1042 #ifdef VBOX 1028 SVN_ERR(svn_ra_open 3(&from_session, baton->from_url, NULL, baton->callbacks,1043 SVN_ERR(svn_ra_open4(&from_session, NULL, baton->from_url, NULL, baton->callbacks, 1029 1044 baton, baton->config, pool)); 1030 1045 #else /* !VBOX */ … … 1036 1051 pool)); 1037 1052 1053 #ifdef VBOX 1054 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, SVNSYNC_PROP_FROM_URL, NULL, 1055 svn_string_create(baton->from_url, pool), 1056 pool)); 1057 #else /* !VBOX */ 1038 1058 SVN_ERR(svn_ra_change_rev_prop(to_session, 0, SVNSYNC_PROP_FROM_URL, 1039 1059 svn_string_create(baton->from_url, pool), 1040 1060 pool)); 1061 #endif /* !VBOX */ 1041 1062 1042 1063 #ifdef VBOX … … 1046 1067 #endif /* !VBOX */ 1047 1068 1069 #ifdef VBOX 1070 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, SVNSYNC_PROP_FROM_UUID, NULL, 1071 svn_string_create(uuid, pool), pool)); 1072 #else /* !VBOX */ 1048 1073 SVN_ERR(svn_ra_change_rev_prop(to_session, 0, SVNSYNC_PROP_FROM_UUID, 1049 1074 svn_string_create(uuid, pool), pool)); 1075 #endif /* !VBOX */ 1050 1076 1051 1077 #ifdef VBOX 1052 1078 start_rev_str = svn_string_create(apr_psprintf(pool, "%ld", baton->start_rev), 1053 1079 pool); 1054 SVN_ERR(svn_ra_change_rev_prop (to_session, 0, SVNSYNC_PROP_START_REV,1055 start_rev_str, pool));1056 SVN_ERR(svn_ra_change_rev_prop (to_session, 0, SVNSYNC_PROP_LAST_MERGED_REV,1057 start_rev_str, pool));1080 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, SVNSYNC_PROP_START_REV, NULL, 1081 start_rev_str, pool)); 1082 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, SVNSYNC_PROP_LAST_MERGED_REV, NULL, 1083 start_rev_str, pool)); 1058 1084 if (!baton->default_process) 1059 1085 default_process = "export"; 1060 else default_process = baton->default_process; 1061 SVN_ERR(svn_ra_change_rev_prop(to_session, 0, SVNSYNC_PROP_DEFAULT_PROCESS, 1062 svn_string_create(default_process, pool), 1063 pool)); 1086 else 1087 default_process = baton->default_process; 1088 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, SVNSYNC_PROP_DEFAULT_PROCESS, NULL, 1089 svn_string_create(default_process, pool), 1090 pool)); 1064 1091 if (baton->replace_externals) 1065 SVN_ERR(svn_ra_change_rev_prop (to_session, 0,1066 SVNSYNC_PROP_REPLACE_EXTERNALS,1067 svn_string_create("", pool), pool));1092 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 1093 SVNSYNC_PROP_REPLACE_EXTERNALS, NULL, 1094 svn_string_create("", pool), pool)); 1068 1095 if (baton->replace_license) 1069 SVN_ERR(svn_ra_change_rev_prop (to_session, 0,1070 SVNSYNC_PROP_REPLACE_LICENSE,1071 svn_string_create("", pool), pool));1096 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 1097 SVNSYNC_PROP_REPLACE_LICENSE, NULL, 1098 svn_string_create("", pool), pool)); 1072 1099 #else /* !VBOX */ 1073 1100 SVN_ERR(svn_ra_change_rev_prop(to_session, 0, SVNSYNC_PROP_LAST_MERGED_REV, … … 1112 1139 NULL, FALSE, pool)); 1113 1140 1114 SVN_ERR(svn_ra_open 3(&from_session_prop, baton->from_url, NULL,1141 SVN_ERR(svn_ra_open4(&from_session_prop, NULL, baton->from_url, NULL, 1115 1142 baton->callbacks, baton, baton->config, pool)); 1116 1143 … … 1126 1153 1127 1154 /* Run it via an update reporter. */ 1128 SVN_ERR(svn_ra_do_update 2(from_session, &reporter, &report_baton,1155 SVN_ERR(svn_ra_do_update3(from_session, &reporter, &report_baton, 1129 1156 baton->start_rev, "", svn_depth_infinity, FALSE, 1130 cancel_editor, cancel_baton, pool));1157 FALSE, cancel_editor, cancel_baton, pool, pool)); 1131 1158 SVN_ERR(reporter->set_path(report_baton, "", baton->start_rev, 1132 1159 svn_depth_infinity, TRUE, NULL, pool)); … … 1152 1179 SVN_ERR(svn_opt_parse_num_args(&args, os, 2, pool)); 1153 1180 1154 to_url = svn_ path_canonicalize(APR_ARRAY_IDX(args, 0, const char *), pool);1155 from_url = svn_ path_canonicalize(APR_ARRAY_IDX(args, 1, const char *), pool);1181 to_url = svn_uri_canonicalize(APR_ARRAY_IDX(args, 0, const char *), pool); 1182 from_url = svn_uri_canonicalize(APR_ARRAY_IDX(args, 1, const char *), pool); 1156 1183 1157 1184 if (! svn_path_is_url(to_url)) … … 1162 1189 _("Path '%s' is not a URL"), from_url); 1163 1190 1164 baton.to_url = svn_path_canonicalize(to_url, pool);1165 baton.from_url = svn_path_canonicalize(from_url, pool);1191 baton.to_url = to_url; 1192 baton.from_url = from_url; 1166 1193 baton.config = opt_baton->config; 1167 1194 #ifdef VBOX … … 1178 1205 1179 1206 #ifdef VBOX 1180 SVN_ERR(svn_ra_open 3(&to_session, baton.to_url, NULL,1207 SVN_ERR(svn_ra_open4(&to_session, NULL, baton.to_url, NULL, 1181 1208 &callbacks, &baton, baton.config, pool)); 1182 1209 #else /* !VBOX */ … … 1249 1276 1250 1277 1278 #ifdef VBOX 1251 1279 static svn_revnum_t 1252 1280 lookup_revnum(svn_ra_session_t *to_session, … … 1308 1336 SVN_ERR(open_tmp_file(&tmpfile, NULL, subpool)); 1309 1337 filestream = svn_stream_from_aprfile2(tmpfile, FALSE, subpool); 1310 /* svn_ra_get_file() insists on getting a file path without leading /, 1311 * and there is a leading / in our input parameter when copying from a 1312 * different branch. The assertion is annoying, as continuing would work. */ 1313 if (src_path[0] == '/') 1314 src_path++; 1315 SVN_ERR(svn_ra_get_file(from_session, src_path, src_rev, filestream, NULL, 1316 &fileprops, subpool)); 1338 SVN_ERR(svn_ra_get_file(from_session, STRIP_LEADING_SLASH(src_path), src_rev, 1339 filestream, NULL, &fileprops, subpool)); 1317 1340 SVN_ERR(svn_io_file_seek(tmpfile, APR_SET, &offset, subpool)); 1318 1341 1319 1342 SVN_ERR(apply_textdelta(file_baton, NULL, subpool, &window_handler, 1320 1343 &window_handler_baton)); 1321 svn_txdelta (&deltastream, emptystream, filestream, subpool);1344 svn_txdelta2(&deltastream, emptystream, filestream, FALSE, subpool); 1322 1345 do 1323 1346 { … … 1378 1401 val_ent = (svn_dirent_t *)val; 1379 1402 oppool = svn_pool_create(subpool); 1380 from_path = svn_ path_join(src_path, key, oppool);1381 to_path = svn_ path_join(dst_path, key, oppool);1403 from_path = svn_relpath_join(src_path, key, oppool); 1404 to_path = svn_relpath_join(dst_path, key, oppool); 1382 1405 switch (val_ent->kind) 1383 1406 { … … 1419 1442 return SVN_NO_ERROR; 1420 1443 } 1444 #endif /* VBOX */ 1421 1445 1422 1446 /*** Editor vtable functions ***/ … … 2137 2161 #endif /* VBOX */ 2138 2162 /* only regular properties can pass over libsvn_ra */ 2139 if (svn_property_kind(NULL, name) != svn_prop_regular_kind) 2163 #ifdef VBOX 2164 if (svn_property_kind2(name) != svn_prop_regular_kind) 2140 2165 return SVN_NO_ERROR; 2141 #ifdef VBOX2142 2166 if (!strcmp(name, "cvs2svn:cvs-rev")) 2143 2167 return SVN_NO_ERROR; … … 2157 2181 return SVN_NO_ERROR; 2158 2182 eb->changeset_live = TRUE; 2159 #endif /* VBOX */ 2183 #else /* !VBOX */ 2184 if (svn_property_kind(NULL, name) != svn_prop_regular_kind) 2185 return SVN_NO_ERROR; 2186 #endif /* !VBOX */ 2160 2187 2161 2188 return eb->wrapped_editor->change_file_prop(fb->wrapped_node_baton, … … 2177 2204 #endif /* VBOX */ 2178 2205 /* only regular properties can pass over libsvn_ra */ 2179 if (svn_property_kind(NULL, name) != svn_prop_regular_kind) 2206 #ifdef VBOX 2207 if (svn_property_kind2(name) != svn_prop_regular_kind) 2180 2208 return SVN_NO_ERROR; 2181 #ifdef VBOX2182 2209 if (!strcmp(name, "cvs2svn:cvs-rev")) 2183 2210 return SVN_NO_ERROR; … … 2197 2224 return SVN_NO_ERROR; 2198 2225 eb->changeset_live = TRUE; 2199 #endif /* VBOX */ 2226 #else /* !VBOX */ 2227 if (svn_property_kind(NULL, name) != svn_prop_regular_kind) 2228 return SVN_NO_ERROR; 2229 #endif /* !VBOX */ 2200 2230 2201 2231 return eb->wrapped_editor->change_dir_prop(db->wrapped_node_baton, … … 2412 2442 2413 2443 #ifdef VBOX 2414 SVN_ERR(svn_ra_open 3(from_session, from_url->data, NULL, callbacks, baton,2444 SVN_ERR(svn_ra_open4(from_session, NULL, from_url->data, NULL, callbacks, baton, 2415 2445 config, pool)); 2416 2446 #else /* !VBOX */ … … 2484 2514 &replace_license_str, pool)); 2485 2515 replace_license = !!replace_license_str; 2486 SVN_ERR(svn_ra_open 3(&from_session_prop, from_url->data, NULL,2516 SVN_ERR(svn_ra_open4(&from_session_prop, NULL, from_url->data, NULL, 2487 2517 baton->callbacks, baton, baton->config, pool)); 2488 SVN_ERR(svn_ra_open 3(&to_session_prop, baton->to_url, NULL,2518 SVN_ERR(svn_ra_open4(&to_session_prop, NULL, baton->to_url, NULL, 2489 2519 baton->callbacks, baton, baton->config, pool)); 2490 2520 #else /* !VBOX */ … … 2570 2600 (i.e. non-svnsync) commits to the dest repository. */ 2571 2601 2602 #ifdef VBOX 2603 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 2604 SVNSYNC_PROP_LAST_MERGED_REV, NULL, 2605 last_merged_rev, pool)); 2606 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 2607 SVNSYNC_PROP_CURRENTLY_COPYING, NULL, 2608 NULL, pool)); 2609 #else /* !VBOX */ 2572 2610 SVN_ERR(svn_ra_change_rev_prop(to_session, 0, 2573 2611 SVNSYNC_PROP_LAST_MERGED_REV, … … 2576 2614 SVNSYNC_PROP_CURRENTLY_COPYING, 2577 2615 NULL, pool)); 2616 #endif /* !VBOX */ 2578 2617 } 2579 2618 /* If copying > to_latest, then we just fall through to … … 2629 2668 because ra_svn doesn't let you change rev props during a 2630 2669 commit. */ 2670 #ifdef VBOX 2671 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 2672 SVNSYNC_PROP_CURRENTLY_COPYING, NULL, 2673 svn_string_createf(subpool, "%ld", 2674 current), 2675 subpool)); 2676 #else /* !VBOX */ 2631 2677 SVN_ERR(svn_ra_change_rev_prop(to_session, 0, 2632 2678 SVNSYNC_PROP_CURRENTLY_COPYING, … … 2634 2680 current), 2635 2681 subpool)); 2682 #endif /* !VBOX */ 2636 2683 2637 2684 /* The actual copy is just a replay hooked up to a commit. */ … … 2723 2770 2724 2771 /* Add a revision cross-reference revprop. */ 2725 SVN_ERR(svn_ra_change_rev_prop (to_session, 0,2726 apr_psprintf(subpool,2727 SVNSYNC_PROP_REV__FMT,2728 current),2729 svn_string_create(apr_psprintf(subpool,2730 "%ld",2731 baton->committed_rev),2732 subpool),2733 subpool));2772 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 2773 apr_psprintf(subpool, 2774 SVNSYNC_PROP_REV__FMT, 2775 current), NULL, 2776 svn_string_create(apr_psprintf(subpool, 2777 "%ld", 2778 baton->committed_rev), 2779 subpool), 2780 subpool)); 2734 2781 } 2735 2782 else … … 2740 2787 * appears in the destination repository. */ 2741 2788 SVN_ERR(svn_ra_get_latest_revnum(to_session, &to_latest, subpool)); 2742 SVN_ERR(svn_ra_change_rev_prop (to_session, 0,2743 apr_psprintf(subpool,2744 SVNSYNC_PROP_REV__FMT,2745 current),2746 svn_string_create(apr_psprintf(subpool,2747 "%ld",2748 to_latest),2749 subpool),2750 subpool));2789 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 2790 apr_psprintf(subpool, 2791 SVNSYNC_PROP_REV__FMT, 2792 current), NULL, 2793 svn_string_create(apr_psprintf(subpool, 2794 "%ld", 2795 to_latest), 2796 subpool), 2797 subpool)); 2751 2798 } 2752 2799 #else /* !VBOX */ … … 2756 2803 /* Ok, we're done, bring the last-merged-rev property up to date. */ 2757 2804 2805 #ifdef VBOX 2806 SVN_ERR(svn_ra_change_rev_prop2 2807 (to_session, 2808 0, 2809 SVNSYNC_PROP_LAST_MERGED_REV, NULL, 2810 svn_string_create(apr_psprintf(subpool, "%ld", current), 2811 subpool), 2812 subpool)); 2813 #else /* !VBOX */ 2758 2814 SVN_ERR(svn_ra_change_rev_prop 2759 2815 (to_session, … … 2763 2819 subpool), 2764 2820 subpool)); 2821 #endif /* !VBOX */ 2765 2822 2766 2823 /* And finally drop the currently copying prop, since we're done 2767 2824 with this revision. */ 2768 2825 2826 #ifdef VBOX 2827 SVN_ERR(svn_ra_change_rev_prop2(to_session, 0, 2828 SVNSYNC_PROP_CURRENTLY_COPYING, NULL, 2829 NULL, subpool)); 2830 #else /* !VBOX */ 2769 2831 SVN_ERR(svn_ra_change_rev_prop(to_session, 0, 2770 2832 SVNSYNC_PROP_CURRENTLY_COPYING, 2771 2833 NULL, subpool)); 2834 #endif /* !VBOX */ 2772 2835 } 2773 2836 … … 2789 2852 SVN_ERR(svn_opt_parse_num_args(&args, os, 1, pool)); 2790 2853 2791 to_url = svn_ path_canonicalize(APR_ARRAY_IDX(args, 0, const char *), pool);2854 to_url = svn_uri_canonicalize(APR_ARRAY_IDX(args, 0, const char *), pool); 2792 2855 2793 2856 if (! svn_path_is_url(to_url)) … … 2803 2866 2804 2867 #ifdef VBOX 2805 SVN_ERR(svn_ra_open 3(&to_session, to_url, NULL,2868 SVN_ERR(svn_ra_open4(&to_session, NULL, to_url, NULL, 2806 2869 baton.callbacks, &baton, baton.config, pool)); 2807 2870 #else /* !VBOX */ … … 2895 2958 SVN_ERR(svn_opt_parse_num_args(&args, os, 2, pool)); 2896 2959 2897 to_url = svn_ path_canonicalize(APR_ARRAY_IDX(args, 0, const char *), pool);2960 to_url = svn_uri_canonicalize(APR_ARRAY_IDX(args, 0, const char *), pool); 2898 2961 revision = strtol(APR_ARRAY_IDX(args, 1, const char *), &digits_end, 10); 2899 2962 … … 2914 2977 2915 2978 #ifdef VBOX 2916 SVN_ERR(svn_ra_open 3(&to_session, to_url, NULL,2979 SVN_ERR(svn_ra_open4(&to_session, NULL, to_url, NULL, 2917 2980 baton.callbacks, &baton, baton.config, pool)); 2918 2981 #else /* !VBOX */ … … 2960 3023 2961 3024 #ifdef VBOX 2962 SVN_ERR(svn_opt_print_help 3(os, "svnsync",3025 SVN_ERR(svn_opt_print_help4(os, "svnsync", 2963 3026 opt_baton ? opt_baton->version : FALSE, 2964 FALSE, version_footer->data, header,3027 FALSE, FALSE, version_footer->data, header, 2965 3028 svnsync_cmd_table, svnsync_options, NULL, 2966 3029 NULL, pool)); … … 3030 3093 } 3031 3094 3032 err = svn_cmdline__getopt_init(&os, argc, argv, pool); 3033 if (err) 3034 return svn_cmdline_handle_exit_error(err, pool, "svnsync: "); 3095 { 3096 apr_status_t apr_err; 3097 apr_err = apr_getopt_init(&os, pool, argc, argv); 3098 if (apr_err) 3099 { 3100 err = svn_error_wrap_apr(apr_err, "Error initializing command line parsing"); 3101 return svn_cmdline_handle_exit_error(err, pool, "svnsync: "); 3102 } 3103 } 3035 3104 3036 3105 os->interleave = 1;
Note:
See TracChangeset
for help on using the changeset viewer.
