From b401ef2cf096d08ab6b0a14ee34543ca4a7efdd3 Mon Sep 17 00:00:00 2001 From: Dmitriy Smirnov Date: Fri, 7 Jul 2017 17:41:11 +0300 Subject: [PATCH] IDEA-78377 Improve notification for committing in detached HEAD. Show full repo path, capitalize titles, use same fonts --- .../checkin/GitCheckinHandlerFactory.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java index 0d4880018814..10a4ec211208 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java +++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java @@ -26,7 +26,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.CheckinProjectPanel; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.ProjectLevelVcsManager; @@ -301,17 +300,19 @@ public class GitCheckinHandlerFactory extends VcsCheckinHandlerFactory { final String title; final String message; - final CharSequence rootPath = StringUtil.last(detachedRoot.myRoot.getPresentableUrl(), 50, true); - final String messageCommonStart = "The Git repository " + rootPath + ""; + final CharSequence rootPath = detachedRoot.myRoot.getPresentableUrl(); + final String messageCommonStart = "The Git repository at the following path"; if (detachedRoot.myRebase) { - title = "Unfinished rebase process"; - message = messageCommonStart + "
has an unfinished rebase process.
" + + title = "Unfinished Rebase Process"; + message = messageCommonStart + " has an unfinished rebase process:
" + + "" + rootPath + "
" + "You probably want to continue rebase instead of committing.
" + "Committing during rebase may lead to the commit loss.
" + readMore("http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html", "Read more about Git rebase"); } else { - title = "Commit in detached HEAD may be dangerous"; - message = messageCommonStart + " is in the detached HEAD state.
" + + title = "Commit in Detached HEAD"; + message = messageCommonStart + " is in the detached HEAD state:
" + + "" + rootPath + "
" + "You can look around, make experimental changes and commit them, but be sure to checkout a branch not to lose your work.
" + "Otherwise you risk losing your changes.
" + readMore("http://gitolite.com/detached-head.html", "Read more about detached HEAD");