[netbeans] 01/01: Fixed the compatibility with SVNKit >= 1.7.5
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Aug 17 22:25:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository netbeans.
commit ecf37da82de68b326516c95f5160e9beb50a0655
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Aug 18 00:25:07 2014 +0200
Fixed the compatibility with SVNKit >= 1.7.5
---
debian/changelog | 1 +
debian/control | 2 +-
debian/linked-jars | 2 +-
debian/patches/netbeans~svnkit-compatibility.patch | 490 +++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 494 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae7a8ea..a9b5e5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ netbeans (7.0.1+dfsg1-6) UNRELEASED; urgency=medium
* Fixed the build failure with Ant 1.9 (Closes: #713182)
* Removed the obsolete -mno-cygwin flag to build the Windows launcher
with mingw32 4.9
+ * Fixed the compatibility with SVNKit >= 1.7.5
* Added a patch to build with Java 7
* debian/control:
- Standards-Version updated to 3.9.5 (no changes)
diff --git a/debian/control b/debian/control
index 052cab3..c3807e9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9), javahelper, ant (>= 1.7.0),
libjvyamlb-java (>= 0.2.5-2~), libjzlib-java (>= 1.0.7),
liblucene2-java (>= 2.4.1), libxml-commons-resolver1.1-java (>= 1.2-3),
libsac-java, libservlet2.5-java, libsvnclientadapter-java, libsvn-java,
- libsvnkit-java, libswingx1-java, libtrilead-ssh2-java,
+ libsvnkit-java (>= 1.7.5), libswingx1-java, libtrilead-ssh2-java,
libsimple-validation-java, libxerces2-java, libpostgresql-jdbc-java,
libmysql-java,
libbetter-appframework-java, libbeansbinding-java, libcglib-java,
diff --git a/debian/linked-jars b/debian/linked-jars
index 5fa3baa..4234691 100644
--- a/debian/linked-jars
+++ b/debian/linked-jars
@@ -34,7 +34,7 @@ $JAVADIR/servlet-api-2.5.jar servletapi/external ide/modules/ext servlet-2.2.jar
$JAVADIR/svnClientAdapter.jar libs.svnClientAdapter/external ide/modules/ext svnClientAdapter-main-1.6.13.jar
$JAVADIR/svn-javahl.jar libs.svnClientAdapter.javahl/external ide/modules/ext svnjavahl-1.6.0.jar
$JAVADIR/svnkit.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnkit-1.3.4.jar
-$JAVADIR/svnkit-javahl.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnkit-javahl.jar
+$JAVADIR/svnkit-javahl16.jar libs.svnClientAdapter.svnkit/external ide/modules/ext svnkit-javahl.jar
$JAVADIR/swingx1.jar libs.swingx/external ide/modules/ext swingx-0.9.5.jar
$JAVADIR/trilead-ssh2.jar libs.svnClientAdapter.svnkit/external ide/modules/ext trilead.jar
$JAVADIR/simple-validation.jar swing.validation/external ide/modules/ext ValidationAPI.jar
diff --git a/debian/patches/netbeans~svnkit-compatibility.patch b/debian/patches/netbeans~svnkit-compatibility.patch
new file mode 100644
index 0000000..8db23cb
--- /dev/null
+++ b/debian/patches/netbeans~svnkit-compatibility.patch
@@ -0,0 +1,490 @@
+Description: Fix the compatibility with SVNKit >= 1.7
+Origin: backport, http://hg.netbeans.org/core-main/rev/0118e2db3843
+ http://hg.netbeans.org/core-main/rev/1654f9eddf7e
+ http://hg.netbeans.org/core-main/rev/db27973dcebf
+--- a/subversion/src/org/netbeans/modules/subversion/FileStatusCache.java
++++ b/subversion/src/org/netbeans/modules/subversion/FileStatusCache.java
+@@ -1127,10 +1127,6 @@
+ return value.getUrlString();
+ }
+ @Override
+- public SVNUrl getUrlCopiedFrom() {
+- return value.getUrlCopiedFrom();
+- }
+- @Override
+ public SVNUrl getUrl() {
+ return value.getUrl();
+ }
+@@ -1214,6 +1210,16 @@
+ public boolean isFileExternal() {
+ return value.isFileExternal();
+ }
++
++ @Override
++ public String getMovedFromAbspath () {
++ return value.getMovedFromAbspath();
++ }
++
++ @Override
++ public String getMovedToAbspath () {
++ return value.getMovedToAbspath();
++ }
+ }
+
+ public FileLabelCache getLabelsCache () {
+--- a/subversion/src/org/netbeans/modules/subversion/client/cli/CLIStatus.java
++++ b/subversion/src/org/netbeans/modules/subversion/client/cli/CLIStatus.java
+@@ -179,6 +179,16 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ @Override
++ public String getMovedFromAbspath () {
++ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
++ }
++
++ @Override
++ public String getMovedToAbspath () {
++ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
++ }
++
+ private class UnversionedInfo implements ISVNInfo {
+ private final File file;
+ public UnversionedInfo(String path) {
+--- a/subversion/src/org/netbeans/modules/subversion/client/cli/CommandlineClient.java
++++ b/subversion/src/org/netbeans/modules/subversion/client/cli/CommandlineClient.java
+@@ -102,6 +102,7 @@
+ import org.tigris.subversion.svnclientadapter.ISVNPromptUserPassword;
+ import org.tigris.subversion.svnclientadapter.ISVNProperty;
+ import org.tigris.subversion.svnclientadapter.ISVNStatus;
++import org.tigris.subversion.svnclientadapter.ISVNStatusCallback;
+ import org.tigris.subversion.svnclientadapter.SVNClientException;
+ import org.tigris.subversion.svnclientadapter.SVNDiffSummary;
+ import org.tigris.subversion.svnclientadapter.SVNKeywords;
+@@ -306,6 +307,11 @@
+ return getInfoFromWorkingCopy(file);
+ }
+
++ @Override
++ public String getPostCommitError () {
++ return null;
++ }
++
+ private ISVNInfo[] getInfo(File[] files, SVNRevision revision, SVNRevision pegging) throws SVNClientException, SVNClientException {
+ if(files == null || files.length == 0) {
+ return new ISVNInfo[0];
+@@ -1145,7 +1151,12 @@
+
+ @Override
+ public ISVNProperty[] getProperties(SVNUrl url, SVNRevision revision, SVNRevision pegRevision) throws SVNClientException {
+- ListPropertiesCommand cmd = new ListPropertiesCommand(url, revision.toString(), false);
++ return getProperties(url, revision, pegRevision, false);
++ }
++
++ @Override
++ public ISVNProperty[] getProperties(SVNUrl url, SVNRevision revision, SVNRevision pegRevision, boolean recursive) throws SVNClientException {
++ ListPropertiesCommand cmd = new ListPropertiesCommand(url, revision.toString(), recursive);
+ exec(cmd);
+ List<String> names = cmd.getPropertyNames();
+ List<ISVNProperty> props = new ArrayList<ISVNProperty>(names.size());
+@@ -1170,6 +1181,56 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ @Override
++ public ISVNStatus[] getStatus (File file, boolean bln, boolean bln1, boolean bln2, boolean bln3, ISVNStatusCallback isvnsc) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ @Override
++ public void propertySet (SVNUrl svnurl, Number number, String string, String string1, String string2) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ @Override
++ public ISVNProperty[] getProperties (File file, boolean bln) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ @Override
++ public void upgrade (File wcRoot) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++
++ }
++
++ @Override
++ public void switchToUrl (File file, SVNUrl svnurl, SVNRevision svnr, SVNRevision svnr1, int i, boolean bln, boolean bln1, boolean bln2, boolean bln3) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
++ @Override
++ public ISVNStatus[] getStatus (File file, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4, ISVNStatusCallback isvnsc) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
++ }
++
++ @Override
++ public ISVNProperty[] getPropertiesIncludingInherited (File file) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
++ }
++
++ @Override
++ public ISVNProperty[] getPropertiesIncludingInherited (File file, boolean bln, boolean bln1, List<String> list) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
++ }
++
++ @Override
++ public ISVNProperty[] getPropertiesIncludingInherited (SVNUrl svnurl) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
++ }
++
++ @Override
++ public ISVNProperty[] getPropertiesIncludingInherited (SVNUrl svnurl, boolean bln, boolean bln1, List<String> list) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
++ }
+
+ class NotificationHandler extends SVNNotificationHandler { }
+
+--- a/subversion/src/org/netbeans/modules/subversion/client/parser/ParserSvnStatus.java
++++ b/subversion/src/org/netbeans/modules/subversion/client/parser/ParserSvnStatus.java
+@@ -236,5 +236,15 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ @Override
++ public String getMovedFromAbspath () {
++ return null;
++ }
++
++ @Override
++ public String getMovedToAbspath () {
++ return null;
++ }
++
+ }
+
+--- a/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
++++ b/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
+@@ -47,7 +47,6 @@
+ import org.openide.util.lookup.ServiceProvider;
+ import org.openide.util.lookup.ServiceProviders;
+ import org.tigris.subversion.svnclientadapter.ISVNClientAdapter;
+-import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapterFactory;
+ import org.tmatesoft.svn.core.javahl.SVNClientImpl;
+
+ /**
+@@ -78,8 +77,6 @@
+ }
+ if(org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory.isAvailable()) {
+ available = true;
+- // is this really needed? this clears the credentials cache
+- SVNClientImpl.setRuntimeCredentialsStorage(null);
+ }
+ }
+ return available;
+@@ -87,6 +84,9 @@
+
+ @Override
+ public ISVNClientAdapter createClient() {
++ // is this really needed? this clears the credentials cache
++ SVNClientImpl.setRuntimeCredentialsStorage(null);
++ org.tmatesoft.svn.core.javahl17.SVNClientImpl.setRuntimeCredentialsStorage(null);
+ return org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory
+ .createSVNClient(org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory.SVNKIT_CLIENT);
+ }
+--- a/subversion/src/org/netbeans/modules/subversion/FilesystemHandler.java
++++ b/subversion/src/org/netbeans/modules/subversion/FilesystemHandler.java
+@@ -769,7 +769,7 @@
+
+ // store all from-s children -> they also have to be refreshed in after move
+ List<File> srcChildren = null;
+- SVNUrl url = status != null ? status.getUrlCopiedFrom() : null;
++ SVNUrl url = status != null && status.isCopied() ? getCopiedUrl(client, from) : null;
+ SVNUrl toUrl = toStatus != null ? toStatus.getUrl() : null;
+ try {
+ srcChildren = SvnUtils.listRecursively(from);
+@@ -916,4 +916,19 @@
+ return true;
+ }
+
++ private SVNUrl getCopiedUrl (SvnClient client, File f) {
++ try {
++ ISVNInfo info = Subversion.getInstance().getClient(false).getInfoFromWorkingCopy(f);
++ if (info != null) {
++ return info.getCopyUrl();
++ }
++ } catch (SVNClientException e) {
++ // at least log the exception
++ if (!WorkingCopyAttributesCache.getInstance().isSuppressed(e)) {
++ Subversion.LOG.log(Level.INFO, null, e);
++ }
++ }
++ return null;
++ }
++
+ }
+--- a/subversion/src/org/netbeans/modules/subversion/client/PropertiesClient.java
++++ b/subversion/src/org/netbeans/modules/subversion/client/PropertiesClient.java
+@@ -124,7 +124,8 @@
+ if (info != null && (info.getUrl() != null || info.getCopyUrl() != null)) {
+ ISVNProperty[] props = client.getProperties(info.getCopyUrl() == null ? info.getUrl() : info.getCopyUrl(),
+ SVNRevision.getRevision(info.getRevision().toString()),
+- SVNRevision.getRevision(info.getRevision().toString()));
++ SVNRevision.getRevision(info.getRevision().toString()),
++ false);
+ for (ISVNProperty prop : props) {
+ map.put(prop.getName(), prop.getData());
+ }
+@@ -209,6 +210,8 @@
+ public static boolean hasOldMetadata (File file) {
+ File parent;
+ return new File(file, SvnUtils.SVN_ENTRIES_DIR).canRead()
+- || (parent = file.getParentFile()) != null && new File(parent, SvnUtils.SVN_ENTRIES_DIR).canRead();
++ || (parent = file.getParentFile()) != null
++ && new File(parent, SvnUtils.SVN_ENTRIES_DIR).canRead()
++ && !new File(parent, SvnUtils.SVN_WC_DB).exists();
+ }
+ }
+--- a/subversion/src/org/netbeans/modules/subversion/util/SvnUtils.java
++++ b/subversion/src/org/netbeans/modules/subversion/util/SvnUtils.java
+@@ -856,6 +856,21 @@
+ return false;
+ }
+
++ public static SVNUrl getCopiedUrl (File f) {
++ try {
++ ISVNInfo info = Subversion.getInstance().getClient(false).getInfoFromWorkingCopy(f);
++ if (info != null) {
++ return info.getCopyUrl();
++ }
++ } catch (SVNClientException e) {
++ // at least log the exception
++ if (!WorkingCopyAttributesCache.getInstance().isSuppressed(e)) {
++ Subversion.LOG.log(Level.INFO, null, e);
++ }
++ }
++ return null;
++ }
++
+ /**
+ * Removes all occurances of '\r' and replaces them with '\n'
+ * @param text
+--- a/subversion/test/unit/src/org/netbeans/modules/subversion/client/commands/StatusTestHidden.java
++++ b/subversion/test/unit/src/org/netbeans/modules/subversion/client/commands/StatusTestHidden.java
+@@ -321,7 +321,6 @@
+ assertEquals(refs[i].getRevision(), nbs[i].getRevision());
+ assertEquals(refs[i].getTextStatus(), nbs[i].getTextStatus());
+ assertEquals(refs[i].getUrl(), nbs[i].getUrl());
+- assertEquals(refs[i].getUrlCopiedFrom(), nbs[i].getUrlCopiedFrom());
+ assertEquals(refs[i].getUrlString(), nbs[i].getUrlString());
+ }
+ }
+--- a/subversion/test/unit/src/org/netbeans/modules/subversion/client/parser/SvnWcParserTest.java
++++ b/subversion/test/unit/src/org/netbeans/modules/subversion/client/parser/SvnWcParserTest.java
+@@ -84,7 +84,6 @@
+ assertTrue(myFile.exists());
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(2, parsedStatus.getRevision().getNumber());
+@@ -108,7 +107,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-no-changes/testapp/Main.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(16, parsedStatus.getRevision().getNumber());
+@@ -132,7 +130,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-changes/testapp/Main.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.MODIFIED, parsedStatus.getTextStatus());
+ assertEquals(2, parsedStatus.getRevision().getNumber());
+@@ -156,7 +153,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-changes/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.MODIFIED, parsedStatus.getTextStatus());
+ assertEquals(16, parsedStatus.getRevision().getNumber());
+@@ -180,7 +176,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-unknown/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.UNVERSIONED, parsedStatus.getTextStatus());
+ assertEquals(0, parsedStatus.getRevision().getNumber());
+@@ -203,7 +198,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-unknown/testapp/readme.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/readme.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.UNVERSIONED, parsedStatus.getTextStatus());
+ assertEquals(0, parsedStatus.getRevision().getNumber());
+@@ -230,7 +224,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/no-changes/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.UNVERSIONED, parsedStatus.getTextStatus());
+ assertEquals(0, parsedStatus.getRevision().getNumber());
+@@ -258,7 +251,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-no-changes/testapp/readme.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/readme.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.UNVERSIONED, parsedStatus.getTextStatus());
+ assertEquals(0, parsedStatus.getRevision().getNumber());
+@@ -281,7 +273,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-added/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.ADDED, parsedStatus.getTextStatus());
+ assertEquals(0, parsedStatus.getRevision().getNumber());
+@@ -304,7 +295,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-added/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.ADDED, parsedStatus.getTextStatus());
+ assertEquals(0, parsedStatus.getRevision().getNumber());
+@@ -327,7 +317,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-conflicts/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.CONFLICTED, parsedStatus.getTextStatus());
+ assertEquals(5, parsedStatus.getRevision().getNumber());
+@@ -352,7 +341,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-conflicts/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.CONFLICTED, parsedStatus.getTextStatus());
+ assertEquals(18, parsedStatus.getRevision().getNumber());
+@@ -377,7 +365,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-removed/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.DELETED, parsedStatus.getTextStatus());
+ assertEquals(6, parsedStatus.getRevision().getNumber());
+@@ -401,7 +388,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-removed/testapp/ReadMe.txt");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/ReadMe.txt", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.DELETED, parsedStatus.getTextStatus());
+ assertEquals(18, parsedStatus.getRevision().getNumber());
+@@ -425,7 +411,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-copied1/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertTrue(parsedStatus.isCopied());
+- assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrlCopiedFrom().toString());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.ADDED, parsedStatus.getTextStatus());
+ assertEquals(5, parsedStatus.getRevision().getNumber());
+@@ -448,7 +433,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-copied1/testapp/AnotherAnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertTrue(parsedStatus.isCopied());
+- assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrlCopiedFrom().toString());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherAnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.ADDED, parsedStatus.getTextStatus());
+ assertEquals(18, parsedStatus.getRevision().getNumber());
+@@ -471,7 +455,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-copied2/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertTrue(parsedStatus.isCopied());
+- assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrlCopiedFrom().toString());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.ADDED, parsedStatus.getTextStatus());
+ assertEquals(5, parsedStatus.getRevision().getNumber());
+@@ -494,7 +477,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-copied2/testapp/AnotherAnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertTrue(parsedStatus.isCopied());
+- assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrlCopiedFrom().toString());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherAnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.ADDED, parsedStatus.getTextStatus());
+ assertEquals(18, parsedStatus.getRevision().getNumber());
+@@ -517,7 +499,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/prop-added/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(8, parsedStatus.getRevision().getNumber());
+@@ -541,7 +522,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-prop-added/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(19, parsedStatus.getRevision().getNumber());
+@@ -565,7 +545,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/prop-modified/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(9, parsedStatus.getRevision().getNumber());
+@@ -589,7 +568,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-prop-modified/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(19, parsedStatus.getRevision().getNumber());
+@@ -613,7 +591,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/file-locked/testapp/Main.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/Main.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(10, parsedStatus.getRevision().getNumber());
+@@ -638,7 +615,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-locked/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(19, parsedStatus.getRevision().getNumber());
+@@ -663,7 +639,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/new-format-file-locked-with-comment/testapp/AnotherMain.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("svn://gonzo/testRepos/trunk/testApp/src/testapp/AnotherMain.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(19, parsedStatus.getRevision().getNumber());
+@@ -688,7 +663,6 @@
+ File myFile = new File(dataRootDir + "/SvnWcParser/no-changes-keywords/testapp/Main.java");
+ ISVNStatus parsedStatus = svnWcParser.getSingleStatus(myFile);
+ assertFalse(parsedStatus.isCopied());
+- assertNull(parsedStatus.getUrlCopiedFrom());
+ assertEquals("file:///data/subversion/trunk/testapp/Main.java", parsedStatus.getUrl().toString());
+ assertEquals(SVNStatusKind.NORMAL, parsedStatus.getTextStatus());
+ assertEquals(989, parsedStatus.getRevision().getNumber());
diff --git a/debian/patches/series b/debian/patches/series
index 5d1bb13..414ee41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ netbeans~include-junit.patch
netbeans~xerces.patch
netbeans~ant-compatibility.patch
netbeans~java7-compatibility.patch
+netbeans~svnkit-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git
More information about the pkg-java-commits
mailing list