# HG changeset patch # User eugene.petrenko@gmail.com # Date 1387370708 -3600 # Node ID e6d203e5c6e39a4be3982f23ad039340d0e2a4e5 # Parent cccf6b5c2745870205f66424dfb33e21f6b67be7 fix commit message and author for commits with no parents diff -r cccf6b5c2745 -r e6d203e5c6e3 mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCommitsInfoBuilderSupport.java --- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCommitsInfoBuilderSupport.java Tue Dec 17 19:53:39 2013 +0100 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCommitsInfoBuilderSupport.java Wed Dec 18 13:45:08 2013 +0100 @@ -50,10 +50,10 @@ if (ZERO_PARENT_ID.equals(commitId)) continue; if (ZERO_PARENT_SHORT_ID.equals(commitId)) continue; change.addParentRevision(commitId); + } - change.setCommitMessage(set.getDescription()); - change.setCommitAuthor(set.getUser()); - } + change.setCommitMessage(set.getDescription()); + change.setCommitAuthor(set.getUser()); change.addBranch(set.getBranch()); for (String tag : commitToTag.get(set.getId())) { diff -r cccf6b5c2745 -r e6d203e5c6e3 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java --- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Tue Dec 17 19:53:39 2013 +0100 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Wed Dec 18 13:45:08 2013 +0100 @@ -70,6 +70,7 @@ //commit should be returned once Assert.assertTrue(commits.add(commitInfo.getVersion())); + Assert.assertNotNull(commitInfo.getCommitAuthor()); parents.addAll(commitInfo.getParentRevisions()); }