setFileContent() using VCSChangeListNode

Author: host6

src/main/java/org/scm4j/vcs/GitVCS.java

@@ -331,54 +331,56 @@ public String getFileContent(String branchName, String fileRelativePath, String
 			throw new RuntimeException(e);
 		}
 	}
-	
-	public VCSCommit setFilesContent(String branchName, List<String> filePathes, List<String> contents, String commitMessage) {
-		if (filePathes.isEmpty()) {
+
+	@Override
+	public VCSCommit setFileContent(String branchName, List<VCSChangeListNode> vcsChangeList) {
+		if (vcsChangeList.isEmpty()) {
 			return null;
 		}
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
 				 Git git = getLocalGit(wc);
 				 Repository gitRepo = git.getRepository()) {
 
-				checkout(git, gitRepo, branchName, null);
-				CommitCommand commitCommand = git.commit();
-				int contentId = 0;
-				for (int filePathId = 0; filePathId < filePathes.size(); filePathId++) {
-					String filePath = filePathes.get(filePathId);
-					File file = new File(wc.getFolder(), filePath);
-					if (!file.exists()) {
-						FileUtils.forceMkdir(file.getParentFile());
-						file.createNewFile();
-						git
-								.add()
-								.addFilepattern(filePath)
-								.call();
-					}
-	
-					try (FileWriter fw = new FileWriter(file, false)) {
-						fw.write(contents.get(contentId));
-					}
-					contentId++;
-					commitCommand.setOnly(filePath);
+			checkout(git, gitRepo, branchName, null);
+			CommitCommand commitCommand = git.commit();
+			StringBuilder commitMessageSB = new StringBuilder();
+			for (VCSChangeListNode vcsChangeListNode : vcsChangeList) {
+				String filePath = vcsChangeListNode.getFilePath();
+				File file = new File(wc.getFolder(), filePath);
+				if (!file.exists()) {
+					FileUtils.forceMkdir(file.getParentFile());
+					file.createNewFile();
+					git
+							.add()
+							.addFilepattern(filePath)
+							.call();
 				}
-				RevCommit newCommit = commitCommand
-						.setMessage(commitMessage)
-						.call();
 
-				String bn = getRealBranchName(branchName);
-				RefSpec refSpec = new RefSpec(bn + ":" + bn);
-				push(git, refSpec);
-				return getVCSCommit(newCommit);
-			} catch (GitAPIException e) {
-				throw new EVCSException(e);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
+				try (FileWriter fw = new FileWriter(file, false)) {
+					fw.write(vcsChangeListNode.getContent());
+				}
+				commitCommand.setOnly(filePath);
+				commitMessageSB.append(vcsChangeListNode.getLogMessage() + VCSChangeListNode.COMMIT_MESSAGES_SEPARATOR);
 			}
+			commitMessageSB.setLength(commitMessageSB.length() - VCSChangeListNode.COMMIT_MESSAGES_SEPARATOR.length());
+			RevCommit newCommit = commitCommand
+					.setMessage(commitMessageSB.toString())
+					.call();
+
+			String bn = getRealBranchName(branchName);
+			RefSpec refSpec = new RefSpec(bn + ":" + bn);
+			push(git, refSpec);
+			return getVCSCommit(newCommit);
+		} catch (GitAPIException e) {
+			throw new EVCSException(e);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	@Override
 	public VCSCommit setFileContent(String branchName, String filePath, String content, String commitMessage) {
-		return setFilesContent(branchName, Collections.singletonList(filePath), Collections.singletonList(content), commitMessage);
+		return setFileContent(branchName, Collections.singletonList(new VCSChangeListNode(filePath, content, commitMessage)));
 	}
 
 	private void checkout(Git git, Repository gitRepo, String branchName, String revision) throws Exception {
@@ -389,7 +391,6 @@ private void checkout(Git git, Repository gitRepo, String branchName, String rev
 				.setCredentialsProvider(credentials)
 				.call();
 		if (revision == null) {
-
 			cmd
 					.setStartPoint("origin/" + bn)
 					.setCreateBranch(gitRepo.exactRef("refs/heads/" + bn) == null)