Mercurial > hg > mercurial
changeset 462:acc577dfa041 Faradi-7.0.x
Do not ignore empty commits
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Thu, 12 Jul 2012 16:41:40 +0400 |
parents | b5e79418bacf |
children | |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java |
diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Jul 05 21:07:04 2012 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Jul 12 16:41:40 2012 +0400 @@ -598,12 +598,22 @@ for (ChangeSetRevision parent : parents) { result.addParentRevision(parent.getFullVersion()); } - if (result.getParentRevisions().size() > 1) - result.setCanBeIgnored(false); + setCanBeIgnored(result); return result; } + private void setCanBeIgnored(@NotNull ModificationData md) { + if (md.getParentRevisions().size() > 1) { + //don't ignore merge commits + md.setCanBeIgnored(false); + } else if (md.getChangeCount() == 0) { + //don't ignore empty commits + md.setCanBeIgnored(false); + } + } + + @NotNull private List<ChangeSet> getChangesets(@NotNull final Settings settings, @NotNull final String fromVersion, @Nullable final String toVersion) throws VcsException { if (toVersion == null)