Mercurial > hg > mercurial

changeset 561:35098f0c8fda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix test
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 01 Mar 2013 20:11:10 +0400
parents a1c15a8cec64
children f791921a887c
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, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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<String> fromRevisions = ctx.getFromRevisionsForBranch(hgRoot, fromRevision, toRevision);
--- 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<ModificationData> 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());
   }