I don't have the permission to add an attachment to an open issue and
it's better not to open a new issue.
Could you add the attached patch to issue #1612 and the following log :
"
* SVNClient.cpp, SVNClient.h
(svn_client_checkout, svn_client_update,svn_client_export and
svn_client_switch) : these functions take a new parameter.Calls to these
functions have been modified
(mapStatusKind) : svn_wc_status_absent replaced by
svn_wc_status_missing, handling of svn_wc_status_external added
(blame) : strict parameter removed
* org_tigris_subversion_javahl_SVNClient.cpp,
SVNClientSynchronized.java, SVNClient.java,SVNClientInterface.java
changes on blame reported
* Status.java
external const added, absent replaced by missing
(getDescription) : external kind added, absent replaced by missing
"
My changes are against revision #7830 (latest revision at this time), so
I don't know if it would make 0.33.1 compile.
Cédric
> you seem to know far more about it than I, you should submit your
> fixes.
>
> ---
> McClain Looney
> m@loonsoft.com
> On Nov 22, 2003, at 11:34 AM, Cédric Chabanois wrote:
>
>> Yes, last time I compiled from repository, it was already the case.
>>
>> But I am not sure you made the right correction.
>> svn_wc_status_absent has been replaced by svn_wc_status_missing
>> Moreover, another status has been added : svn_wc_status_external
>>
>> Do you want I submit another patch for issue #1612 ?
>>
>> Cédric
>>
>>> i figured it out, svn_wc_status_absent is no longer a valid status.
>>> i've submitted an issue and patch #1612
>>>
>>> it just removes the case for svn_wc_status_absent in svnclient.cpp
>>> ---
>>> McClain Looney
>>> m@loonsoft.com
>>> On Nov 22, 2003, at 10:43 AM, Cédric Chabanois wrote:
>>>
>>>> I did not try it yet.
>>>> I will compile javahl tomorrow and will eventually submit a patch
>>>> if needed.
>>>>
>>>> Cédric
>>>>
>>>>> -----BEGIN PGP SIGNED MESSAGE-----
>>>>> Hash: SHA1
>>>>>
>>>>> Hello all,
>>>>>
>>>>> have you guys managed to build javahl in svn 0.33.1? looks like
>>>>> the auth changes they made have broken the build. or is this just
>>>>> me trying to build on osx (haven't tried linux yet)?
>>>>>
>>>>> - -- McClain Looney
>>>>> LoonSoft LLC
>>>>> m@loonsoft.com
>>>>>
>>>>> Public key E3122EF8 available at http://wwwkeys.us.pgp.net/
>>>>> -----BEGIN PGP SIGNATURE-----
>>>>> Version: GnuPG v1.2.3 (GNU/Linux)
>>>>>
>>>>> iD8DBQE/v4whJY6NG+MSLvgRArN3AJwJU4v6y2xPxjQXQYnIZWUEs++yrgCfV2ob
>>>>> LCK07IWk9HkEepg/0WTnvgw=
>>>>> =vP35
>>>>> -----END PGP SIGNATURE-----
>>>>>
Index: native/SVNClient.cpp
===================================================================
--- native/SVNClient.cpp (revision 7830)
+++ native/SVNClient.cpp (working copy)
@@ -444,7 +444,9 @@
return ;
}
- svn_error_t *Err = svn_client_checkout (moduleName,
+ svn_error_t *Err = svn_client_checkout (
+ NULL,
+ moduleName,
m_lastPath.c_str (),
revision.revision (),
recurse, ctx,
@@ -526,7 +528,9 @@
{
return;
}
- svn_error_t *Err = svn_client_update (m_lastPath.c_str (),
+ svn_error_t *Err = svn_client_update (
+ NULL,
+ m_lastPath.c_str (),
revision.revision (),
recurse,
ctx,
@@ -680,7 +684,9 @@
{
return;
}
- svn_error_t *Err = svn_client_export (sourcePath.c_str (),
+ svn_error_t *Err = svn_client_export (
+ NULL,
+ sourcePath.c_str (),
m_lastPath.c_str (),
const_cast<svn_opt_revision_t*>(
revision.revision ()),
@@ -705,7 +711,9 @@
{
return;
}
- svn_error_t *Err = svn_client_switch (m_lastPath.c_str (),
+ svn_error_t *Err = svn_client_switch (
+ NULL,
+ m_lastPath.c_str (),
url,
revision.revision (),
recurse,
@@ -1273,8 +1281,8 @@
return org_tigris_subversion_javahl_Status_Kind_normal;
case svn_wc_status_added:
return org_tigris_subversion_javahl_Status_Kind_added;
- case svn_wc_status_absent:
- return org_tigris_subversion_javahl_Status_Kind_absent;
+ case svn_wc_status_missing:
+ return org_tigris_subversion_javahl_Status_Kind_missing;
case svn_wc_status_deleted:
return org_tigris_subversion_javahl_Status_Kind_deleted;
case svn_wc_status_replaced:
@@ -1291,6 +1299,8 @@
return org_tigris_subversion_javahl_Status_Kind_obstructed;
case svn_wc_status_incomplete:
return org_tigris_subversion_javahl_Status_Kind_incomplete;
+ case svn_wc_status_external:
+ return org_tigris_subversion_javahl_Status_Kind_external;
}
}
svn_error_t *SVNClient::messageReceiver (void *baton, apr_hash_t * changed_paths,
@@ -1678,7 +1688,7 @@
return svn_stream_printf (out, pool, "%6"SVN_REVNUM_T_FMT" %10s %s\n",
revision, author, line);
}
-jbyteArray SVNClient::blame(const char *path, Revision &revisionStart, Revision &revisionEnd, bool strict)
+jbyteArray SVNClient::blame(const char *path, Revision &revisionStart, Revision &revisionEnd)
{
Pool subPool;
apr_pool_t * apr_pool = subPool.pool ();
@@ -1694,7 +1704,6 @@
svn_error_t * error = svn_client_blame (path,
revisionStart.revision(),
revisionEnd.revision(),
- strict,
blame_receiver,
read_stream,
ctx,
Index: native/svnjavahl.dsp
===================================================================
--- native/svnjavahl.dsp (revision 7830)
+++ native/svnjavahl.dsp (working copy)
@@ -56,6 +56,11 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 "C:\program files\microsoft sdk\lib\shfolder.lib" ws2_32.lib Rpcrt4.lib Mswsock.lib ../../../../../db4-win32\lib\libdb41.lib ../../../../../Release/subversion/libsvn_fs/libsvn_fs-1.lib ../../../../../Release/subversion/libsvn_diff/libsvn_diff-1.lib ../../../../../Release/subversion/libsvn_repos/libsvn_repos-1.lib ../../../../../Release/subversion/libsvn_delta/libsvn_delta-1.lib ../../../../../Release/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib ../../../../../Release/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib ../../../../../Release/subversion/libsvn_ra_local/libsvn_ra_local-1.lib ../../../../../Release/subversion/libsvn_ra/libsvn_ra-1.lib ../../../../../Release/subversion/libsvn_wc/libsvn_wc-1.lib ../../../../../apr/LibR/apr.lib ../../../../../apr-iconv/LibR/apriconv.lib ../../../../../apr-util/LibR/aprutil.lib ../../../../../Release/subversion/libsvn_subr/libsvn_subr-1.lib ../../../../../Release/subversion/libsvn_client/libsvn_client-1.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=createJar
+PostBuild_Cmds=jar cvf javahl.jar -C ../cls .
+# End Special Build Tool
!ELSEIF "$(CFG)" == "svnjavahl - Win32 Debug"
@@ -82,6 +87,11 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 Rpcrt4.lib Mswsock.lib "C:\program files\microsoft sdk\lib\shfolder.lib" ../../../../../db4-win32\lib\libdb41d.lib ../../../../../Debug/subversion/libsvn_fs/libsvn_fs-1.lib ../../../../../Debug/subversion/libsvn_repos/libsvn_repos-1.lib ../../../../../Debug/subversion/libsvn_delta/libsvn_delta-1.lib ../../../../../Debug/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib ../../../../../Debug/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib ../../../../../Debug/subversion/libsvn_ra_local/libsvn_ra_local-1.lib ../../../../../Debug/subversion/libsvn_ra/libsvn_ra-1.lib ../../../../../Debug/subversion/libsvn_wc/libsvn_wc-1.lib ../../../../../apr/LibD/apr.lib ../../../../../apr-iconv/LibD/apriconv.lib ../../../../../apr-util/LibD/aprutil.lib ../../../../../Debug/subversion/libsvn_subr/libsvn_subr-1.lib ../../../../../Debug/subversion/libsvn_diff/libsvn_diff-1.lib ../../../../../Debug/subversion/libsvn_client/libsvn_client-1.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=createJar
+PostBuild_Cmds=jar cvf javahl.jar -C ../cls .
+# End Special Build Tool
!ELSEIF "$(CFG)" == "svnjavahl - Win32 Release DB40"
@@ -108,8 +118,13 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ws2_32.lib Rpcrt4.lib Mswsock.lib ../../../../../db4-win32\lib\libdb41.lib ../../../../../Release/subversion/libsvn_fs/libsvn_fs-1.lib ../../../../../Release/subversion/libsvn_diff/libsvn_diff-1.lib ../../../../../Release/subversion/libsvn_repos/libsvn_repos-1.lib ../../../../../Release/subversion/libsvn_delta/libsvn_delta-1.lib ../../../../../Release/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib ../../../../../Release/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib ../../../../../Release/subversion/libsvn_ra_local/libsvn_ra_local-1.lib ../../../../../Release/subversion/libsvn_ra/libsvn_ra-1.lib ../../../../../Release/subversion/libsvn_wc/libsvn_wc-1.lib ../../../../../apr/LibR/apr.lib ../../../../../apr-iconv/LibR/apriconv.lib ../../../../../apr-util/LibR/aprutil.lib ../../../../../Release/subversion/libsvn_subr/libsvn_subr-1.lib ../../../../../Release/subversion/libsvn_client/libsvn_client-1.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 "C:\programme\microsoft sdk\lib\shfolder.lib" ws2_32.lib Rpcrt4.lib Mswsock.lib ../../../../../db4-win32\lib\libdb40.lib ../../../../../Release/subversion/libsvn_fs/libsvn_fs-1.lib ../../../../../Release/subversion/libsvn_diff/libsvn_diff-1.lib ../../../../../Release/subversion/libsvn_repos/libsvn_repos-1.lib ../../../../../Release/subversion/libsvn_delta/libsvn_delta-1.lib ../../../../../Release/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib ../../../../../Release/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib ../../../../../Release/subversion/libsvn_ra_local/libsvn_ra_local-1.lib ../../../../../Release/subversion/libsvn_ra/libsvn_ra-1.lib ../../../../../Release/subversion/libsvn_wc/libsvn_wc-1.lib ../../../../../apr/LibR/apr.lib ../../../../../apr-iconv/LibR/apriconv.lib ../../../../../apr-util/LibR/aprutil.lib ../../../../../Release/subversion/libsvn_subr/libsvn_subr-1.lib ../../../../../Release/subversion/libsvn_client/libsvn_client-1.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 shfolder.lib ws2_32.lib Rpcrt4.lib Mswsock.lib ../../../../../db4-win32\lib\libdb40.lib ../../../../../Release/subversion/libsvn_fs/libsvn_fs-1.lib ../../../../../Release/subversion/libsvn_diff/libsvn_diff-1.lib ../../../../../Release/subversion/libsvn_repos/libsvn_repos-1.lib ../../../../../Release/subversion/libsvn_delta/libsvn_delta-1.lib ../../../../../Release/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib ../../../../../Release/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib ../../../../../Release/subversion/libsvn_ra_local/libsvn_ra_local-1.lib ../../../../../Release/subversion/libsvn_ra/libsvn_ra-1.lib ../../../../../Release/subversion/libsvn_wc/libsvn_wc-1.lib ../../../../../apr/LibR/apr.lib ../../../../../apr-iconv/LibR/apriconv.lib ../../../../../apr-util/LibR/aprutil.lib ../../../../../apr-util/xml/expat/lib/LibR/xml.lib ../../../../../neon/libneon.lib ../../../../../Release/subversion/libsvn_subr/libsvn_subr-1.lib ../../../../../Release/subversion/libsvn_client/libsvn_client-1.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=createJar
+PostBuild_Cmds=jar cvf javahl.jar -C ../cls .
+# End Special Build Tool
!ELSEIF "$(CFG)" == "svnjavahl - Win32 Debug DB40"
@@ -138,6 +153,11 @@
# ADD BASE LINK32 Rpcrt4.lib Mswsock.lib ../../../../../db4-win32\lib\libdb41d.lib ../../../../../Debug/subversion/libsvn_fs/libsvn_fs-1.lib ../../../../../Debug/subversion/libsvn_repos/libsvn_repos-1.lib ../../../../../Debug/subversion/libsvn_delta/libsvn_delta-1.lib ../../../../../Debug/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib ../../../../../Debug/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib ../../../../../Debug/subversion/libsvn_ra_local/libsvn_ra_local-1.lib ../../../../../Debug/subversion/libsvn_ra/libsvn_ra-1.lib ../../../../../Debug/subversion/libsvn_wc/libsvn_wc-1.lib ../../../../../apr/LibD/apr.lib ../../../../../apr-iconv/LibD/apriconv.lib ../../../../../apr-util/LibD/aprutil.lib ../../../../../Debug/subversion/libsvn_subr/libsvn_subr-1.lib ../../../../../Debug/subversion/libsvn_diff/libsvn_diff-1.lib ../../../../../Debug/subversion/libsvn_client/libsvn_client-1.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 "C:\programme\microsoft sdk\lib\shfolder.lib" Rpcrt4.lib Mswsock.lib ../../../../../db4-win32\lib\libdb40d.lib ../../../../../Debug/subversion/libsvn_fs/libsvn_fs-1.lib ../../../../../Debug/subversion/libsvn_repos/libsvn_repos-1.lib ../../../../../Debug/subversion/libsvn_delta/libsvn_delta-1.lib ../../../../../Debug/subversion/libsvn_ra_dav/libsvn_ra_dav-1.lib ../../../../../Debug/subversion/libsvn_ra_svn/libsvn_ra_svn-1.lib ../../../../../Debug/subversion/libsvn_ra_local/libsvn_ra_local-1.lib ../../../../../Debug/subversion/libsvn_ra/libsvn_ra-1.lib ../../../../../Debug/subversion/libsvn_wc/libsvn_wc-1.lib ../../../../../apr/LibD/apr.lib ../../../../../apr-iconv/LibD/apriconv.lib ../../../../../apr-util/LibD/aprutil.lib ../../../../../Debug/subversion/libsvn_subr/libsvn_subr-1.lib ../../../../../Debug/subversion/libsvn_diff/libsvn_diff-1.lib ../../../../../Debug/subversion/libsvn_client/libsvn_client-1.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=createJar
+PostBuild_Cmds=jar cvf javahl.jar -C ../cls .
+# End Special Build Tool
!ENDIF
@@ -677,7 +697,7 @@
InputPath=..\src\org\tigris\subversion\javahl\PromptUserPassword2.java
"..\cls\org\tigris\subversion\javahl\PromptUserPassword2.class" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- avac -d ../cls -sourcepath ../src -g ../src/org/tigris/subversion/javahl/PromptUserPassword2.java
+ javac -d ../cls -sourcepath ../src -g ../src/org/tigris/subversion/javahl/PromptUserPassword2.java
# End Custom Build
Index: native/org_tigris_subversion_javahl_SVNClient.cpp
===================================================================
--- native/org_tigris_subversion_javahl_SVNClient.cpp (revision 7830)
+++ native/org_tigris_subversion_javahl_SVNClient.cpp (working copy)
@@ -1164,10 +1164,10 @@
/*
* Class: org_tigris_subversion_javahl_SVNClient
* Method: blame
- * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision;Lorg/tigris/subversion/javahl/Revision;Z)[B
+ * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision;Lorg/tigris/subversion/javahl/Revision;)[B
*/
JNIEXPORT jbyteArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_blame
- (JNIEnv *env, jobject jthis, jstring jpath, jobject jrevisionStart, jobject jrevisionEnd, jboolean jstrict)
+ (JNIEnv *env, jobject jthis, jstring jpath, jobject jrevisionStart, jobject jrevisionEnd)
{
JNIEntry(SVNClient, blame);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1191,5 +1191,5 @@
{
return NULL;
}
- return cl->blame(path, revisionStart, revisionEnd, jstrict? true:false);
+ return cl->blame(path, revisionStart, revisionEnd);
}
Index: native/SVNClient.h
===================================================================
--- native/SVNClient.h (revision 7830)
+++ native/SVNClient.h (working copy)
@@ -38,7 +38,7 @@
class SVNClient
{
public:
- jbyteArray blame(const char *path, Revision& revisionStart, Revision &revisionEnd, bool strict);
+ jbyteArray blame(const char *path, Revision& revisionStart, Revision &revisionEnd);
void relocate(const char *from, const char *to, const char *path, bool recurse);
jbyteArray fileContent(const char *path, Revision &revision);
void propertyCreate(const char *path, const char *name, JNIByteArray &value, bool recurse);
Index: src/org/tigris/subversion/javahl/SVNClientSynchronized.java
===================================================================
--- src/org/tigris/subversion/javahl/SVNClientSynchronized.java (revision 7830)
+++ src/org/tigris/subversion/javahl/SVNClientSynchronized.java (working copy)
@@ -466,11 +466,11 @@
}
}
- public byte[] blame(String path, Revision revisionStart, Revision revisionEnd, boolean strict) throws ClientException
+ public byte[] blame(String path, Revision revisionStart, Revision revisionEnd) throws ClientException
{
synchronized(clazz)
{
- return worker.blame(path,revisionStart, revisionEnd, strict);
+ return worker.blame(path,revisionStart, revisionEnd);
}
}
Index: src/org/tigris/subversion/javahl/SVNClient.java
===================================================================
--- src/org/tigris/subversion/javahl/SVNClient.java (revision 7830)
+++ src/org/tigris/subversion/javahl/SVNClient.java (working copy)
@@ -251,7 +251,7 @@
public native void relocate(String from, String to, String path, boolean recurse) throws ClientException;
- public native byte[] blame(String path, Revision revisionStart, Revision revisionEnd, boolean strict) throws ClientException;
+ public native byte[] blame(String path, Revision revisionStart, Revision revisionEnd) throws ClientException;
public static native void enableLogging(int logLevel, String logFilePath);
public static native String version();
Index: src/org/tigris/subversion/javahl/Status.java
===================================================================
--- src/org/tigris/subversion/javahl/Status.java (revision 7830)
+++ src/org/tigris/subversion/javahl/Status.java (working copy)
@@ -310,7 +310,7 @@
public static final int unversioned = 5;
/** under v.c., but is missing */
- public static final int absent = 6;
+ public static final int missing = 6;
/** was deleted and then re-added */
public static final int replaced = 7;
@@ -330,6 +330,9 @@
/** a directory doesn't contain a complete entries list */
public static final int incomplete = 12;
+ /** an unversioned path populated by an svn:external property */
+ public static final int external = 13;
+
public static final String getDescription(int kind)
{
switch (kind)
@@ -340,8 +343,8 @@
return "normal";
case added:
return "added";
- case absent:
- return "absent";
+ case missing:
+ return "missing";
case deleted:
return "deleted";
case replaced:
@@ -356,6 +359,8 @@
return "ignored";
case incomplete:
return "incomplete";
+ case external:
+ return "external";
case unversioned:
default:
return "unversioned";
Index: src/org/tigris/subversion/javahl/SVNClientInterface.java
===================================================================
--- src/org/tigris/subversion/javahl/SVNClientInterface.java (revision 7830)
+++ src/org/tigris/subversion/javahl/SVNClientInterface.java (working copy)
@@ -245,5 +245,5 @@
void relocate(String from, String to, String path, boolean recurse) throws ClientException;
- byte[] blame(String path, Revision revisionStart, Revision revisionEnd, boolean strict) throws ClientException;
+ byte[] blame(String path, Revision revisionStart, Revision revisionEnd) throws ClientException;
}
_____________________________________________________________________
Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France
Received on Sun Nov 23 22:05:10 2003