Modified: subversion/trunk/subversion/libsvn_subr/x509info.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/x509info.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/x509info.c (original) +++ subversion/trunk/subversion/libsvn_subr/x509info.c Fri Feb 13 11:17:40 2015 @@ -168,7 +168,7 @@ svn_x509_oid_to_string(const unsigned ch } else if (*p < 128) { - /* The remaining values if they're less than 128 are just + /* The remaining values if they're less than 128 are just * the number one to one encoded */ temp = apr_psprintf(scratch_pool, ".%d", *p); p++;
Modified: subversion/trunk/subversion/libsvn_wc/diff.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.h?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/diff.h (original) +++ subversion/trunk/subversion/libsvn_wc/diff.h Fri Feb 13 11:17:40 2015 @@ -39,7 +39,7 @@ extern "C" { #endif /* __cplusplus */ /* A function to diff locally added and locally copied files. - + Reports the file LOCAL_ABSPATH as ADDED file with relpath RELPATH to PROCESSOR with as parent baton PROCESSOR_PARENT_BATON. @@ -60,7 +60,7 @@ svn_wc__diff_local_only_file(svn_wc__db_ apr_pool_t *scratch_pool); /* A function to diff locally added and locally copied directories. - + Reports the directory LOCAL_ABSPATH and everything below it (limited by DEPTH) as added with relpath RELPATH to PROCESSOR with as parent baton PROCESSOR_PARENT_BATON. Modified: subversion/trunk/subversion/libsvn_wc/props.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/props.c (original) +++ subversion/trunk/subversion/libsvn_wc/props.c Fri Feb 13 11:17:40 2015 @@ -541,7 +541,7 @@ prop_conflict_new(const svn_string_t **c /* How we render the conflict: - We have four sides: original, mine, incoming_base, incoming. + We have four sides: original, mine, incoming_base, incoming. We render the conflict as a 3-way diff. A diff3 API has three parts, called: Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original) +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Feb 13 11:17:40 2015 @@ -945,7 +945,7 @@ mark_file_edited(struct file_baton *fb, fb->local_abspath, fb->old_repos_relpath, fb->old_revision, fb->new_repos_relpath, svn_node_file, svn_node_file, - NULL, + NULL, fb->pool, scratch_pool)); SVN_ERR(svn_wc__db_op_mark_conflict(fb->edit_baton->db, @@ -4756,7 +4756,7 @@ update_keywords_after_switch_cb(void *ba install_from = NULL; record_fileinfo = TRUE; } - + SVN_ERR(svn_wc__wq_build_file_install(&work_items, eb->db, local_abspath, install_from, eb->use_commit_times, @@ -4880,7 +4880,7 @@ close_edit(void *edit_baton, if (eb->switch_repos_relpath) { svn_depth_t depth; - + if (eb->requested_depth > svn_depth_empty) depth = eb->requested_depth; else Modified: subversion/trunk/subversion/libsvn_wc/wc.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc.h (original) +++ subversion/trunk/subversion/libsvn_wc/wc.h Fri Feb 13 11:17:40 2015 @@ -158,7 +158,7 @@ extern "C" { * Bumped in r1395109. * * == 1.8.x shipped with format 31 - * + * * Please document any further format changes here. */ Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Feb 13 11:17:40 2015 @@ -4980,7 +4980,7 @@ svn_wc__db_op_copy_layer_internal(svn_wc SVN_ERR(svn_error_compose_create(err, svn_sqlite__reset(stmt))); /* ### TODO: Did we handle ACTUAL as intended? */ - + SVN_ERR(add_work_items(wcroot->sdb, work_items, scratch_pool)); if (conflict) @@ -6994,7 +6994,7 @@ op_revert_recursive_txn(void *baton, STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE)); SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath)); SVN_ERR(svn_sqlite__step_done(stmt)); - + SVN_ERR(svn_sqlite__get_statement( &stmt, wcroot->sdb, STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE)); @@ -16278,7 +16278,7 @@ static int compare_queue_items(const void *v1, const void *v2) { - const commit_queue_item_t *cqi1 + const commit_queue_item_t *cqi1 = *(const commit_queue_item_t **)v1; const commit_queue_item_t *cqi2 = *(const commit_queue_item_t **)v2; Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.h (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri Feb 13 11:17:40 2015 @@ -3487,7 +3487,7 @@ svn_wc__db_resolve_delete_raise_moved_aw /* Like svn_wc__db_resolve_delete_raise_moved_away this should be combined. - + ### LOCAL_ABSPATH specifies the move origin, but the move origin ### is not necessary unique enough. This function needs an op_root_abspath ### argument to differentiate between different origins. Modified: subversion/trunk/subversion/mod_dav_svn/lock.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/lock.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/lock.c (original) +++ subversion/trunk/subversion/mod_dav_svn/lock.c Fri Feb 13 11:17:40 2015 @@ -805,7 +805,7 @@ append_locks(dav_lockdb *lockdb, to return the lock details? Add yet another custom header? - Just an header doesn't handle a full error chain... + Just an header doesn't handle a full error chain... ### Current behavior: we don't report an error. */ 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=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original) +++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Fri Feb 13 11:17:40 2015 @@ -249,7 +249,7 @@ merge_dir_config(apr_pool_t *p, void *ba newconf->txdelta_cache = INHERIT_VALUE(parent, child, txdelta_cache); newconf->fulltext_cache = INHERIT_VALUE(parent, child, fulltext_cache); newconf->revprop_cache = INHERIT_VALUE(parent, child, revprop_cache); - newconf->block_read = INHERIT_VALUE(parent, child, block_read); + newconf->block_read = INHERIT_VALUE(parent, child, block_read); newconf->root_dir = INHERIT_VALUE(parent, child, root_dir); newconf->hooks_env = INHERIT_VALUE(parent, child, hooks_env); Modified: subversion/trunk/subversion/mod_dav_svn/status.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/status.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/status.c (original) +++ subversion/trunk/subversion/mod_dav_svn/status.c Fri Feb 13 11:17:40 2015 @@ -57,7 +57,7 @@ int dav_svn__status(request_rec *r) ap_set_content_type(r, "text/html; charset=ISO-8859-1"); - ap_rvputs(r, + ap_rvputs(r, DOCTYPE_HTML_3_2 "<html><head>\n" "<title>Apache SVN Status</title>\n" Modified: subversion/trunk/subversion/svn/auth-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/auth-cmd.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svn/auth-cmd.c (original) +++ subversion/trunk/subversion/svn/auth-cmd.c Fri Feb 13 11:17:40 2015 @@ -373,7 +373,7 @@ svn_cl__auth(apr_getopt_t *os, void *bat SVN_ERR(svn_cmdline_printf(pool, _("Credentials cache in '%s' is empty\n"), svn_dirent_local_style(config_path, pool))); - else + else return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, 0, _("Credentials cache in '%s' contains " "no matching credentials"), Modified: subversion/trunk/subversion/svn/info-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svn/info-cmd.c (original) +++ subversion/trunk/subversion/svn/info-cmd.c Fri Feb 13 11:17:40 2015 @@ -391,14 +391,14 @@ print_info(void *baton, if (info->wc_info->moved_from_abspath) SVN_ERR(svn_cmdline_printf(pool, _("Moved From: %s\n"), svn_cl__local_style_skip_ancestor( - path_prefix, + path_prefix, info->wc_info->moved_from_abspath, pool))); if (info->wc_info->moved_to_abspath) SVN_ERR(svn_cmdline_printf(pool, _("Moved To: %s\n"), svn_cl__local_style_skip_ancestor( - path_prefix, + path_prefix, info->wc_info->moved_to_abspath, pool))); } Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original) +++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Fri Feb 13 11:17:40 2015 @@ -240,7 +240,7 @@ mergeinfo_summary( target_is_wc = (! svn_path_is_url(target_path_or_url)) && (target_revision->kind == svn_opt_revision_unspecified - || target_revision->kind == svn_opt_revision_working + || target_revision->kind == svn_opt_revision_working || target_revision->kind == svn_opt_revision_base); SVN_ERR(svn_client_get_merging_summary( &is_reintegration, @@ -304,10 +304,10 @@ mergeinfo_log(svn_boolean_t finding_merg baton->show_diff = FALSE; baton->depth = depth; baton->diff_extensions = NULL; - baton->merge_stack = NULL; + baton->merge_stack = NULL; baton->search_patterns = NULL; baton->pool = pool; - log_receiver_baton = baton; + log_receiver_baton = baton; } else { Modified: subversion/trunk/subversion/svn/notify.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svn/notify.c (original) +++ subversion/trunk/subversion/svn/notify.c Fri Feb 13 11:17:40 2015 @@ -129,7 +129,7 @@ svn_cl__conflict_stats_resolved(svn_cl__ static const char * remaining_str(apr_pool_t *pool, int n_remaining) { - return apr_psprintf(pool, Q_("%d remaining", + return apr_psprintf(pool, Q_("%d remaining", "%d remaining", n_remaining), n_remaining); Modified: subversion/trunk/subversion/svn/propget-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propget-cmd.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svn/propget-cmd.c (original) +++ subversion/trunk/subversion/svn/propget-cmd.c Fri Feb 13 11:17:40 2015 @@ -490,7 +490,7 @@ svn_cl__propget(apr_getopt_t *os, { svn_error_t *err; err = svn_error_createf(SVN_ERR_PROPERTY_NOT_FOUND, NULL, - _("Property '%s' not found on '%s'"), + _("Property '%s' not found on '%s'"), pname_utf8, target); svn_handle_warning2(stderr, err, "svn: "); svn_error_clear(err); Modified: subversion/trunk/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svn/svn.c (original) +++ subversion/trunk/subversion/svn/svn.c Fri Feb 13 11:17:40 2015 @@ -503,7 +503,7 @@ const svn_opt_subcommand_desc2_t svn_cl_ " expand them.\n"), { opt_remove, opt_show_passwords }, { {opt_remove, N_("remove matching authentication credentials")} } - + }, { "blame", svn_cl__blame, {"praise", "annotate", "ann"}, N_ Modified: subversion/trunk/subversion/svnadmin/svnadmin.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svnadmin/svnadmin.c (original) +++ subversion/trunk/subversion/svnadmin/svnadmin.c Fri Feb 13 11:17:40 2015 @@ -906,7 +906,7 @@ repos_notify_handler(void *baton, if (b->error_summary && notify->revision != SVN_INVALID_REVNUM) { struct verification_error *verr; - + verr = apr_palloc(b->result_pool, sizeof(*verr)); verr->rev = notify->revision; verr->err = svn_error_dup(notify->err); @@ -1880,7 +1880,7 @@ subcommand_verify(apr_getopt_t *os, void struct verification_error *verr; svn_error_t *err; const char *rev_str; - + svn_pool_clear(iterpool); verr = APR_ARRAY_IDX(notify_baton.error_summary, i, @@ -1892,7 +1892,7 @@ subcommand_verify(apr_getopt_t *os, void { char buf[512]; const char *message; - + message = svn_err_best_message(err, buf, sizeof(buf)); svn_error_clear(svn_stream_printf(notify_baton.feedback_stream, iterpool, Modified: subversion/trunk/subversion/svnserve/logger.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/logger.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/logger.c (original) +++ subversion/trunk/subversion/svnserve/logger.c Fri Feb 13 11:17:40 2015 @@ -58,7 +58,7 @@ logger__create_for_stderr(logger_t **log { logger_t *result = apr_pcalloc(pool, sizeof(*result)); result->pool = svn_pool_create(pool); - + SVN_ERR(svn_stream_for_stderr(&result->stream, pool)); SVN_ERR(svn_mutex__init(&result->mutex, TRUE, pool)); @@ -74,7 +74,7 @@ logger__create(logger_t **logger, { logger_t *result = apr_pcalloc(pool, sizeof(*result)); apr_file_t *file; - + SVN_ERR(svn_io_file_open(&file, filename, APR_WRITE | APR_CREATE | APR_APPEND, APR_OS_DEFAULT, pool)); @@ -145,7 +145,7 @@ logger__log_error(logger_t *logger, } svn_pool_clear(logger->pool); - + svn_error_clear(svn_mutex__unlock(logger->mutex, SVN_NO_ERROR)); } } Modified: subversion/trunk/subversion/svnserve/serve.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/serve.c (original) +++ subversion/trunk/subversion/svnserve/serve.c Fri Feb 13 11:17:40 2015 @@ -2179,7 +2179,7 @@ static svn_error_t *log_receiver(void *b } } SVN_ERR(svn_ra_svn__end_list(conn, pool)); - + /* send LOG_ENTRY main members */ SVN_ERR(svn_ra_svn__write_data_log_entry(conn, pool, log_entry->revision, @@ -2856,7 +2856,7 @@ static svn_error_t *lock_many(svn_ra_svn ¤t_rev); if (write_err) break; - + full_path = svn_fspath__join(b->repository->fs_path->data, svn_relpath_canonicalize(path, subpool), subpool); @@ -3755,7 +3755,7 @@ construct_server_baton(server_baton_t ** server_baton_t *b = apr_pcalloc(conn_pool, sizeof(*b)); fs_warning_baton_t *warn_baton; svn_stringbuf_t *cap_log = svn_stringbuf_create_empty(scratch_pool); - + b->repository = apr_pcalloc(conn_pool, sizeof(*b->repository)); b->repository->username_case = params->username_case; b->repository->base = params->base; @@ -3857,7 +3857,7 @@ construct_server_baton(server_baton_t ** err = handle_config_error(find_repos(client_url, params->root, b->vhost, b->read_only, params->cfg, b->repository, params->config_pool, - params->authz_pool, params->fs_config, + params->authz_pool, params->fs_config, conn_pool, scratch_pool), b); if (!err) Modified: subversion/trunk/subversion/svnserve/server.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/server.h?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/server.h (original) +++ subversion/trunk/subversion/svnserve/server.h Fri Feb 13 11:17:40 2015 @@ -40,7 +40,7 @@ extern "C" { #include "private/svn_mutex.h" #include "private/svn_repos_private.h" #include "private/svn_subr_private.h" - + enum username_case_type { CASE_FORCE_UPPER, CASE_FORCE_LOWER, CASE_ASIS }; enum authn_type { UNAUTHENTICATED, AUTHENTICATED }; @@ -70,7 +70,7 @@ typedef struct repository_t { enum access_type auth_access; /* access granted to authenticated users */ enum access_type anon_access; /* access granted to annonymous users */ - + } repository_t; typedef struct client_info_t { @@ -186,7 +186,7 @@ typedef struct connection_t the new thread decrease it and when it reaches 0 the pool can be released. */ svn_atomic_t ref_count; - + } connection_t; /* Return a client_info_t structure allocated in POOL and initialize it Modified: subversion/trunk/subversion/svnserve/svnserve.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/svnserve.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/svnserve.c (original) +++ subversion/trunk/subversion/svnserve/svnserve.c Fri Feb 13 11:17:40 2015 @@ -126,7 +126,7 @@ enum run_mode { * * Since very slow connections will hog a full thread for a potentially * long time before timing out, be sure to not set this limit too low. - * + * * On the other hand, keep in mind that every thread will allocate up to * 4MB of unused RAM in the APR allocator of its root pool. 32 bit servers * must hence do with fewer threads. @@ -150,7 +150,7 @@ enum run_mode { * * Larger values improve scalability with lots of small requests coming * on over long latency networks. - * + * * The OS may actually use a lower limit than specified here. */ #define ACCEPT_BACKLOG 128 @@ -475,7 +475,7 @@ static apr_status_t redirect_stdout(void /* Wait for the next client connection to come in from SOCK. Allocate * the connection in a root pool from CONNECTION_POOLS and assign PARAMS. * Return the connection object in *CONNECTION. - * + * * Use HANDLING_MODE for proper internal cleanup. */ static svn_error_t * @@ -486,30 +486,30 @@ accept_connection(connection_t **connect apr_pool_t *pool) { apr_status_t status; - + /* Non-standard pool handling. The main thread never blocks to join * the connection threads so it cannot clean up after each one. So * separate pools that can be cleared at thread exit are used. */ - + apr_pool_t *connection_pool = svn_pool_create(pool); *connection = apr_pcalloc(connection_pool, sizeof(**connection)); (*connection)->pool = connection_pool; (*connection)->params = params; (*connection)->ref_count = 1; - + do { #ifdef WIN32 if (winservice_is_stopping()) exit(0); #endif - + status = apr_socket_accept(&(*connection)->usock, sock, connection_pool); if (handling_mode == connection_mode_fork) { apr_proc_t proc; - + /* Collect any zombie child processes. */ while (apr_proc_wait_all_procs(&proc, NULL, NULL, APR_NOWAIT, connection_pool) == APR_CHILD_DONE) @@ -519,7 +519,7 @@ accept_connection(connection_t **connect while (APR_STATUS_IS_EINTR(status) || APR_STATUS_IS_ECONNABORTED(status) || APR_STATUS_IS_ECONNRESET(status)); - + return status ? svn_error_wrap_apr(status, _("Can't accept client connection")) : SVN_NO_ERROR; @@ -611,7 +611,7 @@ static void * APR_THREAD_FUNC serve_thre close_connection(connection); else apr_thread_pool_push(threads, serve_thread, connection, 0, NULL); - + return NULL; } @@ -983,7 +983,7 @@ sub_main(int *exit_code, int argc, const svn_hash_sets(params.fs_config, SVN_FS_CONFIG_FSFS_CACHE_REVPROPS, cache_revprops ? "2" :"0"); svn_hash_sets(params.fs_config, SVN_FS_CONFIG_FSFS_BLOCK_READ, - use_block_read ? "1" :"0"); + use_block_read ? "1" :"0"); SVN_ERR(svn_repos__config_pool_create(¶ms.config_pool, is_multi_threaded, @@ -1001,7 +1001,7 @@ sub_main(int *exit_code, int argc, const SVN_ERR(svn_repos__config_pool_get(¶ms.cfg, NULL, params.config_pool, - config_filename, + config_filename, TRUE, /* must_exist */ FALSE, /* names_case_sensitive */ NULL, Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Fri Feb 13 11:17:40 2015 @@ -951,12 +951,12 @@ def blame_youngest_to_oldest(sbox): line = "New contents for iota\n" svntest.main.file_append(iota, line) sbox.simple_commit() - + # Move the file, to check that the operation will peg correctly. iota_moved = sbox.ospath('iota_moved') sbox.simple_move('iota', 'iota_moved') sbox.simple_commit() - + # Delete a line. open(iota_moved, 'w').write(line) sbox.simple_commit() Modified: subversion/trunk/subversion/tests/cmdline/checkout_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/checkout_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/checkout_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/checkout_tests.py Fri Feb 13 11:17:40 2015 @@ -707,7 +707,7 @@ def checkout_peg_rev_date(sbox): expected_output, expected_wc) - # now try another checkout with repo@r1_string + # now try another checkout with repo@r1_string checkout_target = sbox.add_wc_path('checkout2') os.mkdir(checkout_target) @@ -1160,9 +1160,9 @@ def checkout_wc_from_drive(sbox): 'D/G/tau' : Item(contents="This is the file 'tau'.\n"), 'D/G/pi' : Item(contents="This is the file 'pi'.\n"), 'D/gamma' : Item(contents="This is the file 'gamma'.\n"), - 'mu' : Item(contents="This is the file 'mu'.\n"), + 'mu' : Item(contents="This is the file 'mu'.\n"), }) - + svntest.actions.run_and_verify_checkout(repo_url + '/A', wc2_dir, expected_output, expected_wc, None, None, None, None) @@ -1187,7 +1187,7 @@ def checkout_wc_from_drive(sbox): 'G/pi' : Item(contents="This is the file 'pi'.\n"), 'G/tau' : Item(contents="This is the file 'tau'.\n"), 'G/rho' : Item(contents="This is the file 'rho'.\n"), - 'gamma' : Item(contents="This is the file 'gamma'.\n"), + 'gamma' : Item(contents="This is the file 'gamma'.\n"), }) svntest.actions.run_and_verify_checkout(repo_url + '/A/D', wc3_dir, Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Fri Feb 13 11:17:40 2015 @@ -2931,17 +2931,17 @@ def last_changed_of_copied_subdir(sbox): def commit_unversioned(sbox): "verify behavior on unversioned targets" - + sbox.build(read_only=True) wc_dir = sbox.wc_dir - + expected_err = 'E200009: .*existing.*\' is not under version control' # Unversioned, but existing file - svntest.main.file_write(sbox.ospath('existing'), "xxxx") + svntest.main.file_write(sbox.ospath('existing'), "xxxx") svntest.actions.run_and_verify_commit(wc_dir, None, None, expected_err, sbox.ospath('existing')) - + # Unversioned, not existing svntest.actions.run_and_verify_commit(wc_dir, None, None, expected_err, sbox.ospath('not-existing')) Modified: subversion/trunk/subversion/tests/cmdline/export_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/export_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/export_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/export_tests.py Fri Feb 13 11:17:40 2015 @@ -1016,18 +1016,18 @@ def export_file_external(sbox): @Issue(4427) def export_file_externals2(sbox): "exporting file externals" - + sbox.build() sbox.simple_mkdir('DIR', 'DIR2') - + sbox.simple_propset('svn:externals', '^/iota file', 'DIR') sbox.simple_propset('svn:externals', '^/DIR TheDir', 'DIR2') sbox.simple_commit() sbox.simple_update() - + tmp = sbox.add_wc_path('tmp') os.mkdir(tmp) - + expected_output = svntest.wc.State(tmp, { 'file' : Item(status='A '), }) @@ -1040,7 +1040,7 @@ def export_file_externals2(sbox): tmp, expected_output, expected_disk) - + expected_output = svntest.wc.State(tmp, { 'DIR/file' : Item(status='A '), }) @@ -1052,7 +1052,7 @@ def export_file_externals2(sbox): os.path.join(tmp, 'DIR'), expected_output, expected_disk) - + expected_output = svntest.wc.State(tmp, { 'DIR2/TheDir/file' : Item(status='A '), }) Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Fri Feb 13 11:17:40 2015 @@ -3437,7 +3437,7 @@ def update_deletes_file_external(sbox): # As of r1448345, this update fails: # E000002: Can't remove directory '.../A_copy/C': No such file or directory sbox.simple_update() - + @Issue(4519) def switch_relative_externals(sbox): Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Fri Feb 13 11:17:40 2015 @@ -1841,8 +1841,8 @@ def commit_stolen_lock(sbox): err_re, wc_dir) -# When removing directories, the locks of contained files were not -# correctly removed from the working copy database, thus they later +# When removing directories, the locks of contained files were not +# correctly removed from the working copy database, thus they later # magically reappeared when new files or directories with the same # pathes were added. @Issue(4364) @@ -1857,10 +1857,10 @@ def drop_locks_on_parent_deletion(sbox): sbox.simple_lock('A/B/E/alpha') sbox.simple_lock('A/B/E/beta') sbox.simple_rm('A/B') - + expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.remove_subtree('A/B') - + svntest.actions.run_and_verify_commit(wc_dir, [], expected_status, @@ -1874,7 +1874,7 @@ def drop_locks_on_parent_deletion(sbox): # The bug also resurrected locks on directories when their path # matched a former file. sbox.simple_mkdir('A/B/E', 'A/B/E/alpha') - + expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/B', 'A/B/E', @@ -1883,7 +1883,7 @@ def drop_locks_on_parent_deletion(sbox): 'A/B/lambda', wc_rev='3') expected_status.remove('A/B/E/beta') - + svntest.actions.run_and_verify_commit(wc_dir, [], expected_status, @@ -2147,7 +2147,7 @@ def non_root_locks(sbox): 'cp', sbox.repo_url, sbox.repo_url + '/X', '-m', 'copy greek tree') - sbox.simple_switch(sbox.repo_url + '/X') + sbox.simple_switch(sbox.repo_url + '/X') expected_status = svntest.actions.get_virginal_state(wc_dir, 2) svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -2336,20 +2336,20 @@ def lock_commit_bump(sbox): }) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/mu', wc_rev=3) - + svntest.actions.run_and_verify_commit(wc_dir, expected_output, expected_status, None, wc_dir) # We explicitly check both the Revision and Last Changed Revision. - expected_infos = [ { + expected_infos = [ { 'Revision' : '1' , 'Last Changed Rev' : '1' , 'URL' : '.*', 'Lock Token' : None, } ] - svntest.actions.run_and_verify_info(expected_infos, + svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('iota')) def copy_dir_with_locked_file(sbox): Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Feb 13 11:17:40 2015 @@ -18505,7 +18505,7 @@ def merge_to_empty_target_merge_to_infin C1_path = sbox.ospath('A/C/C1') test3_path = sbox.ospath('A/C/C1/test.txt') - + # r3 - Add some subtrees: # A /A/B/B1 # A /A/B/B1/B1a Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri Feb 13 11:17:40 2015 @@ -2027,7 +2027,7 @@ def merge_conflict_details(sbox): expected_info = [ { "Path" : re.escape(sbox.ospath('B')), - + "Conflict Properties File" : re.escape(sbox.ospath('B/dir_conflicts.prej')) + '.*', "Conflict Details": re.escape( Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/move_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/move_tests.py Fri Feb 13 11:17:40 2015 @@ -1373,7 +1373,7 @@ def move_many_update_delete(sbox): svntest.actions.run_and_verify_update(wc_dir, expected_output, None, expected_status) - # Would be nice if we could run the resolver as a separate step, + # Would be nice if we could run the resolver as a separate step, # but 'svn resolve' just fails for any value but working def move_many_update_add(sbox): @@ -1483,7 +1483,7 @@ def copy_move_commit(sbox): # create table bbb (Id int not null) # - Commit # Repro Issue 2 - # - Copy folder aaa under same parent folder (i.e. as a sibling). (using Ctrl drag/drop). + # - Copy folder aaa under same parent folder (i.e. as a sibling). (using Ctrl drag/drop). # Creates Copy of aaa # - Rename Copy of aaa to eee # - Commit @@ -1512,7 +1512,7 @@ def move_to_from_external(sbox): 'move', sbox.ospath('iota'), sbox.ospath('GG/tau')) - + svntest.actions.run_and_verify_svn(None, [], 'ci', '-m', 'Commit both', sbox.ospath(''), @@ -1633,7 +1633,7 @@ def move_conflict_details(sbox): expected_info = [ { "Path" : re.escape(sbox.ospath('B')), - + "Conflict Properties File" : re.escape(sbox.ospath('B/dir_conflicts.prej')) + '.*', "Conflict Details": re.escape( Modified: subversion/trunk/subversion/tests/cmdline/redirect_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/redirect_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/redirect_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/redirect_tests.py Fri Feb 13 11:17:40 2015 @@ -154,7 +154,7 @@ def redirected_nonroot_update(sbox): checkout_url, wc_dir) if err: raise svntest.Failure - + # Relocate (by cheating) the working copy to the redirect URL. When # we then update, we'll expect to find ourselves automagically back # to the original URL. (This is because we can't easily introduce a Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Feb 13 11:17:40 2015 @@ -2093,12 +2093,12 @@ def status_path_handling(sbox): def status_move_missing_direct(sbox): "move information when status is called directly" - + sbox.build() sbox.simple_copy('A', 'Z') sbox.simple_commit('') sbox.simple_update('') - + sbox.simple_move('Z', 'ZZ') sbox.simple_move('A', 'Z') sbox.simple_move('Z/B', 'ZB') @@ -2108,14 +2108,14 @@ def status_move_missing_direct(sbox): # Somehow 'svn status' now shows different output for 'ZB/E' # when called directly and via an ancestor, as this handles # multi-layer in a different way - + # Note that the status output may change over different Subversion revisions, # but the status on a node should be identical anyway 'svn status' is called # on it. - + expected_output = [ 'A + %s\n' % sbox.ospath('ZB'), - ' > moved from %s\n' % os.path.join('..', 'Z', 'B'), + ' > moved from %s\n' % os.path.join('..', 'Z', 'B'), 'D + %s\n' % sbox.ospath('ZB/E'), ' > moved to %s\n' % os.path.join('..', 'Z', 'B', 'E'), ] @@ -2133,7 +2133,7 @@ def status_move_missing_direct(sbox): def status_move_missing_direct_base(sbox): "move when status is called directly with base" - + sbox.build() sbox.simple_copy('A', 'Z') sbox.simple_mkdir('Q') @@ -2141,10 +2141,10 @@ def status_move_missing_direct_base(sbox sbox.simple_mkdir('Q/ZB/E') sbox.simple_commit('') sbox.simple_update('') - + sbox.simple_rm('Q') sbox.simple_mkdir('Q') - + sbox.simple_move('Z', 'ZZ') sbox.simple_move('A', 'Z') sbox.simple_move('Z/B', 'Q/ZB') @@ -2154,14 +2154,14 @@ def status_move_missing_direct_base(sbox # Somehow 'svn status' now shows different output for 'Q/ZB/E' # when called directly and via an ancestor, as this handles # multi-layer in a different way - + # Note that the status output may change over different Subversion revisions, # but the status on a node should be identical anyway 'svn status' is called # on it. - + # This test had a different result as status_move_missing_direct at the time of # writing this test. - + expected_output = [ 'A + %s\n' % sbox.ospath('Q/ZB'), ' > moved from %s\n' % os.path.join('..', '..', 'Z', 'B'), Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Feb 13 11:17:40 2015 @@ -179,7 +179,7 @@ def check_hotcopy_fsfs(src, dst): def check_hotcopy_fsx(src, dst): "Verify that the SRC FSX repository has been correctly copied to DST." check_hotcopy_fsfs_fsx(src, dst) - + #---------------------------------------------------------------------- # How we currently test 'svnadmin' -- @@ -2051,7 +2051,7 @@ def verify_keep_going(sbox): svntest.actions.run_and_verify_svn(None, [], 'mkdir', '-m', 'log_msg', C_url) - + r2 = fsfs_file(sbox.repo_dir, 'revs', '2') fp = open(r2, 'r+b') fp.write("""inserting junk to corrupt the rev""") Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Feb 13 11:17:40 2015 @@ -2121,7 +2121,7 @@ def tree_conflicts_on_switch_1_1(sbox): 'DDF/D1/D2' : Item(status=' ', treeconflict='U'), 'DDF/D1/D2/gamma' : Item(status=' ', treeconflict='U') }) - + expected_disk = svntest.wc.State('', { 'F' : Item(), 'D' : Item(), Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/update_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Feb 13 11:17:40 2015 @@ -6766,7 +6766,7 @@ def update_conflict_details(sbox): expected_info = [ { "Path" : re.escape(sbox.ospath('A/B')), - + "Conflict Properties File" : re.escape(sbox.ospath('A/B/dir_conflicts.prej')) + '.*', "Conflict Details": re.escape( Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Fri Feb 13 11:17:40 2015 @@ -1091,8 +1091,8 @@ test_copy_pin_externals(const svn_test_o { "-r1 ^/A/B D/z/y/z/blah", "-r1 ^/A/B@2 D/z/y/z/blah" } , { "-r1 ^/A/D@2 exdir_D", "-r1 ^/A/D@2 exdir_D" }, /* Dated revision should retain their date string exactly. */ - { "-r{1970-01-01T00:00} ^/A/C 70s", "-r{1970-01-01T00:00} ^/A/C@2 70s"}, - { "-r{2004-02-23} ^/svn 1.0", "-r{2004-02-23} ^/svn 1.0"}, + { "-r{1970-01-01T00:00} ^/A/C 70s", "-r{1970-01-01T00:00} ^/A/C@2 70s"}, + { "-r{2004-02-23} ^/svn 1.0", "-r{2004-02-23} ^/svn 1.0"}, { NULL }, }; @@ -1173,7 +1173,7 @@ test_copy_pin_externals(const svn_test_o { const char *externals_desc; const char *expected_desc; - + externals_desc = APR_ARRAY_IDX(pinned_externals_descs, i, const char *); expected_desc = pin_externals_test_data[i].expected_dst_external_desc; SVN_TEST_STRING_ASSERT(externals_desc, expected_desc); @@ -1181,7 +1181,7 @@ test_copy_pin_externals(const svn_test_o /* Ensure all test cases were tested. */ SVN_TEST_ASSERT(i == (sizeof(pin_externals_test_data) / sizeof(pin_externals_test_data[0]) - 1)); - + SVN_ERR(svn_wc_parse_externals_description3(&pinned_externals, A_copy_url, propval->data, TRUE, pool)); Modified: subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c Fri Feb 13 11:17:40 2015 @@ -614,7 +614,7 @@ test_file_revs_both_ways(const svn_test_ handle_rev, &hrb, subpool)); SVN_TEST_ASSERT(hrb.last == 6); - + return SVN_NO_ERROR; } 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=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Fri Feb 13 11:17:40 2015 @@ -5136,7 +5136,7 @@ filename_trailing_newline(const svn_test SVN_TEST_ASSERT(err == SVN_NO_ERROR); else SVN_TEST_ASSERT_ERROR(err, SVN_ERR_FS_PATH_SYNTAX); - + /* Create another file, with contents. */ if (!legacy_backend) @@ -5314,7 +5314,7 @@ test_compat_version(const svn_test_opts_ { svn_version_t *compatible_version; apr_hash_t *config = apr_hash_make(pool); - + svn_version_t vcurrent = {SVN_VER_MAJOR, SVN_VER_MINOR, 0, ""}; svn_version_t v1_2_0 = {1, 2, 0, ""}; svn_version_t v1_3_0 = {1, 3, 0, ""}; @@ -5493,7 +5493,7 @@ reopen_modify(const svn_test_opts_t *opt /* Create txn with changes. */ SVN_ERR(svn_fs_begin_txn(&txn, fs, head_rev, pool)); - SVN_ERR(svn_fs_txn_name(&txn_name, txn, pool)); + SVN_ERR(svn_fs_txn_name(&txn_name, txn, pool)); SVN_ERR(svn_fs_txn_root(&root, txn, pool)); SVN_ERR(svn_fs_make_dir(root, "X", pool)); @@ -5903,7 +5903,7 @@ compare_contents(const svn_test_opts_t * svn_checksum_t *checksum1, *checksum2; /* (path, rev) pairs to compare plus the expected API return values */ - struct + struct { svn_revnum_t rev1; const char *path1; @@ -5931,12 +5931,12 @@ compare_contents(const svn_test_opts_t * { 3, "bar", 4, "bar", TRUE, svn_tristate_true }, /* variations on the same theme: same content, possibly different rep */ - { 4, "foo", 4, "bar", FALSE, svn_tristate_unknown }, - { 1, "foo", 4, "bar", FALSE, svn_tristate_unknown }, - { 2, "foo", 4, "bar", FALSE, svn_tristate_unknown }, - { 1, "foo", 4, "foo", FALSE, svn_tristate_unknown }, - { 2, "foo", 4, "foo", FALSE, svn_tristate_unknown }, - { 2, "bar", 4, "bar", FALSE, svn_tristate_unknown }, + { 4, "foo", 4, "bar", FALSE, svn_tristate_unknown }, + { 1, "foo", 4, "bar", FALSE, svn_tristate_unknown }, + { 2, "foo", 4, "bar", FALSE, svn_tristate_unknown }, + { 1, "foo", 4, "foo", FALSE, svn_tristate_unknown }, + { 2, "foo", 4, "foo", FALSE, svn_tristate_unknown }, + { 2, "bar", 4, "bar", FALSE, svn_tristate_unknown }, /* EOL */ { 0 }, @@ -6743,7 +6743,7 @@ test_prop_and_text_rep_sharing_collision SVN_ERR(svn_fs_file_length(&length, rev_root, "/foo", pool)); SVN_TEST_ASSERT(length == 23); - return SVN_NO_ERROR; + return SVN_NO_ERROR; } /* ------------------------------------------------------------------------ */ Modified: subversion/trunk/subversion/tests/libsvn_fs/locks-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/locks-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs/locks-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs/locks-test.c Fri Feb 13 11:17:40 2015 @@ -58,7 +58,7 @@ get_locks_callback(void *baton, { apr_hash_set(b->locks, lock_path->data, lock_path->len, svn_lock_dup(lock, hash_pool)); - return SVN_NO_ERROR; + return SVN_NO_ERROR; } else { Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c Fri Feb 13 11:17:40 2015 @@ -325,7 +325,7 @@ fuzzing_null_byte_test(const svn_test_op apr_pool_t *pool) \ { \ return svn_error_trace(fuzzing_set_byte_test(opts, N, M, pool)); \ - } + } /* Add the test function declared above to the test_funcs array. */ #define TEST_FUZZING_SET_BYTE_TEST_N(N,M)\ 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=1659509&r1=1659508&r2=1659509&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 Fri Feb 13 11:17:40 2015 @@ -144,7 +144,7 @@ create_packed_filesystem(const char *dir SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool)); SVN_ERR(svn_test__create_greek_tree(txn_root, subpool)); SVN_ERR(svn_fs_change_txn_prop(txn, SVN_PROP_REVISION_LOG, - svn_string_create(R1_LOG_MSG, pool), + svn_string_create(R1_LOG_MSG, pool), pool)); SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, subpool)); SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev)); @@ -1164,7 +1164,7 @@ id_parser_test(const svn_test_opts_t *op apr_pool_t *pool) { #define LONG_MAX_STR #LONG_MAX - + /* Verify the revision number parser (e.g. first element of a txn ID) */ svn_fs_fs__id_part_t id_part; SVN_ERR(svn_fs_fs__id_txn_parse(&id_part, "0-0")); Modified: subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c Fri Feb 13 11:17:40 2015 @@ -166,7 +166,7 @@ create_packed_filesystem(const char *dir SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool)); SVN_ERR(svn_test__create_greek_tree(txn_root, subpool)); SVN_ERR(svn_fs_change_txn_prop(txn, SVN_PROP_REVISION_LOG, - svn_string_create(R1_LOG_MSG, pool), + svn_string_create(R1_LOG_MSG, pool), pool)); SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, subpool)); SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev)); Modified: subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c Fri Feb 13 11:17:40 2015 @@ -124,19 +124,19 @@ short_string_table_body(svn_boolean_t do apr_pool_t *pool) { apr_size_t indexes[STRING_COUNT] = { 0 }; - + string_table_builder_t *builder; string_table_t *table; int i; - + builder = svn_fs_x__string_table_builder_create(pool); for (i = 0; i < STRING_COUNT; ++i) indexes[i] = svn_fs_x__string_table_builder_add(builder, basic_strings[i], 0); - + table = svn_fs_x__string_table_create(builder, pool); if (do_load_store) SVN_ERR(store_and_load_table(&table, pool)); - + SVN_TEST_ASSERT(indexes[2] == indexes[6]); for (i = 0; i < STRING_COUNT; ++i) { 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=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_ra/ra-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_ra/ra-test.c Fri Feb 13 11:17:40 2015 @@ -441,7 +441,7 @@ lock_cb(void *baton, result->err = ra_err; svn_hash_sets(b->results, apr_pstrdup(b->pool, path), result); - + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/tests/libsvn_subr/cache-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/cache-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/cache-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/cache-test.c Fri Feb 13 11:17:40 2015 @@ -290,7 +290,7 @@ test_membuffer_serializer_error_handling /* Test setting data in cache using partial setter that always raises an error. */ SVN_TEST_ASSERT_ERROR( - svn_cache__set_partial(cache, "twenty", + svn_cache__set_partial(cache, "twenty", raise_error_partial_setter_func, NULL, pool), APR_EGENERAL); Modified: subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c Fri Feb 13 11:17:40 2015 @@ -170,7 +170,7 @@ zero_cross_match(apr_pool_t *pool) { svn_checksum_t *i_zero; svn_checksum_t *i_A; - + i_zero = svn_checksum_create(i_kind, pool); SVN_ERR(svn_checksum_clear(i_zero)); SVN_ERR(svn_checksum(&i_A, i_kind, "A", 1, pool)); Modified: subversion/trunk/subversion/tests/libsvn_subr/config-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/config-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/config-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/config-test.c Fri Feb 13 11:17:40 2015 @@ -363,7 +363,7 @@ test_expand(const svn_test_opts_t *opts, /* Get expanded "c". */ svn_config_get(cfg, &val, "section1", "c", NULL); - /* With pool debugging enabled this ensures that the expanded value + /* With pool debugging enabled this ensures that the expanded value of "c" was not created in a temporary pool when expanding "g". */ SVN_TEST_STRING_ASSERT(val, "bar"); 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=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/io-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/io-test.c Fri Feb 13 11:17:40 2015 @@ -703,7 +703,7 @@ ignore_enoent(apr_pool_t *pool) SVN_ERR(svn_io_set_file_executable(path, FALSE, TRUE, pool)); SVN_ERR(svn_io_stat_dirent2(&dirent_p, path, TRUE, TRUE, pool, pool)); SVN_ERR(svn_io_stat_dirent2(&dirent_p, path, FALSE, TRUE, pool, pool)); - + /* Neither path nor parent exists. */ path = svn_dirent_join(path, "not-present", pool); SVN_ERR(svn_io_remove_dir2(path, TRUE, NULL, NULL, pool)); Modified: subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c Fri Feb 13 11:17:40 2015 @@ -99,7 +99,7 @@ verify_uint_stream(const apr_uint64_t *v SVN_TEST_ASSERT(stream); SVN_TEST_ASSERT(!svn_packed__next_int_stream(stream)); SVN_TEST_ASSERT(!svn_packed__first_byte_stream(root)); - + /* the stream shall contain exactly the items we put into it */ SVN_TEST_ASSERT(svn_packed__int_count(stream) == count); for (i = 0; i < count; ++i) @@ -356,7 +356,7 @@ pack(const base_record_t *data, svn_packed__create_int_substream(base_stream, TRUE, TRUE); /* large_signed1 */ svn_packed__create_int_substream(base_stream, FALSE, TRUE); /* large_signed2 */ svn_packed__create_int_substream(base_stream, TRUE, FALSE); /* prime */ - + for (i = 0; i < count; ++i) { svn_packed__add_int(base_stream, data[i].counter); @@ -434,7 +434,7 @@ unpack(apr_size_t *count, base_record_t *data; *count = svn_packed__int_count(sub_count_stream) / 2; data = apr_pcalloc(pool, *count * sizeof(*data)); - + for (i = 0; i < *count; ++i) { data[i].counter = (int) svn_packed__get_int(base_stream); Modified: subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c Fri Feb 13 11:17:40 2015 @@ -70,7 +70,7 @@ verify_empty_queue(svn_priority_queue__t /* these should be no-ops */ svn_priority_queue__update(queue); svn_priority_queue__pop(queue); - + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c Fri Feb 13 11:17:40 2015 @@ -57,7 +57,7 @@ error_second(svn_sqlite__context_t *sctx svn_sqlite__result_error(sctx, "fake error", 0); else svn_sqlite__result_int64(sctx, 1); - + return SVN_NO_ERROR; } @@ -102,7 +102,7 @@ test_sqlite_reset(apr_pool_t *pool) /* The svn_sqlite__step wrapper calls svn_sqlite__reset when step fails so the reset call here is a no-op. The first step can be - repeated. */ + repeated. */ SVN_ERR(svn_sqlite__reset(stmt)); SVN_ERR(svn_sqlite__step(&have_row, stmt)); SVN_TEST_ASSERT(have_row); Modified: subversion/trunk/subversion/tests/libsvn_subr/string-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/string-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/string-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/string-test.c Fri Feb 13 11:17:40 2015 @@ -849,7 +849,7 @@ test_string_matching(apr_pool_t *pool) SVN_TEST_ASSERT(match_len == test->match_len); SVN_TEST_ASSERT(rmatch_len == test->rmatch_len); } - + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c Fri Feb 13 11:17:40 2015 @@ -397,7 +397,7 @@ test_svn_subst_long_keywords(apr_pool_t "01234567890123456789012345678901234567890123456789" "012345678901234567890123456789012345678901234567"; - /* The longest keyword that can be expanded: the value is empty. */ + /* The longest keyword that can be expanded: the value is empty. */ const char keyword_z[] = "Q" "01234567890123456789012345678901234567890123456789" Modified: subversion/trunk/subversion/tests/libsvn_subr/x509-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/x509-test.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/x509-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/x509-test.c Fri Feb 13 11:17:40 2015 @@ -151,7 +151,7 @@ static struct x509_test cert_tests[] = { "b3b9789d8a53868f418619565f6b56af0033bdd3" }, /* The issuer and subject (except for the country code) is * UnversalString encoded. Created with a hacked version of openssl - * using utf8=yes and string_mask=MASK:256. In order for that to + * using utf8=yes and string_mask=MASK:256. In order for that to * output UniversalString encoded data you need to change the * DIRSTRING_TYPE in crypto/asn1/asn1.h to be defined as * B_ASN1_DIRECTORYSTRING so that UnviersalString is available to be 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=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Fri Feb 13 11:17:40 2015 @@ -9141,15 +9141,15 @@ move_twice_within_delete(const svn_test_ nodes_row_t nodes[] = { { 0, "", "normal", 1, "" }, - + { 0, "A", "normal", 1, "A" }, { 0, "A/A", "normal", 1, "A/A" }, { 0, "A/A/A", "normal", 1, "A/A/A" }, - + { 1, "A", "base-deleted", NO_COPY_FROM, "B/A" }, { 1, "A/A", "base-deleted", NO_COPY_FROM }, { 1, "A/A/A", "base-deleted", NO_COPY_FROM }, - + { 1, "AA", "normal", 1, "A/A/A", MOVED_HERE }, { 1, "B", "normal", NO_COPY_FROM }, @@ -10966,7 +10966,7 @@ move_deep_bump(const svn_test_opts_t *op {0} }; conflict_info_t conflicts[] = { - {"B/B/B/A", FALSE, FALSE, {svn_wc_conflict_action_edit, + {"B/B/B/A", FALSE, FALSE, {svn_wc_conflict_action_edit, svn_wc_conflict_reason_moved_away, "B/B/B/A"}}, {0} }; Modified: subversion/trunk/subversion/tests/svn_test_main.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_main.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/subversion/tests/svn_test_main.c (original) +++ subversion/trunk/subversion/tests/svn_test_main.c Fri Feb 13 11:17:40 2015 @@ -224,7 +224,7 @@ svn_test_add_dir_cleanup(const char *pat err = svn_mutex__lock(log_mutex); if (err) { - if (verbose_mode) + if (verbose_mode) printf("FAILED svn_mutex__lock in svn_test_add_dir_cleanup.\n"); svn_error_clear(err); return; @@ -241,7 +241,7 @@ svn_test_add_dir_cleanup(const char *pat err = svn_mutex__unlock(log_mutex, NULL); if (err) { - if (verbose_mode) + if (verbose_mode) printf("FAILED svn_mutex__unlock in svn_test_add_dir_cleanup.\n"); svn_error_clear(err); } @@ -620,7 +620,7 @@ do_tests_concurrently(const char *progna CHECK_STATUS(result, "Test thread returned an error."); } - + return params.got_error != FALSE; } Modified: subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py (original) +++ subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py Fri Feb 13 11:17:40 2015 @@ -137,7 +137,7 @@ class Repository: @classmethod def is_repository(cls, path): """ Quick check that PATH is (probably) a repository. - This is mainly to filter out aux files put next to + This is mainly to filter out aux files put next to (not inside) the repositories to copy. """ format_path = os.path.join(path, 'db', 'format') Modified: subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py (original) +++ subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py Fri Feb 13 11:17:40 2015 @@ -115,7 +115,7 @@ def run_cs_command(state, config, reposi # Display the operation repo_title = repository.replace('nonpacked', 'nopack') - print state, "\t", repo_title, "\t", prefix, "\t", config, "\t", + print state, "\t", repo_title, "\t", prefix, "\t", config, "\t", sys.stdout.flush() # Execute the command and show the execution times @@ -146,18 +146,18 @@ def run_test_cs_sequence(config, reposit run_cs_command("Cold", config, repository, prefix, args) stop_server(prefix) - # OS caches are quite hot now. + # OS caches are quite hot now. # Run operation from hot OS caches but cold SVN caches. start_server(prefix, config) run_cs_command("WarmOS", config, repository, prefix, args) stop_server(prefix) - # OS caches may be even hotter now. + # OS caches may be even hotter now. # Run operation from hot OS caches but cold SVN caches. start_server(prefix, config) run_cs_command("HotOS", config, repository, prefix, args) - # Keep server process and thus the warmed up SVN caches. + # Keep server process and thus the warmed up SVN caches. # Run operation from hot OS and SVN caches. run_cs_command("WrmSVN", config, repository, prefix, args) run_cs_command("HotSVN", config, repository, prefix, args) @@ -215,7 +215,7 @@ def run_admin_command(state, config, rep else: extra = [] - print state, "\t", repository, "\t", config, "\t", + print state, "\t", repository, "\t", config, "\t", sys.stdout.flush() subprocess.call(["TimeWin.exe", exe] + args + extra) Modified: subversion/trunk/tools/dev/build-svn-deps-win.pl URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/build-svn-deps-win.pl?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dev/build-svn-deps-win.pl (original) +++ subversion/trunk/tools/dev/build-svn-deps-win.pl Fri Feb 13 11:17:40 2015 @@ -17,7 +17,7 @@ # under the License. # ==================================================================== # -# Script to build all the dependencies for Subversion on Windows +# Script to build all the dependencies for Subversion on Windows # It's been written for Windows 8 and Visual Studio 2012, but # it's entirely possible it will work with older versions of both. @@ -27,7 +27,7 @@ # Subversion and quickly get up a development environment. # Prerequisites: -# Perl: http://www.activestate.com/activeperl/downloads +# Perl: http://www.activestate.com/activeperl/downloads # Python: http://www.activestate.com/activepython/downloads # 7-Zip: http://www.7-zip.org/download.html # CMake: http://www.cmake.org/cmake/resources/software.html @@ -42,7 +42,7 @@ # available. # # TODO: -# Find some way to work around the lack of devenv in Express (msbuild will help some) +# Find some way to work around the lack of devenv in Express (msbuild will help some) # Include a package target that zips everything up. # Perl script that runs the Subversion get-make.py tool with the right args. # Alternatively update gen-make.py with an arg that knows about our layout. @@ -54,7 +54,7 @@ # Allow selection of Arch (x86 and x64) # ZLib support for OpenSSL (have to patch openssl) # Use CMake zlib build instead. -# Assembler support for OpenSSL. +# Assembler support for OpenSSL. # Add more specific commands to the command line (e.g. build-httpd) ################################### @@ -208,10 +208,10 @@ my $PERL = $Config{perlpath}; # Directory constants that we setup for convenience, but that # shouldn't be changed since they are assumed in the build systems -# of the various dependencies. +# of the various dependencies. my $HTTPD; # Where httpd gets built my $BDB; # Where bdb gets built -my $BINDIR; # where binaries are installed +my $BINDIR; # where binaries are installed my $LIBDIR; # where libraries are installed my $INCDIR; # where headers are installed my $SRCLIB; # httpd's srclib dir @@ -274,7 +274,7 @@ sub system_or_die { } # Like perl -pi.orig the second arg is a reference to a -# function that does whatever line processing you want. +# function that does whatever line processing you want. # Note that $_ is used for the input and output of the # function. So modifying $_ changes the line in the file. # bak can be passed to set the backup extension. If the @@ -345,7 +345,7 @@ sub prepare_structure { sub clean_structure { # ignore errors in this function the paths may not exist my $real_clean = shift; - + if ($real_clean) { rmtree($SRCDIR); } @@ -478,7 +478,7 @@ sub extract_dependencies { extract_file($API_FILE, $SRCLIB, "$SRCLIB\\apr-iconv-$API_VER", "$SRCLIB\\apr-iconv"); # We fix the line endings before putting the non-Apache deps in place since it - # touches everything under httpd and there's no point in doing other things. + # touches everything under httpd and there's no point in doing other things. httpd_fix_lineends(); extract_file($ZLIB_FILE, $SRCLIB, "$SRCLIB\\zlib-$ZLIB_VER", "$SRCLIB\\zlib"); @@ -507,7 +507,7 @@ sub build_pcre { my $pcre_options = '-DPCRE_NO_RECURSE:BOOL=ON'; my $pcre_shared_libs = '-DBUILD_SHARED_LIBS:BOOL=ON'; my $pcre_install_prefix = "-DCMAKE_INSTALL_PREFIX:PATH=$INSTDIR"; - my $cmake_cmd = qq("$CMAKE" -G "$pcre_generator" "$pcre_build_type" "$pcre_shared_libs" "$pcre_install_prefix" "$pcre_options" .); + my $cmake_cmd = qq("$CMAKE" -G "$pcre_generator" "$pcre_build_type" "$pcre_shared_libs" "$pcre_install_prefix" "$pcre_options" .); system_or_die("Failure generating pcre Makefiles", $cmake_cmd); system_or_die("Failure building pcre", qq("$NMAKE")); system_or_die("Failure testing pcre", qq("$NMAKE" test)); @@ -521,7 +521,7 @@ sub build_zlib { chdir_or_die("$SRCLIB\\zlib"); $ENV{CC_OPTS} = $DEBUG ? '/MDd /Gm /ZI /Od /GZ /D_DEBUG' : '/MD /02 /Zi'; $ENV{COMMON_CC_OPTS} = '/nologo /W3 /DWIN32 /D_WINDOWS'; - + system_or_die("Failure building zilb", qq("$NMAKE" /nologo -f win32\\Makefile.msc STATICLIB=zlibstat.lib all)); delete $ENV{CC_OPTS}; @@ -533,14 +533,14 @@ sub build_zlib { sub build_openssl { chdir_or_die("$SRCLIB\\openssl"); - # We're building openssl without an assembler. If someone wants to + # We're building openssl without an assembler. If someone wants to # use this for production they should probably download NASM and # remove the no-asm below and use ms\do_nasm.bat instead. - + # TODO: Enable openssl to use zlib. openssl needs some patching to do # this since it wants to look for zlib as zlib1.dll and as the httpd # build instructions note you probably don't want to dynamic link zlib. - + # TODO: OpenSSL requires perl on the path since it uses perl without a full # path in the batch file and the makefiles. Probably should determine # if PERL is on the path and add it here if not. @@ -599,7 +599,7 @@ sub httpd_fix_lineends { chdir_or_die($TOPDIR); } -# The httpd makefile in 2.4.4 doesn't know about .vcxproj files and +# The httpd makefile in 2.4.4 doesn't know about .vcxproj files and # still thinks it's got an older version of Visual Studio because # .vcproj files have become .vcxproj. sub httpd_fix_makefile { @@ -607,8 +607,8 @@ sub httpd_fix_makefile { modify_file_in_place($file, sub { s/\.vcproj/.vcxproj/i; - # below fixes that installd breaks when trying to install pcre because - # dll is named pcred.dll when a Debug build. + # below fixes that installd breaks when trying to install pcre because + # dll is named pcred.dll when a Debug build. s/^(\s*copy srclib\\pcre\\pcre\.\$\(src_dll\)\s+"\$\(inst_dll\)"\s+<\s*\.y\s*)$/!IF EXISTS("srclib\\pcre\\pcre\.\$(src_dll)")\n$1!ENDIF\n!IF EXISTS("srclib\\pcre\\pcred\.\$(src_dll)")\n\tcopy srclib\\pcre\\pcred.\$(src_dll)\t\t\t"\$(inst_dll)" <.y\n!ENDIF\n/; }); } @@ -797,8 +797,8 @@ sub build_httpd { sub build_bdb { chdir_or_die($BDB); - print(cwd(),$/); - my $sln = 'build_windows\Berkeley_DB_vs2010.sln'; + print(cwd(),$/); + my $sln = 'build_windows\Berkeley_DB_vs2010.sln'; upgrade_solution($sln); my $platform = $DEBUG ? 'Debug|Win32' : 'Release|Win32'; @@ -834,7 +834,7 @@ sub build_serf { s/^(INTDIR = Debug)$/$1\nOPENSSL_OUT_SUFFIX = .dbg/; s/(\$\(OPENSSL_SRC\)\\out32(?:dll)?)/$1\$(OPENSSL_OUT_SUFFIX)/g; }, '.debug'); - + chdir_or_die($TOPDIR); } Modified: subversion/trunk/tools/dev/fsfs-access-map.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/fsfs-access-map.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dev/fsfs-access-map.c (original) +++ subversion/trunk/tools/dev/fsfs-access-map.c Fri Feb 13 11:17:40 2015 @@ -60,7 +60,7 @@ typedef struct file_stats_t /* number of read() calls that returned 0 bytes */ apr_int64_t empty_reads; - + /* total number of bytes returned by those reads */ apr_int64_t read_size; @@ -314,7 +314,7 @@ parse_line(svn_stringbuf_t *line) else while(*func_start == ' ') func_start++; - + first_param_end = strchr(func_end, ','); if (first_param_end == NULL) first_param_end = strchr(func_end, ')'); @@ -558,13 +558,13 @@ scale_line(color_t* out, int in_len) { double scaling_factor = (double)(in_len) / (double)(out_len); - + apr_size_t i; memset(out, 0, out_len * sizeof(color_t)); for (i = 0; i < out_len; ++i) { color_t color = { 0 }; - + double source_start = i * scaling_factor; double source_end = (i + 1) * scaling_factor; @@ -626,7 +626,7 @@ write_bitmap(apr_array_header_t *info, /**/ line = apr_pcalloc(pool, xsize * sizeof(color_t)); scaled_line = apr_pcalloc(pool, row_size); - + /* write header to file */ write_bitmap_header(file, max_x, ysize); Modified: subversion/trunk/tools/dev/po-merge.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/po-merge.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dev/po-merge.py (original) +++ subversion/trunk/tools/dev/po-merge.py Fri Feb 13 11:17:40 2015 @@ -188,7 +188,7 @@ def main(argv): # We're done. Tell the user what we did. print(('%d strings updated. ' - '%d fuzzy strings. ' + '%d fuzzy strings. ' '%d of %d strings are still untranslated (%.0f%%).' % (update_count, fuzzy, untranslated, string_count, 100.0 * untranslated / string_count))) Modified: subversion/trunk/tools/dev/x509-parser.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/x509-parser.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dev/x509-parser.c (original) +++ subversion/trunk/tools/dev/x509-parser.c Fri Feb 13 11:17:40 2015 @@ -84,7 +84,7 @@ is_der_cert(const svn_string_t *raw) { /* really simplistic fingerprinting of a DER. By definition it must * start with an ASN.1 tag of a constructed (0x20) sequence (0x10). - * It's somewhat unfortunate that 0x30 happens to also come out to the + * It's somewhat unfortunate that 0x30 happens to also come out to the * ASCII for '0' which may mean this will create false positives. */ return raw->data[0] == 0x30 ? TRUE : FALSE; } Modified: subversion/trunk/tools/diff/diff.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff.c?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/diff/diff.c (original) +++ subversion/trunk/tools/diff/diff.c Fri Feb 13 11:17:40 2015 @@ -117,7 +117,7 @@ int main(int argc, const char *argv[]) APR_ARRAY_PUSH(options_array, const char *) = argv[i]; - /* Special case: '-U' takes an argument, so capture the + /* Special case: '-U' takes an argument, so capture the * next argument in the array. */ if (argv[i][1] == 'U' && !argv[i][2]) { Modified: subversion/trunk/tools/dist/backport.pl URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport.pl (original) +++ subversion/trunk/tools/dist/backport.pl Fri Feb 13 11:17:40 2015 @@ -63,7 +63,7 @@ my @sh = qw/false true/; die if grep { ($sh[$_] eq 'true') != !!$_ } $DEBUG, $MAY_COMMIT, $VERBOSE, $YES; # Username for entering votes. -my $SVN_A_O_REALM = '<https://svn.apache.org:443> ASF Committers'; +my $SVN_A_O_REALM = '<https://svn.apache.org:443> ASF Committers'; my ($AVAILID) = $ENV{AVAILID} // do { local $_ = `$SVN auth svn.apache.org:443 2>/dev/null`; # TODO: pass $SVN_A_O_REALM ($? == 0 && /Auth.*realm: \Q$SVN_A_O_REALM\E\nUsername: (.*)/) ? $1 : undef @@ -288,7 +288,7 @@ sub shell_safe_path_or_url($) { local $_ = shift; return m{^[A-Za-z0-9._:+/-]+$} and !/^-|^[+]/; } - + # Shell-safety-validating wrapper for File::Temp::tempfile sub my_tempfile { my ($fh, $fn) = tempfile(); @@ -502,8 +502,8 @@ sub parse_entry { $notes .= shift while @_ and $_[0] !~ /^\w/; my %accepts = map { $_ => 1 } ($notes =~ /--accept[ =]([a-z-]+)/g); given (scalar keys %accepts) { - when (0) { } - when (1) { $accept = [keys %accepts]->[0]; } + when (0) { } + when (1) { $accept = [keys %accepts]->[0]; } default { warn "Too many --accept values at '", logsummarysummary({ logsummary => [@logsummary] }), @@ -625,7 +625,7 @@ sub vote { (exists $approved->{$key}) ? ($raw_approved .= $_) : (print VOTES); next; } - + s/^(\s*\Q$vote\E:.*)/"$1, $AVAILID"/me or s/(.*\w.*?\n)/"$1 $vote: $AVAILID\n"/se; $_ = edit_string $_, $entry->{header}, trailing_eol => 2 @@ -648,7 +648,7 @@ sub vote { grep { !$approvedcheck{$_} } keys %$approved if scalar(keys %$approved) != scalar(keys %approvedcheck); prompt "Press the 'any' key to continue...\n", dontprint => 1 - if scalar(keys %$approved) != scalar(keys %approvedcheck) + if scalar(keys %$approved) != scalar(keys %approvedcheck) or scalar(keys %$votes) != scalar(keys %votescheck); move "$STATUS.$$.tmp", $STATUS; @@ -893,7 +893,7 @@ sub handle_entry { verbose => 1, extra => qr/[+-]/) { when (/^y/i) { merge %entry; - while (1) { + while (1) { given (prompt "Shall I open a subshell? [ydN] ", verbose => 1) { when (/^y/i) { # TODO: if $MAY_COMMIT, save the log message to a file (say, @@ -1091,7 +1091,7 @@ sub nominate_main { # Construct entry. my $logmsg = `$SVN propget --revprop -r $revnums[0] --strict svn:log '^/'`; die "Can't fetch log message of r$revnums[0]: $!" unless $logmsg; - + unless ($logmsg =~ s/^(.*?)\n\n.*/$1/s) { # "* file\n (symbol): Log message." Modified: subversion/trunk/tools/dist/backport_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport_tests.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport_tests.py (original) +++ subversion/trunk/tools/dist/backport_tests.py Fri Feb 13 11:17:40 2015 @@ -74,38 +74,38 @@ class BackportTest(object): """Return a decorator that: builds TEST_FUNC's sbox, creates ^/subversion/trunk, and calls TEST_FUNC, then compare its output to the expected dump file named after TEST_FUNC.""" - + # .wraps() propagates the wrappee's docstring to the wrapper. - @functools.wraps(test_func) + @functools.wraps(test_func) def wrapped_test_func(sbox): expected_dump_file = './%s.dump' % (test_func.func_name,) sbox.build() - + # r2: prepare ^/subversion/ tree sbox.simple_mkdir('subversion', 'subversion/trunk') sbox.simple_mkdir('subversion/tags', 'subversion/branches') sbox.simple_move('A', 'subversion/trunk') sbox.simple_move('iota', 'subversion/trunk') sbox.simple_commit(message='Create trunk') - + # r3: branch sbox.simple_copy('subversion/trunk', 'branch') sbox.simple_append('branch/STATUS', '') sbox.simple_add('branch/STATUS') sbox.simple_commit(message='Create branch, with STATUS file') - + # r4: random change on trunk sbox.simple_append('subversion/trunk/iota', 'First change\n') sbox.simple_commit(message='First change') - + # r5: random change on trunk sbox.simple_append('subversion/trunk/A/mu', 'Second change\n') sbox.simple_commit(message='Second change') - + # Do the work. test_func(sbox) - + # Verify it. verify_backport(sbox, expected_dump_file, self.uuid) return wrapped_test_func @@ -139,7 +139,7 @@ def serialize_entry(entry): # notes ' Notes: %s\n' % (entry['notes'],) if entry['notes'] else '', - + # branch ' Branch: %s\n' % (entry['branch'],) if entry['branch'] else '', @@ -294,7 +294,7 @@ def backport_accept(sbox): # r6: conflicting change on branch sbox.simple_append('branch/iota', 'Conflicts with first change\n') sbox.simple_commit(message="Conflicting change on iota") - + # r7: nominate r4 with --accept (because of r6) approved_entries = [ make_entry([4], notes="Merge with --accept=theirs-conflict."), @@ -318,7 +318,7 @@ def backport_branches(sbox): # r6: conflicting change on branch sbox.simple_append('branch/iota', 'Conflicts with first change') sbox.simple_commit(message="Conflicting change on iota") - + # r7: backport branch sbox.simple_update() sbox.simple_copy('branch', 'subversion/branches/r4') @@ -367,7 +367,7 @@ def backport_conflicts_detection(sbox): # r6: conflicting change on branch sbox.simple_append('branch/iota', 'Conflicts with first change\n') sbox.simple_commit(message="Conflicting change on iota") - + # r7: nominate r4, but without the requisite --accept approved_entries = [ make_entry([4], notes="This will conflict."), Modified: subversion/trunk/tools/hook-scripts/mailer/mailer.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/mailer/mailer.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/hook-scripts/mailer/mailer.py (original) +++ subversion/trunk/tools/hook-scripts/mailer/mailer.py Fri Feb 13 11:17:40 2015 @@ -241,7 +241,7 @@ class MailedOutput(OutputBase): # characters), encoding (per RFC2047) each token as necessary, and # slapping 'em back to together again. from email.Header import Header - + def _maybe_encode_header(hdr_token): try: hdr_token.encode('ascii') Modified: subversion/trunk/tools/server-side/svnpubsub/daemonize.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/daemonize.py?rev=1659509&r1=1659508&r2=1659509&view=diff ============================================================================== --- subversion/trunk/tools/server-side/svnpubsub/daemonize.py (original) +++ subversion/trunk/tools/server-side/svnpubsub/daemonize.py Fri Feb 13 11:17:40 2015 @@ -83,7 +83,7 @@ class Daemon(object): p = multiprocessing.Process(target=self._first_child, args=(child_is_ready, child_completed)) p.start() - + # Wait for the child to finish setting things up (in case we need # to communicate with it). It will only exit when ready. ### use a timeout here! (parameterized, of course) @@ -260,13 +260,13 @@ class _Detacher(Daemon): def run(self): self.target(*self.args, **self.kwargs) - + def run_detached(target, *args, **kwargs): """Simple function to run TARGET as a detached daemon. - + The additional arguments/keywords will be passed along. This function does not return -- sys.exit() will be called as appropriate. - + (capture SystemExit if logging/reporting is necessary) ### if needed, a variant of this func could be written to not exit """
