Mercurial > hg > mercurial

changeset 151:97da90dac992

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If branch point is initial cset - do no try to find its parents
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Tue, 11 Jan 2011 15:47:13 +0300
parents 49beebea53ad
children 8532bc45bb32
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Tue Jan 11 15:44:08 2011 +0300
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Tue Jan 11 15:47:13 2011 +0300
@@ -426,7 +426,12 @@
     lc.setToRevId(new ChangeSetRevision(branchTwoRev).getId());
     lc.setLimit(1);
     List<ChangeSet> changeSets = lc.execute();
-    return changeSets.get(0).getParents().get(0).getId();
+    ChangeSet cs = changeSets.get(0);
+    if (cs.isInitial()) {
+      return cs.getId();
+    } else {
+      return cs.getParents().get(0).getId();
+    }
   }
 
   @NotNull