From a1f95fa14d4e432bd645a89c029f71f432f4fa06 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Sun, 8 Dec 2013 19:02:00 +0400 Subject: [PATCH] IDEA-113922 incorrect statusbar text when hover Mercurial > Update to fixed --- .../resources/org/zmlx/hg4idea/HgVcsMessages.properties | 3 ++- .../hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties index 1283e65c4d4a..fc82b7d5d452 100644 --- a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties +++ b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties @@ -3,7 +3,7 @@ group.hg4idea.file.menu.text=Mercurial action.hg4idea.tag.text=Tag Repository... action.hg4idea.tag.description=Create a tag for current revision action.hg4idea.updateTo.text=Update to... -action.hg4idea.updateTo.description=Updating to {0}... +action.hg4idea.updateTo.description=Update the repository's working directory to the specified changeset. action.hg4idea.push.text=Push... action.hg4idea.push.description=Push outgoing commits action.hg4idea.pull.text=Pull... @@ -102,6 +102,7 @@ hg4idea.progress.updatingworkingdir=Updating local working directory hg4idea.progress.integrating=Integrating {0} ... hg4idea.progress.merging=Performing merge... hg4idea.progress.updating=Updating {0} ... +hg4idea.progress.updatingTo=Updating to {0}... hg4idea.progress.countingHeads=Checking number of heads... hg4idea.progress.pull.with.rebase=Rebasing patches hg4idea.progress.pull.with.update=Updating repository diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java index f7a3b8af6987..94ede3f92fbd 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java @@ -57,7 +57,7 @@ public class HgUpdateToAction extends HgAbstractGlobalAction { String updateToValue = dialog.isBranchSelected() ? dialog.getBranch().getName() : dialog.isTagSelected() ? dialog.getTag().getName() : dialog.getRevision(); - new Task.Backgroundable(project, HgVcsMessages.message("action.hg4idea.updateTo.description", updateToValue)) { + new Task.Backgroundable(project, HgVcsMessages.message("hg4idea.progress.updatingTo", updateToValue)) { @Override public void run(@NotNull ProgressIndicator indicator) {