github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge changes I7e7fae12,I87ecca00 

* changes:
  Add conflicts message before footer
  Only replace the ChangeId in the footer, not in the body
stable-2.3
Robin Rosenberg 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
6a3c360984 215a74eceb
commit
9f7b97c90a
4 changed files with 212 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java
  2. 86
      org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java
  3. 25
      org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
  4. 95
      org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java

42
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java
Unescape View File

@ -185,4 +185,46 @@ public class MergeMessageFormatterTest extends SampleDataRepositoryTestCase {
String message = formatter.format(Arrays.asList(a), head);
assertEquals("Merge branch 'a'", message);
}
@Test
public void testFormatWithConflictsNoFooter() {
String originalMessage = "Header Line\n\nCommit body\n";
String message = formatter.formatWithConflicts(originalMessage,
Arrays.asList(new String[] { "path1" }));
assertEquals("Header Line\n\nCommit body\n\nConflicts:\n\tpath1\n",
message);
}
@Test
public void testFormatWithConflictsNoFooterNoLineBreak() {
String originalMessage = "Header Line\n\nCommit body";
String message = formatter.formatWithConflicts(originalMessage,
Arrays.asList(new String[] { "path1" }));
assertEquals("Header Line\n\nCommit body\n\nConflicts:\n\tpath1\n",
message);
}
@Test
public void testFormatWithConflictsWithFooters() {
String originalMessage = "Header Line\n\nCommit body\n\nChangeId:"
+ " I123456789123456789123456789123456789\nBug:1234567\n";
String message = formatter.formatWithConflicts(originalMessage,
Arrays.asList(new String[] { "path1" }));
assertEquals(
"Header Line\n\nCommit body\n\nConflicts:\n\tpath1\n\n"
+ "ChangeId: I123456789123456789123456789123456789\nBug:1234567\n",
message);
}
@Test
public void testFormatWithConflictsWithFooterlikeLineInBody() {
String originalMessage = "Header Line\n\nCommit body\nBug:1234567\nMore Body\n\nChangeId:"
+ " I123456789123456789123456789123456789\nBug:1234567\n";
String message = formatter.formatWithConflicts(originalMessage,
Arrays.asList(new String[] { "path1" }));
assertEquals(
"Header Line\n\nCommit body\nBug:1234567\nMore Body\n\nConflicts:\n\tpath1\n\n"
+ "ChangeId: I123456789123456789123456789123456789\nBug:1234567\n",
message);
}
}

86
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java
Unescape View File

