MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: support partial changes for moved files

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-01-25 14:19:07 +03:00
parent 7e0a3a1417
commit 316ba82f29
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.kt
+2 -2
View File
@@ -299,8 +299,8 @@ class LineStatusTrackerManager(
val change = ChangeListManager.getInstance(project).getChange(virtualFile)
return change != null && change.javaClass == Change::class.java &&
change.type == Change.Type.MODIFICATION && change.afterRevision is CurrentContentRevision
(change.type == Change.Type.MODIFICATION || change.type == Change.Type.MOVED) &&
change.afterRevision is CurrentContentRevision
}
override fun arePartialChangelistsEnabled(virtualFile: VirtualFile): Boolean {
plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+32 -2
View File
@@ -53,6 +53,7 @@ import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.components.JBLabel;
import com.intellij.util.FunctionUtil;
import com.intellij.util.NullableFunction;
import com.intellij.util.ObjectUtils;
import com.intellij.util.PairConsumer;
import com.intellij.util.concurrency.FutureResult;
import com.intellij.util.textCompletion.DefaultTextCompletionValueDescriptor;
@@ -399,8 +400,20 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
List<PartialCommitHelper> helpers = result.first;
List<Change> partialChanges = result.second;
List<FilePath> pathsToDelete = new ArrayList<>();
for (Change change : partialChanges) {
if (change.getType() == Change.Type.MOVED) {
ContentRevision beforeRevision = ObjectUtils.assertNotNull(change.getBeforeRevision());
pathsToDelete.add(beforeRevision.getFile());
}
}
GitFileUtils.delete(myProject, repository.getRoot(), pathsToDelete, "--ignore-unmatch");
for (int i = 0; i < partialChanges.size(); i++) {
CurrentContentRevision revision = (CurrentContentRevision)partialChanges.get(i).getAfterRevision();
Change change = partialChanges.get(i);
CurrentContentRevision revision = (CurrentContentRevision)change.getAfterRevision();
assert revision != null;
FilePath path = revision.getFile();
@@ -408,7 +421,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
VirtualFile file = revision.getVirtualFile();
if (file == null) throw new VcsException("Can't find file: " + path.getPath());
GitIndexUtil.StagedFile stagedFile = GitIndexUtil.list(repository, path);
GitIndexUtil.StagedFile stagedFile = getStagedFile(repository, change);
boolean isExecutable = stagedFile != null && stagedFile.isExecutable();
Pair.NonNull<Charset, byte[]> fileContent =
@@ -417,6 +430,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
GitIndexUtil.write(repository, path, fileContent.second, isExecutable);
}
Runnable callback = () -> ApplicationManager.getApplication().invokeLater(() -> {
for (PartialCommitHelper helper : helpers) {
try {
@@ -431,6 +445,22 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
return Pair.create(callback, partialChanges);
}
@Nullable
private static GitIndexUtil.StagedFile getStagedFile(@NotNull GitRepository repository, @NotNull Change change) throws VcsException {
FilePath bPath = getBeforePath(change);
if (bPath != null) {
GitIndexUtil.StagedFile file = GitIndexUtil.list(repository, bPath);
if (file != null) return file;
}
FilePath aPath = getAfterPath(change);
if (aPath != null) {
GitIndexUtil.StagedFile file = GitIndexUtil.list(repository, aPath);
if (file != null) return file;
}
return null;
}
@Nullable
private static <T> T computeAfterLSTManagerUpdate(@NotNull Project project, @NotNull final Computable<T> computation) {
assert !ApplicationManager.getApplication().isDispatchThread();