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

[vcs-log] rename processDetails -> getCherryPickerOrReportError, make it return VcsCherryPicker or null instead of modifying groupedDetails in it

Browse Source
This commit is contained in:
Julia Beliaeva
2016-01-14 19:25:59 +03:00
parent ff8ac4b968
commit 8d1158dba4
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/cherrypick/VcsCherryPickManager.java
+12 -8
View File
@@ -100,12 +100,15 @@ public class VcsCherryPickManager {
myChangeListManager.blockModalNotifications();
}
public boolean processDetails(@NotNull VcsFullCommitDetails details,
@NotNull MultiMap<VcsCherryPicker, VcsFullCommitDetails> groupedDetails) {
@Nullable
private VcsCherryPicker getCherryPickerOrReportError(@NotNull VcsFullCommitDetails details) {
CommitId commitId = new CommitId(details.getId(), details.getRoot());
if (myIdsInProgress.contains(commitId)) {
showError("Cherry pick process is already started for commit " + commitId.getHash().toShortString() + " from root " + commitId.getRoot().getName());
return false;
showError("Cherry pick process is already started for commit " +
commitId.getHash().toShortString() +
" from root " +
commitId.getRoot().getName());
return null;
}
myIdsInProgress.add(commitId);
@@ -113,10 +116,9 @@ public class VcsCherryPickManager {
if (cherryPicker == null) {
showError(
"Cherry pick is not supported for commit " + details.getId().toShortString() + " from root " + details.getRoot().getName());
return false;
return null;
}
groupedDetails.putValue(cherryPicker, details);
return true;
return cherryPicker;
}
public void showError(@NotNull String message) {
@@ -130,10 +132,12 @@ public class VcsCherryPickManager {
boolean isOk = true;
MultiMap<VcsCherryPicker, VcsFullCommitDetails> groupedCommits = createArrayMultiMap();
for (VcsFullCommitDetails details : myAllCommits) {
if (!processDetails(details, groupedCommits)) {
VcsCherryPicker cherryPicker = getCherryPickerOrReportError(details);
if (cherryPicker == null) {
isOk = false;
break;
}
groupedCommits.putValue(cherryPicker, details);
}
if (isOk) {