- r995547: 2010-09-09 19:22:52 [ehu] Erik Hülsmann
-
/subversion/libsvn_wc/wc-metadata.sql [diff, log, file]
/subversion/tests/libsvn_wc/db-test.c [diff, log, file]
/subversion/tests/libsvn_wc/entries-compat.c [diff, log, file]
Remove NODE_DATA creation statement: SVN_WC__NODE_DATA doesn't work
anymore anyway.
* subversion/libsvn_wc/wc-metadata.sql
(STMT_CREATE_NODE_DATA): Remove.
* subversion/tests/libsvn_wc/db-test.c (create_fake_wc)
* subversion/tests/libsvn_wc/entries-compat.c (create_fake_wc):
Remove references, replacing them with the NODES table creation
statement and conditionals.
- r995530: 2010-09-09 18:28:29 [pburba] Paul T. Burba
-
/subversion/tests/cmdline/merge_tests.py [diff, log, file]
Fix spurious failure in test for issue #3514, this issue has been fixed for
some time.
* subversion/tests/cmdline/merge_tests.py
(merge_automatic_conflict_resolution): Remove local mod to merge target
in final merge --accept=base portion of test, this has nothing to do with
what is being tested here. Remove comments about failure status. Change
expectation of base value in final merge to be that of the merge source's
base (see http://subversion.tigris.org/issues/show_bug.cgi?id=3514#desc3).
(test_list): Remove XFail from merge_automatic_conflict_resolution.
- r995513: 2010-09-09 17:39:53 [stsp] Stefan Sperling
-
/subversion/include/private/svn_dep_compat.h [diff, log, file]
* subversion/include/private/svn_dep_compat.h
(APR_UINT16_MAX, APR_INT16_MAX, APR_INT16_MIN): Define for backwards compat
to APR versions prior to 1.3.0.
- r995508: 2010-09-09 17:32:47 [stsp] Stefan Sperling
-
/subversion/svnserve/cyrus_auth.c [diff, log, file]
* subversion/svnserve/cyrus_auth.c
(cyrus_auth_request): Replace use of atoi() with svn_cstring_atoui().
The values being parsed are supposed to be unsigned integers as per
Cyrus-SASL documentation.
- r995507: 2010-09-09 17:31:47 [hwright] Hyrum Wright
-
[performance] /subversion/libsvn_repos/dump.c [diff, log, file]
On the performance branch:
Remove a superfluous function.
* subversion/libsvn_repos/dump.c
(write_hash_to_stringbuf): This function is no longer present on trunk,
but still managed to survive on this branch.
- r995502: 2010-09-09 17:23:59 [stsp] Stefan Sperling
-
/subversion/svnserve/main.c [diff, log, file]
Follow-up to r995501:
* subversion/svnserve/main.c
(main): Use the SVN_ERR_CL_ARG_PARSING_ERROR error code instead of
SVN_ERR_INCORRECT_PARAMS for consistency with the svn client.
- r995501: 2010-09-09 17:18:36 [stsp] Stefan Sperling
-
/subversion/svnserve/main.c [diff, log, file]
* subversion/svnserve/main.c
(): Include svn_string.h and private/svn_dep_compat.h.
(main): Parse the --listen-port argument with svn_cstring_strtoui64() instead
of atoi(). Make sure the argument parses correctly as a 16 bit unsigned
integer. Previously, any argument was accepted, e.g. --listen-port "abc"
actually worked (PORT ended up being zero, so the OS assigned a random port).
- r995498: 2010-09-09 17:11:17 [stsp] Stefan Sperling
-
/subversion/libsvn_subr/svn_string.c [diff, log, file]
* subversion/libsvn_subr/svn_string.c
(svn_cstring_strtoi64, svn_cstring_strtoui64): If apr_strtoi64() reports
the first character of the string as invalid, there is no number in the
string, so return an error. apr_strtoi64() sets errno only to indicate
overflow, not other error conditions, so this additional check is needed.
- r995485: 2010-09-09 16:35:53 [stsp] Stefan Sperling
-
/subversion/libsvn_repos/load.c [diff, log, file]
* subversion/libsvn_repos/load.c
(parse_format_version, svn_repos_parse_dumpstream2): Replace use of atoi()
with svn_cstring_atoi().
- r995484: 2010-09-09 16:28:48 [stsp] Stefan Sperling
-
/subversion/libsvn_repos/load.c [diff, log, file]
* subversion/libsvn_repos/load.c
(parse_property_block): Replace two more occurrences of atoi() with
svn_cstring_atoi64(), switching to 64bit because size_t isn't
guaranteed to be 32bit.
- r995478: 2010-09-09 15:59:00 [hwright] Hyrum Wright
-
Click to show all 46 changes...
On the performance branch:
Bring up-to-date with trunk.
- r995475: 2010-09-09 15:51:34 [stsp] Stefan Sperling
-
/subversion/libsvn_repos/load.c [diff, log, file]
* subversion/libsvn_repos/load.c
(parse_property_block): Use svn_cstring_atoi64() instead of atoi() (switching
to 64bit because size_t isn't guaranteed to be 32bit).
- r995472: 2010-09-09 15:46:30 [stsp] Stefan Sperling
-
/subversion/libsvn_ra_neon/util.c [diff, log, file]
Follow-up to r995461 to fix the build:
* subversion/libsvn_ra_neon/util.c
(start_err_element): Don't return an svn_error_t*, as this function
returns an int.
- r995465: 2010-09-09 15:34:35 [stsp] Stefan Sperling
-
/subversion/libsvn_ra_neon/lock.c [diff, log, file]
* subversion/libsvn_ra_neon/lock.c
(): Include svn_string.h.
(lock_from_baton): Use svn_cstring_atoi() instead of atoi().
- r995461: 2010-09-09 15:28:54 [stsp] Stefan Sperling
-
/subversion/libsvn_ra_neon/util.c [diff, log, file]
* subversion/libsvn_ra_neon/util.c
(start_err_element): Use svn_cstring_atoi64() instead of atoi() (switch
to 64bit integer for consistency with serf).
- r995459: 2010-09-09 15:23:19 [stsp] Stefan Sperling
-
/subversion/libsvn_ra_serf/util.c [diff, log, file]
Follow-up to r995455:
* subversion/libsvn_ra_serf/util.c: Include svn_string.h.
- r995455: 2010-09-09 15:19:23 [stsp] Stefan Sperling
-
/subversion/libsvn_ra_serf/util.c [diff, log, file]
* subversion/libsvn_ra_serf/util.c
(start_error): Use svn_cstring_atoi64() instead of apr_atoi64().
- r995450: 2010-09-09 14:51:28 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/update_tests.py [diff, log, file]
* subversion/tests/cmdline/update_tests.py
(update_with_file_lock_and_keywords_property_set):
Following up on r995441, wait a second instead of hoping that lock
or propset wait for us.
Suggested by: philip
- r995447: 2010-09-09 14:41:44 [stsp] Stefan Sperling
-
/subversion/include/private/svn_skel.h [diff, log, file]
/subversion/libsvn_subr/skel.c [diff, log, file]
/subversion/libsvn_wc/workqueue.c [diff, log, file]
Make svn_skel__parse_int use svn_cstring_atoi64() instead of apr_atoi64().
As a side-effect, make svn_skel__parse_int() return an error if conversion
from string to a number fails.
* subversion/libsvn_subr/skel.c
(svn_skel__parse_int): Use svn_cstring_atoi64(), return errors.
* subversion/include/private/svn_skel.h
(svn_skel__parse_int): Update declaration. Drop comment saying this
function assumes valid input.
* subversion/libsvn_wc/workqueue.c
(run_revert, run_killme, run_base_remove, run_deletion_postcommit,
run_postcommit, run_file_install, run_record_fileinfo): Update callers.
- r995441: 2010-09-09 14:19:43 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/update_tests.py [diff, log, file]
* subversion/tests/cmdline/update_tests.py
(update_with_file_lock_and_keywords_property_set):
Enable sleeping for timestamp changes to detect the mtime
change even if the update takes less then a second.
- r995407: 2010-09-09 12:51:37 [philip] Philip Martin
-
/subversion/libsvn_wc/copy.c [diff, log, file]
* subversion/libsvn_wc/copy.c.c
(copy_versioned_dir, svn_wc_copy3): Remove conditional multi-db code.
- r995402: 2010-09-09 12:31:57 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
Follow-up to r995383:
* subversion/libsvn_fs_fs/fs_fs.c
(read_rep_line): Wrapping svn_error_create() within svn_error_return()
is redundant.
Found by: danielsh
- r995400: 2010-09-09 12:27:53 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/id.c [diff, log, file]
* subversion/libsvn_fs_fs/id.c
(svn_fs_fs__id_parse): Use svn_cstring_atoi64() instead of apr_atoi64().
- r995395: 2010-09-09 12:16:39 [danielsh] Daniel Shahaf
-
/subversion/tests/cmdline/copy_tests.py [diff, log, file]
* subversion/tests/cmdline/copy_tests.py
(changed_data_should_match_checkout):
Following up r961831, mark expected output unordered.
- r995394: 2010-09-09 12:13:26 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(get_root_changes_offset): Use svn_cstring_atoi64() instead of apr_atoi64().
Adjust, and ask a question in, a comment.
- r995390: 2010-09-09 12:01:08 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(get_root_changes_offset): Use svn_cstring_atoi64() instead of apr_atoi64().
- r995388: 2010-09-09 11:47:22 [stylesen] Senthil Kumaran S
-
/subversion/tests/cmdline/update_tests.py [diff, log, file]
Add a test for issue #3471: 'svn up touches file w/ lock & svn:keywords
property'.
* subversion/tests/cmdline/update_tests.py
(update_with_file_lock_and_keywords_property_set): New test case.
(test_list): Add the above test case and mark it as XFail.
Patchy by: Vijayaguru G <vijay@...>
- r995387: 2010-09-09 11:46:43 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(read_rep_line): Use svn_cstring_atoi64() instead of apr_atoi64().
- r995383: 2010-09-09 11:31:12 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(read_rep_line): Properly indent the body of various if-statements.
Use "error" instead of "err" as a goto label, because "err" is the
conventional name for variables of type svn_error_t*.
Use svn_error_return() when returning errors.
- r995382: 2010-09-09 11:22:37 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__read_noderev): Use svn_cstring_atoi64() instead of apr_atoi64()
and svn_cstring_atoi() instead of atoi().
- r995380: 2010-09-09 11:12:32 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(read_rep_offsets): Use svn_cstring_atoi64() instead of apr_atoi64().
- r995377: 2010-09-09 10:51:50 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(get_packed_offset): Use svn_cstring_atoi64() instead of apr_atoi64().
Also mark an error message string for translation.
- r995372: 2010-09-09 10:42:10 [stsp] Stefan Sperling
-
/subversion/libsvn_fs_fs/fs_fs.c [diff, log, file]
* subversion/libsvn_fs_fs/fs_fs.c
(): Include svn_string.h.
(read_format): Use svn_cstring_atoi() instead of atoi().
- r995363: 2010-09-09 09:42:32 [philip] Philip Martin
-
/subversion/libsvn_wc/upgrade.c [diff, log, file]
Make upgrade rerunnable after an interrupt without needing to use
pre-1.7 for cleanup.
* subversion/libsvn_wc/upgrade.c
(upgrade_to_wcng): Delete any previous partial upgrade.
- r995357: 2010-09-09 09:16:45 [philip] Philip Martin
-
/subversion/libsvn_wc/upgrade.c [diff, log, file]
/subversion/tests/cmdline/upgrade_tests.py [diff, log, file]
Fix upgrade_tests.py 12.
* subversion/libsvn_wc/upgrade.c
(svn_wc__wipe_postupgrade): Handle an unversioned directory obstructing
a versioned directory.
(upgrade_working_copy): Handle an unversioned directory obstructing a
versioned directory, destroy iterpool when skipping, remove unneeded
comments.
* subversion/tests/cmdline/upgrade_tests.py
(missing_dirs2): Verify status.
(test_list): Remove XFail mark.
- r995260: 2010-09-08 21:27:58 [danielsh] Daniel Shahaf
-
/tools/dev/wc-format.py [log, file]
Add a helper script, ported to Python.
* tools/dev/wc-format.py: New.
Prints the working copy format of a given directory.
- r995215: 2010-09-08 19:29:11 [dannas] Daniel Näslund
-
/subversion/libsvn_client/patch.c [diff, log, file]
* subversion/libsvn_client/patch.c
(apply_one_patch): Remove a question with an associated answer from
the code.
- r995212: 2010-09-08 19:22:29 [hwright] Hyrum Wright
-
Click to show all 18 changes...
Merge r985014, r985669, and r987893 from the performance branch, which make
use of the svn_ctype_is* functions more uniform.
This also adds an include to subversion/libsvn_fs_fs/fs_fs.c which was added
as part of r983430 on the performance branch. That revision is not related
to the above, and so isn't being merged here.
- r995210: 2010-09-08 19:18:29 [dannas] Daniel Näslund
-
/subversion/libsvn_client/patch.c [diff, log, file]
In the patch code, factor out the code dealing with closing streams to
its own function for readability.
* subversion/libsvn_client/patch.c
(close_target_streams): New. Created with code from ...
(apply_one_patch): .. here.
Suggested by: stsp
- r995194: 2010-09-08 18:58:29 [dannas] Daniel Näslund
-
/subversion/libsvn_client/patch.c [diff, log, file]
In the patch code, remove some unnecessary intermediate variables.
* subversion/libsvn_client/patch.c
(apply_one_patch): Use 'prop_patch_target_t' variables directly
instead of introducing intermediate variables to hold some
members.
Suggested by: stsp
- r995183: 2010-09-08 18:34:20 [philip] Philip Martin
-
/subversion/libsvn_wc/upgrade.c [diff, log, file]
/subversion/libsvn_wc/wc.h [diff, log, file]
/subversion/libsvn_wc/workqueue.c [diff, log, file]
/subversion/libsvn_wc/workqueue.h [diff, log, file]
Make interrupting the upgrade of a pre-1.7 working copy leave the
working copy in a working state.
* subversion/libsvn_wc/wc.h
(svn_wc__wipe_postupgrade): New.
* subversion/libsvn_wc/upgrade.c
(): Include workqueue.h.
(svn_wc__wipe_postupgrade): New.
(upgrade_to_wcng): Put temporary db in .svn/tmp, don't remove old metadata.
(svn_wc_upgrade): Add wq items and run the wq, close and reopen
db handle rather than droping the root.
* subversion/libsvn_wc/workqueue.h
(svn_wc__wq_build_postupgrade): New.
* subversion/libsvn_wc/workqueue.c
(OP_POSTUPGRADE, run_postupgrade, svn_wc__wq_build_postupgrade): New.
(dispatch_table): Add OP_POSTUPGRADE.
- r995168: 2010-09-08 17:55:23 [hwright] Hyrum Wright
-
[javahl-ra] /BRANCH-README [log, file]
On the javahl-ra branch:
Add a BRANCH-README file.
* BRANCH-README: New.
- r995156: 2010-09-08 17:05:14 [stsp] Stefan Sperling
-
/subversion/svn/main.c [diff, log, file]
* subversion/svn/main.c
(svn_cl__options): Add two aliases for the --no-unlock option:
--nul (shorter to type) and --keep-lock (no confusing double-negative).
- r994957: 2010-09-08 09:59:22 [philip] Philip Martin
-
/subversion/include/private/svn_dep_compat.h [diff, log, file]
/subversion/libsvn_repos/reporter.c [diff, log, file]
Followup to r993425, compatibility with older APR.
* subversion/include/private/svn_dep_compat.h
(APR_SIZE_MAX): Define for older APR.
* subversion/libsvn_repos/reporter.c: Remove APR_SIZE_MAX definition,
include svn_dep_compat.h
- r994956: 2010-09-08 09:58:07 [stefan2] User: stefan2
-
[performance] /subversion/libsvn_subr/cache-membuffer.c [diff, log, file]
Fix server crashes reported by Johan Corvelyn.
As it turned out, find_entry used only the first 4 or 8 bytes
of the MD5 hash as a key to identify an entry.
* subversion/libsvn_subr/cache_membuffer.c
(find_entry): compare & copy KEY_LEN bytes when dealing with keys.
- r993544: 2010-09-07 22:00:57 [hwright] Hyrum Wright
-
[javahl-ra] /subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNReposAccess.cpp [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/native/SVNReposAccess.cpp [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/native/SVNReposAccess.h [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRATests.java [diff, log, file]
On the javahl-ra branch:
Implement the checkPath() RA method for JavaHL.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/SVNRATests.java
(testCheckPath): New.
* native/SVNReposAccess.h
(checkPath): New.
* native/SVNReposAccess.cpp
(checkPath): New.
* native/org_apache_subversion_javahl_SVNReposAccess.cpp
(Java_org_apache_subversion_javahl_SVNReposAccess_checkPath): New.
* src/org/apache/subversion/javahl/ISVNReposAccess.java
(checkPath): New.
* src/org/apache/subversion/javahl/SVNReposAccess.java
(checkPath): New.
- r993504: 2010-09-07 19:49:02 [dannas] Daniel Näslund
-
/subversion/tests/cmdline/patch_tests.py [diff, log, file]
Add patch test for adding empty files.
Such files can only be applied if the diff uses the git extensions to
the unidiff format.
* subversion/tests/cmdline/patch_tests.py
(patch_git_add_file): New.
(test_list): Add patch_git_add_file.
- r993495: 2010-09-07 19:39:41 [hwright] Hyrum Wright
-
[javahl-ra] /subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java [diff, log, file]
On the javahl-ra branch:
Make a function private which has no need of publicity.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java
(getCppAddr): Privatize.
- r993494: 2010-09-07 19:38:09 [hwright] Hyrum Wright
-
[javahl-ra] /subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java [diff, log, file]
On the javahl-ra branch:
Ensure we inform callers that we may well throw SubversionExceptions.
[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/ISVNReposAccess.java,
src/org/apache/subversion/javahl/SVNReposAccess.java
(getDatedRevision, getLocks): Add throws SubversionException clause.
- r993493: 2010-09-07 19:32:23 [hwright] Hyrum Wright
-
[javahl-ra] /subversion/bindings/javahl/native/CreateJ.cpp [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/native/CreateJ.h [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNReposAccess.cpp [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/native/SVNReposAccess.cpp [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/native/SVNReposAccess.h [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReposAccess.java [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNReposAccess.java [diff, log, file]
[javahl-ra] /subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRATests.java [diff, log, file]
On the javahl-ra branch:
Implement the getLocks() ra API in JavaHL.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/SVNRATests.java
(setUp): Create a working copy, because it will be useful for out tests.
(testGetLocks): New.
* native/CreateJ.cpp
(LockMap): New.
* native/SVNReposAccess.h
(getLocks): New.
* native/SVNReposAccess.cpp
(getLocks): New.
* native/org_apache_subversion_javahl_SVNReposAccess.cpp
(Java_org_apache_subversion_javahl_SVNReposAccess_getLocks): New.
* native/CreateJ.h
(LockMap): New.
* src/org/apache/subversion/javahl/ISVNReposAccess.java
(getLocks): New.
* src/org/apache/subversion/javahl/SVNReposAccess.java
(getLocks): New.