Modified: subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c (original) +++ subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c Thu Dec 30 21:27:46 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/ignore-mergeinfo/tools/dev/svn-dev.el URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/svn-dev.el?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/dev/svn-dev.el (original) +++ subversion/branches/ignore-mergeinfo/tools/dev/svn-dev.el Thu Dec 30 21:27:46 2010 @@ -152,15 +152,18 @@ Inhibit backup files unless `vc-make-bac ;;; Net if you don't have a local copy, but it requires a very recent ;;; version of Emacs, so I didn't bother with it here. -kfogel) -(defvar svn-source-tree-top (expand-file-name "~/projects/svn/") - "*Top directory of your Subversion source tree. You almost -certainly want to set this in your .emacs, to override the default; -use `(setq svn-source-tree-top \"/path/to/the/tree\")'.") +(defvar svn-site-source-tree-top (expand-file-name "~/projects/svn/site/") + "*Top directory of your Subversion site source tree of +repository \"http://svn.apache.org/repos/asf/subversion/site\";. +You almost certainly want to set this in your .emacs, to override +the default; use `(setq svn-site-source-tree-top +\"/path/to/the/site/tree\")'.") -(defvar svn-faq-file (concat svn-source-tree-top "/www/faq.html") +(defvar svn-faq-file (concat svn-site-source-tree-top "/publish/faq.html") "*A local copy of the Subversion FAQ.") -(defvar svn-hacking-file (concat svn-source-tree-top "/www/hacking.html") +(defvar svn-hacking-file (concat svn-site-source-tree-top + "/docs/community-guide/community-guide.html") "*A local copy of the Subversion hacking.html file.") ;; Helper for referring to issue numbers in a user-friendly way. @@ -188,11 +191,13 @@ the resulting URL." (start (car bounds)) (end (cdr bounds))) (delete-region start end))) - (insert (format "http://svn.collab.net/viewcvs/svn?rev=%s&view=rev"; rev))) + (insert (format "http://svn.apache.org/viewcvs?view=revision&revision=%s"; + rev))) -(defconst svn-url-base "http://subversion.tigris.org/";) +(defconst svn-url-base "http://subversion.apache.org/";) (defconst svn-faq-url (concat svn-url-base "faq.html")) -(defconst svn-hacking-url (concat svn-url-base "hacking.html")) +(defconst svn-hacking-url (concat svn-url-base + "docs/community-guide/community-guide.html")) (defun svn-html-get-targets (file) "Build a list of targets for the Subversion web file FILE." Modified: subversion/branches/ignore-mergeinfo/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/unix-build/Makefile.svn?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/dev/unix-build/Makefile.svn (original) +++ subversion/branches/ignore-mergeinfo/tools/dev/unix-build/Makefile.svn Thu Dec 30 21:27:46 2010 @@ -1044,7 +1044,7 @@ HTTPD_CMD = env LD_LIBRARY_PATH=$(LD_LIB $(PREFIX)/httpd/bin/apachectl \ -f conf/httpd-svn-check-$(WC).conf HTTPD_START_CMD = $(HTTPD_CMD) -k start -HTTPD_STOP_CMD = $(HTTPD_CMD) -k stop +HTTPD_STOP_CMD = $(HTTPD_CMD) -k stop; sleep 3 SVNSERVE_START_CMD = $(SVN_PREFIX)/bin/svnserve \ --listen-host 127.0.0.1 \ @@ -1061,7 +1061,6 @@ start-httpd: httpd-conf stop-httpd: $(HTTPD_STOP_CMD) - sleep 3 start-svnserve: $(SVN_OBJDIR)/.compiled $(SVNSERVE_START_CMD) Modified: subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/bump-to-19.py URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/bump-to-19.py?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/bump-to-19.py (original) +++ subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/bump-to-19.py Thu Dec 30 21:27:46 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/ignore-mergeinfo/tools/dev/wc-ng/populate-pristine.py URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/populate-pristine.py?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/populate-pristine.py (original) +++ subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/populate-pristine.py Thu Dec 30 21:27:46 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/ignore-mergeinfo/tools/diff/diff.c URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/diff/diff.c?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/diff/diff.c (original) +++ subversion/branches/ignore-mergeinfo/tools/diff/diff.c Thu Dec 30 21:27:46 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/ignore-mergeinfo/tools/dist/collect_sigs.py URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/dist/collect_sigs.py?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/dist/collect_sigs.py (original) +++ subversion/branches/ignore-mergeinfo/tools/dist/collect_sigs.py Thu Dec 30 21:27:46 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/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py (original) +++ subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py Thu Dec 30 21:27:46 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/ignore-mergeinfo/tools/po/l10n-report.py URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py (original) +++ subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py Thu Dec 30 21:27:46 2010 @@ -59,9 +59,9 @@ def usage_and_exit(errmsg=None): class l10nReport: - def __init__(self, to_email_id="[email protected]"): + def __init__(self, to_email_id=""): self.to_email_id = to_email_id - self.from_email_id = "<[email protected]>" + self.from_email_id = "<[email protected]>" def safe_command(self, cmd_and_args, cmd_in=""): [stdout, stderr] = subprocess.Popen(cmd_and_args, \ @@ -148,7 +148,7 @@ def main(): sys.exit(0) po_dir = 'subversion/po' - branch_name = l10n.match('URL:.*/svn/(\S+)', info_out) + branch_name = l10n.match('URL:.*/asf/subversion/(\S+)', info_out) [info_out, info_err] = l10n.safe_command(['svnversion', po_dir]) if info_err: sys.stderr.write("\nError: %s\n" % info_err) @@ -156,7 +156,7 @@ def main(): sys.exit(0) wc_version = re.sub('[MS]', '', info_out) - title = "Translation status report for %s r%s" % \ + title = "Translation status report for %...@r%s" % \ (branch_name, wc_version) os.chdir(po_dir) @@ -178,7 +178,10 @@ def main(): print(po_format) if to_email_id: - email_from = "From: SVN DEV <[email protected]>" + 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" \ % (branch_name, wc_version) @@ -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/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c (original) +++ subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c Thu Dec 30 21:27:46 2010 @@ -120,8 +120,8 @@ build_index(const char *repos_path, apr_ { svn_repos_t *repos; svn_fs_t *fs; - svn_revnum_t youngest_rev; - int i, slotsize; + svn_revnum_t youngest_rev, i; + size_t slotsize; const char *progress_fmt; apr_pool_t *subpool; @@ -134,9 +134,12 @@ build_index(const char *repos_path, apr_ /* Fetch the youngest revision of the repository. */ SVN_ERR(svn_fs_youngest_rev(&youngest_rev, fs, pool)); slotsize = strlen(apr_ltoa(pool, youngest_rev)); - progress_fmt = apr_psprintf(pool, - "[%%%dd/%%%dd] Found %%d new lines of history." - "\n", slotsize, slotsize); + progress_fmt = apr_psprintf + (pool, + "[%%%" APR_SIZE_T_FMT "ld" + "/%%%" APR_SIZE_T_FMT "ld] " + "Found %%d new lines of history." + "\n", slotsize, slotsize); /* Now, iterate over all the revisions, calling index_revision_adds(). */ subpool = svn_pool_create(pool); Modified: subversion/branches/ignore-mergeinfo/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/win-tests.py?rev=1054005&r1=1054004&r2=1054005&view=diff ============================================================================== --- subversion/branches/ignore-mergeinfo/win-tests.py (original) +++ subversion/branches/ignore-mergeinfo/win-tests.py Thu Dec 30 21:27:46 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
