Checkout
 

dlr in subversion

Remove use of the deprecated svn_path_canonicalize() API.

* subversion/libsvn_client/repos_diff.c

(make_dir_baton, make_file_baton, delete_entry): Replace

svn_path_join() with svn_dirent_join(). An eb->target WC directory

is the "base" parameter for each call.

Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>

Remove use of the deprecated svn_path_canonicalize() API from libsvn_ra_svn.

* subversion/libsvn_ra_svn/client.c

(parse_lock, open_session, ra_svn_get_dir, ra_svn_log,

ra_svn_get_locations, ra_svn_get_location_segments,

ra_svn_get_file_revs): Replace all use of svn_path_canonicalize()

with svn_uri _canonicalize(), and adjust header includes as

appropriate.

* subversion/libsvn_ra_svn/editorp.c

(ra_svn_handle_delete_entry, ra_svn_handle_add_dir, ra_svn_handle_open_dir,

ra_svn_handle_add_file, ra_svn_handle_open_file): Ditto.

* STATUS: Vote for r39614 and r40400.

* www/links.html: Add cc2svn.

Suggested by: Vadim Goryunov

* subversion/libsvn_client/deprecated.c

(wrap_pre_blame3_receiver): Replace use of strlen(3) with sizeof.

Suggested by: Daniel Näslund <daniel{_AT_}longitudo.com>

stsp

brane

* Makefile.in

(check-javahl): Pass the system property "test.rooturl" with the value of

the BASE_URL Makefile variable when invoking the Java tests.

* subversion/libsvn_diff/diff.h

(svn_diff__normalize_buffer): Improve doc string.

Add property retrieval tests.

* subversion/tests/libsvn_wc/db-test.c

(set_prop): Tweak doc string wording to match Subversion style.

(validate_node): Remove idefs around property retrieval

tests. Rewrite the code to actually compile + work with the seed

data from test_inserting_nodes(). Also, add comparisons that the

two styles of property value retrieval produce the same result.

(test_inserting_nodes): Drop some extraneous calls to set_prop().

* subversion/tests/libsvn_wc/db-test.c

(set_prop): Add doc string.

* subversion/tests/cmdline/trans_tests.py

* subversion/tests/cmdline/lock_tests.py

* subversion/tests/cmdline/switch_tests.py

* subversion/tests/cmdline/diff_tests.py

* subversion/tests/cmdline/basic_tests.py

* subversion/tests/cmdline/update_tests.py

* subversion/tests/cmdline/merge_tests.py

* subversion/tests/cmdline/depth_tests.py

Die excessive hash mark usage, die.

* subversion/tests/cmdline/svntest/wc.py

Really, how many freaking hash marks do we need?

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_base_get_info): Tweak documentation, remove some todos

which are already implemented.

Formatting tweaks, no functional change.

* subversion/libsvn_wc/wc_db.c

For cases where one block of an "if/else" construct uses braces, use

them for both blocks to improve readability (trading off a little

extra line count), even for single-line blocks.

For consistency with word_to_kind()...

* subversion/libsvn_wc/wc_db.c

(word_to_presence): Rewrite routine using a "switch" statement, and

respond to inline question, replacing it with a comment channeling

the essence of the implementation.

* subversion/libsvn_wc/wc_db.c

(word_to_kind): Rewrite routine using a "switch" statement, and

respond to inline question, replacing it with a comment channeling

the essence of the implementation.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_checkmode_multi): Fix typo in doc string.

* subversion/libsvn_wc/wc_db.h: Questions, comments, and documentation tweaks.

### NOTE: This revision was reverted in r32085. ###

Merge r32023 from trunk into the 1.5.x branch, a follow up to r31884

to fix issue #2242, which checks for a NULL username.

Votes: +1: stylesen, danielsh, dlr

* STATUS: Vote for r32023, approving.

JavaHL: Another follow-up to r31993, changing Path.isURL() to raise

IllegalArgumentException rather than NullPointerException for a null

path input.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/Path.java

(isURL): Tweak implementation.

* tests/org/tigris/subversion/javahl/BasicTests.java

(testPathIsURL): Tweak check of null input.

Suggested by: blair

JavaHL: A follow-up to r31993, substituting a trivial scheme check for

usage of java.net.URL, which requires that protocols be registered

with it before being recognized as valid schemes.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/Path.java

(isURL): Tweak implementation.

* tests/org/tigris/subversion/javahl/BasicTests.java

(testPathIsURL): Expand variety of protocol schemes tested to

include some Subversion-specific schemes.

Reported by: markphip

Talden <talden@gmail.com>

* STATUS: Nominate r31994 for backport.
JavaHL: Fix bug in the CopySources::array() JNI method, where the peg

revision was extracted incorrectly from a Java object because we were

calling the wrong method (we were using the revision instead).

[ in subversion/bindings/javahl/ ]

* native/CopySources.cpp

(array): Invoke the CopySource.getPegRevision() method when

extracting the peg revision of a copy source from a Java object.

Reported by: Alexander Kitaev <Alexander.Kitaev@svnkit.com>

JavaHL: Add a new API which uses java.net.URL to determine whether the

specified Subversion path is considered to be a URL. This may be

slightly different than what svn_path_is_url() considers to be a URL,

as the latter employs a simplistic implementation.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/Path.java

(isURL): Add new API.

* tests/org/tigris/subversion/javahl/BasicTests.java

(testPathIsURL): Add test for the new Path.isURL() method.

* STATUS: Fix typo.

* STATUS: Vote for r31619, approving.

* STATUS: Add r31806 to the r31719 group, voting +1 for both.

A follow-up to r31719, adding corresponding documentation.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/SVNClientInterface.java

(singleStatus): Expand on @return JavaDoc to mention that null is

returned when there is no status available for "path".

* STATUS: Vote for r31727, approving.
Improve test coverage of svn_config.h by trivially testing the "server

setting" config retrival variants that return textual and boolean

values. Also, perform a little general housekeeping.

* subversion/tests/libsvn_subr/config-test.c

(fail): Use SVN_NO_ERROR in place of the literal value 0.

(test_text_retrieval): Rename from the ever-so-descriptive name of

test1. Add basic test for the default value returned by the

svn_config_get_server_setting() API.

(test_boolean_retrieval): Rename from test2. Add test as above for

the new svn_config_get_server_setting_bool() API.

(test_funcs): Update for test function renames.