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] fix deadlocks in cherry-pick, including IDEA-95523

Browse Source 
Refresh changes in the background (fixes IDEA-95523),
invoke callback in the background as well (fixes newly introduced
lock with waiting in the EDT).
This commit is contained in:
Kirill Likhodedov
2014-10-08 18:41:54 +04:00
parent 7cf6d7c361
commit 9b28336f8b
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
+18 -5
View File
@@ -237,6 +237,7 @@ public class GitCherryPicker {
@Nullable
private LocalChangeList createChangeListAfterUpdate(@NotNull final VcsFullCommitDetails commit, @NotNull final Collection<FilePath> paths,
@NotNull final String commitMessage) {
final CountDownLatch waiter = new CountDownLatch(1);
final AtomicReference<LocalChangeList> changeList = new AtomicReference<LocalChangeList>();
myPlatformFacade.invokeAndWait(new Runnable() {
@Override
@@ -244,17 +245,26 @@ public class GitCherryPicker {
myChangeListManager.invokeAfterUpdate(new Runnable() {
public void run() {
changeList.set(createChangeListIfThereAreChanges(commit, commitMessage));
waiter.countDown();
}
}, InvokeAfterUpdateMode.SYNCHRONOUS_NOT_CANCELLABLE, "Cherry-pick",
}, InvokeAfterUpdateMode.SILENT_CALLBACK_POOLED, "Cherry-pick",
new Consumer<VcsDirtyScopeManager>() {
public void consume(VcsDirtyScopeManager vcsDirtyScopeManager) {
vcsDirtyScopeManager.filePathsDirty(paths, null);
}
}, ModalityState.NON_MODAL
);
}, ModalityState.NON_MODAL);
}
}, ModalityState.NON_MODAL);
try {
boolean success = waiter.await(100, TimeUnit.SECONDS);
if (!success) {
LOG.error("Couldn't await for change list manager refresh");
}
}
catch (InterruptedException e) {
LOG.error(e);
return null;
}
return changeList.get();
}
@@ -475,7 +485,10 @@ public class GitCherryPicker {
try {
myChangeListManager.addChangeListListener(listener);
myChangeListManager.moveChangesTo(targetChangeList, originalChanges.toArray(new Change[originalChanges.size()]));
moveChangesWaiter.await(100, TimeUnit.SECONDS);
boolean success = moveChangesWaiter.await(100, TimeUnit.SECONDS);
if (!success) {
LOG.error("Couldn't await for changes move.");
}
return resultingChangeList.get();
}
catch (InterruptedException e) {