# HG changeset patch # User Dmitry Neverov # Date 1341231721 -14400 # Node ID 6fb828bf0d87f5a7181435168b6815c00bfe57a3 # Parent 6c43663744d9ff5a533022a480a7d18366601d01 Do not fail when log doesn't contain some commit diff -r 6c43663744d9 -r 6fb828bf0d87 mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CollectChangesNoRevsets.java --- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CollectChangesNoRevsets.java Mon Jun 18 22:04:51 2012 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CollectChangesNoRevsets.java Mon Jul 02 16:22:01 2012 +0400 @@ -62,7 +62,7 @@ String commit = iter.next(); ChangeSet cset = csetsMap.get(commit); if (cset == null) - throw new IllegalStateException("Cannot find cset for id " + commit + ", csets map: " + csetsMap); + continue;//commit is parent of some commit and wasn't included in the log int revNum = cset.getRevNumber(); if (revNum < minRevNum) minRevNum = revNum; @@ -77,7 +77,7 @@ private Map getChangesetMap(@NotNull final List csets) { - Map result = new HashMap(); + Map result = new HashMap(csets.size()); for (ChangeSet cset : csets) { result.put(cset.getId(), cset); }