Mercurial > hg > mercurial
changeset 447:6fb828bf0d87 Faradi-7.0.x
Do not fail when log doesn't contain some commit
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Mon, 02 Jul 2012 16:22:01 +0400 |
| parents | 6c43663744d9 |
| children | d4c061183a5f 56aa3f718c24 |
| files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CollectChangesNoRevsets.java |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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<String, ChangeSet> getChangesetMap(@NotNull final List<ChangeSet> csets) { - Map<String, ChangeSet> result = new HashMap<String, ChangeSet>(); + Map<String, ChangeSet> result = new HashMap<String, ChangeSet>(csets.size()); for (ChangeSet cset : csets) { result.put(cset.getId(), cset); }