You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 19:03:37 UTC
svn commit: r984122 [33/40] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6...
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/main.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/main.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/main.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* main.c: Subversion command line client.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -115,6 +115,7 @@ typedef enum {
opt_reintegrate,
opt_trust_server_cert,
opt_show_copies_as_adds,
+ opt_ignore_keywords,
opt_ignore_mergeinfo
} svn_cl__longopt_t;
@@ -152,7 +153,9 @@ const apr_getopt_option_t svn_cl__option
{"incremental", opt_incremental, 0,
N_("give output suitable for concatenation")},
{"encoding", opt_encoding, 1,
- N_("treat value as being in charset encoding ARG")},
+ N_("treat value as being in charset encoding ARG\n"
+ " "
+ "[alias: --enc]")},
{"version", opt_version, 0, N_("show program version information")},
{"verbose", 'v', 0, N_("print extra information")},
{"show-updates", 'u', 0, N_("display update information")},
@@ -199,15 +202,21 @@ const apr_getopt_option_t svn_cl__option
{"set-depth", opt_set_depth, 1,
N_("set new working copy depth to ARG ('exclude',\n"
" "
- "'empty', 'files', 'immediates', or 'infinity')")},
+ "'empty', 'files', 'immediates', or 'infinity')\n"
+ " "
+ "[alias: --sd]")},
{"xml", opt_xml, 0, N_("output in XML")},
{"strict", opt_strict, 0, N_("use strict semantics")},
{"stop-on-copy", opt_stop_on_copy, 0,
- N_("do not cross copies while traversing history")},
+ N_("do not cross copies while traversing history\n"
+ " "
+ "[alias: --soc]")},
{"no-ignore", opt_no_ignore, 0,
N_("disregard default and svn:ignore property ignores")},
{"no-auth-cache", opt_no_auth_cache, 0,
- N_("do not cache authentication tokens")},
+ N_("do not cache authentication tokens\n"
+ " "
+ "[alias: --nac]")},
{"trust-server-cert", opt_trust_server_cert, 0,
N_("accept unknown SSL server certificates without\n"
" "
@@ -215,29 +224,41 @@ const apr_getopt_option_t svn_cl__option
{"non-interactive", opt_non_interactive, 0,
N_("do no interactive prompting")},
{"dry-run", opt_dry_run, 0,
- N_("try operation but make no changes")},
+ N_("try operation but make no changes\n"
+ " "
+ "[alias: --dry]")},
{"no-diff-deleted", opt_no_diff_deleted, 0,
- N_("do not print differences for deleted files")},
+ N_("do not print differences for deleted files\n"
+ " "
+ "[alias: --ndd]")},
{"notice-ancestry", opt_notice_ancestry, 0,
- N_("notice ancestry when calculating differences")},
+ N_("notice ancestry when calculating differences\n"
+ " "
+ "[alias: --na]")},
{"ignore-ancestry", opt_ignore_ancestry, 0,
- N_("ignore ancestry when calculating merges")},
+ N_("ignore ancestry when calculating merges\n"
+ " "
+ "[alias: --ia]")},
{"ignore-externals", opt_ignore_externals, 0,
N_("ignore externals definitions\n"
" "
- "[aliases: --ie]")},
+ "[alias: --ie]")},
{"diff-cmd", opt_diff_cmd, 1, N_("use ARG as diff command")},
{"diff3-cmd", opt_merge_cmd, 1, N_("use ARG as merge command")},
{"editor-cmd", opt_editor_cmd, 1, N_("use ARG as external editor")},
{"record-only", opt_record_only, 0,
- N_("merge only mergeinfo differences")},
+ N_("merge only mergeinfo differences\n"
+ " "
+ "[alias: --ro]")},
{"old", opt_old_cmd, 1, N_("use ARG as the older target")},
{"new", opt_new_cmd, 1, N_("use ARG as the newer target")},
{"revprop", opt_revprop, 0,
N_("operate on a revision property (use with -r)")},
{"relocate", opt_relocate, 0, N_("relocate via URL-rewriting")},
{"config-dir", opt_config_dir, 1,
- N_("read user configuration files from directory ARG")},
+ N_("read user configuration files from directory ARG\n"
+ " "
+ "[alias: --cd]")},
{"config-option", opt_config_options, 1,
N_("set user configuration option in the format:\n"
" "
@@ -245,7 +266,7 @@ const apr_getopt_option_t svn_cl__option
" "
"For example:\n"
" "
- " servers:global:http-library=serf\n")},
+ " servers:global:http-library=serf")},
{"auto-props", opt_autoprops, 0, N_("enable automatic properties")},
{"no-auto-props", opt_no_autoprops, 0, N_("disable automatic properties")},
{"native-eol", opt_native_eol, 1,
@@ -263,10 +284,12 @@ const apr_getopt_option_t svn_cl__option
{"changelist", opt_changelist, 1,
N_("operate only on members of changelist ARG\n"
" "
- "[aliases: --cl]")},
+ "[alias: --cl]")},
{"keep-changelists", opt_keep_changelists, 0,
N_("don't delete changelists after commit")},
- {"keep-local", opt_keep_local, 0, N_("keep path in working copy")},
+ {"keep-local", opt_keep_local, 0, N_("keep path in working copy\n"
+ " "
+ "[alias: --kl]")},
{"with-all-revprops", opt_with_all_revprops, 0,
N_("retrieve all revision properties")},
{"with-no-revprops", opt_with_no_revprops, 0,
@@ -291,9 +314,13 @@ const apr_getopt_option_t svn_cl__option
{"show-revs", opt_show_revs, 1,
N_("specify which collection of revisions to display\n"
" "
- "('merged', 'eligible')")},
+ "('merged', 'eligible')\n"
+ " "
+ "[alias: --sr]")},
{"reintegrate", opt_reintegrate, 0,
- N_("lump-merge all of source URL's unmerged changes")},
+ N_("lump-merge all of source URL's unmerged changes\n"
+ " "
+ "[alias: --ri]")},
{"strip", 'p', 1,
N_("number of leading path components to strip\n"
" "
@@ -307,9 +334,15 @@ const apr_getopt_option_t svn_cl__option
" "
" fudge/crunchy.html\n"
" "
- "while -p2 would give just crunchy.html\n")},
+ "while -p2 would give just crunchy.html")},
{"show-copies-as-adds", opt_show_copies_as_adds, 0,
- N_("don't diff copied or moved files with their source")},
+ N_("don't diff copied or moved files with their source\n"
+ " "
+ "[alias: --sca]")},
+ {"ignore-keywords", opt_ignore_keywords, 0,
+ N_("don't expand keywords\n"
+ " "
+ "[alias: --ik]")},
{"ignore-mergeinfo", opt_ignore_mergeinfo, 0,
N_("ignore changes to mergeinfo")},
@@ -319,8 +352,23 @@ const apr_getopt_option_t svn_cl__option
* other option (whose description should probably mention its aliases).
*/
- {"cl", opt_changelist, 1, NULL},
+ {"sd", opt_set_depth, 1, NULL},
+ {"enc", opt_encoding, 1, NULL},
+ {"soc", opt_stop_on_copy, 0, NULL},
+ {"nac", opt_no_auth_cache, 0, NULL},
+ {"dry", opt_dry_run, 0, NULL},
+ {"ndd", opt_no_diff_deleted, 0, NULL},
+ {"na", opt_notice_ancestry, 0, NULL},
+ {"ia", opt_ignore_ancestry, 0, NULL},
{"ie", opt_ignore_externals, 0, NULL},
+ {"ro", opt_record_only, 0, NULL},
+ {"cd", opt_config_dir, 1, NULL},
+ {"cl", opt_changelist, 1, NULL},
+ {"kl", opt_keep_local, 0, NULL},
+ {"sr", opt_show_revs, 1, NULL},
+ {"ri", opt_reintegrate, 0, NULL},
+ {"sca", opt_show_copies_as_adds, 0, NULL},
+ {"ik", opt_ignore_keywords, 0, NULL},
{0, 0, 0, 0},
};
@@ -519,7 +567,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" If specified, PEGREV determines in which revision the target is first\n"
" looked up.\n"),
- {'r', 'q', 'N', opt_depth, opt_force, opt_native_eol, opt_ignore_externals} },
+ {'r', 'q', 'N', opt_depth, opt_force, opt_native_eol, opt_ignore_externals,
+ opt_ignore_keywords} },
{ "help", svn_cl__help, {"?", "h"}, N_
("Describe the usage of this program or its subcommands.\n"
@@ -851,7 +900,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" foo/bar -r 1234 http://example.com/repos/zag\n"
" Subversion 1.5 and greater support the above formats and the\n"
" following formats where the URLs may have peg revisions:\n"
- " http://example.com/repos/zig foo\n"
+ " http://example.com/repos/zig@42 foo\n"
" -r 1234 http://example.com/repos/zig foo/bar\n"
" Relative URLs are supported in Subversion 1.5 and greater for\n"
" all above formats and are indicated by starting the URL with one\n"
@@ -862,6 +911,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
" / to the server root\n"
" The ambiguous format 'relative_path relative_path' is taken as\n"
" 'relative_url relative_path' with peg revision support.\n"
+ " Lines in externals definitions starting with the '#' character\n"
+ " are considered comments and are ignored.\n"
" svn:needs-lock - If present, indicates that the file should be locked\n"
" before it is modified. Makes the working copy file read-only\n"
" when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n"
@@ -1016,9 +1067,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" are applied to the obstructing path.\n"
"\n"
" Use the --set-depth option to set a new working copy depth on the\n"
- " targets of this operation. Currently, the depth of a working copy\n"
- " directory can only be increased (telescoped more deeply); you cannot\n"
- " make a directory more shallow.\n"
+ " targets of this operation.\n"
"\n"
" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
" This is used when repository's root URL changes (such as a scheme\n"
@@ -1085,9 +1134,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" in the first column with code 'E'.\n"
"\n"
" Use the --set-depth option to set a new working copy depth on the\n"
- " targets of this operation. Currently, the depth of a working copy\n"
- " directory can only be increased (telescoped more deeply); you cannot\n"
- " make a directory more shallow.\n"),
+ " targets of this operation.\n"),
{'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_force,
opt_ignore_externals, opt_changelist, opt_editor_cmd, opt_accept} },
@@ -1552,7 +1599,7 @@ main(int argc, const char *argv[])
break;
case opt_config_options:
if (!opt_state.config_options)
- opt_state.config_options =
+ opt_state.config_options =
apr_array_make(pool, 1, sizeof(svn_cmdline__config_argument_t*));
err = svn_utf_cstring_to_utf8(&opt_arg, opt_arg, pool);
@@ -1667,6 +1714,9 @@ main(int argc, const char *argv[])
}
}
break;
+ case opt_ignore_keywords:
+ opt_state.ignore_keywords = TRUE;
+ break;
case opt_ignore_mergeinfo:
opt_state.ignore_mergeinfo = TRUE;
break;
@@ -1786,7 +1836,7 @@ main(int argc, const char *argv[])
}
}
- /* Only merge supports multiple revisions/revision ranges. */
+ /* Only merge and log support multiple revisions/revision ranges. */
if (subcommand->cmd_func != svn_cl__merge
&& subcommand->cmd_func != svn_cl__log)
{
@@ -1800,17 +1850,6 @@ main(int argc, const char *argv[])
}
}
- /* Merge doesn't support specifying a revision range
- when using --reintegrate. */
- if (subcommand->cmd_func == svn_cl__merge
- && opt_state.revision_ranges->nelts
- && opt_state.reintegrate)
- {
- err = svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- _("-r and -c can't be used with --reintegrate"));
- return svn_cmdline_handle_exit_error(err, pool, "svn: ");
- }
-
/* Disallow simultaneous use of both --depth and --set-depth. */
if ((opt_state.depth != svn_depth_unknown)
&& (opt_state.set_depth != svn_depth_unknown))
@@ -1850,7 +1889,7 @@ main(int argc, const char *argv[])
return svn_cmdline_handle_exit_error(err, pool, "svn: ");
}
- /* Ensure that 'revision_ranges' has at least one item, and that
+ /* Ensure that 'revision_ranges' has at least one item, and make
'start_revision' and 'end_revision' match that item. */
if (opt_state.revision_ranges->nelts == 0)
{
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/merge-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/merge-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/merge-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* merge-cmd.c -- Merging changes into a working copy.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -56,6 +56,15 @@ svn_cl__merge(apr_getopt_t *os,
peg_revision2;
apr_array_header_t *options, *ranges_to_merge = opt_state->revision_ranges;
+ /* Merge doesn't support specifying a revision or revision range
+ when using --reintegrate. */
+ if (opt_state->reintegrate
+ && opt_state->start_revision.kind != svn_opt_revision_unspecified)
+ {
+ return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("-r and -c can't be used with --reintegrate"));
+ }
+
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, pool));
@@ -263,8 +272,8 @@ svn_cl__merge(apr_getopt_t *os,
}
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, pool));
if (opt_state->extensions)
options = svn_cstring_split(opt_state->extensions, " \t\n\r", TRUE, pool);
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/mergeinfo-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/mergeinfo-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* mergeinfo-cmd.c -- Query merge-relative info.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/mkdir-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/mkdir-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/mkdir-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/mkdir-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* mkdir-cmd.c -- Subversion mkdir command
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -58,8 +58,8 @@ svn_cl__mkdir(apr_getopt_t *os,
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, pool));
if (! svn_path_is_url(APR_ARRAY_IDX(targets, 0, const char *)))
{
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/move-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/move-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/move-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/move-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* move-cmd.c -- Subversion move command
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -67,8 +67,8 @@ svn_cl__move(apr_getopt_t *os,
}
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, pool));
dst_path = APR_ARRAY_IDX(targets, targets->nelts - 1, const char *);
apr_array_pop(targets);
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/notify.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/notify.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/notify.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* notify.c: feedback handlers for cmdline client.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -685,7 +685,7 @@ notify(void *baton, const svn_wc_notify_
}
-void
+svn_error_t *
svn_cl__get_notifier(svn_wc_notify_func2_t *notify_func_p,
void **notify_baton_p,
svn_boolean_t is_checkout,
@@ -710,8 +710,9 @@ svn_cl__get_notifier(svn_wc_notify_func2
nb->ext_prop_conflicts = 0;
nb->ext_tree_conflicts = 0;
nb->ext_skipped_paths = 0;
- apr_filepath_get((char **)&nb->path_prefix, 0 /* flags */, pool);
+ SVN_ERR(svn_dirent_get_absolute(&nb->path_prefix, "", pool));
*notify_func_p = notify;
*notify_baton_p = nb;
+ return SVN_NO_ERROR;
}
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/obliterate-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/obliterate-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/obliterate-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/obliterate-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* obliterate-cmd.c -- Subversion command to permanently delete history.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/patch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/patch-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/patch-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/patch-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* patch-cmd.c -- Apply changes to a working copy.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -71,12 +71,15 @@ svn_cl__patch(apr_getopt_t *os,
target_path = APR_ARRAY_IDX(targets, 0, const char *);
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, pool));
/* OK we're good. */
SVN_ERR(svn_client_patch(patch_path, target_path, opt_state->dry_run,
opt_state->strip_count, ctx, pool));
+ if (! opt_state->quiet)
+ SVN_ERR(svn_cl__print_conflict_stats(ctx->notify_baton2, pool));
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/propdel-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/propdel-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/propdel-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/propdel-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* propdel-cmd.c -- Remove property from files/dirs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -91,8 +91,8 @@ svn_cl__propdel(apr_getopt_t *os,
if (! opt_state->quiet)
{
- svn_cl__get_notifier(&nwb.real_func, &nwb.real_baton, FALSE,
- FALSE, FALSE, pool);
+ SVN_ERR(svn_cl__get_notifier(&nwb.real_func, &nwb.real_baton, FALSE,
+ FALSE, FALSE, pool));
ctx->notify_func2 = notify_wrapper;
ctx->notify_baton2 = &nwb;
}
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* propedit-cmd.c -- Edit properties of files/dirs using $EDITOR
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/propget-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/propget-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/propget-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/propget-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* propget-cmd.c -- Print properties and values of files/dirs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -320,11 +320,11 @@ svn_cl__propget(apr_getopt_t *os,
like_proplist = opt_state->verbose && !opt_state->strict;
if (opt_state->xml)
- print_properties_xml(pname_utf8, props, subpool);
+ SVN_ERR(print_properties_xml(pname_utf8, props, subpool));
else
- print_properties(out, svn_path_is_url(target), pname_utf8, props,
- print_filenames, omit_newline, like_proplist,
- subpool);
+ SVN_ERR(print_properties(out, svn_path_is_url(target), pname_utf8,
+ props, print_filenames, omit_newline,
+ like_proplist, subpool));
}
if (opt_state->xml)
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/proplist-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/proplist-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/proplist-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/proplist-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* proplist-cmd.c -- List properties of files/dirs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/props.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/props.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/props.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* props.c: Utility functions for property handling
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/propset-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/propset-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/propset-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/propset-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* propset-cmd.c -- Set property values on files/dirs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -102,8 +102,8 @@ svn_cl__propset(apr_getopt_t *os,
ctx, scratch_pool));
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
/* Implicit "." is okay for revision properties; it just helps
us find the right repository. */
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/resolve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/resolve-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/resolve-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/resolve-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* resolve-cmd.c -- Subversion resolve subcommand
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -89,8 +89,8 @@ svn_cl__resolve(apr_getopt_t *os,
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_empty;
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/resolved-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/resolved-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/resolved-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/resolved-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* resolved-cmd.c -- Subversion resolved subcommand
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -60,8 +60,8 @@ svn_cl__resolved(apr_getopt_t *os,
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_empty;
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/revert-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/revert-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/revert-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/revert-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* revert-cmd.c -- Subversion revert command
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -57,8 +57,8 @@ svn_cl__revert(apr_getopt_t *os,
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
/* Revert is especially conservative, by default it is as
nonrecursive as possible. */
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/blame.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/blame.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/blame.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/blame.rnc Tue Aug 10 17:03:06 2010
@@ -1,6 +1,25 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn blame"
+
include "common.rnc"
start = blame
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/common.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/common.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/common.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/common.rnc Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# Common declarations
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/diff.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/diff.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/diff.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/diff.rnc Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn diff --summarize --xml"
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/info.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/info.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/info.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/info.rnc Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn info"
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/list.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/list.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/list.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/list.rnc Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn list"
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/log.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/log.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/log.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/log.rnc Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn log"
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/props.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/props.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/props.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/props.rnc Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn proplist"
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/schema/status.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/schema/status.rnc?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/schema/status.rnc (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/schema/status.rnc Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+# 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.
+#
+#
# XML RELAX NG schema for Subversion command-line client output
# For "svn status"
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/status-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/status-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/status-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* status-cmd.c -- Display status information in current directory
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -193,8 +193,8 @@ svn_cl__status(apr_getopt_t *os,
/* The notification callback, leave the notifier as NULL in XML mode */
if (! opt_state->xml)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
sb.had_print_error = FALSE;
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/status.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/status.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/status.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* status.c: the command-line's portion of the "svn status" command
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/svn.1
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/svn.1?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/svn.1 (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/svn.1 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/switch-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/switch-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/switch-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* switch-cmd.c -- Bring work tree in sync with a different URL
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -146,8 +146,8 @@ svn_cl__switch(apr_getopt_t *os,
switch_url = svn_uri_canonicalize(switch_url, scratch_pool);
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
/* Deal with depthstuffs. */
if (opt_state->set_depth != svn_depth_unknown)
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* tree-conflicts.c: Tree conflicts.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.h Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* tree-conflicts.h: Tree conflicts.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/unlock-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/unlock-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/unlock-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/unlock-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* unlock-cmd.c -- Unlock a working copy path.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -57,8 +57,8 @@ svn_cl__unlock(apr_getopt_t *os,
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
+ FALSE, FALSE, scratch_pool));
SVN_ERR(svn_opt_eat_peg_revisions(&targets, targets, scratch_pool));
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/update-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/update-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/update-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/update-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* update-cmd.c -- Bring work tree in sync with repository
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -74,8 +74,8 @@ svn_cl__update(apr_getopt_t *os,
}
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
/* Deal with depthstuffs. */
if (opt_state->set_depth != svn_depth_unknown)
@@ -98,6 +98,6 @@ svn_cl__update(apr_getopt_t *os,
if (! opt_state->quiet)
SVN_ERR(svn_cl__print_conflict_stats(ctx->notify_baton2, scratch_pool));
-
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/upgrade-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/upgrade-cmd.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/upgrade-cmd.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/upgrade-cmd.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* upgrade-cmd.c -- Upgrade a working copy.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -58,8 +58,8 @@ svn_cl__upgrade(apr_getopt_t *os,
svn_opt_push_implicit_dot_target(targets, scratch_pool);
if (! opt_state->quiet)
- svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- FALSE, FALSE, scratch_pool);
+ SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
+ FALSE, FALSE, FALSE, scratch_pool));
SVN_ERR(svn_opt_eat_peg_revisions(&targets, targets, scratch_pool));
Modified: subversion/branches/ignore-mergeinfo/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn/util.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn/util.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn/util.c Tue Aug 10 17:03:06 2010
@@ -4,10 +4,10 @@
* in here.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -1270,7 +1270,7 @@ svn_cl__node_description(const svn_wc_co
* Otherwise show the complete URL, and if we can't, show dots. */
if (node->repos_url &&
- (wc_repos_root_URL == NULL ||
+ (wc_repos_root_URL == NULL ||
strcmp(node->repos_url, wc_repos_root_URL) != 0))
root_str = node->repos_url;
@@ -1283,3 +1283,10 @@ svn_cl__node_description(const svn_wc_co
node->peg_rev);
}
+const char *
+svn_cl__path_join(const char *base,
+ const char *component,
+ apr_pool_t *pool)
+{
+ return svn_path_join(base, component, pool);
+}
Modified: subversion/branches/ignore-mergeinfo/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svn_private_config.hw?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svn_private_config.hw (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svn_private_config.hw Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* svn_private_config.hw : Template for svn_private_config.h on Win32.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
Modified: subversion/branches/ignore-mergeinfo/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svnadmin/main.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svnadmin/main.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svnadmin/main.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* main.c: Subversion server administration tool.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -903,9 +903,9 @@ list_dblogs(apr_getopt_t *os, void *bato
for (i = 0; i < logfiles->nelts; i++)
{
const char *log_utf8;
- log_utf8 = svn_path_join(opt_state->repository_path,
- APR_ARRAY_IDX(logfiles, i, const char *),
- pool);
+ log_utf8 = svn_dirent_join(opt_state->repository_path,
+ APR_ARRAY_IDX(logfiles, i, const char *),
+ pool);
log_utf8 = svn_dirent_local_style(log_utf8, pool);
SVN_ERR(svn_cmdline_printf(pool, "%s\n", log_utf8));
}
@@ -1611,7 +1611,7 @@ main(int argc, const char *argv[])
break;
case svnadmin__config_dir:
opt_state.config_dir =
- apr_pstrdup(pool, svn_path_canonicalize(opt_arg, pool));
+ apr_pstrdup(pool, svn_dirent_canonicalize(opt_arg, pool));
break;
case svnadmin__wait:
opt_state.wait = TRUE;
Modified: subversion/branches/ignore-mergeinfo/subversion/svnadmin/svnadmin.1
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svnadmin/svnadmin.1?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svnadmin/svnadmin.1 (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svnadmin/svnadmin.1 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"
Modified: subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/main.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/main.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/main.c Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
* main.c: Subversion dump stream filtering tool.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * 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 SVN Corp. licenses this file
+ * 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
@@ -89,7 +89,7 @@ write_prop_to_stringbuf(svn_stringbuf_t
namelen = strlen(name);
svn_stringbuf_appendbytes(*strbuf, "K ", 2);
- bytes_used = sprintf(buf, "%d", namelen);
+ bytes_used = apr_snprintf(buf, sizeof(buf), "%d", namelen);
svn_stringbuf_appendbytes(*strbuf, buf, bytes_used);
svn_stringbuf_appendbytes(*strbuf, "\n", 1);
@@ -99,7 +99,7 @@ write_prop_to_stringbuf(svn_stringbuf_t
/* Output value length, then value. */
svn_stringbuf_appendbytes(*strbuf, "V ", 2);
- bytes_used = sprintf(buf, "%" APR_SIZE_T_FMT, value->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), "%" APR_SIZE_T_FMT, value->len);
svn_stringbuf_appendbytes(*strbuf, buf, bytes_used);
svn_stringbuf_appendbytes(*strbuf, "\n", 1);
@@ -134,10 +134,15 @@ ary_prefix_match(apr_array_header_t *pfx
the PREFIXES list, and the DO_EXCLUDE option. */
static APR_INLINE svn_boolean_t
skip_path(const char *path, apr_array_header_t *prefixes,
- svn_boolean_t do_exclude)
+ svn_boolean_t do_exclude, svn_boolean_t glob)
{
+ const svn_boolean_t matches =
+ (glob
+ ? svn_cstring_match_glob_list(path, prefixes)
+ : ary_prefix_match(prefixes, path));
+
/* NXOR */
- return (ary_prefix_match(prefixes, path) ? do_exclude : !do_exclude);
+ return (matches ? do_exclude : !do_exclude);
}
@@ -170,6 +175,7 @@ struct parse_baton_t
/* Command-line options values. */
svn_boolean_t do_exclude;
svn_boolean_t quiet;
+ svn_boolean_t glob;
svn_boolean_t drop_empty_revs;
svn_boolean_t do_renumber_revs;
svn_boolean_t preserve_revprops;
@@ -353,13 +359,14 @@ output_revision(struct revision_baton_t
svn_stringbuf_appendcstr(props, "PROPS-END\n");
svn_stringbuf_appendcstr(rb->header,
SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" APR_SIZE_T_FMT, props->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT,
+ props->len);
svn_stringbuf_appendbytes(rb->header, buf, bytes_used);
svn_stringbuf_appendbytes(rb->header, "\n", 1);
}
svn_stringbuf_appendcstr(rb->header, SVN_REPOS_DUMPFILE_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" APR_SIZE_T_FMT, props->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT, props->len);
svn_stringbuf_appendbytes(rb->header, buf, bytes_used);
svn_stringbuf_appendbytes(rb->header, "\n", 1);
@@ -470,11 +477,12 @@ new_node_record(void **node_baton,
APR_HASH_KEY_STRING);
/* Ensure that paths start with a leading '/'. */
- node_path = svn_path_join("/", node_path, pool);
+ node_path = svn_uri_join("/", node_path, pool);
if (copyfrom_path)
- copyfrom_path = svn_path_join("/", copyfrom_path, pool);
+ copyfrom_path = svn_uri_join("/", copyfrom_path, pool);
- nb->do_skip = skip_path(node_path, pb->prefixes, pb->do_exclude);
+ nb->do_skip = skip_path(node_path, pb->prefixes,
+ pb->do_exclude, pb->glob);
/* If we're skipping the node, take note of path, discarding the
rest. */
@@ -493,7 +501,7 @@ new_node_record(void **node_baton,
/* Test if this node was copied from dropped source. */
if (copyfrom_path &&
- skip_path(copyfrom_path, pb->prefixes, pb->do_exclude))
+ skip_path(copyfrom_path, pb->prefixes, pb->do_exclude, pb->glob))
{
/* This node was copied from a dropped source.
We have a problem, since we did not want to drop this node too.
@@ -614,7 +622,8 @@ output_node(struct node_baton_t *nb)
{
svn_stringbuf_appendcstr(nb->header,
SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" APR_SIZE_T_FMT, nb->props->len);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT,
+ nb->props->len);
svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
svn_stringbuf_appendbytes(nb->header, "\n", 1);
}
@@ -622,13 +631,14 @@ output_node(struct node_baton_t *nb)
{
svn_stringbuf_appendcstr(nb->header,
SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" SVN_FILESIZE_T_FMT, nb->tcl);
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" SVN_FILESIZE_T_FMT,
+ nb->tcl);
svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
svn_stringbuf_appendbytes(nb->header, "\n", 1);
}
svn_stringbuf_appendcstr(nb->header, SVN_REPOS_DUMPFILE_CONTENT_LENGTH);
- bytes_used = sprintf(buf, ": %" SVN_FILESIZE_T_FMT,
- (svn_filesize_t) (nb->props->len + nb->tcl));
+ bytes_used = apr_snprintf(buf, sizeof(buf), ": %" SVN_FILESIZE_T_FMT,
+ (svn_filesize_t) (nb->props->len + nb->tcl));
svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
svn_stringbuf_appendbytes(nb->header, "\n", 1);
@@ -668,7 +678,7 @@ adjust_mergeinfo(svn_string_t **final_va
int i;
/* Determine whether the merge_source is a part of the prefix. */
- if (skip_path(merge_source, pb->prefixes, pb->do_exclude))
+ if (skip_path(merge_source, pb->prefixes, pb->do_exclude, pb->glob))
{
if (pb->skip_missing_merge_sources)
continue;
@@ -864,6 +874,7 @@ enum
svndumpfilter__skip_missing_merge_sources,
svndumpfilter__targets,
svndumpfilter__quiet,
+ svndumpfilter__glob,
svndumpfilter__version
};
@@ -883,6 +894,8 @@ static const apr_getopt_option_t options
N_("show program version information") },
{"quiet", svndumpfilter__quiet, 0,
N_("Do not display filtering statistics.") },
+ {"pattern", svndumpfilter__glob, 0,
+ N_("Treat the path prefixes as file glob patterns.") },
{"drop-empty-revs", svndumpfilter__drop_empty_revs, 0,
N_("Remove revisions emptied by filtering.")},
{"renumber-revs", svndumpfilter__renumber_revs, 0,
@@ -908,14 +921,16 @@ static const svn_opt_subcommand_desc2_t
"usage: svndumpfilter exclude PATH_PREFIX...\n"),
{svndumpfilter__drop_empty_revs, svndumpfilter__renumber_revs,
svndumpfilter__skip_missing_merge_sources, svndumpfilter__targets,
- svndumpfilter__preserve_revprops, svndumpfilter__quiet} },
+ svndumpfilter__preserve_revprops, svndumpfilter__quiet,
+ svndumpfilter__glob} },
{"include", subcommand_include, {0},
N_("Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"),
{svndumpfilter__drop_empty_revs, svndumpfilter__renumber_revs,
svndumpfilter__skip_missing_merge_sources, svndumpfilter__targets,
- svndumpfilter__preserve_revprops, svndumpfilter__quiet} },
+ svndumpfilter__preserve_revprops, svndumpfilter__quiet,
+ svndumpfilter__glob} },
{"help", subcommand_help, {"?", "h"},
N_("Describe the usage of this program or its subcommands.\n"
@@ -932,6 +947,7 @@ struct svndumpfilter_opt_state
svn_opt_revision_t start_revision; /* -r X[:Y] is */
svn_opt_revision_t end_revision; /* not implemented. */
svn_boolean_t quiet; /* --quiet */
+ svn_boolean_t glob; /* --pattern */
svn_boolean_t version; /* --version */
svn_boolean_t drop_empty_revs; /* --drop-empty-revs */
svn_boolean_t help; /* --help or -? */
@@ -965,6 +981,7 @@ parse_baton_initialize(struct parse_bato
baton->drop_empty_revs = opt_state->drop_empty_revs;
baton->preserve_revprops = opt_state->preserve_revprops;
baton->quiet = opt_state->quiet;
+ baton->glob = opt_state->glob;
baton->prefixes = opt_state->prefixes;
baton->skip_missing_merge_sources = opt_state->skip_missing_merge_sources;
baton->rev_drop_count = 0; /* used to shift revnums while filtering */
@@ -1044,16 +1061,32 @@ do_filter(apr_getopt_t *os,
{
apr_pool_t *subpool = svn_pool_create(pool);
- SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
- do_exclude
- ? opt_state->drop_empty_revs
- ? _("Excluding (and dropping empty "
- "revisions for) prefixes:\n")
- : _("Excluding prefixes:\n")
- : opt_state->drop_empty_revs
- ? _("Including (and dropping empty "
- "revisions for) prefixes:\n")
- : _("Including prefixes:\n")));
+ if (opt_state->glob)
+ {
+ SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
+ do_exclude
+ ? opt_state->drop_empty_revs
+ ? _("Excluding (and dropping empty "
+ "revisions for) prefixes:\n")
+ : _("Excluding prefixes:\n")
+ : opt_state->drop_empty_revs
+ ? _("Including (and dropping empty "
+ "revisions for) prefixes:\n")
+ : _("Including prefixes:\n")));
+ }
+ else
+ {
+ SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
+ do_exclude
+ ? opt_state->drop_empty_revs
+ ? _("Excluding (and dropping empty "
+ "revisions for) prefix patterns:\n")
+ : _("Excluding prefix patterns:\n")
+ : opt_state->drop_empty_revs
+ ? _("Including (and dropping empty "
+ "revisions for) prefix patterns:\n")
+ : _("Including prefix patterns:\n")));
+ }
for (i = 0; i < opt_state->prefixes->nelts; i++)
{
@@ -1271,6 +1304,9 @@ main(int argc, const char *argv[])
case svndumpfilter__quiet:
opt_state.quiet = TRUE;
break;
+ case svndumpfilter__glob:
+ opt_state.glob = TRUE;
+ break;
case svndumpfilter__drop_empty_revs:
opt_state.drop_empty_revs = TRUE;
break;
@@ -1366,8 +1402,8 @@ main(int argc, const char *argv[])
/* Ensure that each prefix is UTF8-encoded, in internal
style, and absolute. */
SVN_INT_ERR(svn_utf_cstring_to_utf8(&prefix, os->argv[i], pool));
- prefix = svn_dirent_internal_style(prefix, pool);
- prefix = svn_path_join("/", prefix, pool);
+ prefix = svn_relpath_internal_style(prefix, pool);
+ prefix = svn_uri_join("/", prefix, pool);
APR_ARRAY_PUSH(opt_state.prefixes, const char *) = prefix;
}
Modified: subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/svndumpfilter.1
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/svndumpfilter.1?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/svndumpfilter.1 (original)
+++ subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/svndumpfilter.1 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,23 @@
+.\"
+.\"
+.\" 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.
+.\"
+.\"
.\" You can view this file with:
.\" nroff -man [filename]
.\"