Merge branch 'master' of https://github.com/Programming-Toolkit/javaToolkit

Author: maxxbw

lib/utils/DiffUtil.java

@@ -29,27 +29,26 @@ public static List<Integer> getChangedLineNumListInOldVersion(String diffStr) {
 		return changedLineNumList;
 	}
 
-	public static Integer getChangedLineCount(String diffStr, String mode) {
+	
+	/**
+	 * the mode can only be "add" or "delete"
+	 * @param diffStr
+	 * @param mode
+	 * @return
+	 */
+	public static int getChangedLineCount(String diffStr, String mode) {
 
 		int count = 0;
 		String symbol = null;
-		try {
-			if ("delete".equals(mode)) {
-				symbol = "-";
-			} else if ("add".equals(mode)) {
-				symbol = "+";
-			} else {
-				throw new Exception("Only have delete or add mode!");
-			}
-			for (String line : diffStr.split("\n")) {
-				if (line.startsWith(symbol) && !line.startsWith("---") && !line.startsWith("+++")) {
-					count++;
-				}
+		if ("delete".equals(mode)) {
+			symbol = "-";
+		} else if ("add".equals(mode)) {
+			symbol = "+";
+		}
+		for (String line : diffStr.split("\n")) {
+			if (line.startsWith(symbol) && !line.startsWith("---") && !line.startsWith("+++")) {
+				count++;
 			}
-		} catch (Exception e) {
-			// TODO: handle exception
-			e.printStackTrace();
-			return null;
 		}
 		return count;
 	}

lib/utils/FileUtil.java

@@ -127,6 +127,22 @@ public static Boolean copyFile2Dir(File f, String DestDir) {
 		return true;
 	}
 
+	public static Boolean copyFile2Dir(Path fPath, Path DestDir) {
+		try {
+			File DestDirFile = DestDir.toFile();
+			if (!DestDirFile.exists()) {
+				DestDirFile.mkdirs();
+			}
+			Path targetFilePath = Paths.get(DestDirFile.getAbsolutePath(), fPath.toFile().getName());
+			FileUtils.copyFile(fPath.toFile(), targetFilePath.toFile());
+		} catch (IOException e) {
+
+			e.printStackTrace();
+			return false;
+		}
+		return true;
+	}
+
 	public static Boolean copyFile2File(File srcFile, File dstFile) {
 		try {
 			// dstfile will be overwrited if exist
@@ -150,7 +166,7 @@ public static boolean deleteDirectory(String dirPath) {
 		return directoryToBeDeleted.delete();
 	}
 
-	public static void copyFolder(String srcDirStr, String destDirStr) {
+	public static void copyDirectory(String srcDirStr, String destDirStr) {
 		File source = new File(srcDirStr);
 		File dest = new File(destDirStr);
 		try {

lib/utils/GitUtil.java

@@ -10,24 +10,6 @@
 
 public class GitUtil {
 
-	public static void main(String[] args) {
-		Path repoDir = Paths.get("/data/bowen/data/PTBench-Data/data/2019/quarkusio#gizmo/raw_github");
-		Set<String> mergeSet = new HashSet<>();
-		Set<String> bugComs = new HashSet<String>(getComsWithSingleWordMatch(repoDir, "bug"));
-		System.out.println("# bug coms " + String.valueOf(bugComs.size()));
-		mergeSet.addAll(bugComs);
-		Set<String> BugComs = new HashSet<String>(getComsWithSingleWordMatch(repoDir, "Bug"));
-		System.out.println("# Bug coms " + String.valueOf(BugComs.size()));
-		mergeSet.addAll(BugComs);
-		Set<String> fixComs = new HashSet<String>(getComsWithSingleWordMatch(repoDir, "fix"));
-		System.out.println("# fix coms " + String.valueOf(fixComs.size()));
-		mergeSet.addAll(fixComs);
-		Set<String> FixComs = new HashSet<String>(getComsWithSingleWordMatch(repoDir, "Fix"));
-		System.out.println("# Fix coms " + String.valueOf(FixComs.size()));
-		mergeSet.addAll(FixComs);
-		System.out.println("# merge coms " + String.valueOf(mergeSet.size()));
-	}
-
 	public static Boolean clone(String repoName, String usrName, Path targetDir) {
 
 		if (targetDir.toFile().exists()) {
@@ -85,6 +67,24 @@ public static List<String> getComsWithSingleWordMatch(Path repoDir, String word)
 		}
 	}
 
+	public static String getDiff4SingleFileNCommit(Path repoDir, String parCom, String curCom, String oldRelFilePath,
+			String newRelFilePath) {
+
+		String cmd = "timeout 300 git --no-pager diff --unified=0 " + parCom + ":" + oldRelFilePath + " " + curCom + ":"
+				+ newRelFilePath;
+
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir, 0);
+		if (pr.exitCode == 0) {
+			return pr.out.trim();
+		} else {
+			FileUtil.writeStr2File(pr.out, Paths.get(repoDir.toString(), "getDiff4SingleFileNCommit.txt"));
+			FileUtil.writeStr2File(pr.err, Paths.get(repoDir.toString(), "getDiff4SingleFileNCommit.txt"));
+			// System.out.println("cmd " + cmd + "\n");
+			// System.out.println("report \n" + pr.toString());
+			return null;
+		}
+	}
+
 	public static String getCommitMsg(Path repoDir, String com) {
 
 		String cmd = "timeout 300 git log --format=%B -n 1 " + com;

lib/utils/ProcessUtil.java

@@ -45,8 +45,6 @@ public static ProcessReporter executeCMD(String cmd, String[] envp, Path workDir
 			Runtime rt = Runtime.getRuntime();
 			Process proc = rt.exec(cmd, envp, workDir.toFile());
 
-			pr.exitCode = proc.waitFor();
-
 			// Read the output from the command
 			BufferedReader stdInput = new BufferedReader(new InputStreamReader(proc.getInputStream()));
 			// System.out.println("Here is the standard output of the
@@ -70,6 +68,8 @@ public static ProcessReporter executeCMD(String cmd, String[] envp, Path workDir
 			}
 			pr.err = err.trim();
 
+			pr.exitCode = proc.waitFor();
+
 			proc.destroy();
 
 			if (pr.exitCode != expectedExitCode) {