Mercurial > hg > mercurial
changeset 512:1533dd8058b8
Fix tests
Truncate subrepo revisions to the short form which
we are currently using.
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 16 Nov 2012 15:58:26 +0400 |
parents | f2666e817701 |
children | 575d716a6846 |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java |
diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Thu Nov 15 16:40:22 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubRepo.java Fri Nov 16 15:58:26 2012 +0400 @@ -34,6 +34,8 @@ @NotNull public String revision() { + if (myRevision.length() > 12) + return myRevision.substring(0, 12); return myRevision; }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java Thu Nov 15 16:40:22 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java Fri Nov 16 15:58:26 2012 +0400 @@ -76,9 +76,22 @@ } - public void should_report_subrepo_changes_recursevly() throws Exception { + public void should_report_subrepo_changes_recursevly() throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepo1.getAbsolutePath()).build(); List<ModificationData> changes = myVcs.collectChanges(root, "09c256b6163e", "d64d9799c143", CheckoutRules.DEFAULT); assertEquals(5, changes.size()); } + + + public void report_subrepo_changes_without_revsets() throws Exception { + ServerPluginConfig pluginConfig = new ServerPluginConfigBuilder() + .cachesDir(myTempFiles.createTempDir()) + .detectSubrepoChanges(true) + .dontUseRevsets() + .build(); + myVcs = mercurialSupport().withConfig(pluginConfig).build(); + VcsRoot root = vcsRoot().withUrl(myRemoteRepo1.getAbsolutePath()).build(); + List<ModificationData> changes = myVcs.collectChanges(root, "d350e7209906", "09c256b6163e", CheckoutRules.DEFAULT); + assertEquals(3, changes.size()); + } }