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: an attempt to fix unstash

Browse Source
This commit is contained in:
unknown
2009-10-26 10:28:25 +03:00
parent 02c4686cb6
commit b435acafc1
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
+16 -3
View File
@@ -15,6 +15,7 @@
*/
package git4idea.update;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
@@ -61,6 +62,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
* and processed as well.
*/
public class GitUpdateEnvironment implements UpdateEnvironment {
private static final Logger LOG = Logger.getInstance("#git4idea.update.GitUpdateEnvironment");
/**
* The vcs instance
*/
@@ -106,10 +108,14 @@ public class GitUpdateEnvironment implements UpdateEnvironment {
projectManager.blockReloadingProjectOnExternalChanges();
try {
HashSet<VirtualFile> rootsToStash = new HashSet<VirtualFile>();
List<LocalChangeList> listsCopy = null;
ChangeListManagerEx changeManager = (ChangeListManagerEx)ChangeListManagerEx.getInstance(myProject);
if (mySettings.UPDATE_STASH) {
ChangeListManagerEx changeManager = (ChangeListManagerEx)ChangeListManagerEx.getInstance(myProject);
for (LocalChangeList l : changeManager.getChangeListsCopy()) {
for (Change c : l.getChanges()) {
listsCopy = changeManager.getChangeListsCopy();
for (LocalChangeList l : listsCopy) {
final Collection<Change> changeCollection = l.getChanges();
LOG.debug("Stashing " + changeCollection.size() + " changes from '" + l.getName() + "'");
for (Change c : changeCollection) {
if (c.getAfterRevision() != null) {
VirtualFile r = GitUtil.getGitRootOrNull(c.getAfterRevision().getFile());
if (r != null) {
@@ -256,6 +262,13 @@ public class GitUpdateEnvironment implements UpdateEnvironment {
if (stashCreated) {
try {
GitStashUtils.popLastStash(myProject, root);
for (LocalChangeList changeList : listsCopy) {
final Collection<Change> changes = changeList.getChanges();
if (! changes.isEmpty()) {
LOG.debug("After unstash: moving " + changes.size() + " changes to '" + changeList.getName() + "'");
changeManager.moveChangesTo(changeList, changes.toArray(new Change[changes.size()]));
}
}
}
catch (final VcsException ue) {
exceptions.add(ue);