forked from Praqma/pretested-integration-plugin
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JENKINS-25960: MultiScm fix - resolve git client:
When resolving the git client for MultiSCM we should chose the first found git scm, but the one that matches the build data set. - changed the findScm to select not the first, but the relevant git scm client - changed error message in strategies to match better description of the problem, which is two-fold thus two things mentioned in error message - Implemeted a shared message setup, also to be used in tests.
- Loading branch information
Bue Petersen
committed
Dec 11, 2014
1 parent
9cda554
commit 4523980
Showing
4 changed files
with
91 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitMessages.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,28 @@ | |||
/* | |||
* To change this license header, choose License Headers in Project Properties. | |||
* To change this template file, choose Tools | Templates | |||
* and open the template in the editor. | |||
*/ | |||
|
|||
package org.jenkinsci.plugins.pretestedintegration.scm.git; | |||
|
|||
/** | |||
* Hold common git error or user messages, used several times | |||
* in different classes and reusable for testing later. | |||
* @author bue | |||
*/ | |||
public class GitMessages { | |||
|
|||
public static final String text1 = ""; | |||
|
|||
/** | |||
* Message for merge strategies to show when they don't find a match | |||
* between remote branches and relevant SCM change. | |||
* @param branchName | |||
* @return | |||
*/ | |||
public static String NoRelevantSCMchange(String branchName) { | |||
return String.format("There is no relevant SCM change to integrate where branch matches the 'Integration repository'. Either branch (%s) is deleted or already integrated, or the SCM change is not related to the integration repository.", branchName); | |||
} | |||
|
|||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters