Mercurial > hg > mercurial
changeset 563:093ce7ffe064
Fix collecting changes for the case when repository has one branch
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Mon, 04 Mar 2013 15:25:22 +0400 |
| parents | f791921a887c |
| children | a7719626703d |
| files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/OperationContext.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java |
| diffstat | 2 files changed, 2 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/OperationContext.java Fri Mar 01 21:13:26 2013 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/OperationContext.java Mon Mar 04 15:25:22 2013 +0400 @@ -168,6 +168,8 @@ FindIntervalVisitor visitor = new FindIntervalVisitor(dag, myFromState.getBranchRevisions().values()); dag.breadthFirstSearch(toRevision, visitor); fromRevisions.addAll(visitor.getEndpoints()); + } else { + fromRevisions.add(fromRevision); } if (fromRevisions.isEmpty())
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java Fri Mar 01 21:13:26 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java Mon Mar 04 15:25:22 2013 +0400 @@ -158,29 +158,4 @@ assertThat(changes, hasItem(modificationData().withVersion("514c3e09cddf").withVcsRootProperties(subrepoRootProperties))); assertThat(changes, hasItem(modificationData().withVersion("1f9eb39a3921").withVcsRootProperties(subrepoRootProperties))); } - - - - private void slow(@NotNull HgVersion _) throws IOException, VcsException { - RepositoryStateData from = RepositoryStateData.createVersionState("default", map("default", "bd3cd9555f51")); - - RepositoryStateData to = RepositoryStateData.createVersionState("default", map("default", "ae2ba34d0b2c")); - - ServerPluginConfig pluginConfig = new ServerPluginConfigBuilder() - .cachesDir(new File("/home/nd/sandbox/tc/8.0/.BuildServer/system/caches/mercurial")) - .detectSubrepoChanges(true) - .build(); - myVcs = mercurialSupport().withConfig(pluginConfig).build(); - - VcsRoot root = vcsRoot().withUrl("http://hg.labs.intellij.net/ReSharper") - .withUserName("hg-ro") - .withPassword("9ZO463dVyo") - .withSubrepoChanges(true).build(); - - List<ModificationData> changes = myVcs.collectChanges(root, from, to, CheckoutRules.DEFAULT); - - boolean pause = true; - } - - }