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

IDEA-148585 LOG.info commits to be cherry-picked

Browse Source 
To make sure they are applied in the correct order.
This commit is contained in:
Kirill Likhodedov
2015-12-01 13:45:38 +03:00
parent 5e62e298db
commit ab7197571f
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
+18
View File
@@ -65,6 +65,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import static com.intellij.dvcs.DvcsUtil.getShortRepositoryName;
import static com.intellij.openapi.util.text.StringUtil.pluralize;
import static git4idea.commands.GitSimpleEventDetector.Event.CHERRY_PICK_CONFLICT;
import static git4idea.commands.GitSimpleEventDetector.Event.LOCAL_CHANGES_OVERWRITTEN_BY_CHERRY_PICK;
@@ -94,6 +95,7 @@ public class GitCherryPicker extends VcsCherryPicker {
public void cherryPick(@NotNull List<VcsFullCommitDetails> commits) {
Map<GitRepository, List<VcsFullCommitDetails>> commitsInRoots =
DvcsUtil.<GitRepository>groupCommitsByRoots(myPlatformFacade.getRepositoryManager(myProject), commits);
LOG.info("Cherry-picking commits: " + toString(commitsInRoots));
List<GitCommitWrapper> successfulCommits = ContainerUtil.newArrayList();
List<GitCommitWrapper> alreadyPicked = ContainerUtil.newArrayList();
AccessToken token = DvcsUtil.workingTreeChangeStarted(myProject);
@@ -113,6 +115,22 @@ public class GitCherryPicker extends VcsCherryPicker {
}
}
@NotNull
private static String toString(@NotNull final Map<GitRepository, List<VcsFullCommitDetails>> commitsInRoots) {
return StringUtil.join(commitsInRoots.keySet(), new Function<GitRepository, String>() {
@Override
public String fun(@NotNull GitRepository repository) {
String commits = StringUtil.join(commitsInRoots.get(repository), new Function<VcsFullCommitDetails, String>() {
@Override
public String fun(VcsFullCommitDetails details) {
return details.getId().asString();
}
}, ", ");
return getShortRepositoryName(repository) + ": [" + commits + "]";
}
}, "; ");
}
// return true to continue with other roots, false to break execution
private boolean cherryPick(@NotNull GitRepository repository, @NotNull List<VcsFullCommitDetails> commits,
@NotNull List<GitCommitWrapper> successfulCommits, @NotNull List<GitCommitWrapper> alreadyPicked) {