Modified: subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/error-test.c URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/error-test.c?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/error-test.c (original) +++ subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/error-test.c Thu Dec 30 22:20:48 2010 @@ -169,7 +169,7 @@ test_error_purge_tracing(apr_pool_t *poo assert that the error is being thrown from the expected line and not from another assertion that could be introduced in the future. */ - SVN_TEST_ASSERT(376 == err3_copy.line); + SVN_TEST_ASSERT(379 == err3_copy.line); } else {
Modified: subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/mergeinfo-test.c URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/mergeinfo-test.c (original) +++ subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/mergeinfo-test.c Thu Dec 30 22:20:48 2010 @@ -1579,7 +1579,7 @@ remove_prefix_helper(struct catalog_bits svn_mergeinfo_catalog_t in_catalog, out_catalog, exp_out_catalog; apr_hash_index_t *hi; int i = 0; - + in_catalog = apr_hash_make(pool); exp_out_catalog = apr_hash_make(pool); while (test_data[i].orig_path) Modified: subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/stream-test.c URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/stream-test.c?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/stream-test.c (original) +++ subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/stream-test.c Thu Dec 30 22:20:48 2010 @@ -429,7 +429,7 @@ test_stream_seek_translated(apr_pool_t * svn_stream_mark_t *mark, *mark2; apr_hash_t *keywords; svn_string_t *keyword_val; - + keywords = apr_hash_make(pool); keyword_val = svn_string_create("my key word was expanded", pool); apr_hash_set(keywords, "MyKeyword", APR_HASH_KEY_STRING, keyword_val); Modified: subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/entries-compat.c URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/entries-compat.c?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/entries-compat.c (original) +++ subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/entries-compat.c Thu Dec 30 22:20:48 2010 @@ -376,7 +376,7 @@ create_open(svn_wc__db_t **db, TRUE /* auto_upgrade */, TRUE /* enforce_empty_wq */, pool, pool)); - + return SVN_NO_ERROR; } Modified: subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/op-depth-test.c?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_wc/op-depth-test.c Thu Dec 30 22:20:48 2010 @@ -327,7 +327,7 @@ print_row(const nodes_row_t *row, } /* A baton to pass through svn_hash_diff() to compare_nodes_rows(). */ -typedef struct { +typedef struct comparison_baton_t { apr_hash_t *expected_hash; /* Maps "OP_DEPTH PATH" to nodes_row_t. */ apr_hash_t *found_hash; /* Maps "OP_DEPTH PATH" to nodes_row_t. */ apr_pool_t *scratch_pool; Modified: subversion/branches/diff-optimizations-bytes/subversion/tests/manual/tree-conflicts-add-vs-add.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/tests/manual/tree-conflicts-add-vs-add.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/subversion/tests/manual/tree-conflicts-add-vs-add.py (original) +++ subversion/branches/diff-optimizations-bytes/subversion/tests/manual/tree-conflicts-add-vs-add.py Thu Dec 30 22:20:48 2010 @@ -217,14 +217,14 @@ def prepare(ctx, action, kind): prepare_cp(ctx, kind, '1') elif action == cp2: prepare_cp(ctx, kind, '2') - + def postpare(ctx, action, kind): if action == cp1: postpare_cp(ctx, kind, '1') elif action == cp2: postpare_cp(ctx, kind, '2') - + def co(name, local_action, local_kind, incoming_action, incoming_kind): @@ -249,7 +249,7 @@ def co(name, local_action, local_kind, i postpare(ctx, local_action, local_kind) postpare(ctx, incoming_action, incoming_kind) - + # get conflicts o1,e1 = shell('yes p | svn checkout "' + ctx.URL + '" ' + '"' + ctx.WC + '"') @@ -260,7 +260,7 @@ def co(name, local_action, local_kind, i +'select local_relpath,properties from actual_node; ' ]) return o1, e1, o2, e2, o3, e3 - + def up(name, local_action, local_kind, incoming_action, incoming_kind): ctx = TestContext() @@ -285,7 +285,7 @@ def up(name, local_action, local_kind, i postpare(ctx, local_action, local_kind) postpare(ctx, incoming_action, incoming_kind) - + # get conflicts o1,e1 = svn('update', '--accept=postpone', ctx.WC) o2,e2 = svn('status', ctx.WC) @@ -295,7 +295,7 @@ def up(name, local_action, local_kind, i +'select local_relpath,properties from actual_node; ' ]) return o1, e1, o2, e2, o3, e3 - + def sw(name, local_action, local_kind, incoming_action, incoming_kind): ctx = TestContext() @@ -318,7 +318,7 @@ def sw(name, local_action, local_kind, i postpare(ctx, local_action, local_kind) postpare(ctx, incoming_action, incoming_kind) - + # get conflicts o1,e1 = svn('switch', '--accept=postpone', ctx.url('branch'), ctx.wc('trunk')) o2,e2 = svn('status', ctx.WC) @@ -330,7 +330,7 @@ def sw(name, local_action, local_kind, i # This controls which tests are run. All possible combinations are tested. -# The elements are functions for up,sw and add,cp1,cp2,unver, and they are +# The elements are functions for up,sw and add,cp1,cp2,unver, and they are # simple strings for f (file), l (symlink), d (directory). # # cmd local action and kind incoming action and kind Modified: subversion/branches/diff-optimizations-bytes/tools/client-side/svn-viewspec.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/client-side/svn-viewspec.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/client-side/svn-viewspec.py (original) +++ subversion/branches/diff-optimizations-bytes/tools/client-side/svn-viewspec.py Thu Dec 30 22:20:48 2010 @@ -35,7 +35,7 @@ by this script as it checks out the spec 2. Parse VIEWSPEC-FILE and dump out a human-readable representation of the tree described in the specification. - + 3. Show this usage message. 4. Show information about the file format this program expects. @@ -307,7 +307,7 @@ def usage_and_exit(errmsg=None): if errmsg: stream.write("ERROR: %s\n" % (errmsg)) sys.exit(errmsg and 1 or 0) - + def main(): argc = len(sys.argv) if argc < 2: @@ -341,6 +341,6 @@ def main(): checkout_spec(parse_viewspec(fp), sys.argv[3]) else: usage_and_exit('Unknown subcommand "%s".' % (subcommand)) - + if __name__ == "__main__": main() Modified: subversion/branches/diff-optimizations-bytes/tools/client-side/svnmucc/svnmucc.c URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/client-side/svnmucc/svnmucc.c?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/client-side/svnmucc/svnmucc.c (original) +++ subversion/branches/diff-optimizations-bytes/tools/client-side/svnmucc/svnmucc.c Thu Dec 30 22:20:48 2010 @@ -136,7 +136,7 @@ commit_callback(const svn_commit_info_t return SVN_NO_ERROR; } -typedef enum { +typedef enum action_code_t { ACTION_MV, ACTION_MKDIR, ACTION_CP, @@ -162,7 +162,7 @@ struct operation { const char *url; /* to copy, valid for add and replace */ const char *src_file; /* for put, the source file for contents */ apr_hash_t *children; /* const char *path -> struct operation * */ - apr_hash_t *prop_mods; /* const char *prop_name -> + apr_hash_t *prop_mods; /* const char *prop_name -> const svn_string_t *prop_value */ apr_array_header_t *prop_dels; /* const char *prop_name deletions */ void *baton; /* as returned by the commit editor */ @@ -204,7 +204,7 @@ change_props(const svn_delta_editor_t *e { const void *key; void *val; - + svn_pool_clear(iterpool); apr_hash_this(hi, &key, NULL, &val); if (child->kind == svn_node_dir) @@ -1009,15 +1009,15 @@ main(int argc, const char **argv) else if (action->action == ACTION_PROPSET) { action->prop_value = - svn_string_create(APR_ARRAY_IDX(action_args, i, + svn_string_create(APR_ARRAY_IDX(action_args, i, const char *), pool); if (++i == action_args->nelts) insufficient(pool); } else { - const char *propval_file = - svn_path_canonicalize(APR_ARRAY_IDX(action_args, i, + const char *propval_file = + svn_path_canonicalize(APR_ARRAY_IDX(action_args, i, const char *), pool); if (++i == action_args->nelts) Modified: subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/bump-to-19.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/bump-to-19.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/bump-to-19.py (original) +++ subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/bump-to-19.py Thu Dec 30 22:20:48 2010 @@ -212,7 +212,7 @@ def select_subdir(wc_subdir_path): return False else: return True - + def migrate_wc_subdirs(wc_root_path): """Move Subversion metadata from the admin dir of each subdirectory Modified: subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/populate-pristine.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/populate-pristine.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/populate-pristine.py (original) +++ subversion/branches/diff-optimizations-bytes/tools/dev/wc-ng/populate-pristine.py Thu Dec 30 22:20:48 2010 @@ -58,7 +58,7 @@ INSERT_QUERY = """ INTO pristine(checksum,compression,size,refcount,md5_checksum) VALUES (?,?,?,?,?) """ - + def populate(wc_path): conn = open_db(wc_path) sys.stdout.write("Updating '%s': " % wc_path) Modified: subversion/branches/diff-optimizations-bytes/tools/diff/diff.c URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/diff/diff.c?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/diff/diff.c (original) +++ subversion/branches/diff-optimizations-bytes/tools/diff/diff.c Thu Dec 30 22:20:48 2010 @@ -86,9 +86,9 @@ int main(int argc, const char *argv[]) svn_handle_error2(svn_err, stdout, FALSE, "diff: "); return 2; } - + options_array = apr_array_make(pool, 0, sizeof(const char *)); - + for (i = 1 ; i < argc ; i++) { if (!no_more_options && (argv[i][0] == '-')) Modified: subversion/branches/diff-optimizations-bytes/tools/dist/collect_sigs.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/dist/collect_sigs.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/dist/collect_sigs.py (original) +++ subversion/branches/diff-optimizations-bytes/tools/dist/collect_sigs.py Thu Dec 30 22:20:48 2010 @@ -159,7 +159,7 @@ and <tt>END PGP SIGNATURE</tt> lines wil </form> <hr/> ''' % os.getenv('SCRIPT_NAME') - + def split(sigs): Modified: subversion/branches/diff-optimizations-bytes/tools/hook-scripts/mailer/mailer.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/hook-scripts/mailer/mailer.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/hook-scripts/mailer/mailer.py (original) +++ subversion/branches/diff-optimizations-bytes/tools/hook-scripts/mailer/mailer.py Thu Dec 30 22:20:48 2010 @@ -965,7 +965,7 @@ class DifflibDiffContent(): tolines = open(to_file, 'U').readlines() self.diff = difflib.unified_diff(fromlines, tolines, label_from, label_to) - + def __nonzero__(self): # we always have some items return True Modified: subversion/branches/diff-optimizations-bytes/tools/po/l10n-report.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/tools/po/l10n-report.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/tools/po/l10n-report.py (original) +++ subversion/branches/diff-optimizations-bytes/tools/po/l10n-report.py Thu Dec 30 22:20:48 2010 @@ -178,6 +178,9 @@ def main(): print(po_format) if to_email_id: + import smtplib + + server = smtplib.SMTP('localhost') email_from = "From: SVN DEV <[email protected]>" email_to = "To: %s" % to_email_id email_sub = "Subject: [l10n] Translation status report for %s r%s" \ @@ -186,8 +189,7 @@ def main(): msg = "%s\n%s\n%s\n%s\n%s\n%s\n%s" % (email_from, email_to,\ email_sub, title, format_head, format_line, body) - cmd = ['sendmail', '-t'] - l10n.safe_command(cmd, msg) + server.sendmail(email_from, email_to, msg) print("The report is sent to '%s' email id." % to_email_id) else: print("\nYou have not passed '-m' option, so email is not sent.") Modified: subversion/branches/diff-optimizations-bytes/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/win-tests.py?rev=1054012&r1=1054011&r2=1054012&view=diff ============================================================================== --- subversion/branches/diff-optimizations-bytes/win-tests.py (original) +++ subversion/branches/diff-optimizations-bytes/win-tests.py Thu Dec 30 22:20:48 2010 @@ -483,7 +483,7 @@ class Httpd: fp.write(self._svn_repo('local_tmp')) # And two redirects for the redirect tests - fp.write('RedirectMatch permanent ^/svn-test-work/repositories/' + fp.write('RedirectMatch permanent ^/svn-test-work/repositories/' 'REDIRECT-PERM-(.*)$ /svn-test-work/repositories/$1\n') fp.write('RedirectMatch ^/svn-test-work/repositories/' 'REDIRECT-TEMP-(.*)$ /svn-test-work/repositories/$1\n') @@ -491,7 +491,7 @@ class Httpd: fp.write('TypesConfig ' + self._quote(self.httpd_mime_types) + '\n') fp.write('LogLevel Debug\n') fp.write('HostNameLookups Off\n') - + fp.close() def __del__(self): @@ -685,26 +685,26 @@ else: '-Dtest.rooturl=', '-Dtest.fstype=' + fs_type , '-Dtest.tests=', - - '-Djava.library.path=' + + '-Djava.library.path=' + os.path.join(abs_objdir, 'subversion/bindings/javahl/native'), - '-classpath', + '-classpath', os.path.join(abs_srcdir, 'subversion/bindings/javahl/classes') +';' + gen_obj.junit_path ) - - sys.stderr.flush() + + sys.stderr.flush() print('Running org.apache.subversion tests:') sys.stdout.flush() - + r = subprocess.call(args + tuple(['org.apache.subversion.javahl.RunTests'])) sys.stdout.flush() sys.stderr.flush() if (r != 0): print('[Test runner reported failure]') failed = True - + print('Running org.tigris.subversion tests:') sys.stdout.flush() r = subprocess.call(args + tuple(['org.tigris.subversion.javahl.RunTests'])) @@ -713,7 +713,7 @@ else: if (r != 0): print('[Test runner reported failure]') failed = True - + # Stop service daemon, if any if daemon: del daemon
