diff --git a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java index 11fd0ff42fac..38bdd91983f7 100644 --- a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java +++ b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java @@ -76,7 +76,8 @@ public class GitMergeUpdater extends GitUpdater { GitUntrackedFilesOverwrittenByOperationDetector untrackedFilesDetector = new GitUntrackedFilesOverwrittenByOperationDetector(myRoot); mergeHandler.addLineListener(untrackedFilesDetector); - final GitTask mergeTask = new GitTask(myProject, mergeHandler, "Merging changes"); + String progressTitle = makeProgressTitle("Merging"); + final GitTask mergeTask = new GitTask(myProject, mergeHandler, progressTitle); mergeTask.setProgressIndicator(myProgressIndicator); mergeTask.setProgressAnalyzer(new GitStandardProgressAnalyzer()); final AtomicReference updateResult = new AtomicReference(); diff --git a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java index d4a7f0b49e39..467a60418c09 100644 --- a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java +++ b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java @@ -73,7 +73,8 @@ public class GitRebaseUpdater extends GitUpdater { GitUntrackedFilesOverwrittenByOperationDetector untrackedFilesDetector = new GitUntrackedFilesOverwrittenByOperationDetector(myRoot); rebaseHandler.addLineListener(untrackedFilesDetector); - GitTask rebaseTask = new GitTask(myProject, rebaseHandler, "Rebasing"); + String progressTitle = makeProgressTitle("Rebasing"); + GitTask rebaseTask = new GitTask(myProject, rebaseHandler, progressTitle); rebaseTask.setProgressIndicator(myProgressIndicator); rebaseTask.setProgressAnalyzer(new GitStandardProgressAnalyzer()); final AtomicReference updateResult = new AtomicReference(); diff --git a/plugins/git4idea/src/git4idea/update/GitUpdater.java b/plugins/git4idea/src/git4idea/update/GitUpdater.java index ca6d53ff2929..71b703a60811 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdater.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdater.java @@ -24,6 +24,7 @@ import com.intellij.openapi.vcs.update.UpdatedFiles; import com.intellij.openapi.vfs.VirtualFile; import git4idea.GitBranch; import git4idea.GitRevisionNumber; +import git4idea.GitUtil; import git4idea.GitVcs; import git4idea.branch.GitBranchPair; import git4idea.branch.GitBranchUtil; @@ -33,6 +34,7 @@ import git4idea.commands.GitSimpleHandler; import git4idea.config.GitConfigUtil; import git4idea.config.GitVcsSettings; import git4idea.merge.MergeChangeCollector; +import git4idea.repo.GitRepositoryManager; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -48,11 +50,12 @@ public abstract class GitUpdater { @NotNull protected final Project myProject; @NotNull protected final Git myGit; - protected final @NotNull VirtualFile myRoot; - protected final @NotNull Map myTrackedBranches; - protected final @NotNull ProgressIndicator myProgressIndicator; - protected final @NotNull UpdatedFiles myUpdatedFiles; - protected final @NotNull AbstractVcsHelper myVcsHelper; + @NotNull protected final VirtualFile myRoot; + @NotNull protected final Map myTrackedBranches; + @NotNull protected final ProgressIndicator myProgressIndicator; + @NotNull protected final UpdatedFiles myUpdatedFiles; + @NotNull protected final AbstractVcsHelper myVcsHelper; + @NotNull protected final GitRepositoryManager myRepositoryManager; protected final GitVcs myVcs; protected GitRevisionNumber myBefore; // The revision that was before update @@ -68,6 +71,7 @@ public abstract class GitUpdater { myUpdatedFiles = updatedFiles; myVcsHelper = AbstractVcsHelper.getInstance(project); myVcs = GitVcs.getInstance(project); + myRepositoryManager = GitUtil.getRepositoryManager(myProject); } /** @@ -174,4 +178,10 @@ public abstract class GitUpdater { String output = handler.run(); return output != null && !output.isEmpty(); } + + @NotNull + protected String makeProgressTitle(@NotNull String operation) { + return myRepositoryManager.moreThanOneRoot() ? String.format("%s %s...", operation, myRoot.getName()) : operation + "..."; + } + }