Modified: subversion/trunk/subversion/libsvn_subr/x509parse.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/x509parse.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/x509parse.c (original) +++ subversion/trunk/subversion/libsvn_subr/x509parse.c Wed Mar 25 09:04:28 2020 @@ -262,7 +262,7 @@ x509_get_alg(const unsigned char **p, co if (*p == end) return SVN_NO_ERROR; - + /* The OID encoding of 1.2.840.113549.1.1.10 (id-RSASSA-PSS) */ #define OID_RSASSA_PSS "\x2a\x86\x48\x86\xf7\x0d\x01\x01\x0a"
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/conflicts.c (original) +++ subversion/trunk/subversion/libsvn_wc/conflicts.c Wed Mar 25 09:04:28 2020 @@ -1386,7 +1386,7 @@ generate_propconflict(svn_boolean_t *con } case svn_wc_conflict_choose_merged: { - if (!cdesc->merged_file + if (!cdesc->merged_file && (!result->merged_file && !result->merged_value)) return svn_error_create (SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, @@ -2381,7 +2381,7 @@ svn_wc__read_conflict_descriptions2_t(co apr_pool_t *result_pool, apr_pool_t *scratch_pool) { - return svn_wc__read_conflicts(conflicts, NULL, wc_ctx->db, local_abspath, + return svn_wc__read_conflicts(conflicts, NULL, wc_ctx->db, local_abspath, FALSE, FALSE, result_pool, scratch_pool); } @@ -2637,7 +2637,7 @@ resolve_prop_conflict_on_node(svn_boolea return SVN_NO_ERROR; } -/* +/* * Record a tree conflict resolution failure due to error condition ERR * in the RESOLVE_LATER hash table. If the hash table is not available * (meaning the caller does not wish to retry resolution later), or if Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/conflicts.h (original) +++ subversion/trunk/subversion/libsvn_wc/conflicts.h Wed Mar 25 09:04:28 2020 @@ -220,7 +220,7 @@ svn_wc__conflict_skel_add_prop_conflict( with (1), MOVE_SRC_OP_ROOT_ABSPATH should be A/B for a conflict associated with (2). MOVE_DST_OP_ROOT_ABSPATH is the op-root of the move target (i.e. the - op-root of the corresponding copy). This needs to be stored because + op-root of the corresponding copy). This needs to be stored because moves in the NODE table do not always persist after an update, while the conflict resolver may need information about the pre-update state of the move. Modified: subversion/trunk/subversion/libsvn_wc/entries.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/entries.c (original) +++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Mar 25 09:04:28 2020 @@ -781,7 +781,7 @@ read_one_entry(const svn_wc_entry_t **ne if (parent_root_url != NULL && strcmp(original_root_url, parent_root_url) == 0) { - + const char *relpath_to_entry = svn_dirent_is_child( op_root_abspath, entry_abspath, NULL); const char *entry_repos_relpath = svn_relpath_join( @@ -1049,7 +1049,7 @@ read_entries_new(apr_hash_t **result_ent svn_pool_clear(iterpool); SVN_ERR(read_one_entry(&entry, - db, dir_abspath, + db, dir_abspath, wcroot, dir_relpath, name, parent_entry, result_pool, iterpool)); Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/upgrade.c (original) +++ subversion/trunk/subversion/libsvn_wc/upgrade.c Wed Mar 25 09:04:28 2020 @@ -1667,7 +1667,7 @@ svn_wc__upgrade_sdb(int *result_format, "use the current client"), svn_dirent_local_style(wcroot_abspath, scratch_pool), - start_format); + start_format); /* ### need lock-out. only one upgrade at a time. note that other code ### cannot use this un-upgraded database until we finish the upgrade. */ Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original) +++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Wed Mar 25 09:04:28 2020 @@ -260,7 +260,7 @@ WHERE wc_id = ?1 AND IS_STRICT_DESCENDAN -- STMT_DELETE_BASE_RECURSIVE DELETE FROM nodes -WHERE wc_id = ?1 AND (local_relpath = ?2 +WHERE wc_id = ?1 AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2)) AND op_depth = 0 Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Mar 25 09:04:28 2020 @@ -2374,7 +2374,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro /* For file externals we only want to place a not present marker if there is a BASE parent */ - + svn_relpath_split(&parent_local_relpath, &name, local_relpath, scratch_pool); @@ -6702,7 +6702,7 @@ svn_wc__db_op_mark_resolved_internal(svn return SVN_NO_ERROR; conflicts = svn_skel__parse(conflict_data, conflict_len, scratch_pool); - + SVN_ERR(svn_wc__conflict_skel_resolve(&resolved_all, conflicts, db, wcroot->abspath, @@ -16616,7 +16616,7 @@ svn_wc__db_find_repos_node_in_wc(apr_arr SVN_ERR(svn_sqlite__step(&have_row, stmt)); } - + return svn_error_trace(svn_sqlite__reset(stmt)); } Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Wed Mar 25 09:04:28 2020 @@ -95,7 +95,7 @@ * to avoid tree conflicts where the "incoming" and "local" change both * originated in the working copy, because the resolver code cannot handle * such tree conflicts at present. - * + * * The whole drive occurs as one single wc.db transaction. At the end * of the transaction the destination NODES table should have a WORKING * layer that is equivalent to the WORKING layer found in the copied victim @@ -1056,7 +1056,7 @@ tc_editor_incoming_add_file(node_move_ba SVN_ERR(svn_wc__wq_build_file_remove(&work_item, b->db, b->wcroot->abspath, src_abspath, scratch_pool, scratch_pool)); - + work_items = svn_wc__wq_merge(work_items, work_item, scratch_pool); } @@ -2527,7 +2527,7 @@ update_incoming_moved_node(node_move_bat SVN_ERR(svn_stream_open_unique(&temp_stream, &temp_abspath, wctemp_abspath, svn_io_file_del_none, scratch_pool, scratch_pool)); - err = svn_stream_copy3(working_stream, temp_stream, + err = svn_stream_copy3(working_stream, temp_stream, b->cancel_func, b->cancel_baton, scratch_pool); if (err && err->apr_err == SVN_ERR_CANCELLED) @@ -2692,7 +2692,7 @@ update_incoming_move(svn_revnum_t *old_r * recorded for any tree conflicts created during the editor drive. * We assume this path contains no local changes, and create local changes * in DST_RELPATH corresponding to changes contained in the conflict victim. - * + * * DST_OP_DEPTH is used to infer the "op-root" of the incoming move. This * "op-root" is virtual because all nodes belonging to the incoming move * live in the BASE tree. It is used for constructing repository paths @@ -2988,7 +2988,7 @@ tc_editor_update_add_new_file(added_node nb->skip = TRUE; return SVN_NO_ERROR; } - + /* Check for obstructions. */ local_abspath = svn_dirent_join(nb->b->wcroot->abspath, nb->local_relpath, scratch_pool); @@ -3589,7 +3589,7 @@ svn_wc__db_update_local_add(svn_wc__db_t VERIFY_USABLE_WCROOT(wcroot); SVN_WC__DB_WITH_TXN(update_local_add(&new_rev, db, wcroot, - local_relpath, + local_relpath, cancel_func, cancel_baton, scratch_pool), wcroot); @@ -4258,7 +4258,7 @@ svn_wc__db_op_raise_moved_away(svn_wc__d scratch_pool), wcroot); - /* These version numbers are valid for update/switch notifications + /* These version numbers are valid for update/switch notifications only! */ SVN_ERR(svn_wc__db_update_move_list_notify(wcroot, (left_version Modified: subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c (original) +++ subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c Wed Mar 25 09:04:28 2020 @@ -92,7 +92,7 @@ typedef struct authz_svn_config_rec { # define USE_FORCE_AUTHN 1 # define IN_SOME_AUTHN_NOTE "authz_svn-in-some-authn" # define FORCE_AUTHN_NOTE "authz_svn-force-authn" -# else +# else /* ap_some_auth_required() is busted and no viable alternative exists */ # ifndef SVN_ALLOW_BROKEN_HTTPD_AUTH # error This Apache httpd has broken auth (CVE-2015-3184) @@ -961,7 +961,7 @@ access_checker(request_rec *r) else return HTTP_FORBIDDEN; } - } + } #else /* Support for older versions of httpd that have a working Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original) +++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Wed Mar 25 09:04:28 2020 @@ -231,8 +231,8 @@ merge_server_config(apr_pool_t *p, void newconf->compression_level = child->compression_level; } - newconf->use_utf8 = INHERIT_VALUE(parent, child, use_utf8); - svn_utf_initialize2(newconf->use_utf8, p); + newconf->use_utf8 = INHERIT_VALUE(parent, child, use_utf8); + svn_utf_initialize2(newconf->use_utf8, p); return newconf; } Modified: subversion/trunk/subversion/mod_dav_svn/reports/list.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/list.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/reports/list.c (original) +++ subversion/trunk/subversion/mod_dav_svn/reports/list.c Wed Mar 25 09:04:28 2020 @@ -141,7 +141,7 @@ list_receiver(const char *path, } SVN_ERR(maybe_send_header(b)); - + /* If we need to close the element, then send the attributes that apply to all changed items and then close the element. */ SVN_ERR(dav_svn__brigade_printf(b->bb, b->output, Modified: subversion/trunk/subversion/mod_dav_svn/reports/log.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/log.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/reports/log.c (original) +++ subversion/trunk/subversion/mod_dav_svn/reports/log.c Wed Mar 25 09:04:28 2020 @@ -125,7 +125,7 @@ start_path_with_copy_from(const char **e { switch (log_item->change_kind) { - case svn_fs_path_change_add: + case svn_fs_path_change_add: *element = "S:added-path"; break; @@ -244,7 +244,7 @@ log_revision_receiver(void *baton, SVN_ERR(maybe_start_log_item(lrb)); lrb->needs_log_item = TRUE; - /* Path changes have been processed already. + /* Path changes have been processed already. Now send the remaining per-revision info. */ SVN_ERR(dav_svn__brigade_printf(lrb->bb, lrb->output, "<D:version-name>%ld" Modified: subversion/trunk/subversion/mod_dav_svn/repos.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/repos.c (original) +++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Mar 25 09:04:28 2020 @@ -3224,7 +3224,7 @@ set_headers(request_rec *r, const dav_re if (!resource->exists) return NULL; - if ((resource->type == DAV_RESOURCE_TYPE_REGULAR) + if ((resource->type == DAV_RESOURCE_TYPE_REGULAR) && resource->info->is_public_uri) { /* Include Last-Modified header for 'external' GET or HEAD requests Modified: subversion/trunk/subversion/svn/cl.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svn/cl.h (original) +++ subversion/trunk/subversion/svn/cl.h Wed Mar 25 09:04:28 2020 @@ -501,7 +501,7 @@ svn_error_t * svn_cl__print_conflict_stats(svn_cl__conflict_stats_t *conflict_stats, apr_pool_t *scratch_pool); -/* +/* * Interactively resolve the conflict a @a CONFLICT. * TODO: more docs */ @@ -518,7 +518,7 @@ svn_cl__resolve_conflict(svn_boolean_t * svn_client_ctx_t *ctx, apr_pool_t *scratch_pool); -/* +/* * Interactively resolve conflicts for all TARGETS. * TODO: more docs */ Modified: subversion/trunk/subversion/svn/conflict-callbacks.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svn/conflict-callbacks.c (original) +++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Mar 25 09:04:28 2020 @@ -234,7 +234,7 @@ merge_prop_conflict(svn_stream_t *output my_propval = svn_string_create_empty(pool); if (their_propval == NULL) their_propval = svn_string_create_empty(pool); - + options->ignore_eol_style = TRUE; SVN_ERR(svn_diff_mem_string_diff3(&diff, base_propval, merged_propval ? @@ -361,7 +361,7 @@ edit_prop_conflict(const svn_string_t ** svn_stringbuf_t *buf; SVN_ERR(svn_stringbuf_from_file2(&buf, file_path, scratch_pool)); - *merged_propval = svn_string_create_from_buf(buf, result_pool); + *merged_propval = svn_string_create_from_buf(buf, result_pool); } return SVN_NO_ERROR; @@ -900,7 +900,7 @@ handle_text_conflict(svn_boolean_t *reso const char *their_abspath; const char *merged_abspath = svn_client_conflict_get_local_abspath(conflict); apr_array_header_t *text_conflict_options; - svn_client_conflict_option_id_t option_id; + svn_client_conflict_option_id_t option_id; option_id = svn_client_conflict_option_unspecified; @@ -1559,11 +1559,11 @@ build_tree_conflict_options( /* Add move target choice options only if there are multiple * move targets to choose from. */ if (strcmp(o->code, "d") == 0 && - (*possible_moved_to_repos_relpaths == NULL || + (*possible_moved_to_repos_relpaths == NULL || (*possible_moved_to_repos_relpaths)->nelts <= 1)) continue; if (strcmp(o->code, "w") == 0 && - (*possible_moved_to_abspaths == NULL || + (*possible_moved_to_abspaths == NULL || (*possible_moved_to_abspaths)->nelts <= 1)) continue; @@ -1689,7 +1689,7 @@ find_conflict_option_with_repos_move_tar apr_pool_t *iterpool = svn_pool_create(scratch_pool); int i; apr_array_header_t *possible_moved_to_repos_relpaths = NULL; - + *option_with_move_targets = NULL; for (i = 0; i < options->nelts; i++) @@ -1720,7 +1720,7 @@ find_conflict_option_with_working_copy_m apr_pool_t *iterpool = svn_pool_create(scratch_pool); int i; apr_array_header_t *possible_moved_to_abspaths = NULL; - + *option_with_move_targets = NULL; for (i = 0; i < options->nelts; i++) Modified: subversion/trunk/subversion/svn/resolve-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/resolve-cmd.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svn/resolve-cmd.c (original) +++ subversion/trunk/subversion/svn/resolve-cmd.c Wed Mar 25 09:04:28 2020 @@ -109,7 +109,7 @@ svn_cl__walk_conflicts(apr_array_header_ svn_client_conflict_t *conflict; svn_pool_clear(iterpool); - + SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton)); SVN_ERR(svn_dirent_get_absolute(&local_abspath, target, iterpool)); Modified: subversion/trunk/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svn/svn.c (original) +++ subversion/trunk/subversion/svn/svn.c Wed Mar 25 09:04:28 2020 @@ -605,9 +605,9 @@ svn_cl__cmd_table_main[] = " referenced by any file in the working copy.\n" )}, { opt_remove_unversioned, opt_remove_ignored, opt_vacuum_pristines, - opt_include_externals, 'q', opt_merge_cmd }, + opt_include_externals, 'q', opt_merge_cmd }, { { opt_merge_cmd, N_("deprecated and ignored") } } }, - + { "commit", svn_cl__commit, {"ci"}, {N_( "Send changes from your working copy to the repository.\n" "usage: commit [PATH...]\n" Modified: subversion/trunk/subversion/svnadmin/svnadmin.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svnadmin/svnadmin.c (original) +++ subversion/trunk/subversion/svnadmin/svnadmin.c Wed Mar 25 09:04:28 2020 @@ -1833,7 +1833,7 @@ subcommand_lstxns(apr_getopt_t *os, void SVN_ERR(svn_fs_youngest_rev(&youngest, fs, pool)); SVN_ERR(get_revnum(&limit, &opt_state->start_revision, youngest, repos, pool)); - + iterpool = svn_pool_create(pool); for (i = 0; i < txns->nelts; i++) { Modified: subversion/trunk/subversion/svnmucc/svnmucc.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svnmucc/svnmucc.c (original) +++ subversion/trunk/subversion/svnmucc/svnmucc.c Wed Mar 25 09:04:28 2020 @@ -632,7 +632,7 @@ sub_main(int *exit_code, int argc, const case config_inline_opt: SVN_ERR(svn_utf_cstring_to_utf8(&opt_arg, arg, pool)); SVN_ERR(svn_cmdline__parse_config_option(config_options, opt_arg, - "svnmucc: ", + "svnmucc: ", pool)); break; case no_auth_cache_opt: Modified: subversion/trunk/subversion/svnrdump/svnrdump.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svnrdump/svnrdump.c (original) +++ subversion/trunk/subversion/svnrdump/svnrdump.c Wed Mar 25 09:04:28 2020 @@ -925,7 +925,7 @@ sub_main(int *exit_code, int argc, const SVN_ERR(svn_utf_cstring_to_utf8(&opt_arg, opt_arg, pool)); SVN_ERR(svn_cmdline__parse_config_option(config_options, - opt_arg, + opt_arg, "svnrdump: ", pool)); break; Modified: subversion/trunk/subversion/svnsync/svnsync.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/svnsync.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/svnsync/svnsync.c (original) +++ subversion/trunk/subversion/svnsync/svnsync.c Wed Mar 25 09:04:28 2020 @@ -294,7 +294,7 @@ static const apr_getopt_option_t svnsync typedef struct opt_baton_t { svn_boolean_t non_interactive; - struct { + struct { svn_boolean_t trust_server_cert_unknown_ca; svn_boolean_t trust_server_cert_cn_mismatch; svn_boolean_t trust_server_cert_expired; Modified: subversion/trunk/subversion/tests/afl/afl-svndiff.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/afl/afl-svndiff.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/afl/afl-svndiff.c (original) +++ subversion/trunk/subversion/tests/afl/afl-svndiff.c Wed Mar 25 09:04:28 2020 @@ -56,7 +56,7 @@ parse(const char *filename, apr_pool_t * stream = svn_txdelta_parse_svndiff(txdelta_window_handler, NULL, TRUE, pool); SVN_ERR(svn_stream_copy3(svndiff, stream, NULL, NULL, pool)); - + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Wed Mar 25 09:04:28 2020 @@ -3105,7 +3105,7 @@ def plaintext_password_storage_disabled( servers_file = open(os.path.join(config_dir_path, "servers"), "w") servers_file.write("[global]\nstore-plaintext-passwords=no\n") servers_file.close() - + svntest.main.run_command(svntest.main.svn_binary, False, False, "commit", "--config-dir", config_dir_path, "-m", "committing with plaintext password storage disabled", Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Wed Mar 25 09:04:28 2020 @@ -2846,7 +2846,7 @@ def commit_excluded(sbox): expected_output = svntest.wc.State(wc_dir, { 'D' : Item(verb='Adding'), }) - + expected_status.add({ 'D' : Item(status=' ', wc_rev='2'), 'D/H' : Item(status=' ', wc_rev='2'), @@ -2971,10 +2971,10 @@ def fold_tree_with_unversioned_items(sbo # Set A to be excluded. svntest.main.run_svn(None, 'update', '--set-depth=exclude', A_path) - + # try a simple update afterwards sbox.simple_update() - + #---------------------------------------------------------------------- # list all tests here, starting with None: test_list = [ None, Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/getopt_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/getopt_tests.py Wed Mar 25 09:04:28 2020 @@ -229,7 +229,7 @@ def getopt_config_option(sbox): expected_stderr = '.*W205000.*did you mean.*' expected_stdout = svntest.verify.AnyOutput svntest.actions.run_and_verify_svn2(expected_stdout, expected_stderr, 0, - 'info', + 'info', '--config-option', 'config:miscellanous:diff-extensions=' + '-u -p', Modified: subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py Wed Mar 25 09:04:28 2020 @@ -167,7 +167,7 @@ def anon(sbox): write_authz_file(sbox) - anon_tests = ( + anon_tests = ( { 'path': '', 'status': 301 }, { 'path': '/', 'status': 200 }, { 'path': '/repos', 'status': 301 }, Modified: subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py Wed Mar 25 09:04:28 2020 @@ -102,7 +102,7 @@ def compare_xml_elem(a, b): # iteration. def sortcmp(x, y): return compare_xml_elem(x, y)[0] - + a_children = sorted(list(a), key=functools.cmp_to_key(sortcmp)) b_children = sorted(list(b), key=functools.cmp_to_key(sortcmp)) @@ -686,7 +686,7 @@ def last_modified_header(sbox): raise svntest.Failure('Unexpected Last-Modified header: %s' % last_modified) r.read() - + ######################################################################## # Run the tests Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/move_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/move_tests.py Wed Mar 25 09:04:28 2020 @@ -1755,7 +1755,7 @@ def move_conflict_markers(sbox): }) expected_disk.remove('iota', 'iota.prej', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta', - 'A/B/E/dir_conflicts.prej', + 'A/B/E/dir_conflicts.prej', 'A/B/E/beta.prej') expected_disk.add({ 'A/iotb' : Item(contents="This is the file 'iota'.\n"), Modified: subversion/trunk/subversion/tests/cmdline/relocate_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/relocate_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/relocate_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/relocate_tests.py Wed Mar 25 09:04:28 2020 @@ -417,8 +417,8 @@ def prefix_partial_component(sbox): wc_dir) svntest.actions.run_and_verify_info([{ 'URL' : '.*.yyyother$' }], wc_dir) - - + + ######################################################################## # Run the tests Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Wed Mar 25 09:04:28 2020 @@ -1606,7 +1606,7 @@ def status_dash_u_deleted_directories(sb os.path.join("B", "E", "alpha"), "D 1 1 jrandom %s\n" % \ os.path.join("B", "E", "beta"), - "D 1 1 jrandom %s\n" % + "D 1 1 jrandom %s\n" % os.path.join("B", "F"), "Status against revision: 1\n" ]) svntest.actions.run_and_verify_svn(expected, Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Wed Mar 25 09:04:28 2020 @@ -3220,7 +3220,7 @@ def load_no_svndate_r0(sbox): b"Content-length: 10\n", b"\n", b"PROPS-END\n", b"\n"] svntest.actions.run_and_verify_load(sbox.repo_dir, dump_old) - + # svn:date should have been removed svntest.actions.run_and_verify_svnlook([], [], 'proplist', '--revprop', '-r0', @@ -4000,7 +4000,7 @@ V 27 2005-05-03T19:10:19.975578Z PROPS-END -Node-path: +Node-path: Node-kind: dir Node-action: change Prop-content-length: 32 Modified: subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py Wed Mar 25 09:04:28 2020 @@ -185,7 +185,7 @@ def test_stats(sbox): '.*\d+ bytes in .*\d+ file property representations', '.*\d+ average delta chain length', '.*\d+ bytes in header & footer overhead' ], - '.* representation statistics:' : + '.* representation statistics:' : ['.*\d+ bytes in .*\d+ reps', '.*\d+ bytes in .*\d+ shared reps', '.*\d+ bytes expanded size', Modified: subversion/trunk/subversion/tests/cmdline/svnmover_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnmover_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnmover_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnmover_tests.py Wed Mar 25 09:04:28 2020 @@ -1545,7 +1545,7 @@ def replace_via_rm_cp(sbox): """replace by deleting and copying""" sbox_build_svnmover(sbox) - + expected_eids = svntest.wc.State('', { 'B0' : Item(eid=0), 'B0/X' : Item(eid=1), @@ -1572,7 +1572,7 @@ def replace_via_rm_cp(sbox): test_svnmover_verify_log(sbox.repo_url, ['D /top0/X/A', 'A /top0/X/A (from /top0/X/A:1)']) - + @XFail() # After making a commit, svnmover currently can't (within the same execution) # look up paths in the revision it just committed. Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Wed Mar 25 09:04:28 2020 @@ -2181,7 +2181,7 @@ def set_prop(name, value, path, expected file = None else: raise TypeError(value) - + if file is None: propset += (name, value, path) else: Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Wed Mar 25 09:04:28 2020 @@ -829,7 +829,7 @@ class State: match = _re_parse_eid_ele.search(line) if match and match.group(2) != 'none': eid = match.group(1) - parent_eid = match.group(3) + parent_eid = match.group(3) path = match.group(4) if path == '.': path = '' @@ -851,7 +851,7 @@ class State: add_to_desc(eids, desc, branch_id) return cls('', desc) - + class StateItem: """Describes an individual item within a working copy. Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/update_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/update_tests.py Wed Mar 25 09:04:28 2020 @@ -6854,16 +6854,16 @@ def update_delete_switched(sbox): @XFail() def update_add_missing_local_add(sbox): "update adds missing local addition" - + sbox.build(read_only=True) - + # Note that updating 'A' to r0 doesn't reproduce this issue... sbox.simple_update('', revision='0') sbox.simple_mkdir('A') sbox.simple_add_text('mumumu', 'A/mu') os.unlink(sbox.ospath('A/mu')) os.rmdir(sbox.ospath('A')) - + sbox.simple_update() # Verify that deleting an unmodified directory leaves behind any unversioned Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Wed Mar 25 09:04:28 2020 @@ -154,7 +154,7 @@ assert_text_conflict_options(svn_client_ return SVN_NO_ERROR; } -/* +/* * The following tests verify resolution of "incoming file add vs. * local file obstruction upon merge" tree conflicts. */ @@ -482,7 +482,7 @@ test_merge_incoming_added_file_replace_a return SVN_NO_ERROR; } -/* +/* * The following tests verify resolution of "incoming dir add vs. * local dir obstruction upon merge" tree conflicts. */ @@ -1453,7 +1453,7 @@ test_merge_incoming_delete_file_ignore(c SVN_TEST_ASSERT(!status->file_external); SVN_TEST_ASSERT(status->moved_from_abspath == NULL); SVN_TEST_ASSERT(status->moved_to_abspath == NULL); - + SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, deleted_path), ctx, b->pool, b->pool)); @@ -1806,7 +1806,7 @@ test_update_incoming_delete_file_ignore( SVN_TEST_ASSERT(!status->file_external); SVN_TEST_ASSERT(status->moved_from_abspath == NULL); SVN_TEST_ASSERT(status->moved_to_abspath == NULL); - + SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, deleted_path), ctx, b->pool, b->pool)); @@ -2116,7 +2116,7 @@ create_wc_with_incoming_delete_dir_confl if (local_add) { const char *new_child_path; - + new_child_path = svn_relpath_join(branch_path, svn_relpath_join(deleted_dir_name, new_file_name_branch, @@ -4127,7 +4127,7 @@ create_wc_with_dir_add_vs_dir_add_update SVN_ERR(svn_io_dir_make(sbox_wc_path(b, new_file_child_path), APR_OS_DEFAULT, b->pool)); - /* Update to the HEAD revision. + /* Update to the HEAD revision. * This should raise an "incoming add vs local add" tree conflict. */ SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM)); @@ -5026,7 +5026,7 @@ test_cherry_pick_post_move_edit(const sv /* And "A1/mu" should have expected contents. */ SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool)); - SVN_TEST_STRING_ASSERT(buf->data, + SVN_TEST_STRING_ASSERT(buf->data, "<<<<<<< .working" "\n" "This is the file 'mu'." "\n" "||||||| .old" "\n" @@ -6732,7 +6732,7 @@ test_merge_file_move_vs_file_move_accept struct status_baton sb; struct svn_client_status_t *status; - SVN_ERR(svn_test__sandbox_create(b, + SVN_ERR(svn_test__sandbox_create(b, "merge_file_move_vs_file_move_accept_move", opts, pool)); Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/fs-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Wed Mar 25 09:04:28 2020 @@ -7219,7 +7219,7 @@ test_cache_clear_during_stream(const svn * Just to be sure, make it not too uniform to keep self-txdelta at bay. */ SVN_ERR(svn_fs_apply_textdelta(&consumer_func, &consumer_baton, txn_root, "/foo", NULL, NULL, subpool)); - stream = svn_txdelta_target_push(consumer_func, consumer_baton, + stream = svn_txdelta_target_push(consumer_func, consumer_baton, svn_stream_empty(subpool), subpool); for (i = 0; i < 10000; ++ i) { Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c Wed Mar 25 09:04:28 2020 @@ -1694,7 +1694,7 @@ compare_0_length_rep(const svn_test_opts enum { COUNT = 5 }; const char *file_names[COUNT] = { no_rep_file, - empty_plain_file, + empty_plain_file, plain_file, empty_delta_file, delta_file }; Modified: subversion/trunk/subversion/tests/libsvn_ra/ra-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_ra/ra-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_ra/ra-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_ra/ra-test.c Wed Mar 25 09:04:28 2020 @@ -1661,16 +1661,16 @@ commit_empty_last_change(const svn_test_ SVN_ERR(svn_ra_get_commit_editor3(session, &editor, &edit_baton, revprop_table, NULL, NULL, NULL, TRUE, tmp_pool)); - + SVN_ERR(editor->open_root(edit_baton, 1, tmp_pool, &root_baton)); SVN_ERR(editor->close_directory(root_baton, tmp_pool)); SVN_ERR(editor->close_edit(edit_baton, tmp_pool)); - + SVN_ERR(svn_ra_stat(session, "", 2+i, &dirent, tmp_pool)); - + SVN_TEST_ASSERT(dirent != NULL); SVN_TEST_STRING_ASSERT(dirent->last_author, "jrandom"); - + /* BDB used to only updates last_changed on the repos_root when there was an actual change. Now all filesystems behave in the same way */ SVN_TEST_INT_ASSERT(dirent->created_rev, 2+i); Modified: subversion/trunk/subversion/tests/libsvn_repos/authz-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/authz-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_repos/authz-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_repos/authz-test.c Wed Mar 25 09:04:28 2020 @@ -481,7 +481,7 @@ issue_4741_groups(apr_pool_t *pool) static svn_error_t * reposful_reposless_stanzas_inherit(apr_pool_t *pool) { - const char rules[] = + const char rules[] = "[groups]" NL "company = user1, user2, user3" NL "customer = customer1, customer2" NL Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Wed Mar 25 09:04:28 2020 @@ -4154,7 +4154,7 @@ mkdir_delete_copy(svn_repos_t *repos, svn_fs_root_t *txn_root, *rev_root; SVN_ERR(svn_fs_youngest_rev(&youngest_rev, fs, pool)); - + SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool)); SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool)); SVN_ERR(svn_fs_make_dir(txn_root, "A/T", pool)); Modified: subversion/trunk/subversion/tests/libsvn_subr/io-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/io-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/io-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/io-test.c Wed Mar 25 09:04:28 2020 @@ -1176,7 +1176,7 @@ test_apr_trunc_workaround(apr_pool_t *po SVN_ERR(svn_io_file_seek(f, APR_CUR, &offset, pool)); SVN_TEST_ASSERT(offset == (int)len); - return SVN_NO_ERROR; + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Wed Mar 25 09:04:28 2020 @@ -911,7 +911,7 @@ test_prop_conflict_resolving(const svn_t SVN_TEST_STRING_ASSERT(value, "r1"); value = svn_prop_get_value(props, "prop-3"); SVN_TEST_STRING_ASSERT(value, "mod"); - + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Mar 25 09:04:28 2020 @@ -1770,7 +1770,7 @@ test_db_make_copy(const svn_test_opts_t }; SVN_ERR(insert_dirs(&b, before)); - SVN_ERR(svn_wc__db_op_make_copy(b.wc_ctx->db, sbox_wc_path(&b, "A"), + SVN_ERR(svn_wc__db_op_make_copy(b.wc_ctx->db, sbox_wc_path(&b, "A"), NULL, NULL, pool)); SVN_ERR(check_db_rows(&b, "", after)); Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c Wed Mar 25 09:04:28 2020 @@ -323,7 +323,7 @@ parse_explanation_item(struct explanatio } else if (MATCH_TOKEN(token, "CONSTANT")) { - item->table = "sqlite_master"; /* not worth checking. + item->table = "sqlite_master"; /* not worth checking. Just a lookup */ token = apr_strtok(NULL, " ", &last); if (!MATCH_TOKEN(token, "ROW")) @@ -512,7 +512,7 @@ parse_explanation_item(struct explanatio } else if (MATCH_TOKEN(item->operation, "INDEX")) { - + } else if (MATCH_TOKEN(item->operation, "MULTI-INDEX")) { @@ -537,7 +537,7 @@ parse_explanation_item(struct explanatio { } else if (MATCH_TOKEN(item->operation, "SCALAR")) - { + { } else if (MATCH_TOKEN(item->operation, "LEFT-MOST")) { Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/log.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/log.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/log.c (original) +++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/log.c Wed Mar 25 09:04:28 2020 @@ -866,7 +866,7 @@ svn_min__get_copies(svn_min__log_t *log, if (copies[idx]->copyfrom_revision <= start_rev) APR_ARRAY_PUSH(result, const svn_min__copy_t *) = copies[idx]; } - + /* Find all parent copies. */ while (!svn_fspath__is_root(to_find->copyfrom_path, strlen(to_find->copyfrom_path))) Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c (original) +++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c Wed Mar 25 09:04:28 2020 @@ -436,7 +436,7 @@ find_surviving_copy(svn_min__log_t *log, survivor = apr_pstrdup(result_pool, copy_target); } } - + svn_pool_destroy(iterpool); return survivor; @@ -488,7 +488,7 @@ find_surviving_copies(apr_array_header_t copy_target); } } - + svn_pool_destroy(iterpool); } @@ -1351,7 +1351,7 @@ progress_string(const progress_t *progre /* Depending on the options in OPT_STATE, print the header to be shown * before processing the m/i at REL_PATH relative to the parent mergeinfo - * at PARENT_PATH. If there is no parent m/i, RELPATH is empty. + * at PARENT_PATH. If there is no parent m/i, RELPATH is empty. * Use SCRATCH_POOL temporary allocations.*/ static svn_error_t * show_elision_header(const char *parent_path, @@ -1651,7 +1651,7 @@ eliminate_subpaths(apr_array_header_t *p } /* If enabled by OPT_STATE, show the list of missing paths encountered by - * LOOKUP and use LOG to determine their fate. LOG may be NULL. + * LOOKUP and use LOG to determine their fate. LOG may be NULL. * Use SCRATCH_POOL for temporary allocations. */ static svn_error_t * show_obsoletes_summary(svn_min__branch_lookup_t *lookup, @@ -1702,7 +1702,7 @@ show_obsoletes_summary(svn_min__branch_l SVN_INVALID_REVNUM, creation_rev, iterpool); find_surviving_copies(surviving_copies, log, path, - SVN_IS_VALID_REVNUM(deletion_rev) + SVN_IS_VALID_REVNUM(deletion_rev) ? deletion_rev - 1 : deletion_rev, creation_rev, Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c (original) +++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c Wed Mar 25 09:04:28 2020 @@ -130,7 +130,7 @@ get_urls(void *baton, apr_pool_t *target_pool = apr_hash_pool_get(mi->mergeinfo); const char *rel_path = svn_uri_skip_ancestor(info->repos_root_URL, info->URL, pool); - + mi->url = apr_pstrdup(target_pool, info->URL); mi->fs_path = svn_fspath__canonicalize(rel_path, target_pool); Modified: subversion/trunk/tools/client-side/svnconflict/svnconflict.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnconflict/svnconflict.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svnconflict/svnconflict.c (original) +++ subversion/trunk/tools/client-side/svnconflict/svnconflict.c Wed Mar 25 09:04:28 2020 @@ -373,7 +373,7 @@ svnconflict_list(apr_getopt_t *os, void for (i = 0; i < props_conflicted->nelts; i++) { - const char *propname = APR_ARRAY_IDX(props_conflicted, i, const char *); + const char *propname = APR_ARRAY_IDX(props_conflicted, i, const char *); SVN_ERR(svn_cmdline_printf(pool, "prop-conflict: %s\n", propname)); } Modified: subversion/trunk/tools/dev/svnmover/scanlog.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/scanlog.c?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dev/svnmover/scanlog.c (original) +++ subversion/trunk/tools/dev/svnmover/scanlog.c Wed Mar 25 09:04:28 2020 @@ -136,7 +136,7 @@ typedef struct scan_moves_log_receiver_b * rB: mv b->c * rC: mv c->d * we map each revision number to all moves which happened in the - * revision, which looks as follows: + * revision, which looks as follows: * rA : [(rA, x->z), (rA, a->b)] * rB : [(rB, b->c)] * rC : [(rC, c->d)] Modified: subversion/trunk/tools/dist/backport.pl URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport.pl (original) +++ subversion/trunk/tools/dist/backport.pl Wed Mar 25 09:04:28 2020 @@ -157,7 +157,7 @@ N: Move to the next entry. Do not pro revisions added, justification changed) in the repository. (This is a local action that will not affect other people or bots.) : Move to the next entry. Prompt for the current entry again in the next - run of backport.pl. + run of backport.pl. (That's a space character, ASCII 0x20.) ?: Display this list. EOF @@ -231,7 +231,7 @@ Both batch modes also perform a basic sa backport branches (via the "Branch:" header): if a backport branch is used, but at least one of the revisions enumerated in the entry title had neither been merged from $TRUNK to the branch root, nor been committed -directly to the backport branch, the hourly bot will turn red and +directly to the backport branch, the hourly bot will turn red and nightly bot will skip the entry and email its admins. (The nightly bot does not email the list on failure, since it doesn't use buildbot.) Modified: subversion/trunk/tools/dist/backport/merger.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport/merger.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport/merger.py (original) +++ subversion/trunk/tools/dist/backport/merger.py Wed Mar 25 09:04:28 2020 @@ -151,13 +151,13 @@ def log_message_file(logmsg): logmsg_file.write(logmsg) logmsg_file.flush() yield logmsg_file.name - + def merge(entry, expected_stderr=None, *, commit=False): """Merges ENTRY into the working copy at cwd. Do not commit the result, unless COMMIT is true. When committing, remove ENTRY from its STATUS file prior to committing. - + EXPECTED_STDERR will be passed to run_svn() for the actual 'merge' command.""" assert isinstance(entry, backport.status.StatusEntry) @@ -225,7 +225,7 @@ def merge(entry, expected_stderr=None, * if entry.branch: revnum = last_changed_revision('./STATUS') - + if commit: # Sleep to avoid out-of-order commit notifications if not os.getenv("SVN_BACKPORT_DONT_SLEEP"): # enabled by the test suite Modified: subversion/trunk/tools/dist/backport/status.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport/status.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport/status.py (original) +++ subversion/trunk/tools/dist/backport/status.py Wed Mar 25 09:04:28 2020 @@ -85,7 +85,7 @@ class Paragraph: def __init__(self, kind, text, entry, containing_section): """Constructor. - + KIND is one of the Kind.* enumerators. TEXT is the physical text in the file, used by unparsing. @@ -109,7 +109,7 @@ class Paragraph: @classmethod def is_header(cls, para_text): """PARA_TEXT is a single physical paragraph, as a bare multiline string. - + If PARA_TEXT is a section header, return the header text; else, return False.""" lines = para_text.split('\n', 2) @@ -135,7 +135,7 @@ class Paragraph: def approved(self): "TRUE if this paragraph is in the approved section, false otherwise." - assert self.kind + assert self.kind # ### backport.pl used to check just .startswith() here. return self.section() == "Approved changes" @@ -335,7 +335,7 @@ class StatusEntry: def __init__(self, para_text, status_file=None): """Parse an entry from PARA_TEXT, and add it to SELF. PARA_TEXT must contain exactly one entry, as a single multiline string. - + STATUS_FILE is the StatusFile object containing this entry, if any. """ self.branch = None @@ -499,7 +499,7 @@ class StatusEntry: assert self.valid() suffix = "" if len(self.logsummary) == 1 else " [...]" return self.logsummary[0] + suffix - + # Private for is_vetoed() _re_vetoed = re.compile(r'^\s*(-1:|-1\s*[()])', re.MULTILINE) def is_vetoed(self): Modified: subversion/trunk/tools/dist/backport_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport_tests.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport_tests.py (original) +++ subversion/trunk/tools/dist/backport_tests.py Wed Mar 25 09:04:28 2020 @@ -528,7 +528,7 @@ def backport_double_conflict(sbox): # ... # Warning summary # =============== - # + # # r4 (default logsummary): subshell exited with code 256 # And backport.pl would exit with exit code 1. Modified: subversion/trunk/tools/dist/checksums.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/checksums.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dist/checksums.py (original) +++ subversion/trunk/tools/dist/checksums.py Wed Mar 25 09:04:28 2020 @@ -19,7 +19,7 @@ # under the License. # # -# Check MD5 and SHA-1 and SHA-2 signatures of files, using +# Check MD5 and SHA-1 and SHA-2 signatures of files, using # md5sums, sha1sums, and/or sha512sums as manifests # Replaces the 'md5sum', 'sha1sum', and 'sha512sums' commands # on systems that do not have them, such as Mac OS X or Windows. Modified: subversion/trunk/tools/dist/release.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dist/release.py (original) +++ subversion/trunk/tools/dist/release.py Wed Mar 25 09:04:28 2020 @@ -159,7 +159,7 @@ class Version(object): ver_tag = '" (Nightly Build r%d)"' % revnum ver_numtag = '"-nightly-r%d"' % revnum else: - ver_tag = '" (r%d)"' % revnum + ver_tag = '" (r%d)"' % revnum ver_numtag = '""' return (ver_tag, ver_numtag) @@ -1475,18 +1475,18 @@ def add_to_changes_dict(changes_dict, au if section: section = section.lower() change = change.strip() - + if not audience in changes_dict: changes_dict[audience] = dict() if not section in changes_dict[audience]: changes_dict[audience][section] = dict() - + changes = changes_dict[audience][section] if change in changes: changes[change].add(revision) else: changes[change] = set([revision]) - + def print_section(changes_dict, audience, section, title, mandatory=False): if audience in changes_dict: audience_changes = changes_dict[audience] @@ -1523,7 +1523,7 @@ def write_changelog(args): # Putting [skip], [ignore], [c:skip] or [c:ignore] somewhere in the # log message means this commit must be ignored for Changelog processing # (ignored even with the --include-unlabeled-summaries option). - # + # # If there is no changes label anywhere in the commit message, and the # --include-unlabeled-summaries option is used, we'll consider the summary # line of the commit message (= first line except if it starts with a *) @@ -1542,7 +1542,7 @@ def write_changelog(args): previous = svn_repos + '/' + args.previous include_unlabeled = args.include_unlabeled separator_line = ('-' * 72) + '\n' - + mergeinfo = subprocess.check_output(['svn', 'mergeinfo', '--show-revs', 'eligible', '--log', branch_url, previous], universal_newlines=True) @@ -1556,7 +1556,7 @@ def write_changelog(args): for log_message in mergeinfo.split(separator_line)[1:-1] } mergeinfo = mergeinfo.splitlines() - + separator_pattern = re.compile('^-{72}$') revline_pattern = re.compile('^r(\d+) \| [^\|]+ \| [^\|]+ \| \d+ lines?$') changes_prefix_pattern = re.compile(r'^\[(U|D)?:?([^\]]+)?\](.+)$') @@ -1573,7 +1573,7 @@ def write_changelog(args): audience = None section = None message = None - + for line in mergeinfo: if separator_pattern.match(line): # New revision section. Reset variables. @@ -1590,7 +1590,7 @@ def write_changelog(args): # logic, in order to extract CHANGES_PREFIX_PATTERN # and CHANGES_SUFFIX_PATTERN lines from the trunk log # message. - + # 2. Parse the STATUS entry this_log_message = log_messages_dict[revision] status_paragraph = this_log_message.split('\n\n')[2] @@ -1631,7 +1631,7 @@ def write_changelog(args): if re.search(r'\[(c:)?(skip|ignore)\]', line, re.IGNORECASE): changes_ignore = True - + prefix_match = changes_prefix_pattern.match(line) if prefix_match: audience = prefix_match.group(1) @@ -1875,7 +1875,7 @@ def main(): like [U:client], [D:api], [U], ...''') subparser.set_defaults(func=write_changelog) subparser.add_argument('previous', - help='''The "previous" branch or tag, relative to + help='''The "previous" branch or tag, relative to ^/subversion/, to compare "branch" against.''') subparser.add_argument('--include-unlabeled-summaries', dest='include_unlabeled', @@ -1886,7 +1886,7 @@ def main(): summary line contains 'STATUS', 'CHANGES', 'Post-release housekeeping', 'Follow-up' or starts with '*').''') - + # Parse the arguments args = parser.parse_args() Modified: subversion/trunk/tools/dist/security/_gnupg.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/security/_gnupg.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/dist/security/_gnupg.py (original) +++ subversion/trunk/tools/dist/security/_gnupg.py Wed Mar 25 09:04:28 2020 @@ -1,9 +1,9 @@ # Copyright (c) 2008-2014 by Vinay Sajip. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright notice, Modified: subversion/trunk/tools/hook-scripts/validate-files.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/validate-files.py?rev=1875617&r1=1875616&r2=1875617&view=diff ============================================================================== --- subversion/trunk/tools/hook-scripts/validate-files.py (original) +++ subversion/trunk/tools/hook-scripts/validate-files.py Wed Mar 25 09:04:28 2020 @@ -22,7 +22,7 @@ exit with a non-zero exit code. The scr file placed in the conf dir under the repo the commit is for. Note: As changed file paths $FILE are always represented as a Unicode (Py3) - or UTF-8 (Py2) strings, you might need to set apropriate locale and + or UTF-8 (Py2) strings, you might need to set apropriate locale and PYTHONIOENCODING environment variable for this script and commands to handle non-ascii path and command outputs, especially you want to use svnlook cat command to inspect file contents."""
