Cleanup: make Path.contains() more precise.

Same problem as in maven-scm's SCM-695: to check whether one
path refers to a parent directory of another path, it behooves one
well to handle file separators, otherwise a directory path "foo/bar"
may be seen incorrectly as a parent to be stripped from the file path
"foo/barbar/someFile.txt".

Author: tomaswolf

src/main/java/hudson/plugins/scm_sync_configuration/JenkinsFilesHelper.java

@@ -6,17 +6,26 @@
 
 public class JenkinsFilesHelper {
 
-	public static String buildPathRelativeToHudsonRoot(File file){
+	public static String buildPathRelativeToHudsonRoot(File file) {
 		File jenkinsRoot = Jenkins.getInstance().getRootDir();
-		if(!file.getAbsolutePath().startsWith(jenkinsRoot.getAbsolutePath())){
+		String jenkinsRootPath = jenkinsRoot.getAbsolutePath();
+		String fileAbsolutePath = file.getAbsolutePath();
+		if (fileAbsolutePath.equals(jenkinsRootPath)) {
+			// Hmmm. Should never occur.
+			throw new IllegalArgumentException("Cannot build relative path to $JENKINS_HOME for $JENKINS_HOME itself; would be empty.");
+		}
+		if (!jenkinsRootPath.endsWith(File.separator)) {
+			jenkinsRootPath += File.separator;
+		}
+		if (!fileAbsolutePath.startsWith(jenkinsRootPath)) {
+			// Oops, the file is not relative to $JENKINS_HOME
 			return null;
 		}
-		String truncatedPath = file.getAbsolutePath().substring(jenkinsRoot.getAbsolutePath().length()+1); // "+1" because we don't need ending file separator
-		return truncatedPath.replaceAll("\\\\", "/"); 
+		String truncatedPath = fileAbsolutePath.substring(jenkinsRootPath.length());
+		return truncatedPath.replace(File.separatorChar, '/');
 	}
 
     public static File buildFileFromPathRelativeToHudsonRoot(String pathRelativeToJenkinsRoot){
-        File jenkinsRoot = Jenkins.getInstance().getRootDir();
-        return new File(jenkinsRoot.getAbsolutePath(), pathRelativeToJenkinsRoot);
+        return new File(Jenkins.getInstance().getRootDir(), pathRelativeToJenkinsRoot);
     }
 }

src/main/java/hudson/plugins/scm_sync_configuration/ScmSyncConfigurationBusiness.java

@@ -166,9 +166,15 @@ private void processCommitsQueue() {
             for(Commit commit: currentCommitQueue){
                 String logMessage = "Processing commit : " + commit.toString();
                 LOGGER.finest(logMessage);
-
                 // Preparing files to add / delete
+                //
+                // Two points:
+                // 1. getPathContents() already returns only those paths that are not also to be deleted.
+                // 2. For svn, we must not run svn add for files already in the repo. For git, we should run git add to stage the
+                //    change. The second happens to work per chance because the git checkIn implementation will use git commit -a
+                //    if a file set without files but only some directory is given, which we do.
                 List<File> updatedFiles = new ArrayList<File>();
+                
                 for(Map.Entry<Path,byte[]> pathContent : commit.getChangeset().getPathContents().entrySet()){
                     Path pathRelativeToJenkinsRoot = pathContent.getKey();
                     byte[] content = pathContent.getValue();

src/main/java/hudson/plugins/scm_sync_configuration/model/Path.java

@@ -24,7 +24,7 @@ public Path(File hudsonFile){
     }
 
     public Path(String path, boolean isDirectory) {
-        this.path = path;
+        this.path = path.replace(File.separatorChar, '/'); // Make sure we use the system-independent separator.
         this.isDirectory = isDirectory;
     }
 
@@ -39,7 +39,7 @@ public File getHudsonFile(){
     public File getScmFile(){
         // TODO: Externalize ScmSyncConfigurationBusiness.getCheckoutScmDirectoryAbsolutePath()
         // in another class ?
-        return new File(ScmSyncConfigurationBusiness.getCheckoutScmDirectoryAbsolutePath()+File.separator+getPath());
+        return new File(ScmSyncConfigurationBusiness.getCheckoutScmDirectoryAbsolutePath(), getPath());
     }
 
     public String getFirstNonExistingParentScmPath(){
@@ -59,7 +59,18 @@ public boolean isDirectory() {
     }
 
     public boolean contains(Path p){
-        return this.isDirectory() && p.getPath().startsWith(this.getPath());
+    	if (this.isDirectory()) {
+    		String path = this.getPath();
+    		if (!path.endsWith("/")) {
+    			path += '/';
+    		}
+    		String otherPath = p.getPath();
+    		if (p.isDirectory() && !otherPath.endsWith("/")) {
+    			otherPath += '/';
+    		}
+    		return otherPath.startsWith(path);
+    	}
+    	return false;
     }
 
     @Override