Checkout Tools
  • last updated 36 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 875492 is being indexed.

JavaHL: Modify the assertExpectedSuggestion test to actually verify

the suggestions returned from the suggestMergeSources API. This

reveals a regression in the API since 1.5.

[ in subversion/bindings/javahl/ ]

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

(assertExpectedSuggestion): Verify the suggestion is the correct path.

(testCopy, testMove): Specify the correct expected path when calling

assertExpectedSuggestion.

JavaHL: Extend the copy tests to include a WC to URL copy that also

has to create parent folders. In this case the test exposes a bug

that currently exists in the notifications sent during this action.

This commit makes the JavaHL tests fail.

[ in subversion/bindings/javahl/ ]

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

(testCopy): Add test for WC to URL copy with parent creation.

JavaHL: A follow-up to r34184, adjust the JavaHL tests to no

longer expect property modifications when an item is moved.

[ in subversion/bindings/javahl/ ]

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

(testMove): Remove expectations of mergeinfo creation.

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

  1. … 1 more file in changeset.
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>

  1. … 1 more file in changeset.
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.

  1. … 1 more file in changeset.
Follow up to r31936.

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

* subversion/bindings/javahl/native/EnumMapper.cpp:

Replace spaces with tabs.

Fix indentation to match our coding style.

  1. … 1 more file in changeset.
Expose the depth member of svn_info_t to JavaHL's Info2 class.

Patch by: Jeremy Whitlock <jcscoobyrs@gmail.com>

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

(testBasicInfo2): Updated tests to check depth.

* subversion/bindings/javahl/native/EnumMapper.h,

subversion/bindings/javahl/native/EnumMapper.cpp

(mapDepth): New.

* subversion/bindings/javahl/native/InfoCallback.cpp

(createJavaInfo2): Updated to call new depth-aware constructor.

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java

(Info2): Updated constructor for depth argument.

(getDepth, setDepth): New functions.

  1. … 4 more files in changeset.
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicLocking): Fix a typo in a comment.

(testBasicInfo2): Likewise.

Patch by: Jeremy Whitlock <jcscoobyrs@gmail.com>

Housekeeping: In the spirit of r27598, remove trailing whitespace in

our repository.

for extsn in c h cpp java py pl rb; do

find . -name "*.$extsn" | xargs perl -pi.bak -e 'next if /^\f$/; s/\s+$/\n/'

done

(This touches files in various and sundry parts of the tree, which I shan't

enumerate here.)

  1. … 175 more files in changeset.
JavaHL: Fix potential ArrayIndexOutOfBoundsException in

singleStatus method. Happens when method is called on

a non-existent path within the working copy.

[ in subversion/bindings/javahl/ ]

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

(testBasicStatus): Added test for non-existent file.

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

(singleStatus): Check array length before referencing

an element from the array.

Found by: Tomas Stupka <Tomas.Stupka@sun.com>

  1. … 1 more file in changeset.
JavaHL: Followup to r31402. Fixed improper timezone

handling in date parsing of LogDate class. Dates were

being treated as if they represented the local timezone.

[ in subversion/bindings/javahl/ ]

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

(LogDate): Explicitly parses date as UTC timezone and

creates a UTC Calendar object.

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

(testLogDate): Adjusted expected date by -04:00. Also

removed explicit references to Assert class which are

not needed in our tests.

  1. … 1 more file in changeset.
JavaHL: Followup to r31273. Create a LogDate class that

performs the parsing of our date string into microseconds.

Includes convenience methods for getting the date in various

formats.

[ in subversion/bindings/javahl/ ]

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

(testLogDate): New test for basic String parsing of class.

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

New class that parses our date into microseconds

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

(MyLogMessageCallback): Use the LogDate class to parse the

date.

  1. … 2 more files in changeset.
Extend issue #3200 API changes to JavaHL for remove(), copy(), move(),

mkdir(), and doImport().

[ subversion/bindings/javahl/ ]

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

(testBasicImport, testCopy): Update tests.

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_remove,

Java_org_tigris_subversion_javahl_SVNClient_copy,

Java_org_tigris_subversion_javahl_SVNClient_move,

Java_org_tigris_subversion_javahl_SVNClient_mkdir,

Java_org_tigris_subversion_javahl_SVNClient_doImport):

Add revpropTable parameter and send it down the stack.

* native/SVNClient.h,

native/SVNClient.cpp

(doImport, mkdir, move, copy, remove): Add parameter, and pass it down the

stack to the C API.

* src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

src/org/tigris/subversion/javahl/SVNClient.java,

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

(remove, mkdir, move, copy, doImport): Add revpropTable parameter, and update

relevant wrappers.

  1. … 6 more files in changeset.
Extend issue #3200 API changes to JavaHL for commit(). Additional APIs will be

forthcoming.

[ subversion/bindings/javahl/ ]

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

