int indexOfChangeId = indexOfChangeId(message, "\n"); //$NON-NLS-1$ if (indexOfChangeId > 0) { if (!replaceExisting) int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) {
private void insertChangeId(ObjectId treeId) { ObjectId firstParentId = null; if (!parents.isEmpty()) firstParentId = parents.get(0); ObjectId changeId = ChangeIdUtil.computeChangeId(treeId, firstParentId, author, committer, message); message = ChangeIdUtil.insertId(message, changeId); if (changeId != null) message = message.replaceAll("\nChange-Id: I" //$NON-NLS-1$ + ObjectId.zeroId().getName() + "\n", "\nChange-Id: I" //$NON-NLS-1$ //$NON-NLS-2$ + changeId.getName() + "\n"); //$NON-NLS-1$ }
final ObjectId firstParentId, final PersonIdent author, final PersonIdent committer, final String message) { String cleanMessage = clean(message); if (cleanMessage.length() == 0) return null;
boolean inFooter = false; for (int i = lines.length - 1; i >= 0; --i) { if (!inFooter && isEmptyLine(lines[i])) continue; inFooter = true; if (changeIdPattern.matcher(trimRight(lines[i])).matches()) { indexOfChangeIdLine = i; break; } else if (isEmptyLine(lines[i]) || i == 0) return -1;
/** * Find the right place to insert a Change-Id and return it. * <p> * The Change-Id is inserted before the first footer line but after a Bug * line. * * @param message * a message. * @param changeId * a Change-Id. * @return a commit message with an inserted Change-Id line */ public static String insertId(String message, ObjectId changeId) { return insertId(message, changeId, false); }
private int findOffsetOfChangeIdLine(String message) { return ChangeIdUtil.indexOfChangeId(message, Text.DELIMITER); }
/** * Add section with conflicting paths to merge message. * * @param message * the original merge message * @param conflictingPaths * the paths with conflicts * @return merge message with conflicting paths added */ public String formatWithConflicts(String message, List<String> conflictingPaths) { StringBuilder sb = new StringBuilder(); String[] lines = message.split("\n"); //$NON-NLS-1$ int firstFooterLine = ChangeIdUtil.indexOfFirstFooterLine(lines); for (int i = 0; i < firstFooterLine; i++) sb.append(lines[i]).append('\n'); if (firstFooterLine == lines.length && message.length() != 0) sb.append('\n'); addConflictsMessage(conflictingPaths, sb); if (firstFooterLine < lines.length) sb.append('\n'); for (int i = firstFooterLine; i < lines.length; i++) sb.append(lines[i]).append('\n'); return sb.toString(); }
boolean inFooter = false; for (int i = lines.length - 1; i >= 0; --i) { if (!inFooter && isEmptyLine(lines[i])) continue; inFooter = true; if (changeIdPattern.matcher(trimRight(lines[i])).matches()) { indexOfChangeIdLine = i; break; } else if (isEmptyLine(lines[i]) || i == 0) return -1;
/** * Find the right place to insert a Change-Id and return it. * <p> * The Change-Id is inserted before the first footer line but after a Bug * line. * * @param message * @param changeId * @return a commit message with an inserted Change-Id line */ public static String insertId(String message, ObjectId changeId) { return insertId(message, changeId, false); }
/** * Add section with conflicting paths to merge message. * * @param message * the original merge message * @param conflictingPaths * the paths with conflicts * @return merge message with conflicting paths added */ public String formatWithConflicts(String message, List<String> conflictingPaths) { StringBuilder sb = new StringBuilder(); String[] lines = message.split("\n"); //$NON-NLS-1$ int firstFooterLine = ChangeIdUtil.indexOfFirstFooterLine(lines); for (int i = 0; i < firstFooterLine; i++) sb.append(lines[i]).append('\n'); if (firstFooterLine == lines.length && message.length() != 0) sb.append('\n'); addConflictsMessage(conflictingPaths, sb); if (firstFooterLine < lines.length) sb.append('\n'); for (int i = firstFooterLine; i < lines.length; i++) sb.append(lines[i]).append('\n'); return sb.toString(); }
private void insertChangeId(ObjectId treeId) { ObjectId firstParentId = null; if (!parents.isEmpty()) firstParentId = parents.get(0); ObjectId changeId = ChangeIdUtil.computeChangeId(treeId, firstParentId, author, committer, message); message = ChangeIdUtil.insertId(message, changeId); if (changeId != null) message = message.replaceAll("\nChange-Id: I" //$NON-NLS-1$ + ObjectId.zeroId().getName() + "\n", "\nChange-Id: I" //$NON-NLS-1$ //$NON-NLS-2$ + changeId.getName() + "\n"); //$NON-NLS-1$ }
int indexOfChangeId = indexOfChangeId(message, "\n"); //$NON-NLS-1$ if (indexOfChangeId > 0) { if (!replaceExisting) int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) {
boolean inFooter = false; for (int i = lines.length - 1; i >= 0; --i) { if (!inFooter && isEmptyLine(lines[i])) continue; inFooter = true; if (changeIdPattern.matcher(trimRight(lines[i])).matches()) { indexOfChangeIdLine = i; break; } else if (isEmptyLine(lines[i]) || i == 0) return -1;
/** * Find the right place to insert a Change-Id and return it. * <p> * The Change-Id is inserted before the first footer line but after a Bug * line. * * @param message * a message. * @param changeId * a Change-Id. * @return a commit message with an inserted Change-Id line */ public static String insertId(String message, ObjectId changeId) { return insertId(message, changeId, false); }
/** * Add section with conflicting paths to merge message. * * @param message * the original merge message * @param conflictingPaths * the paths with conflicts * @return merge message with conflicting paths added */ public String formatWithConflicts(String message, List<String> conflictingPaths) { StringBuilder sb = new StringBuilder(); String[] lines = message.split("\n"); //$NON-NLS-1$ int firstFooterLine = ChangeIdUtil.indexOfFirstFooterLine(lines); for (int i = 0; i < firstFooterLine; i++) sb.append(lines[i]).append('\n'); if (firstFooterLine == lines.length && message.length() != 0) sb.append('\n'); addConflictsMessage(conflictingPaths, sb); if (firstFooterLine < lines.length) sb.append('\n'); for (int i = firstFooterLine; i < lines.length; i++) sb.append(lines[i]).append('\n'); return sb.toString(); }
final ObjectId firstParentId, final PersonIdent author, final PersonIdent committer, final String message) { String cleanMessage = clean(message); if (cleanMessage.length() == 0) return null;
private void insertChangeId(ObjectId treeId) { ObjectId firstParentId = null; if (!parents.isEmpty()) firstParentId = parents.get(0); ObjectId changeId = ChangeIdUtil.computeChangeId(treeId, firstParentId, author, committer, message); message = ChangeIdUtil.insertId(message, changeId); if (changeId != null) message = message.replaceAll("\nChange-Id: I" //$NON-NLS-1$ + ObjectId.zeroId().getName() + "\n", "\nChange-Id: I" //$NON-NLS-1$ //$NON-NLS-2$ + changeId.getName() + "\n"); //$NON-NLS-1$ }
int indexOfChangeId = indexOfChangeId(message, "\n"); //$NON-NLS-1$ if (indexOfChangeId > 0) { if (!replaceExisting) int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) {
private void refreshChangeIdText() { if (createChangeId) { // ChangeIdUtil uses \n line endings String text = commitText.getText().replaceAll(Text.DELIMITER, "\n"); //$NON-NLS-1$ String changedText = ChangeIdUtil.insertId( text, originalChangeId != null ? originalChangeId : ObjectId .zeroId(), true); if (!text.equals(changedText)) { changedText = changedText.replaceAll("\n", Text.DELIMITER); //$NON-NLS-1$ commitText.setText(changedText); } } else { String text = commitText.getText(); int changeIdOffset = findOffsetOfChangeIdLine(text); if (changeIdOffset > 0) { String cleanedText; int endOfChangeId = findNextEOL(changeIdOffset, text); if (endOfChangeId == -1) cleanedText = text.substring(0, changeIdOffset); else cleanedText = text.substring(0, changeIdOffset) + text.substring(endOfChangeId + 1); commitText.setText(cleanedText); } } }
final ObjectId firstParentId, final PersonIdent author, final PersonIdent committer, final String message) { String cleanMessage = clean(message); if (cleanMessage.length() == 0) return null;