On Fri, May 6, 2011 at 9:23 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Thu, May 5, 2011 at 5:57 PM, <hwright_at_apache.org> wrote:
>> Author: hwright
>> Date: Thu May 5 21:57:16 2011
>> New Revision: 1099981
>>
>> URL: http://svn.apache.org/viewvc?rev=1099981&view=rev
>> Log:
>> JavaHL: Move some backward compat code out of C++, and into Java, thus
>> eliminating
>>
>> [ in subversion/bindings/javahl/ ]
>> * native/CreateJ.cpp
>> (Status): Just return the status->conflicted flag, rather than trying to
>> sort out what kind of conflict the node is in.
>>
>> * src/org/apache/subversion/javahl/types/Status.java
>> (isConflicted): New.
>> (treeConflict, conflictDescriptor, conflictNew, conflictOld, conflictWorking):
>> Remove, along with getters.
>> (Status): Update constructor.
>>
>> * src/org/tigris/subversion/javahl/SVNClient.java
>> (Status): Update wrapper.
>>
>> * src/org/tigris/subversion/javahl/Status.java
>> (populateConflicts): New.
>> (Status): Call helper function to populate conflicts from Info.
>>
>> Modified:
>> subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
>> Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java?rev=1099981&r1=1099980&r2=1099981&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java (original)
>> +++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java Thu May 5 21:57:16 2011
>> @@ -317,10 +317,67 @@ public class Status implements java.io.S
>> this.changelist = changelist;
>> }
>>
>> + private void
>> + populateConflicts(org.apache.subversion.javahl.SVNClient aClient,
>> + String path)
>> + throws org.apache.subversion.javahl.ClientException
>> + {
>> + class MyInfoCallback
>> + implements org.apache.subversion.javahl.callback.InfoCallback
>> + {
>> + org.apache.subversion.javahl.types.Info info;
>> +
>> + public void singleInfo(org.apache.subversion.javahl.types.Info aInfo)
>> + {
>> + info = aInfo;
>> + }
>> +
>> + public org.apache.subversion.javahl.types.Info getInfo()
>> + {
>> + return info;
>> + }
>> + }
>> +
>> + MyInfoCallback callback = new MyInfoCallback();
>> +
>> + aClient.info2(path,
>> + org.apache.subversion.javahl.types.Revision.HEAD,
>> + org.apache.subversion.javahl.types.Revision.HEAD,
>> + org.apache.subversion.javahl.types.Depth.empty, null,
>> + callback);
>
> Should it be passing NULL for the two revision arguments here? I
> thought if you provided Revision.HEAD this API will do a call to the
> server which is not wanted/needed here.
Ah yes, either null or WORKING. null is easier, though, r1100234.
-Hyrum
Received on 2011-05-06 16:42:11 CEST