@ -123,15 +123,65 @@ public class ChangeIdUtilTest {
@Test
public void testHasChangeid() throws Exception {
assertEquals(
"has changeid\n\nBug: 33\nmore text\nSigned-off-by: me@you.too\nChange-Id: I0123456789012345678901234567890123456789\nAnd then some\n",
call("has changeid\n\nBug: 33\nmore text\nSigned-off-by: me@you.too\nChange-Id: I0123456789012345678901234567890123456789\nAnd then some\n"));
"has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I0123456789012345678901234567890123456789\n",
call("has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I0123456789012345678901234567890123456789\n"));
}
@Test
public void testHasChangeidWithReplacement() throws Exception {
assertEquals(
"has changeid\n\nBug: 33\nmore text\nSigned-off-by: me@you.too\nChange-Id: I988d2d7a6f2c0578fccabd4ebd3cec0768bc7f9f\nAnd then some\n",
call("has changeid\n\nBug: 33\nmore text\nSigned-off-by: me@you.too\nChange-Id: I0123456789012345678901234567890123456789\nAnd then some\n",
"has changeid\nmore text\n\nSigned-off-by: me@you.too\n"
+ "Change-Id: I2178563fada5edb2c99a8d8c0d619471b050ec24\nBug: 33\n",
call("has changeid\nmore text\n\nSigned-off-by: me@you.too\n"
+ "Change-Id: I0123456789012345678901234567890123456789\nBug: 33\n",
true));
}
@Test
public void testHasChangeidWithReplacementInLastLine() throws Exception {
assertEquals(
"has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I1d6578f4c96e3db4dd707705fe3d17bf658c4758\n",
call("has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I0123456789012345678901234567890123456789\n",
true));
}
@Test
public void testHasChangeidWithReplacementInLastLineNoLineBreak()
throws Exception {
assertEquals(
"has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I1d6578f4c96e3db4dd707705fe3d17bf658c4758",
call("has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I0123456789012345678901234567890123456789",
true));
}
@Test
public void testHasChangeidWithSpacesBeforeId() throws Exception {
assertEquals(
"has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: Ie7575eaf450fdd0002df2e642426faf251de3ad9\n",
call("has changeid\nmore text\n\nBug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I0123456789012345678901234567890123456789\n",
true));
}
@Test
public void testHasChangeidWithReplacementWithChangeIdInCommitMessage()
throws Exception {
assertEquals(
"has changeid\nmore text\n"
+ "Change-Id: I0123456789012345678901234567890123456789\n\n"
+ "Bug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: Ie48d10d59ef67995ca89688ac0171b88f10dd520\n",
call("has changeid\nmore text\n"
+ "Change-Id: I0123456789012345678901234567890123456789\n\n"
+ "Bug: 33\nSigned-off-by: me@you.too\n"
+ "Change-Id: I0123456789012345678901234567890123456789\n",
true));
}
@ -587,6 +637,34 @@ public class ChangeIdUtilTest {
"git://example.com/ fixes this\n"));
}
@Test
public void testIndexOfChangeId() {
assertEquals(3, ChangeIdUtil.indexOfChangeId("x\n" + "\n"
+ "Change-Id: I3b7e4e16b503ce00f07ba6ad01d97a356dad7701\n",
"\n"));
assertEquals(5, ChangeIdUtil.indexOfChangeId("x\r\n" + "\r\n"
+ "Change-Id: I3b7e4e16b503ce00f07ba6ad01d97a356dad7701\r\n",
"\r\n"));
assertEquals(3, ChangeIdUtil.indexOfChangeId("x\r" + "\r"
+ "Change-Id: I3b7e4e16b503ce00f07ba6ad01d97a356dad7701\r",
"\r"));
assertEquals(8, ChangeIdUtil.indexOfChangeId("x\ny\n\nz\n" + "\n"
+ "Change-Id: I3b7e4e16b503ce00f07ba6ad01d97a356dad7701\n",
"\n"));
}
@Test
public void testIndexOfFirstFooterLine() {
assertEquals(
2,
ChangeIdUtil.indexOfFirstFooterLine(new String[] { "a", "",
"Bug: 42", "Signed-Off-By: j.developer@a.com" }));
assertEquals(
3,
ChangeIdUtil.indexOfFirstFooterLine(new String[] { "a",
"Bug: 42", "", "Signed-Off-By: j.developer@a.com" }));
}
private void hookDoesNotModify(final String in) throws Exception {
assertEquals(in, call(in));
}

25
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
Unescape View File

