# HG changeset patch # User Dmitry Neverov # Date 1362154270 -14400 # Node ID 35098f0c8fda17f8a0a660a9750daa7c59f239ef # Parent a1c15a8cec64edc51dbf3f4c48c31a62a0ead0e3 fix test diff -r a1c15a8cec64 -r 35098f0c8fda mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java --- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Fri Mar 01 18:59:41 2013 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Fri Mar 01 20:11:10 2013 +0400 @@ -485,7 +485,7 @@ String fromRevision = fromState.getBranchRevisions().get(branch); if (fromRevision == null) fromRevision = fromState.getBranchRevisions().get(fromState.getDefaultBranchName()); - if (toRevision.equals(fromRevision)) + if (toRevision.equals(fromRevision) || fromRevision == null) continue; Collection fromRevisions = ctx.getFromRevisionsForBranch(hgRoot, fromRevision, toRevision); diff -r a1c15a8cec64 -r 35098f0c8fda mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java --- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri Mar 01 18:59:41 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri Mar 01 20:11:10 2013 +0400 @@ -631,8 +631,8 @@ public void should_not_report_all_changes_in_repository_if_default_branch_is_unrelated() throws Exception { VcsRootImpl root = createVcsRoot(myRep2Path); List changes = myVcs.collectChanges(root, - RepositoryStateData.createVersionState("NULL", map("default", "1f355761350e")), - RepositoryStateData.createVersionState("NULL", map("default", "1f355761350e", "personal-branch", "fd50e4842211")), + RepositoryStateData.createVersionState("NULL", map("NULL", "1f355761350e")), + RepositoryStateData.createVersionState("NULL", map("NULL", "1f355761350e", "personal-branch", "fd50e4842211")), CheckoutRules.DEFAULT); assertEquals(0, changes.size()); }