r30017 | dionisos | 2008-03-24 08:27:40 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Add more issues and comments resulting from discussion. ---------------------------------------------------------------------------- r30015 | stsp | 2008-03-23 16:13:13 EDT Changed paths: M /trunk/www/hacking.html * www/hacking.html: In the "Crediting" section, be more explicit about the preferred way of listing committers. Approved by: kfogel ---------------------------------------------------------------------------- r30013 | kfogel | 2008-03-23 02:57:00 EDT Changed paths: M /trunk/tools/dev/svn-dev.el Transfer some useful stuff over from my .emacs. The entry points here are `svn-faq-url' and `svn-hacking-url'. See also `svn-source-tree-top', which you might need to customize. * tools/dev/svn-dev.el: (svn-source-tree-top, svn-faq-file, svn-hacking-file, svn-url-base, svn-faq-url, svn-hacking-url, svn-html-get-targets, svn-url-completing-read, svn-faq-history-list, svn-hacking-history-list, svn-faq-url, svn-hacking-url): New. ---------------------------------------------------------------------------- r30012 | arfrever | 2008-03-22 21:44:06 EDT Changed paths: M /trunk/configure.ac * configure.ac: Autoconf 2.58 or later is now required so always call AC_PROG_EGREP. ---------------------------------------------------------------------------- r30009 | dionisos | 2008-03-22 16:54:37 EDT Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c Fix issue #3135 (property update on locally deleted file breaks WC). * subversion/libsvn_wc/update_editor.c (merge_file): Only fill WC file related entry cache-fields if the cache will serve any use (ie when the entry is schedule-normal). ---------------------------------------------------------------------------- r30008 | hwright | 2008-03-22 10:33:07 EDT Changed paths: M /trunk/www/hacking.html M /trunk/www/project_tasks.html M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html, www/hacking.html www/project_tasks.html: Fix sundry validation errors. ---------------------------------------------------------------------------- r30007 | hwright | 2008-03-22 10:27:49 EDT Changed paths: M /trunk/www/project_tasks.html * www/project-tasks.html: Fix validation errors caused by r29946: project_tasks.html:228: parser error : Comment must not contain '--' (double-hyphen) ---------------------------------------------------------------------------- r30006 | hwright | 2008-03-22 10:08:12 EDT Changed paths: M /trunk/www/project_tasks.html A little linkifying in the Summer of Code task list. * www/project-tasks.html (summer-of-code): Link back to the main Summer of Code website, and also add a note to see the SoC FAQ for generic program questions. ---------------------------------------------------------------------------- r30004 | stsp | 2008-03-22 09:47:06 EDT Changed paths: M /trunk/subversion/libsvn_ra_svn/client.c Fix the client-side problem described in issue #2382 (correctly handle dual-stack servers in ra_svn client). With this fix, clients iterate over all available addresses when connecting to a host running svnserve and use the first address that works. We used to only try the first address, and if that didn't work we bailed out -- too bad if want to connect to localhost, the first address happens to be IPv6 loopback, and the host is configured to reject any IPv6 packets. See http://svn.haxx.se/dev/archive-2008-03/0605.shtml Patch by: joe (Updated for current trunk by me.) Approved by: lgo * subversion/libsvn_ra_svn/client.c: (make_connection): Iterate through the returned list of addresses until a socket/connect pair succeeds. ---------------------------------------------------------------------------- r30001 | lgo | 2008-03-22 03:28:58 EDT Changed paths: M /trunk/subversion/libsvn_ra_serf/update.c ra_serf: Code cleanup. Suggested by: kfogel * subversion/libsvn_ra_serf/update.c (finish_report): Don't create temp. variable 'err'. ---------------------------------------------------------------------------- r29988 | kfogel | 2008-03-21 18:06:09 EDT Changed paths: M /trunk/www/links.html * www/links.html (hosting): Move 8svn.com to end, following up to r29987. In the absence of alphabetical order or any other clear policy, I'm just going to reward the early adopters :-). ---------------------------------------------------------------------------- r29987 | kfogel | 2008-03-21 18:03:34 EDT Changed paths: M /trunk/www/links.html * www/links.html (hosting): Add 8svn.com. Patch by: Keith Coleman ---------------------------------------------------------------------------- r29986 | lgo | 2008-03-21 17:58:52 EDT Changed paths: M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: Add ability to load CA authority certifications and use them to verify server certificates. This complete issue #3111. Note: as before, those people building svn with serf trunk should update the latter to r1179. * subversion/libsvn_ra_serf/util.c (load_authorities): New function. (svn_ra_serf__conn_setup): Load and trust the CA certificate files. ---------------------------------------------------------------------------- r29984 | stsp | 2008-03-21 14:39:18 EDT Changed paths: M /trunk/notes/tree-conflicts/detection.txt * notes/tree-conflicts/detection.txt: Remove the section explaining why detecting tree conflicts during merge requires history. It has been made obsolete by recent design discussions. Further update descriptions of how we plan to detect use cases 4 and 6. Completely rewrite the section on use case 5, which was still outdated wrt latest discussion. Patch by: Stephen Butler ---------------------------------------------------------------------------- r29983 | stsp | 2008-03-21 11:37:37 EDT Changed paths: M /trunk/notes/tree-conflicts/detection.txt * notes/tree-conflicts/detection.txt: Cover results of further design discussion between Julian Foad, Stephen Butler, Nico Schellingerhout, C. Michael Pilato, and myself. We have gotten much closer to a solid design for detection of the "merge" use cases (UC 4, 5, and 6). Patch by: Julian Foad (Based on a patch by me, and tweaked by me: removed a remark I introduced in the patch that Julian's patch was based on.) ---------------------------------------------------------------------------- r29979 | arfrever | 2008-03-20 20:32:18 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (mt-ui): Delete duplicated words. ---------------------------------------------------------------------------- r29974 | arfrever | 2008-03-20 16:09:05 EDT Changed paths: M /trunk/subversion/mod_authz_svn/mod_authz_svn.c Follow-up to r29947: Fix coding style. * subversion/mod_authz_svn/mod_authz_svn.c (convert_case, get_username_to_authorize): Place function types and names on separate lines. ---------------------------------------------------------------------------- r29973 | hwright | 2008-03-20 15:10:58 EDT Changed paths: M /trunk/www/hacking.html * www/hacking.html (patch-manager): Update to reflect Daniel Shahaf as the new patch manager. ---------------------------------------------------------------------------- r29969 | kameshj | 2008-03-20 06:31:00 EDT Changed paths: M /trunk/subversion/libsvn_client/merge.c When we pass END as 'svn_opt_revision_unspecified' to 'svn_client__repos_locations', we are not interested in END_URL and END_REVISION, so as per API we can pass them as NULL. * subversion/libsvn_client/merge.c (filter_self_referential_mergeinfo): Pass end_revision and end_url as NULL to svn_client__repos_locations. ---------------------------------------------------------------------------- r29967 | pburba | 2008-03-19 21:45:18 EDT Changed paths: M /trunk/subversion/include/svn_mergeinfo.h M /trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Update doc string of svn_rangelist_merge noting that it compacts ranges, and handles empty ranges, and add some C API tests of this behavior. * subversion/include/svn_mergeinfo.h (svn_rangelist_merge): * subversion/tests/libsvn_subr/mergeinfo-test.c (test_rangelist_merge): Test merging of empty ranges and non-empty range_to_string with empty range to see that the former is compacted. ---------------------------------------------------------------------------- r29967 | pburba | 2008-03-19 21:45:18 EDT Changed paths: M /trunk/subversion/include/svn_mergeinfo.h M /trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Update doc string of svn_rangelist_merge noting that it compacts ranges, and handles empty ranges, and add some C API tests of this behavior. * subversion/include/svn_mergeinfo.h (svn_rangelist_merge): * subversion/tests/libsvn_subr/mergeinfo-test.c (test_rangelist_merge): Test merging of empty ranges and non-empty range_to_string with empty range to see that the former is compacted. ---------------------------------------------------------------------------- r29966 | cmpilato | 2008-03-19 20:55:13 EDT Changed paths: M /trunk/subversion/tests/cmdline/basic_tests.py Minor test string fix (doesn't effect the test logic). ---------------------------------------------------------------------------- r29965 | pburba | 2008-03-19 15:42:59 EDT Changed paths: M /trunk/subversion/tests/cmdline/diff_tests.py Fix spurious Win32 buildbot failure of diff_tests.py 47 On Win32,if your current directory is not a working copy, and you do something like diff -x WCPATH -r1 You'll get the error "svn: '.' is not a working copy" because WCPATH is interpreted as the --extensions argument. How other platforms get far enough to examine the --extensions arg and return the error "svn: Invalid argument 'WCPATH' in diff options." is a mystery to me, but diff_tests.py 47 expects the latter and does pass on other platforms (per the buildbots). Regardless, the former error is quite legitimate on Win32. * subversion/tests/cmdline/diff_tests.py (diff_summarize_xml): Tweak expected error regexp to also accept the error that is produced on Win32. ---------------------------------------------------------------------------- r29963 | hwright | 2008-03-19 14:34:49 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (news): Update links in the table of contents, and move a couple of entries around to reflect ordering in the document. ---------------------------------------------------------------------------- r29961 | bhuvan | 2008-03-19 13:48:51 EDT Changed paths: M /trunk/subversion/include/svn_client.h M /trunk/subversion/libsvn_client/client.h M /trunk/subversion/libsvn_client/copy.c M /trunk/subversion/libsvn_client/log.c This is a follow-up for r29948. Rename the macro which checks if revision kind is dependent on a WC. Use the new macro wherever it is applicable. * subversion/include/svn_client.h (SVN_CLIENT_IS_WC_DEPENDENT_REVKIND): Move this macro ... * subversion/libsvn_client/client.h (SVN_CLIENT__REVKIND_NEEDS_WC) ... to here and rename it. * subversion/libsvn_client/copy.c (setup_copy): Use the macro. * subversion/libsvn_client/log.c (svn_client_log4): Use the new macro. Suggested by: kfogel Approved by: kfogel ---------------------------------------------------------------------------- r29953 | hwright | 2008-03-19 12:57:35 EDT Changed paths: M /trunk/tools/dist/write-announcement.py * tools/dist/write_announcment.py (main, ann_text, ann_html): Use the given major and minor version numbers to generate the correct URLs for the release notes. ---------------------------------------------------------------------------- r29951 | kfogel | 2008-03-19 12:48:13 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html: Add material, edit existing material. ---------------------------------------------------------------------------- r29949 | stylesen | 2008-03-19 09:36:52 EDT Changed paths: M /trunk/subversion/libsvn_client/log.c Tweak formatting. * subversion/libsvn_client/log.c (svn_client_log4): Correct level of indentation. ---------------------------------------------------------------------------- r29948 | bhuvan | 2008-03-19 08:50:54 EDT Changed paths: M /trunk/subversion/include/svn_client.h M /trunk/subversion/libsvn_client/log.c Display a better error message, if working copy dependent revision kind is passed for 'svn log url -rXXX' command. Add svn_opt_revision_working to list of revision kinds we should check. * subversion/include/svn_client.h (SVN_CLIENT_IS_WC_DEPENDENT_REVKIND): New macro. * subversion/libsvn_client/log.c (svn_client_log4): Use the new macro. If start/end revision kind is dependent on working copy, display an error message. Approved by: kameshj ---------------------------------------------------------------------------- r29947 | dlr | 2008-03-19 00:41:21 EDT Changed paths: M /trunk/subversion/mod_authz_svn/mod_authz_svn.c Significantly reduce complexity of AuthzForceUsernameCase code added in r29875 (and subsequent follow-ups), dumping an insignificant micro-optimization along the way. * subversion/mod_authz_svn/mod_authz_svn.c (makeupper, makelower): Remove functions. (convert_case): Rename STR_TO_CONVERT and UPPER parameters to TEXT and TO_UPPERCASE, respectively. Tweak doc string accordingly. Really inline use of character case conversion functions. (get_username_to_authorize): Add doc string. Tweak formatting. ---------------------------------------------------------------------------- r29946 | kfogel | 2008-03-18 23:31:10 EDT Changed paths: M /trunk/www/project_tasks.html * www/project_tasks.html Add some potential Google Summer of Code (GSoC) projects. ---------------------------------------------------------------------------- r29944 | xsteve | 2008-03-18 16:31:52 EDT Changed paths: M /trunk/contrib/client-side/emacs/psvn.el Added some more FAQ entries Contributed by Sarir Khamsi * trunk/contrib/client-side/emacs/psvn.el: Added three new FAQ entries ---------------------------------------------------------------------------- r29942 | lgo | 2008-03-17 14:08:35 EDT Changed paths: M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: Follow up r29939. Fix build breakage with serf 0.1.2 ( 0.1.2. ---------------------------------------------------------------------------- r29939 | lgo | 2008-03-16 21:27:54 EDT Changed paths: M /trunk/subversion/include/svn_error_codes.h M /trunk/subversion/libsvn_ra_serf/ra_serf.h M /trunk/subversion/libsvn_ra_serf/serf.c M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: add SSL server certificate validation. This adds a callback to override the default algorithm. Validation is based on subject & issuer, matching hostname (pattern) and certificate expiration dates. Any pre-installed CA certificates can be used. Loading custom CA certificates is not implemented yet. Note: if you're building svn with serf trunk, updating serf to r1176 is needed. * subversion/libsvn_ra_serf/ra_serf.h (struct svn_ra_serf__session_t): Store config information to setup serf. * subversion/include/svn_error_codes.h (SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED): New error code. * subversion/libsvn_ra_serf/serf.c (load_config): Load the ssl server certificate config options. * subversion/libsvn_ra_serf/util.c (serf_failure_map[], ssl_convert_serf_failures): Map serf failure codes to subversion codes. (convert_organisation_to_str): Convert subject or issuer to readable text. (ssl_server_cert): Callback function, allowing override of the default server certificate validation algorithm. (svn_ra_serf__conn_setup): Make serf use our callback. ---------------------------------------------------------------------------- r29938 | kfogel | 2008-03-16 16:26:00 EDT Changed paths: M /trunk/www/hacking.html * www/hacking.html (Crediting, Commit access): Link to COMMITTERS file. ---------------------------------------------------------------------------- r29936 | arfrever | 2008-03-16 14:35:16 EDT Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ---------------------------------------------------------------------------- r29935 | kfogel | 2008-03-16 10:55:34 EDT Changed paths: M /trunk/CHANGES * CHANGES (Minor new features and improvements): Add r25650. Suggested by: zhakov ---------------------------------------------------------------------------- r29934 | fabien | 2008-03-16 08:12:25 EDT Changed paths: M /trunk/subversion/po/fr.po French translation update for r29932: * subversion/po/fr.po: po-update and many fixes. ---------------------------------------------------------------------------- r29932 | dionisos | 2008-03-15 19:09:52 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Commit today's work. ---------------------------------------------------------------------------- r29927 | kfogel | 2008-03-15 00:34:50 EDT Changed paths: M /trunk/subversion/svn/conflict-callbacks.c * subversion/svn/conflict-callbacks.c (svn_cl__conflict_handler): Use "s" to "show all options", where doing so both shows more options and shows help for all options. See this message and its thread for more information: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=136061 From: Blair Zajac To: Subversion Developers Subject: Show all options for conflict resolution Date: Thu, 13 Mar 2008 15:59:44 -0700 Message-ID: <47D9B1E0.7060505@orcaware.com> ---------------------------------------------------------------------------- r29926 | kfogel | 2008-03-15 00:34:32 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (wc-and-repos-format-change): Put the subsections in the same order as they are given in the outer section's title. ---------------------------------------------------------------------------- r29924 | kfogel | 2008-03-14 17:37:59 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (merge-tracking): Improve wording. ---------------------------------------------------------------------------- r29923 | kfogel | 2008-03-14 17:36:11 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (merge-tracking): Fill out this section. ---------------------------------------------------------------------------- r29922 | cmpilato | 2008-03-14 16:55:27 EDT Changed paths: M /trunk/subversion/mod_dav_svn/dav_svn.h M /trunk/subversion/mod_dav_svn/mod_dav_svn.c M /trunk/subversion/mod_dav_svn/reports/update.c M /trunk/subversion/mod_dav_svn/repos.c For issue #3121, implement a new SVNAllowBulkUpdates mod_dav_svn directive which toggles support for send-all style update REPORT responses (versus the original, and now ra_serf-employed, skelta-style ones). This feature is handy for repository administrators who wish to have logs of every file a client grabbed as part of a checkout/update/etc. for security purposes. (Since path-based authz stuffs aren't time sensitive, you can't apply today's policies to a log line that says "User joe checked out /trunk" and know that those policies were the same ones in place at the time of that checkout.) It has no effect on ra_serf clients, which always use skelta-style reports. And ra_neon still carries fallback code which can handle this style of report response, too (for compatibility with older servers). * subversion/mod_dav_svn/mod_dav_svn.c (dir_conf_t): Add 'bulk_updates' member. (create_dir_config): Init 'bulk_updates' to "on". (merge_dir_config): Add inheritance for the 'bulk_updates' conf member. (SVNAllowBulkUpdates_cmd): New. (dav_svn__get_bulk_updates_flag): New. (cmds): Add 'SVNAllowBulkUpdates' directive stuffs. * subversion/mod_dav_svn/dav_svn.h (dav_svn_repos): Add 'bulk_updates' member. (dav_svn__get_bulk_updates_flag): New. * subversion/mod_dav_svn/repos.c (get_parentpath_resource, get_resource): Populate the per-repos 'bulk_updates' flag from the relevant server config stuffs. * subversion/mod_dav_svn/reports/update.c (dav_svn__update_report): Only check to see if the client wants a bulk update report (send-all=true) if the server is configured to allow those. ---------------------------------------------------------------------------- r29918 | kfogel | 2008-03-14 15:55:11 EDT Changed paths: M /trunk/www/merge-tracking/index.html * www/merge-tracking/index.html (internal): Mention what happened to SQLite. ---------------------------------------------------------------------------- r29917 | julianfoad | 2008-03-14 14:06:56 EDT Changed paths: M /trunk/COMMITTERS * COMMITTERS: Update my email address. ---------------------------------------------------------------------------- r29916 | kfogel | 2008-03-14 13:48:55 EDT Changed paths: M /trunk/www/links.html * www/links.html (clients): Add Aigenta Unified SCC. Patch by: Andrei Faber ---------------------------------------------------------------------------- r29913 | kameshj | 2008-03-14 10:19:53 EDT Changed paths: M /trunk/subversion/mod_authz_svn/mod_authz_svn.c Fix build error on MS VC6, which was introduced at r29875. * subversion/mod_authz_svn/mod_authz_svn.c (): remove 'strings.h'. (makeupper, makelower): replace 'inline' with 'APR_INLINE'. Patch by: masaru tsuchiyama ---------------------------------------------------------------------------- r29912 | joe | 2008-03-14 05:28:30 EDT Changed paths: M /trunk/CHANGES * CHANGES: Note PKCS#11 support in ra_neon. ---------------------------------------------------------------------------- r29911 | kameshj | 2008-03-14 04:36:40 EDT Changed paths: M /trunk/subversion/mod_authz_svn/mod_authz_svn.c Pure stylistic fix (Placing the function return type in its own line). Bump the copyright year. * subversion/mod_authz_svn/mod_authz_svn.c Found by: arfrever ---------------------------------------------------------------------------- r29910 | kfogel | 2008-03-14 00:58:39 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (merge-tracking): Make sure to add the "foundational" qualifier to the title here, as in the table of contents. The description will go into more detail. ---------------------------------------------------------------------------- r29909 | kfogel | 2008-03-14 00:57:13 EDT Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html: Finish table of contents, introduction, and repos and wc upgrade sections. Tweak various other things as well. ---------------------------------------------------------------------------- r29908 | kfogel | 2008-03-13 22:50:37 EDT Changed paths: M /trunk/CHANGES * CHANGES: Finish, by pruning, rearranging what was left, and editing. ---------------------------------------------------------------------------- r29904 | kfogel | 2008-03-13 17:35:51 EDT Changed paths: M /trunk/CHANGES * CHANGES (1.5.0): Complete, based on revisions sweep. There are still entries here that should probably be removed, but there shouldn't be any missing entries at this point. ---------------------------------------------------------------------------- r29897 | glasser | 2008-03-13 13:26:54 EDT Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c Adjust a comment. * subversion/libsvn_wc/update_editor.c (add_file_with_history): Don't say "we need to copy working props" in a block that doesn't do that (since that work was done above). Suggested by: bhuvan ---------------------------------------------------------------------------- r29896 | kameshj | 2008-03-13 10:33:02 EDT Changed paths: M /trunk/subversion/mod_authz_svn/mod_authz_svn.c Pure stylistic fix. * subversion/mod_authz_svn/mod_authz_svn.c Found by: dlr ---------------------------------------------------------------------------- r29894 | lgo | 2008-03-13 04:45:32 EDT Changed paths: M /trunk/CHANGES *CHANGES: add line about r26364. ---------------------------------------------------------------------------- r29894 | lgo | 2008-03-13 04:45:32 EDT Changed paths: M /trunk/CHANGES *CHANGES: add line about r26364. ---------------------------------------------------------------------------- r29893 | cauchy | 2008-03-13 02:59:44 EDT Changed paths: M /trunk/subversion/po/zh_CN.po Simplified chinese translation update. * subversion/po/zh_CN.po: Update to r29884. ---------------------------------------------------------------------------- r29893 | cauchy | 2008-03-13 02:59:44 EDT Changed paths: M /trunk/subversion/po/zh_CN.po Simplified chinese translation update. * subversion/po/zh_CN.po: Update to r29884. ---------------------------------------------------------------------------- r29882 | hwright | 2008-03-12 15:13:15 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Fix a few typos. ---------------------------------------------------------------------------- r29876 | cmpilato | 2008-03-12 13:10:59 EDT Changed paths: M /trunk/subversion/libsvn_client/merge.c Fix issue #3118: 2-url merge from DAV-accessed foreign repository leaves bogus wc-props in merge target. * subversion/libsvn_client/merge.c (merge_file_added): Filter wc-props from files merge-added from foreign repositories. ---------------------------------------------------------------------------- r29875 | kameshj | 2008-03-12 12:14:26 EDT Changed paths: M /trunk/subversion/mod_authz_svn/mod_authz_svn.c Make mod_authz_svn to apply the authz checks against upper/lower-cased usernames. * subversion/mod_authz_svn/mod_authz_svn.c (): Include 'apr_lib.h' and 'strings.h'. (struct authz_svn_config_rec): New member 'force_username_case'. (authz_svn_cmds): Populate 'authz_svn_config_rec.force_username_case' from configuration directive 'AuthzForceUsernameCase'. (makeupper, makelower, convert_case, get_username_to_authorize): New functions. (req_check_access, subreq_bypass): Apply authz check against upper/lower-cased usernames. Reviewed by: dlr ---------------------------------------------------------------------------- r29874 | joe | 2008-03-12 11:31:10 EDT Changed paths: M /trunk/subversion/libsvn_ra_neon/session.c Allow use of Negotiate/NTLM for proxy authentiation in ra_neon, without needing to explicitly configure a redundant username and password. * subversion/libsvn_ra_neon/session.c (svn_ra_neon__open): Enable (only) Negotiate auth to the proxy if no proxy-username is configured. ---------------------------------------------------------------------------- r29871 | kfogel | 2008-03-12 02:13:41 EDT Changed paths: M /trunk/www/project_tasks.html * www/project_tasks.html (sparse-dirs-deselect): Oops, give this section a real title, following up to r29870. ---------------------------------------------------------------------------- r29870 | kfogel | 2008-03-12 02:12:36 EDT Changed paths: M /trunk/www/project_tasks.html * www/project_tasks.html: Clean out some old stuff, reorganize, and add one new task for Google Summer of Code (there will be more, but this one was an obvious candidate). ---------------------------------------------------------------------------- r29859 | cmpilato | 2008-03-11 16:30:49 EDT Changed paths: M /trunk/subversion/libsvn_client/merge.c Minor merge sanity-check logic re-org. * subversion/libsvn_client/merge.c (do_merge): Group some related sanity checks, and reorder them so that error conditions are checked before no-op requests (to discourage naughty callers). ---------------------------------------------------------------------------- r29858 | cmpilato | 2008-03-11 16:27:12 EDT Changed paths: M /trunk/subversion/libsvn_client/merge.c Fix some buglets related to merges from foreign repositories. * subversion/libsvn_client/merge.c (do_merge): Disallow --record-only when the sources come from a different repository than the target. (merge_cousins_and_supplement_mergeinfo): If the sources come from a different repository than the target, skip the mergeinfo recording phase (erroring is this was a --record-only request). ---------------------------------------------------------------------------- r29857 | cmpilato | 2008-03-11 15:51:52 EDT Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py * subversion/tests/cmdline/merge_tests.py (foreign_repos_2_url): Tweak the test description. ---------------------------------------------------------------------------- r29854 | rocketraman | 2008-03-11 14:50:10 EDT Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge.py svnmerge.py: Similar to r29741, fix brokenness with r29666 when there is no default locale for sys.stdout.encoding in Python. * contrib/client-side/svnmerge/svnmerge.py (recode_stdout_to_file): Treat as a no-op when sys.stdout.encoding returns None. ---------------------------------------------------------------------------- r29852 | cmpilato | 2008-03-11 14:19:06 EDT Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Add a test for 2-URL merges from foreign repositories. (I'm trying to reproduce a scenario I saw earlier today where such a merge left wc-props that contained DAV opaque URLs which pointed to the wrong repository. So far, I've not been successful.) * subversion/tests/cmdline/merge_tests.py (foreign_repos_2_url): New test. (test_list): Add references to new test. ---------------------------------------------------------------------------- r29844 | hwright | 2008-03-10 16:36:52 EDT Changed paths: M /trunk/tools/dist/construct-rolling-environment.sh * tools/dist/construct-rolling-environment.sh Update dependencies: SWIG 1.3.31 - because we aren't sure that 1.3.33 works with each set of bindings. libtool 1.5.26 - new bugfix release neon 0.28.1 - new bugfix release ---------------------------------------------------------------------------- r29833 | cmpilato | 2008-03-10 14:29:49 EDT Changed paths: M /trunk/subversion/libsvn_repos/log.c Code formatting changes only. ---------------------------------------------------------------------------- r29822 | cmpilato | 2008-03-10 11:38:51 EDT Changed paths: M /trunk/subversion/svnsync/main.c Switch from compile-time to runtime determination of whether to do merge tracking filtering/migration in svnsync. * subversion/svnsync/main.c (edit_baton_t): Add the following boolean fields: strip_mergeinfo, migrate_svnmerge, mergeinfo_stripped, svnmerge_migrated, svnmerge_blocked. (change_file_prop, change_dir_prop): Consult the edit baton to see whether to do Subversion mergeinfo stripping to svnmerge.py info migration, and remember the actions taken by tweaking the appropriate reporting boolean. (close_edit): Print notifications (when not in quiet mode) related to merge tracking information management. (get_sync_editor): Populate the new 'strip_mergeinfo' and 'migrate_svnmerge' fields conditioned on the presence of SVNSYNC_UNSUPPORTED_STRIP_MERGEINFO and SVNSYNC_UNSUPPORTED_MIGRATE_SVNMERGE environment values. ---------------------------------------------------------------------------- r29820 | lgo | 2008-03-10 10:30:55 EDT Changed paths: M /trunk/subversion/libsvn_ra_serf/auth.c M /trunk/subversion/libsvn_ra_serf/ra_serf.h M /trunk/subversion/libsvn_ra_serf/update.c M /trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c M /trunk/subversion/libsvn_ra_serf/win32_auth_sspi.h ra_serf: First part of support for authenticating to NTLM proxy servers (like MS ISA Server). This code is Windows specific. * subversion/libsvn_ra_serf/auth.c: (serf_auth_protocols): Add 'NTLM for proxy servers' scheme. * subversion/libsvn_ra_serf/win32_auth_sspi.h: * subversion/libsvn_ra_serf/win32_auth_sspi.c: (init_proxy_sspi_connection, handle_proxy_sspi_auth, setup_request_proxy_sspi_auth): New functions that implement the NTLM authentication handshake for proxy servers. * subversion/libsvn_ra_serf/ra_serf.h (svn_ra_serf__connection_t): Add member field proxy_sspi_context to store state information about the NTLM handshake. * subversion/libsvn_ra_serf/update.c (finish_report): Initialize a new connection with information about the proxy authentication scheme used for previous connections to the same server. ---------------------------------------------------------------------------- r29819 | stylesen | 2008-03-10 04:44:22 EDT Changed paths: M /trunk/subversion/tests/cmdline/lock_tests.py Mark couple of lock_tests as XFail in dav. * subversion/tests/cmdline/lock_tests.py (test_list): Mark unlock_wrong_token and unlocked_lock_of_other_user as XFail tests in ra_dav only. ---------------------------------------------------------------------------- r29818 | cacknin | 2008-03-09 21:15:05 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Organize the classification of svn_wc_entry_t fields into a table and fix some mistakes. ---------------------------------------------------------------------------- r29817 | dionisos | 2008-03-09 18:57:11 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Reflow to 79 columns. ---------------------------------------------------------------------------- r29816 | dionisos | 2008-03-09 17:44:24 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Add the magic words 'dispatch table'. ---------------------------------------------------------------------------- r29815 | rocketraman | 2008-03-09 17:06:52 EDT Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge.py Fix regression error in r29666 for non-english locales that was causing a KeyError when svnmerge.py commands were executed, since the output of svn info was non-english and therefore non-parseable. * contrib/client-side/svnmerge.py: Set the environment in which the script operates to set LC_MESSAGES = C (to force svn messages, such as those for svn info to be in english, and thus parseable by svnmerge.py), while also removing any pre-existing setting for LC_ALL (since setting LC_ALL to C causes log output to not be internationalized). Patch by: me Laurent Petit Review by: Giovanni Bajo Found by: Hern‡n Mart’nez Foffani ---------------------------------------------------------------------------- r29814 | dionisos | 2008-03-09 16:27:13 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Add additional requirements and annotate with issue #s. ---------------------------------------------------------------------------- r29813 | dionisos | 2008-03-09 13:53:52 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Incorporate the result from discussions with cacknin today, including his classification of svn_wc_entry_t fields (tweaked by me). ---------------------------------------------------------------------------- r29812 | dionisos | 2008-03-09 09:57:18 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Flesh out 2 more sections. ---------------------------------------------------------------------------- r29811 | dionisos | 2008-03-09 09:36:05 EDT Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Add example and some issue numbers. ---------------------------------------------------------------------------- r29809 | arfrever | 2008-03-09 08:29:42 EDT Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ---------------------------------------------------------------------------- r29807 | cauchy | 2008-03-09 04:04:26 EDT Changed paths: M /trunk/subversion/po/zh_CN.po oops, some fix for r29806 ---------------------------------------------------------------------------- r29806 | cauchy | 2008-03-09 03:49:48 EDT Changed paths: M /trunk/subversion/po/zh_CN.po Simplified chinese translation update. * subversion/po/zh_CN.po: Update to r29805. ---------------------------------------------------------------------------- r29805 | arfrever | 2008-03-08 17:27:38 EST Changed paths: M /trunk/aclocal.m4 Follow-up to r26993. * aclocal.m4: s/configure.in/configure.ac/ in comments. ---------------------------------------------------------------------------- r29804 | dionisos | 2008-03-08 17:23:47 EST Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Explain some more about the different trees. ---------------------------------------------------------------------------- r29803 | dionisos | 2008-03-08 17:12:40 EST Changed paths: M /trunk/notes/wc-ng-design * notes/wc-ng-design: Update with comments received from glasser, lgo and cacknin. Also: try to avoid 'etc' in order to be limitative. Add some more thoughts of my own too. ---------------------------------------------------------------------------- r29802 | dionisos | 2008-03-08 17:09:58 EST Changed paths: M /trunk/notes/wc-improvements * notes/wc-improvements: Remove section which seems to have been implemented. ---------------------------------------------------------------------------- r29800 | arfrever | 2008-03-08 15:51:54 EST Changed paths: M /trunk/configure.ac * configure.ac (NEON_ALLOWED_LIST): Allow Neon trunk (0.29). ---------------------------------------------------------------------------- r29799 | dionisos | 2008-03-08 15:18:06 EST Changed paths: D /trunk/notes/propfind-pool-notes * notes/propfind-pool-notes: Remove file relating to (resolved) issue #773. ---------------------------------------------------------------------------- r29798 | dionisos | 2008-03-08 15:13:05 EST Changed paths: M /trunk/notes/reintegrate-todo.txt * notes/reintegrate-todo.txt: Set 'native' eol-style so I can read it on Win. ---------------------------------------------------------------------------- r29798 | dionisos | 2008-03-08 15:13:05 EST Changed paths: M /trunk/notes/reintegrate-todo.txt * notes/reintegrate-todo.txt: Set 'native' eol-style so I can read it on Win. ---------------------------------------------------------------------------- r29796 | djh | 2008-03-08 14:25:14 EST Changed paths: M /trunk/www/faq.html * www/faq.html (mod_dav_svn-win32): Add intl3_svn.dll to list. ---------------------------------------------------------------------------- r29795 | dionisos | 2008-03-08 04:09:32 EST Changed paths: D /trunk/notes/wc-2.0-design A /trunk/notes/wc-ng-design s/wc-2.0/wc-ng/ and set eol style. ---------------------------------------------------------------------------- r29794 | kfogel | 2008-03-07 21:54:40 EST Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html: Add a stub to expand later. ---------------------------------------------------------------------------- r29793 | kfogel | 2008-03-07 20:35:09 EST Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html: Formatting tweaks, following up to r29792. ---------------------------------------------------------------------------- r29792 | kfogel | 2008-03-07 20:31:58 EST Changed paths: M /trunk/www/svn_1.5_releasenotes.html Add some more information on the FSFS improvements. * www/svn_1.5_releasenotes.html (fsfs-sharding): Edit. (fsfs-isolate-immutable): New section. Patch by: Dan Christian (Tweaked by me.) ---------------------------------------------------------------------------- r29789 | dionisos | 2008-03-07 17:58:08 EST Changed paths: A /trunk/notes/wc-2.0-design Add document with my thoughts on libsvn_wc 2.0, giving others the opportunity to add their thoughts. ---------------------------------------------------------------------------- r29786 | hwright | 2008-03-07 15:58:25 EST Changed paths: M /trunk/subversion/libsvn_repos/log.c * subversion/libsvn_repos/log.c (combined_mergeinfo_path_lists): Don't assume that we have a remaining revision range list before adding it. ---------------------------------------------------------------------------- r29767 | cmpilato | 2008-03-07 10:37:42 EST Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge.py Protect svnmerge.py from itself. While Subversion might be able to gracefully deal with loose URL specifications (such as those that contain spaces), svnmerge.py cannot -- it uses whitespace as a record delimiter. * contrib/client-side/svnmerge/svnmerge.py (is_url): Disallow URLs that contain whitespace. ---------------------------------------------------------------------------- r29753 | julianfoad | 2008-03-06 17:27:59 EST Changed paths: M /trunk/subversion/tests/cmdline/authz_tests.py M /trunk/subversion/tests/cmdline/autoprop_tests.py M /trunk/subversion/tests/cmdline/basic_tests.py M /trunk/subversion/tests/cmdline/blame_tests.py M /trunk/subversion/tests/cmdline/cat_tests.py M /trunk/subversion/tests/cmdline/changelist_tests.py M /trunk/subversion/tests/cmdline/checkout_tests.py M /trunk/subversion/tests/cmdline/commit_tests.py M /trunk/subversion/tests/cmdline/copy_tests.py M /trunk/subversion/tests/cmdline/depth_tests.py M /trunk/subversion/tests/cmdline/diff_tests.py M /trunk/subversion/tests/cmdline/getopt_tests.py M /trunk/subversion/tests/cmdline/import_tests.py M /trunk/subversion/tests/cmdline/lock_tests.py M /trunk/subversion/tests/cmdline/log_tests.py M /trunk/subversion/tests/cmdline/merge_tests.py M /trunk/subversion/tests/cmdline/prop_tests.py M /trunk/subversion/tests/cmdline/revert_tests.py M /trunk/subversion/tests/cmdline/schedule_tests.py M /trunk/subversion/tests/cmdline/special_tests.py M /trunk/subversion/tests/cmdline/stat_tests.py M /trunk/subversion/tests/cmdline/svnadmin_tests.py M /trunk/subversion/tests/cmdline/svndumpfilter_tests.py M /trunk/subversion/tests/cmdline/svnlook_tests.py M /trunk/subversion/tests/cmdline/svnsync_tests.py M /trunk/subversion/tests/cmdline/svntest/actions.py M /trunk/subversion/tests/cmdline/svntest/main.py M /trunk/subversion/tests/cmdline/svntest/tree.py M /trunk/subversion/tests/cmdline/svntest/verify.py M /trunk/subversion/tests/cmdline/svnversion_tests.py M /trunk/subversion/tests/cmdline/switch_tests.py M /trunk/subversion/tests/cmdline/update_tests.py Allow testing of application exit codes. This makes all of the lower-level process-running functions in cmdline/svntest/main.py and cmdline/svntest/actions.py return the exit code, all of the "run_and_verify_*()" functions guess the expected exit code based on whether or not output on stderr is expected, and new "run_and_verify_*2()" functions allow the expected exit code to be provided explicitly. On platforms without the Popen3 Python class (e.g. Windows), exit codes are returned as None, and therefore disregarded during validation. Patch by: Jeremy Hinds * subversion/tests/cmdline/svntest/main.py (run_command, run_svn, run_svnadmin, run_svnlook, run_svnsync, run_svnversion, run_command_stdin): Include exit_code in the returned tuple. (create_repos): Accept exit_code returned from run_command. (run_one): Clarify a comment concerning exit codes * subversion/tests/cmdline/svntest/actions.py (run_and_verify_svnlook2, run_and_verify_svnadmin2, run_and_verify_svnversion2, run_and_verify_svn2, run_and_verify_svn_match_any2): New, execute the indicated binary and check actual outputs and exit code against the expected value parameters. (run_and_verify_svnlook, run_and_verify_svnadmin, run_and_verify_svnversion, run_and_verify_svn, run_and_verify_svn_match_any): Guess whether the expected exit should be 0 or 1 based on whether output is expected on stderr. Then invoke the coresponding run_and_verify_*2 function with that value. Return exit_code, stdout_lines, stderr_lines. (setup_pristine_repository, run_and_verify_load, run_and_verify_dump, run_and_verify_checkout, run_and_verify_update, run_and_verify_commit, run_and_verify_status, run_and_verify_unquiet_status, run_and_verify_diff_summarize, run_and_verify_diff_summarize_xml, run_and_verify_log_xml, run_and_verify_merge2, run_and_verify_mergeinfo, run_and_verify_switch, run_and_validate_lock, check_prop, inject_conflict_into_wc, run_and_verify_export): Accept exit_code value returned from main.run_svn, main.run_command, main.run_svnadmin, main.run_command_stdin, actions.run_and_verify_svn * subversion/tests/cmdline/svntest/tree.py (get_props): Accept exit code returned by main.run_svn. * subversion/tests/cmdline/svntest/verify.py (SVNUnexpectedExitCode): New exception raised when the exit code was not what was expected. (verify_exit_code): New, compares expected and actual exit code and raises an exception if they are different. Comparison is not performed if expected exit code is None. * subversion/tests/cmdline/cat_tests.py, subversion/tests/cmdline/lock_tests.py, subversion/tests/cmdline/stat_tests.py: Accept exit code returned from run_*(), replacing those calls with the run_*2() counterparts for cases where stderr output is produced while exiting 0. * subversion/tests/cmdline/prop_tests.py: Accept exit code returned from the run_*() function calls, and verify exit codes along with each verify_output(). * subversion/tests/cmdline/authz_tests.py, subversion/tests/cmdline/autoprop_tests.py, subversion/tests/cmdline/basic_tests.py, subversion/tests/cmdline/blame_tests.py, subversion/tests/cmdline/changelist_tests.py, subversion/tests/cmdline/checkout_tests.py, subversion/tests/cmdline/commit_tests.py, subversion/tests/cmdline/copy_tests.py, subversion/tests/cmdline/depth_tests.py, subversion/tests/cmdline/diff_tests.py, subversion/tests/cmdline/getopt_tests.py, subversion/tests/cmdline/import_tests.py, subversion/tests/cmdline/log_tests.py, subversion/tests/cmdline/merge_tests.py, subversion/tests/cmdline/revert_tests.py, subversion/tests/cmdline/schedule_tests.py, subversion/tests/cmdline/special_tests.py, subversion/tests/cmdline/svnadmin_tests.py, subversion/tests/cmdline/svndumpfilter_tests.py, subversion/tests/cmdline/svnlook_tests.py, subversion/tests/cmdline/svnsync_tests.py, subversion/tests/cmdline/svnversion_tests.py, subversion/tests/cmdline/switch_tests.py, subversion/tests/cmdline/update_tests.py: Accept exit code returned from the run_*() function calls. ---------------------------------------------------------------------------- r29741 | jerenkrantz | 2008-03-06 00:15:02 EST Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge.py svnmerge.py: Fix brokenness with r29666 when there is no default locale in Python. * contrib/client-side/svnmerge/svnmerge.py (recode_stdout_to_file): Treat as a no-op when there is no default locale which is the standard on several OS-bundled Python installs - Mac OS X 10.5 and Solaris 10 both return (None,None). ---------------------------------------------------------------------------- r29740 | glasser | 2008-03-05 17:19:03 EST Changed paths: M /trunk/subversion/svnserve/cyrus_auth.c Comment explicitly that the value returned to SASL in a callback does not need to be '\0'-terminated (which confused me for a bit). * subversion/svnserve/cyrus_auth.c (canonicalize_username): Add clarification to docstring. ----------------------------------------------------------------------------