| | |
|---|
| | |
|
|---|
| | | /** Extracts the ticket id from the ref name */
|
|---|
| | | private long getTicketId(String refName) {
|
|---|
| | | if (refName.indexOf('%') > -1) {
|
|---|
| | | refName = refName.substring(0, refName.indexOf('%'));
|
|---|
| | | }
|
|---|
| | | if (refName.startsWith(Constants.R_FOR)) {
|
|---|
| | | String ref = refName.substring(Constants.R_FOR.length());
|
|---|
| | | if (ref.indexOf('%') > -1) {
|
|---|
| | | ref = ref.substring(0, ref.indexOf('%'));
|
|---|
| | | }
|
|---|
| | | try {
|
|---|
| | | return Long.parseLong(ref);
|
|---|
| | | } catch (Exception e) {
|
|---|
| | |
|---|
| | | }
|
|---|
| | |
|
|---|
| | | TicketModel ticket = ticketService.getTicket(repository, ticketNumber);
|
|---|
| | | if (ticket == null) {
|
|---|
| | | continue;
|
|---|
| | | }
|
|---|
| | | String integrationBranch;
|
|---|
| | | if (StringUtils.isEmpty(ticket.mergeTo)) {
|
|---|
| | | // unspecified integration branch
|
|---|
| | |
|---|
| | |
|
|---|
| | | if (parseMessage) {
|
|---|
| | | // parse commit message looking for fixes/closes #n
|
|---|
| | | Pattern p = Pattern.compile("(?:fixes|closes)[\\s-]+#?(\\d+)", Pattern.CASE_INSENSITIVE);
|
|---|
| | | Matcher m = p.matcher(commit.getFullMessage());
|
|---|
| | | while (m.find()) {
|
|---|
| | | String val = m.group();
|
|---|
| | | return Long.parseLong(val);
|
|---|
| | | String dx = "(?:fixes|closes)[\\s-]+#?(\\d+)";
|
|---|
| | | String x = settings.getString(Keys.tickets.closeOnPushCommitMessageRegex, dx);
|
|---|
| | | if (StringUtils.isEmpty(x)) {
|
|---|
| | | x = dx;
|
|---|
| | | }
|
|---|
| | | try {
|
|---|
| | | Pattern p = Pattern.compile(x, Pattern.CASE_INSENSITIVE);
|
|---|
| | | Matcher m = p.matcher(commit.getFullMessage());
|
|---|
| | | while (m.find()) {
|
|---|
| | | String val = m.group(1);
|
|---|
| | | return Long.parseLong(val);
|
|---|
| | | }
|
|---|
| | | } catch (Exception e) {
|
|---|
| | | LOGGER.error(String.format("Failed to parse \"%s\" in commit %s", x, commit.getName()), e);
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | return 0L;
|
|---|
