Changeset 764

Timestamp:

Mar 31, 2013, 5:11:04 PM (12 years ago)

Author:

alloc

Message:

java lib: SVN Access to check for missing files in WC

File:

• java/SVNAccess/src/net/oni2/svnaccess/SVN.java (modified) (5 diffs)

java/SVNAccess/src/net/oni2/svnaccess/SVN.java

@@ -13 +13 @@
 import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
 import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
+import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
 import org.tmatesoft.svn.core.wc.SVNInfo;
 import org.tmatesoft.svn.core.wc.SVNRevision;
+import org.tmatesoft.svn.core.wc.SVNStatus;
+import org.tmatesoft.svn.core.wc.SVNStatusType;
 import org.tmatesoft.svn.core.wc.SVNWCUtil;
 
@@ -99 +102 @@
          * @return -1: No local working copy yet<br>
          *         0: Revisions are equal<br>
-         *         1: SVN contains newer revisions
+         *         1: SVN contains newer revisions<br>
+         *         2: WC has manually deleted files
          * @throws Exception
          *             If destination is not a WC of the given repository
@@ -114 +118 @@
                         if (remoteRev > localRev)
                                 return 1;
-                        else
-                                return 0;
+                        else {
+                                if (getMissingFiles(wcDir))
+                                        return 2;
+                                else
+                                        return 0;
+                        }
                 } else {
                         return -1;
                 }
+        }
+
+        private boolean getMissingFiles(File wcDir) {
+                try {
+                        final Vector<String> files = new Vector<String>();
+                        svnCManager.getStatusClient().doStatus(wcDir, null,
+                                        SVNDepth.INFINITY, false, false, false, false,
+                                        new ISVNStatusHandler() {
+                                                @Override
+                                                public void handleStatus(SVNStatus status)
+                                                                throws SVNException {
+                                                        SVNStatusType stat = status
+                                                                        .getCombinedNodeAndContentsStatus();
+                                                        if (stat == SVNStatusType.MISSING
+                                                                        || stat == SVNStatusType.STATUS_MISSING) {
+                                                                files.add(status.getFile().getPath());
+                                                        }
+                                                }
+                                        }, null);
+                        return files.size() > 0;
+                } catch (SVNException e) {
+                        e.printStackTrace();
+                }
+                return false;
         }
 
@@ -157 +189 @@
                                         true, 0, new LogEntryHandler(list, reposUrl.getPath()));
                 } catch (Exception e) {
-                        if (e.getMessage().startsWith("svn: No such revision "))
-                                return null;
-                        err.println("Error while getting the list of updated files of the location '"
-                                        + reposUrl + "': " + e.getMessage());
-                        e.printStackTrace();
+                        if (!e.getMessage().contains("No such revision ")) {
+                                err.println("Error while getting the list of updated files of the location '"
+                                                + reposUrl + "': " + e.getMessage());
+                                e.printStackTrace();
+                        }
                 }
 
@@ -171 +203 @@
                 Vector<String> updatedFiles = getUpdatedFilesInRepository(reposUrl,
                                 fromRev);
-
-                if (updatedFiles == null)
-                        return true;
 
                 svnCManager.getUpdateClient().setEventHandler(