From 060fdc2cd5324a728f1a936ebcb6c7cfbadbd973 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 18 Aug 2020 23:45:14 +0300 Subject: [PATCH] hg: suppress i18n warnings for commit message templates GitOrigin-RevId: 7f3d33d6730d15d1e5b25b9bc9bd46827e12a034 --- plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java | 2 +- .../src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java | 2 +- .../src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java index 76bcf3477ccc..b4ec560eda28 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java @@ -73,7 +73,7 @@ public class HgTaskHandler extends DvcsTaskHandler { Project project = repository.getProject(); VirtualFile repositoryRoot = repository.getRoot(); try { - new HgCommitCommand(project, repository, "Automated merge with " + branch).executeInCurrentThread(); + new HgCommitCommand(project, repository, "Automated merge with " + branch).executeInCurrentThread(); //NON-NLS HgBookmarkCommand.deleteBookmarkSynchronously(project, repositoryRoot, branch); } catch (HgCommandException e) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java index f3602830a379..8b194c10b626 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java @@ -187,7 +187,7 @@ public class HgBranchPopupActions { HgCloseBranchExecutor closeBranchExecutor = vcs.getCloseBranchExecutor(); closeBranchExecutor.setRepositories(myRepositories); CommitChangeListDialog.commitChanges(project, changesForRepositories, changesForRepositories, activeChangeList, - Collections.singletonList(closeBranchExecutor), false, vcs, "Close Branch", null, false); + Collections.singletonList(closeBranchExecutor), false, vcs, "Close Branch", null, false); //NON-NLS } @Override diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java index 8f0d2c1e59e8..ac20450de1fb 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java @@ -193,7 +193,7 @@ public class HgRegularUpdater implements HgUpdater { LOG.warn("Couldn't find repository info for " + repoRoot.getName()); return; } - new HgCommitCommand(project, hgRepository, "Automated merge").executeInCurrentThread(); + new HgCommitCommand(project, hgRepository, "Automated merge").executeInCurrentThread(); //NON-NLS } catch (HgCommandException e) { throw new VcsException(e);