Mercurial > hg > mercurial
changeset 142:2ab0bce4bf64
Fix TW-15008. Show changed files in all merge commits.
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Thu, 23 Dec 2010 16:51:28 +0300 |
parents | 247273ec5e27 |
children | 2e90ef872b68 |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Wed Dec 22 17:52:07 2010 +0300 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Dec 23 16:51:28 2010 +0300 @@ -96,8 +96,6 @@ } private Collection<ModifiedFile> computeModifiedFilesForMergeCommit(final Settings settings, final ChangeSet cur) throws VcsException { - if (!cur.containsFiles()) return Collections.emptyList(); - ChangedFilesCommand cfc = new ChangedFilesCommand(settings); cfc.setRevId(cur.getId()); return cfc.execute();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Wed Dec 22 17:52:07 2010 +0300 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Thu Dec 23 16:51:28 2010 +0300 @@ -39,7 +39,6 @@ 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; @@ -361,7 +360,7 @@ assertFiles(Arrays.asList("A dir1/file1.txt"), changes.get(0)); assertFiles(Arrays.asList("A dir2/file2.txt"), changes.get(1)); - Assert.assertEquals(changes.get(2).getChanges().toString(), 0, changes.get(2).getChangeCount()); + assertFiles(Arrays.asList("A dir1/file1.txt", "A dir2/file2.txt"), changes.get(2)); } public void test_collect_changes_merge_conflict() throws Exception {