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: don't show incorrect notification about "local changes not restored"

Browse Source 
Follow-up: 9d9c015
This commit is contained in:
Kirill Likhodedov
2018-05-29 20:40:39 +03:00
parent b7998a157a
commit ef221245a3
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
+5 -1
View File
@@ -241,7 +241,11 @@ public class GitUpdateProcess {
notifyImportantError(myProject, "Error updating " + rootName, notifyImportantError(myProject, "Error updating " + rootName,
"Updating " + rootName + " failed with an error: " + e.getLocalizedMessage()); "Updating " + rootName + " failed with an error: " + e.getLocalizedMessage());
} }
}); }) {
protected boolean shouldNotifyLocalChangesAreNotRestored() {
return unstashAfterUpdate();
}
};
myPreservingProcess.execute(() -> { myPreservingProcess.execute(() -> {
if (!unstashAfterUpdate()) return false; if (!unstashAfterUpdate()) return false;
plugins/git4idea/src/git4idea/util/GitPreservingProcess.java
+5 -1
View File
@@ -100,7 +100,7 @@ public class GitPreservingProcess {
LOG.debug("loading"); LOG.debug("loading");
load(); load();
} }
else { else if (shouldNotifyLocalChangesAreNotRestored()) {
mySaver.notifyLocalChangesAreNotRestored(); mySaver.notifyLocalChangesAreNotRestored();
} }
} }
@@ -111,6 +111,10 @@ public class GitPreservingProcess {
new GitFreezingProcess(myProject, myOperationTitle, operation).execute(); new GitFreezingProcess(myProject, myOperationTitle, operation).execute();
} }
protected boolean shouldNotifyLocalChangesAreNotRestored() {
return true;
}
/** /**
* Configures the saver: i.e. notifications and texts for the GitConflictResolver used inside. * Configures the saver: i.e. notifications and texts for the GitConflictResolver used inside.
*/ */