Mercurial > hg > mercurial
changeset 117:345fe6e101b7
Fix problem with locales different from en_US.
Set --style parameter for log command to default. Also remove test that use wrong revision number and doesn't check anything.
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Mon, 23 Aug 2010 20:30:17 +0400 |
parents | 1c7e94c0ad2f |
children | 80eb7fdc4de0 |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LogCommand.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
diffstat | 2 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LogCommand.java Mon Aug 23 16:18:54 2010 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LogCommand.java Mon Aug 23 20:30:17 2010 +0400 @@ -61,6 +61,8 @@ GeneralCommandLine cli = createCommandLine(); cli.addParameter("log"); cli.addParameter("-v"); + cli.addParameter("--style"); + cli.addParameter("default"); cli.addParameter("-b"); cli.addParameter(getSettings().getBranchName()); cli.addParameter("-r");
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Mon Aug 23 16:18:54 2010 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Mon Aug 23 20:30:17 2010 +0400 @@ -39,6 +39,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Locale; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -278,15 +279,6 @@ assertEquals(md1.getDescription(), "file modified"); } - public void test_collect_changes_after_merge() throws IOException, VcsException { - VcsRootImpl vcsRoot = createVcsRoot(simpleRepo()); - - List<ModificationData> changes = collectChanges(vcsRoot, "6:b9deb9a1c6f4", "12:1870e1100fab", IncludeRule.createDefaultInstance()); - for (ModificationData md: changes) { - System.out.println(md); - } - } - public void test_full_patch_from_branch() throws IOException, VcsException { setName("patch3"); VcsRootImpl vcsRoot = createVcsRoot(simpleRepo(), "test_branch");