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] IDEA-78333 Cherry pick: autogenerated commit message contains short or full hash from time to time

Browse Source 
Don't take the message from COMMIT_MSG (because it contains the full hash), we can make the same message ourselves.
This commit is contained in:
Kirill Likhodedov
2012-12-12 15:50:54 +04:00
parent c3eb1d3da1
commit 8d8a41c133
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+14 -8
View File
@@ -22,11 +22,9 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vcs.merge.MergeDialogCustomizer;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import git4idea.GitPlatformFacade;
import git4idea.commands.Git;
@@ -195,7 +193,7 @@ public class GitCherryPicker {
private CherryPickData updateChangeListManager(@NotNull final GitCommit commit) {
final Collection<FilePath> paths = ChangesUtil.getPaths(commit.getChanges());
refreshChangedFiles(paths);
final String commitMessage = createCommitMessage(commit, paths);
final String commitMessage = createCommitMessage(commit);
LocalChangeList previouslyDefaultChangeList = myChangeListManager.getDefaultChangeList();
LocalChangeList changeList = createChangeListAfterUpdate(commit, paths, commitMessage);
return new CherryPickData(changeList, commitMessage, previouslyDefaultChangeList);
@@ -227,11 +225,19 @@ public class GitCherryPicker {
}
@NotNull
private String createCommitMessage(@NotNull GitCommit commit, @NotNull Collection<FilePath> paths) {
CheckinEnvironment ce = myPlatformFacade.getVcs(myProject).getCheckinEnvironment();
String message = ce == null ? null : ce.getDefaultMessageFor(ArrayUtil.toObjectArray(paths, FilePath.class));
message = message == null ? commit.getDescription() + "\n(cherry-picked from " + commit.getShortHash().getString() + ")" : message;
return message;
private static String createCommitMessage(@NotNull GitCommit commit) {
// make sure there is an empty line after description
String spaces;
if (commit.getDescription().endsWith("\n\n")) {
spaces = "";
}
else if (commit.getDescription().endsWith("\n")) {
spaces = "\n";
}
else {
spaces = "\n\n";
}
return commit.getDescription() + spaces + "(cherry-picked from " + commit.getShortHash().getString() + ")";
}
private boolean showCommitDialogAndWaitForCommit(@NotNull final GitRepository repository, @NotNull final GitCommitWrapper commit,