seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CHE-7001: Fix Git status of untracked files in Git diff (#7962)

6.19.x
Igor Vinokur 2017-12-21 09:16:23 +00:00 committed by GitHub
parent 4025610db7
commit f4c1946fb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/FileStatus.java
View File

@ -16,6 +16,7 @@ import static org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status.DELET
import static org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status.MODIFIED;
import static org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status.RENAMED;
import static org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status.UNMODIFIED;
import static org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status.UNTRACKED;
/**
* Class for determining git status of given changed file.
@ -52,6 +53,8 @@ public class FileStatus {
return RENAMED;
case "C":
return COPIED;
case "U":
return UNTRACKED;
}
return UNMODIFIED;
}

4
wsagent/che-core-api-git/src/test/java/org/eclipse/che/git/impl/DiffTest.java
View File

@ -63,13 +63,15 @@ public class DiffTest {
// given
GitConnection connection = connectToInitializedGitRepository(connectionFactory, repository);
makeCommitInMaster(connection);
addFile(connection, "Untracked", "Content\n");
// when
List<String> diff =
readDiff(DiffParams.create().withType(DiffType.NAME_STATUS).withRenameLimit(0), connection);
// then
assertEquals(diff.size(), 1);
assertEquals(diff.size(), 2);
assertTrue(diff.contains("M\taaa"));
assertTrue(diff.contains("U\tUntracked"));
}
@Test(

2
wsagent/che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitConnection.java
View File

@ -797,7 +797,7 @@ class JGitConnection implements GitConnection {
@Override
public DiffPage diff(DiffParams params) throws GitException {
return new JGitDiffPage(params, repository);
return new JGitDiffPage(params, repository, this);
}
@Override

76
wsagent/che-core-git-impl-jgit/src/main/java/org/eclipse/che/git/impl/jgit/JGitDiffPage.java
View File

@ -21,9 +21,13 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.eclipse.che.api.git.DiffPage;
import org.eclipse.che.api.git.GitConnection;
import org.eclipse.che.api.git.exception.GitException;
import org.eclipse.che.api.git.params.DiffParams;
import org.eclipse.che.api.git.shared.DiffType;
import org.eclipse.che.api.git.shared.Status;
import org.eclipse.jgit.diff.ContentSource;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
@ -44,6 +48,8 @@ import org.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Contains information about difference between two commits, commit and working tree, working tree
@ -54,10 +60,14 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;
class JGitDiffPage extends DiffPage {
private final DiffParams params;
private final Repository repository;
private final GitConnection gitConnection;
JGitDiffPage(DiffParams params, Repository repository) {
private static final Logger LOG = LoggerFactory.getLogger(JGitDiffPage.class);
JGitDiffPage(DiffParams params, Repository repository, GitConnection gitConnection) {
this.params = params;
this.repository = repository;
this.gitConnection = gitConnection;
}
@Override
@ -97,6 +107,8 @@ class JGitDiffPage extends DiffPage {
} else {
writeRawDiff(diff, formatter);
}
} catch (GitException e) {
LOG.error(e.getMessage());
} finally {
formatter.close();
repository.close();
@ -329,33 +341,47 @@ class JGitDiffPage extends DiffPage {
writer.flush();
}
private void writeNamesAndStatus(List<DiffEntry> diff, OutputStream out) throws IOException {
private void writeNamesAndStatus(List<DiffEntry> diff, OutputStream out)
throws IOException, GitException {
PrintWriter writer = new PrintWriter(out);
int diffSize = diff.size();
Status status =
gitConnection.status(diff.stream().map(DiffEntry::getNewPath).collect(Collectors.toList()));
for (DiffEntry de : diff) {
if (de.getChangeType() == ChangeType.ADD) {
writer.print(
"A\t" + de.getNewPath() + (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
} else if (de.getChangeType() == ChangeType.DELETE) {
writer.print(
"D\t" + de.getOldPath() + (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
} else if (de.getChangeType() == ChangeType.MODIFY) {
writer.print(
"M\t" + de.getNewPath() + (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
} else if (de.getChangeType() == ChangeType.COPY) {
writer.print(
"C\t"
+ de.getOldPath()
+ '\t'
+ de.getNewPath()
+ (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
} else if (de.getChangeType() == ChangeType.RENAME) {
writer.print(
"R\t"
+ de.getOldPath()
+ '\t'
+ de.getNewPath()
+ (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
switch (de.getChangeType()) {
case ADD:
writer.print(
(status.getUntracked().contains(de.getNewPath()) ? "U" : "A")
+ "\t"
+ de.getNewPath()
+ (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
break;
case DELETE:
writer.print(
"D\t" + de.getOldPath() + (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
break;
case MODIFY:
writer.print(
"M\t" + de.getNewPath() + (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
break;
case COPY:
writer.print(
"C\t"
+ de.getOldPath()
+ '\t'
+ de.getNewPath()
+ (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
break;
case RENAME:
writer.print(
"R\t"
+ de.getOldPath()
+ '\t'
+ de.getNewPath()
+ (diffSize != diff.indexOf(de) + 1 ? lineSeparator() : ""));
break;
}
}
writer.flush();