Mercurial > hg > mercurial
changeset 690:e6d203e5c6e3
fix commit message and author for commits with no parents
author | eugene.petrenko@gmail.com |
---|---|
date | Wed, 18 Dec 2013 13:45:08 +0100 |
parents | cccf6b5c2745 |
children | d4ef6a366768 |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCommitsInfoBuilderSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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())) {
--- 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()); }