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] IDEA-94378 Hard refresh after stash/unstash, the same as it is done for checkout.

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-11-10 13:32:01 +04:00
parent d2bf18d9da
commit 3c673662ed
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitUtil.java
+5
View File
@@ -34,6 +34,7 @@ import com.intellij.openapi.vcs.changes.FilePathsHelper;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.openapi.vcs.vfs.AbstractVcsVirtualFile;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Consumer;
import com.intellij.util.Function;
@@ -923,4 +924,8 @@ public class GitUtil {
return Collections.emptyMap();
}
}
public static void hardRefresh(VirtualFile dir) {
VfsUtil.markDirtyAndRefresh(true, true, false, dir);
}
}
plugins/git4idea/src/git4idea/actions/GitStash.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vfs.VirtualFile;
import git4idea.GitUtil;
import git4idea.commands.GitHandlerUtil;
import git4idea.commands.GitLineHandler;
import git4idea.i18n.GitBundle;
@@ -52,7 +53,7 @@ public class GitStash extends GitRepositoryAction {
affectedRoots.add(root);
final GitLineHandler h = d.handler();
GitHandlerUtil.doSynchronously(h, GitBundle.getString("stashing.title"), h.printableCommandLine());
root.refresh(true, true);
GitUtil.hardRefresh(root);
}
/**
plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
+1 -2
View File
@@ -23,7 +23,6 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Function;
import git4idea.GitPlatformFacade;
@@ -247,7 +246,7 @@ abstract class GitBranchOperation {
protected static void refreshRoot(@NotNull GitRepository repository) {
// marking all files dirty, because sometimes FileWatcher is unable to process such a large set of changes that can happen during
// checkout on a large repository: IDEA-89944
VfsUtil.markDirtyAndRefresh(true, true, false, repository.getRoot());
GitUtil.hardRefresh(repository.getRoot());
}
protected void fatalLocalChangesError(@NotNull String reference) {
plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
+1 -1
View File
@@ -407,7 +407,7 @@ public class GitUnstashDialog extends DialogWrapper {
}
});
int rc = GitHandlerUtil.doSynchronously(h, GitBundle.getString("unstash.unstashing"), h.printableCommandLine(), false);
root.refresh(true, true);
GitUtil.hardRefresh(root);
if (conflict.get()) {
boolean conflictsResolved = new UnstashConflictResolver(myProject, root, getSelectedStash()).merge();