Mercurial > hg > mercurial
changeset 448:d4c061183a5f
Merge Faradi-7.0.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Mon, 02 Jul 2012 16:26:50 +0400 |
parents | 8a1231dc6a2c (current diff) 6fb828bf0d87 (diff) |
children | 12cb638b63c4 |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RepoFactory.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.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 25 11:09:36 2012 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CollectChangesNoRevsets.java Mon Jul 02 16:26:50 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); }