| 104,6 → 104,8 |
|---|
| // Keys to read from the configuration file. |
| // |
| private static final String OPTION_SVNLOOK = "svnlook"; |
| private static final String OPTION_LOCALE = "env.LANG"; |
| private static final String OPTION_ENCODING = "env.encoding"; |
| private static final String OPTION_ISSUEPATTERN = "issuepattern"; |
| |
| private static final String OPTION_EVENTTEMPLATE = "eventtemplate"; |
| 118,7 → 120,6 |
|---|
| private static final String OPTION_SBM_TABLE = "querytable"; |
| private static final String OPTION_SBM_QUERY = "query"; |
| |
| |
| private static final String OPTION_MARKER_LOGMESSAGE = "marker.logmessage"; |
| private static final String OPTION_MARKER_AUTHOR = "marker.author"; |
| private static final String OPTION_MARKER_REVISION = "marker.revision"; |
| 244,8 → 245,8 |
|---|
| logger.debug(String.format("Using property value '%s' for key '%s'. This is the default value. The property is optional.", value, key)); |
| } |
| } |
| if(value!=null) logger.debug(String.format("Using property value '%s' for key '%s'.", value, key)); |
| if(logmessage!=null) logger.info(logmessage); |
| if(logmessage==null) logmessage=""; |
| if(value!=null) logger.debug(String.format("Using property value '%s' for key '%s'. %s", value, key, logmessage)); |
| return value; |
| } |
| |
| 286,6 → 287,8 |
|---|
| //for a pure Java implementation in future |
| final String svnlook = readConfPropertyAsString(OPTION_SVNLOOK, null, true, null); |
| EmitterUtil.verifyFile(svnlook, false, true); |
| final String locale = readConfPropertyAsString(OPTION_LOCALE, "de_DE.UTF-8", true, null); |
| final String encoding = readConfPropertyAsString(OPTION_LOCALE, "UTF-8", true, "Note that this should match your selected '"+OPTION_LOCALE+"'."); |
| |
| // Issue Id RegEx to parse commit message |
| final String[] issuepatterns = readConfPropertyAsStringArray(OPTION_ISSUEPATTERN, false, null); |
| 305,6 → 308,9 |
|---|
| SVNLookExecutor exec = new SVNLookExecutor(new File(svnlook), repos); |
| if(cmd.hasOption(PARAM_TXN)) exec.setTXN(txn); |
| if(cmd.hasOption(PARAM_REV)) exec.setRev(rev); |
| exec.setEncoding(encoding); |
| exec.setLocale(locale); |
| |
| info = exec.getCommitInfo(); |
| info.parseIssues(issuepatterns, isRemoveIssues); |
| |