(testCommitRevprops): New test.

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_commit): Add revprop table

argument, convert it, and pass it down the stack.

* native/SVNClient.h,

native/SVNClient.cpp

(commit): Add revprop table argument and pass it to the C API.

* native/RevpropTable.h,

native/RevpropTable.cpp:

New.

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

(commit): Add default parameter of null.

(commit): Add revprop table argument.

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

(commit): Add revprop table argument.

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

(commit): Add revprop table argument.

  1. … 8 more files in changeset.
JavaHL: Update the log interface to return arbitrary revprops, not just the

"standard" ones. This better supports the underlying C API, as well as makes

it more extensible for the future.

This was done in conjunction with work for issue #3200, and should be merged

to 1.5.x if it is. If not, we'll need to rev the appropriate APIs to maintain

backwards compat.

[ in subversion/bindings/javahl/ ]

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

(getMergeinfoRevisions): Update to new interface.

* native/ProplistCallback.h

(makeMapFromHash): Make static and public so the log callback can use it.

* native/LogMessageCallback.cpp

(singleMessage): Return all the revprops retrieved by 'log' to the caller.

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

(singleMessage): Update to accept a Map or revprops, instead of just the

standard svn:* revprops.

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

(MyLogMessageCallback): Parse the date into microseconds, to maintain compat.

  1. … 4 more files in changeset.
JavaHL: Follow up to r30407: restore the JavaHL getMergeInfo() method

and Mergeinfo class. This is a partial reverse-merge of r30299

[ in subversion/bindings/javahl/ ]

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

(testMergeinfoParser): Restore.

(getMergeinfo): Remove.

(acquireMergeinfoAndAssertEquals): Restore and update.

(testBasicMerge, testMergeUsingHistory, testMergeReintegrate,

testRecordOnlyMerge): Update tests.

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_getMergeinfo):

Restore.

* native/SVNClient.h,

native/SVNClient.cpp

(makeJRevisionRangeArray, getMergeinfo): Restore.

* src/org/tigris/subversion/javahl/Mergeinfo.java:

Restore.

* src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

src/org/tigris/subversion/javahl/SVNClient.java,

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

(getMergeinfo): Restore.

  1. … 7 more files in changeset.
JavaHL: Follow up to r30304: formatting cleanups. Converted tabs

to spaces and added JavaDoc to new methods. No code changes.

[ in subversion/bindings/javahl ]

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

JavaHL: Follow up to r30304: fix a test failure. The test was trying something

that is not supported by the API. Namely, svn mergeinfo SOURCE-URL TARGET-URL.

It appears that TARGET must always be a WC path.

[ in subversion/bindings/javahl ]

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

(testBasicMerge): Remove the test of mergeinfo retrieval against a URL.

JavaHL: Followup to r30286: Add a revprops parameter to the getMergeinfoLog

APIs.

Aggrevated by: cmpilato

[ in subversion/bindings/javahl/ ]

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_getMergeinfoLog): Add revprops

parameter.

* native/SVNClient.h,

native/SVNClient.cpp

(getMergeinfoLog): Add revprops parameter.

* src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

src/org/tigris/subversion/javahl/SVNClient.java,

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

(getMergeinfoLog): Add revprops parameter.

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

(getMergeinfoRevisions): Update tests to new API.

  1. … 6 more files in changeset.
JavaHL: Followup to r30279: Remove replaced APIs, and update tests.

Note: One test still fails with this commit, I'm working on it, but would like

to get this committed before delving further. Other's welcome to look at it

also, of course.

Patch by: markphip

me

[ in subversion/bindings/javahl/ ]

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

(testMergeinfoParser): Remove.

(assertExpectedMergeRange, acquireMergeinfoAndAssertEquals,

getMergeinfoRevisions, getMergeinfo): New.

(testBasicMerge, testMergeUsingHistory, testMergeReintegrate,

testRecordOnlyMerge): Update tests.

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_getAvailableMerges,

Java_org_tigris_subversion_javahl_SVNClient_getMergeinfo):

Remove.

* native/SVNClient.h,

native/SVNClient.cpp

(makeJRevisionRangeArray, getAvailableMerges, getMergeinfo): Remove.

* src/org/tigris/subversion/javahl/Mergeinfo.java:

Remove.

* src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

src/org/tigris/subversion/javahl/SVNClient.java,

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

(getMergeinfo, getAvailableMerges): Remove.

  1. … 7 more files in changeset.
Fix JavaHL test failures introduced as a result of r30215. Currently, the

tests do not take into account the absense of no-op revisions post-r30215.

This commit updates the expected value to account for this.

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

(acquireMergeinfoAndAssertEquals): Only test the expected available revisions

if they are not null.

(testBasicMerge, testRecordOnlyMerge): Update expected output.

Tweak the "merge_reintegrate" API: remove the redundant "force" argument

and mention the "peg_revision" argument in its doc-string.

