You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/08/23 16:46:44 UTC
svn commit: r1160718 - in /subversion/branches/1.7.x: ./ STATUS
subversion/bindings/javahl/native/CreateJ.cpp
subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
Author: hwright
Date: Tue Aug 23 14:46:44 2011
New Revision: 1160718
URL: http://svn.apache.org/viewvc?rev=1160718&view=rev
Log:
Merge r1160705 from trunk:
* r1160705
Expose post-commit-error through JavaHL
Justification:
Low-impact, user-requested.
Votes:
+1: hwright, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 23 14:46:44 2011
@@ -59,4 +59,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,115
8303,1158309,1158407,1158419,1158421,1158436,1158455,1158616,1158634,1158854,1158893,1159093,1159098,1159101,1159230,1159275,1159686,1159760,1159772,1160671,1160682,1160704
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,115
8303,1158309,1158407,1158419,1158421,1158436,1158455,1158616,1158634,1158854,1158893,1159093,1159098,1159101,1159230,1159275,1159686,1159760,1159772,1160671,1160682,1160704-1160705
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1160718&r1=1160717&r2=1160718&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Aug 23 14:46:44 2011
@@ -144,10 +144,3 @@ Approved changes:
Votes:
+1: rhuijben, cmpilato
+1 (once tests pass): danielsh
-
- * r1160705
- Expose post-commit-error through JavaHL
- Justification:
- Low-impact, user-requested.
- Votes:
- +1: hwright, rhuijben
Modified: subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp?rev=1160718&r1=1160717&r2=1160718&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp Tue Aug 23 14:46:44 2011
@@ -871,7 +871,8 @@ CreateJ::CommitInfo(const svn_commit_inf
if (midCT == 0)
{
midCT = env->GetMethodID(clazz, "<init>",
- "(JLjava/lang/String;Ljava/lang/String;)V");
+ "(JLjava/lang/String;Ljava/lang/String;"
+ "Ljava/lang/String;Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
POP_AND_RETURN_NULL;
}
@@ -886,8 +887,18 @@ CreateJ::CommitInfo(const svn_commit_inf
jlong jRevision = commit_info->revision;
+ jstring jPostCommitError = JNIUtil::makeJString(
+ commit_info->post_commit_err);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
+ jstring jReposRoot = JNIUtil::makeJString(commit_info->repos_root);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
// call the Java method
- jobject jInfo = env->NewObject(clazz, midCT, jRevision, jDate, jAuthor);
+ jobject jInfo = env->NewObject(clazz, midCT, jRevision, jDate, jAuthor,
+ jPostCommitError, jReposRoot);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified: subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java?rev=1160718&r1=1160717&r2=1160718&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java (original)
+++ subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java Tue Aug 23 14:46:44 2011
@@ -50,13 +50,21 @@ public class CommitInfo implements java.
/** the author of the revision */
String author;
+ /** post commit error (or NULL) */
+ String postCommitError;
+
+ /** repos root (or NULL) */
+ String reposRoot;
+
/** This constructor will be only called from the jni code. */
- public CommitInfo(long rev, String d, String a)
+ public CommitInfo(long rev, String d, String a, String pce, String rr)
throws java.text.ParseException
{
revision = rev;
date = (new LogDate(d)).getDate();
author = a;
+ postCommitError = pce;
+ reposRoot = rr;
}
/**
@@ -82,4 +90,20 @@ public class CommitInfo implements java.
{
return author;
}
+
+ /**
+ * return any post commit error for the commit
+ */
+ public String getPostCommitError()
+ {
+ return postCommitError;
+ }
+
+ /**
+ * return the repos root
+ */
+ public String getReposRoot()
+ {
+ return reposRoot;
+ }
}