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] more diagnostics for the problem when change is not found for file

Browse Source
This commit is contained in:
Kirill Likhodedov
2014-07-07 17:12:53 +04:00
parent d73663a247
commit 3c8c2f559e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitUtil.java
+8 -2
View File
@@ -34,6 +34,7 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangeListManagerEx;
import com.intellij.openapi.vcs.changes.FilePathsHelper;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.openapi.vcs.vfs.AbstractVcsVirtualFile;
@@ -976,17 +977,22 @@ public class GitUtil {
@NotNull
public static List<Change> findLocalChangesForPaths(@NotNull Project project, @NotNull VirtualFile root,
@NotNull Collection<String> affectedPaths, boolean relativePaths) {
ChangeListManagerEx changeListManager = (ChangeListManagerEx)ChangeListManager.getInstance(project);
List<Change> affectedChanges = new ArrayList<Change>();
for (String path : affectedPaths) {
String absolutePath = relativePaths ? toAbsolute(root, path) : path;
VirtualFile file = findRefreshFileOrLog(absolutePath);
if (file != null) {
Change change = ChangeListManager.getInstance(project).getChange(file);
Change change = changeListManager.getChange(file);
if (change != null) {
affectedChanges.add(change);
}
else {
LOG.warn("Change is not found for " + file.getPath());
String message = "Change is not found for " + file.getPath();
if (changeListManager.isInUpdate()) {
message += " because ChangeListManager is being updated.";
}
LOG.warn(message);
}
}
}