Skip to content
Permalink
Browse files
Merge pull request #86 from jglick/quieter-log-JENKINS-37274
[JENKINS-37274] Suppress a confusing bit of output
  • Loading branch information
jglick committed Oct 12, 2016
2 parents 8063cc0 + 92bbec6 commit b45f3836bd7fb58b0a7797b89f64f950bb8cfa12
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
@@ -3,7 +3,8 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.11</version>
<version>2.16</version>
<relativePath/>
</parent>
<artifactId>mercurial</artifactId>
<version>1.57-SNAPSHOT</version>
@@ -46,7 +47,7 @@
<licenses>
<license>
<name>MIT</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
<url>http://opensource.org/licenses/MIT</url>
</license>
</licenses>
<scm>
@@ -66,13 +67,13 @@
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
@@ -654,7 +654,7 @@ private void determineChanges(Run<?, ?> build, Launcher launcher, TaskListener l
HgExe hg = new HgExe(inst, credentials, launcher, node, listener, env);
try {

ArgumentListBuilder logCommand = hg.seed(true).add("log", "--rev", prevTag.getId());
ArgumentListBuilder logCommand = hg.seed(true).add("log", "--rev", prevTag.getId(), "--template", "exists\\n");
int exitCode = hg.launch(logCommand).pwd(repository).join();
if(exitCode != 0) {
listener.error("Previously built revision " + prevTag.getId() + " is not known in this clone; unable to determine change log");
@@ -42,12 +42,15 @@
import org.jvnet.hudson.test.JenkinsRule;

import static org.junit.Assert.*;
import org.junit.ClassRule;
import org.jvnet.hudson.test.BuildWatcher;

public abstract class SCMTestBase {

@Rule public JenkinsRule j = new JenkinsRule();
@Rule public MercurialRule m = new MercurialRule(j);
@Rule public TemporaryFolder tmp = new TemporaryFolder();
@ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
private File repo;

@Before public void setUp() throws Exception {

0 comments on commit b45f383

Please sign in to comment.