Merge branch 'master' into release/4

# Conflicts:
#	version

Author: host6

build.gradle

@@ -21,6 +21,13 @@ jacocoTestReport {
 	}
 }
 
+test {
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
+}
+
 repositories {
 	mavenCentral()
 }

src/main/java/org/scm4j/vcs/api/workingcopy/IVCSRepositoryWorkspace.java

@@ -6,6 +6,8 @@
 public interface IVCSRepositoryWorkspace {
 
 	IVCSLockedWorkingCopy getVCSLockedWorkingCopy() throws IOException;
+	
+	IVCSLockedWorkingCopy getVCSLockedWorkingCopyTemp() throws IOException;
 
 	File getRepoFolder();
 

src/main/java/org/scm4j/vcs/api/workingcopy/VCSLockedWorkingCopy.java

@@ -40,28 +40,31 @@ public void setCorrupted(Boolean isCorrupt) {
 		this.corrupt = isCorrupt;
 	}
 
-	protected VCSLockedWorkingCopy (IVCSRepositoryWorkspace vcsRepo) throws IOException {
+	protected VCSLockedWorkingCopy (IVCSRepositoryWorkspace vcsRepo, boolean isTemp) throws IOException {
 		this.vcsRepo = vcsRepo;
-		init();
+		this.corrupt = isTemp;
+		init(isTemp);
 	}
 
 	@Override
 	public Boolean getCorrupted() {
 		return corrupt;
 	}
 
-	private void init() throws IOException {
+	private void init(boolean force) throws IOException {
 		File[] files = vcsRepo.getRepoFolder().listFiles();
-		for (File file : files != null ? files : new File[0]) {
-			if (file.isDirectory()) {
-				lockFile = new File( vcsRepo.getRepoFolder(), LOCK_FILE_PREFIX + file.getName());
-				if (!lockFile.exists()) {
-					continue;
-				}
-				if (tryLockFile(lockFile)) {
-					folder = file;
-					state = VCSLockedWorkingCopyState.LOCKED;
-					return;
+		if (!force) {
+			for (File file : files != null ? files : new File[0]) {
+				if (file.isDirectory()) {
+					lockFile = new File( vcsRepo.getRepoFolder(), LOCK_FILE_PREFIX + file.getName());
+					if (!lockFile.exists()) {
+						continue;
+					}
+					if (tryLockFile(lockFile)) {
+						folder = file;
+						state = VCSLockedWorkingCopyState.LOCKED;
+						return;
+					}
 				}
 			}
 		}

src/main/java/org/scm4j/vcs/api/workingcopy/VCSRepositoryWorkspace.java

@@ -22,7 +22,7 @@ public IVCSWorkspace getWorkspace() {
 
 	@Override
 	public IVCSLockedWorkingCopy getVCSLockedWorkingCopy() throws IOException {
-		return new VCSLockedWorkingCopy(this);
+		return new VCSLockedWorkingCopy(this, false);
 	}
 
 	private String getRepoFolderName() {
@@ -52,4 +52,9 @@ public String toString() {
 				+ "]";
 	}
 
+	@Override
+	public IVCSLockedWorkingCopy getVCSLockedWorkingCopyTemp() throws IOException {
+		return new VCSLockedWorkingCopy(this, true);
+	}
+
 }

src/test/java/org/scm4j/vcs/api/workingcopy/VCSLockedWorkingCopyTest.java

@@ -3,6 +3,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.nio.channels.FileChannel;
 import java.nio.channels.NonWritableChannelException;
@@ -53,22 +54,22 @@ public void testLockingFewWorkspaces() throws Exception {
 
 	@Test
 	public void testReusingUnlockedWorkspaces() throws Exception {
-		VCSLockedWorkingCopy w1 = new VCSLockedWorkingCopy(r);
+		VCSLockedWorkingCopy w1 = new VCSLockedWorkingCopy(r, false);
 		w1.close();
-		VCSLockedWorkingCopy w2 = new VCSLockedWorkingCopy(r);
+		VCSLockedWorkingCopy w2 = new VCSLockedWorkingCopy(r, false);
 		assertEquals(w1.getFolder().getName(), w2.getFolder().getName());
 		w2.close();
 
 		// if lock file does not exists then a new WC should be created
 		w1.getLockFile().delete();
-		w2 = new VCSLockedWorkingCopy(r);
+		w2 = new VCSLockedWorkingCopy(r, false);
 		assertNotEquals(w1.getFolder().getName(), w2.getFolder().getName());
 		w2.close();
 	}
 
 	@Test
 	public void testCorruptingWorkspace() throws Exception {
-		VCSLockedWorkingCopy workspace = new VCSLockedWorkingCopy(r);
+		VCSLockedWorkingCopy workspace = new VCSLockedWorkingCopy(r, false);
 		workspace.setCorrupted(true);
 		workspace.close();
 		assertFalse(workspace.getFolder().exists());
@@ -77,8 +78,20 @@ public void testCorruptingWorkspace() throws Exception {
 
 	@Test
 	public void testToString() throws Exception {
-		try (VCSLockedWorkingCopy lwc = new VCSLockedWorkingCopy(r)) {
+		try (VCSLockedWorkingCopy lwc = new VCSLockedWorkingCopy(r, false)) {
 			assertTrue(lwc.toString().contains(r.getRepoFolder().getPath()));
 		}
 	}
+	
+	@Test
+	public void testTempLWCObtain() throws Exception {
+		File lwcFolder;
+		try (IVCSLockedWorkingCopy lwc = r.getVCSLockedWorkingCopy()) {
+			lwcFolder = lwc.getFolder();
+		}
+		try (IVCSLockedWorkingCopy tempLWC = r.getVCSLockedWorkingCopyTemp()) {
+			assertFalse(lwcFolder.getName().equals(tempLWC.getFolder().getName()));
+			assertTrue(tempLWC.getCorrupted());
+		}
+	}
 }