* subversion/include/svn_client.h

(svn_client_merge_reintegrate): Remove the "force" argument.

Mention the "peg_revision" argument.

* subversion/libsvn_client/merge.c

(svn_client_merge_reintegrate): Remove the "force" argument.

* subversion/svn/merge-cmd.c

(svn_cl__merge): Do not pass the "force" argument to "reintegrate";

instead, error if the "--force" option was given.

* subversion/bindings/javahl/native/SVNClient.cpp,

subversion/bindings/javahl/native/SVNClient.h,

subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

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

Remove the "force" argument from the "svn_client_merge_reintegrate" and

corresponding "mergeReintegrate" functions.

  1. … 9 more files in changeset.
JavaHL: Follow up to r29328 and 29228 by fixing up the new conflict

callback enumerations.

This fixes an error in the JavaHL tests.

[ in subversion/bindings/javahl ]

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

(testMergeConflictResolution): Update the choice value used

in the conflict callback.

* native/ConflictResolverCallback.cpp

(javaChoiceToC): update the switch statement to include the

new values.

  1. … 1 more file in changeset.
More mergeinfo nounifying.

[ in subversion/bindings/javahl ]

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

native/org_tigris_subversion_javahl_SVNClient.cpp,

native/SVNClient.h,

native/SVNClient.cpp,

src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

src/org/tigris/subversion/javahl/SVNClient.java,

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

Change instances of mergeInfo to mergeinfo, and MergeInfo to Mergeinfo.

* src/org/tigris/subversion/javahl/MergeInfo.java:

Move from here...

* src/org/tigris/subversion/javahl/Mergeinfo.java:

...to here.

  1. … 8 more files in changeset.
JavaHL: Fix test failure.

[ in subversion/bindings/javahl/ ]

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

(testRecordOnlyMerge): correct the paths that it was checking for mergeinfo

on when verifying the test results.

Followup to r28979: Add mergeReintegrate method to JavaHL.

[ in subversion/bindings/javahl/ ]

* native/SVNClient.h,

native/SVNClient.cpp

(mergeReintegrate): Add method and call svn_client_merge_reintegrate.

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_mergeReintegrate):

Added mergeReintegrate method.

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

src/org/tigris/subversion/javahl/SVNClient.java,

src/org/tigris/subversion/javahl/SVNClientSynchronized.java

(mergeReintegrate): Added method.

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

(testMergeReintegrate): Added test of failure and success scenarios

(appendText): tweaked to allow update of file in branch

Reviewed by: hwright

  1. … 6 more files in changeset.
JavaHL: Followup to r28951. Add support for changelists to propertySet(),

propertyCreate(), propertyRemove(), and properties().

Note: This commit introduces a test failure in the JavaHL tests. I'm not yet

sure how the failure is related to these changes (though I seem to recall

something similar happening in past changes to the properties interface). I'm

committing this now so others may have the chance to look at the failure also.

[ in subversion/bindings/javahl/ ]

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_properties,

Java_org_tigris_subversion_javahl_SVNClient_propertySet,

Java_org_tigris_subversion_javahl_SVNClient_propertyRemove):

Add changelist parameter.

* native/SVNClient.h,

native/SVNClient.cpp

(propertyRemove, propertySet, properties): Add changelist parameter, use it

for the C APIs.

* src/org/tigris/subversion/javahl/SVNClient.java,

src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

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

(properties, propertyRemove, propertySet, propertyCreate): Add parameter.

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

Update tests.

  1. … 6 more files in changeset.
JavaHL: Followup to r28944. Add support for depth multiple changelists to

removeFromChangelists() and addToChangelist().

[ in subversion/bindings/javahl/ ]

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_removeFromChangelists,

Java_org_tigris_subversion_javahl_SVNClient_addToChangelist):

Add depth and changelist parameters.

* native/SVNClient.h,

native/SVNClient.cpp

(addToChangelist, removeFromChangelists): Add depth and changelist

parameters, use them for the C APIs.

* src/org/tigris/subversion/javahl/SVNClient.java,

src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

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

(addToChangelist, removeFromChangelists): Add parameters.

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

Update tests.

  1. … 6 more files in changeset.
JavaHL: Followup to r28935. Add support for changelists to diffSummarize().

[ in subversion/bindings/javahl/ ]

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2I_3Ljava_lang_String_2ZLorg_tigris_subversion_javahl_DiffSummaryReceiver_2,

Java_org_tigris_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2I_3Ljava_lang_String_2ZLorg_tigris_subversion_javahl_DiffSummaryReceiver_2): Add changelist parameter.

* native/SVNClient.h,

native/SVNClient.cpp

(diffSummarize): Add changelist parameter, use it for the C API.

* src/org/tigris/subversion/javahl/SVNClient.java,

src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

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

(diffSummarize): Add parameter.

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

Update tests.

  1. … 6 more files in changeset.