@ -48,6 +48,7 @@ import java.util.List;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.util.ChangeIdUtil;
import org.eclipse.jgit.util.StringUtils;
/**
@ -133,14 +134,26 @@ public class MergeMessageFormatter {
*/
public String formatWithConflicts(String message,
List<String> conflictingPaths) {
StringBuilder sb = new StringBuilder(message);
if (!message.endsWith("\n") && message.length() != 0) //$NON-NLS-1$
sb.append("\n"); //$NON-NLS-1$
sb.append("\n"); //$NON-NLS-1$
sb.append("Conflicts:\n");
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 static void addConflictsMessage(List<String> conflictingPaths,
StringBuilder sb) {
sb.append("Conflicts:\n"); //$NON-NLS-1$
for (String conflictingPath : conflictingPaths)
sb.append('\t').append(conflictingPath).append('\n');
return sb.toString();
}
private static String joinNames(List<String> names, String singular,

95
org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java
Unescape View File

@ -161,36 +161,26 @@ public class ChangeIdUtil {
*/
public static String insertId(String message, ObjectId changeId,
boolean replaceExisting) {
if (message.indexOf(CHANGE_ID) > 0) {
if (replaceExisting) {
int i = message.indexOf(CHANGE_ID) + 10;
while (message.charAt(i) == ' ')
i++;
String oldId = message.length() == (i + 40) ?
message.substring(i) : message.substring(i, i + 41);
message = message.replace(oldId, "I" + changeId.getName()); //$NON-NLS-1$
int indexOfChangeId = indexOfChangeId(message, "\n"); //$NON-NLS-1$
if (indexOfChangeId > 0) {
if (!replaceExisting)
return message;
else {
StringBuilder ret = new StringBuilder(message.substring(0,
indexOfChangeId));
ret.append(CHANGE_ID);
ret.append(" I"); //$NON-NLS-1$
ret.append(ObjectId.toString(changeId));
int indexOfNextLineBreak = message.indexOf("\n", //$NON-NLS-1$
indexOfChangeId);
if (indexOfNextLineBreak > 0)
ret.append(message.substring(indexOfNextLineBreak));
return ret.toString();
}
return message;
}
String[] lines = message.split("\n"); //$NON-NLS-1$
int footerFirstLine = lines.length;
for (int i = lines.length - 1; i > 1; --i) {
if (footerPattern.matcher(lines[i]).matches()) {
footerFirstLine = i;
continue;
}
if (footerFirstLine != lines.length && lines[i].length() == 0) {
break;
}
if (footerFirstLine != lines.length
&& includeInFooterPattern.matcher(lines[i]).matches()) {
footerFirstLine = i + 1;
continue;
}
footerFirstLine = lines.length;
break;
}
int footerFirstLine = indexOfFirstFooterLine(lines);
int insertAfter = footerFirstLine;
for (int i = footerFirstLine; i < lines.length; ++i) {
if (issuePattern.matcher(lines[i]).matches()) {
@ -217,4 +207,57 @@ public class ChangeIdUtil {
}
return ret.toString();
}
/**
* Find the index in the String {@code} message} where the Change-Id entry
* begins
*
* @param message
* @param delimiter
* the line delimiter, like "\n" or "\r\n", needed to find the
* footer
* @return the index of the ChangeId footer in the message, or -1 if no
* ChangeId footer available
*/
public static int indexOfChangeId(String message, String delimiter) {
String[] lines = message.split(delimiter);
int footerFirstLine = indexOfFirstFooterLine(lines);
if (footerFirstLine == lines.length)
return -1;
int indexOfFooter = 0;
for (int i = 0; i < footerFirstLine; ++i)
indexOfFooter += lines[i].length() + delimiter.length();
return message.indexOf(CHANGE_ID, indexOfFooter);
}
/**
* Find the index of the first line of the footer paragraph in an array of
* the lines, or lines.length if no footer is available
*
* @param lines
* the commit message split into lines and the line delimiters
* stripped off
* @return the index of the first line of the footer paragraph, or
* lines.length if no footer is available
*/
public static int indexOfFirstFooterLine(String[] lines) {
int footerFirstLine = lines.length;
for (int i = lines.length - 1; i > 1; --i) {
if (footerPattern.matcher(lines[i]).matches()) {
footerFirstLine = i;
continue;
}
if (footerFirstLine != lines.length && lines[i].length() == 0)
break;
if (footerFirstLine != lines.length
&& includeInFooterPattern.matcher(lines[i]).matches()) {
footerFirstLine = i + 1;
continue;
}
footerFirstLine = lines.length;
break;
}
return footerFirstLine;
}
}

Write Preview
Loading…
Cancel
Save