Package org.eclipse.jgit.merge
Class MergeMessageFormatter
- java.lang.Object
-
- org.eclipse.jgit.merge.MergeMessageFormatter
-
public class MergeMessageFormatter extends java.lang.Object
Formatter for constructing the commit message for a merge commit.The format should be the same as C Git does it, for compatibility.
-
-
Constructor Summary
Constructors Constructor Description MergeMessageFormatter()
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Deprecated Methods Modifier and Type Method Description private static void
addConflictsMessage(java.lang.Iterable<java.lang.String> conflictingPaths, java.lang.StringBuilder sb, char commentChar)
java.lang.String
format(java.util.List<Ref> refsToMerge, Ref target)
Construct the merge commit message.java.lang.String
formatWithConflicts(java.lang.String message, java.lang.Iterable<java.lang.String> conflictingPaths, char commentChar)
Add section with conflicting paths to merge message.java.lang.String
formatWithConflicts(java.lang.String message, java.util.List<java.lang.String> conflictingPaths)
Deprecated.since 6.1; useformatWithConflicts(String, Iterable, char)
insteadprivate static java.lang.String
joinNames(java.util.List<java.lang.String> names, java.lang.String singular, java.lang.String plural)
-
-
-
Method Detail
-
format
public java.lang.String format(java.util.List<Ref> refsToMerge, Ref target)
Construct the merge commit message.- Parameters:
refsToMerge
- the refs which will be mergedtarget
- the branch ref which will be merged into- Returns:
- merge commit message
-
formatWithConflicts
@Deprecated public java.lang.String formatWithConflicts(java.lang.String message, java.util.List<java.lang.String> conflictingPaths)
Deprecated.since 6.1; useformatWithConflicts(String, Iterable, char)
insteadAdd section with conflicting paths to merge message. Lines are prefixed with a hash.- Parameters:
message
- the original merge messageconflictingPaths
- the paths with conflicts- Returns:
- merge message with conflicting paths added
-
formatWithConflicts
public java.lang.String formatWithConflicts(java.lang.String message, java.lang.Iterable<java.lang.String> conflictingPaths, char commentChar)
Add section with conflicting paths to merge message.- Parameters:
message
- the original merge messageconflictingPaths
- the paths with conflictscommentChar
- comment character to use for prefixing the conflict lines- Returns:
- merge message with conflicting paths added
- Since:
- 6.1
-
addConflictsMessage
private static void addConflictsMessage(java.lang.Iterable<java.lang.String> conflictingPaths, java.lang.StringBuilder sb, char commentChar)
-
joinNames
private static java.lang.String joinNames(java.util.List<java.lang.String> names, java.lang.String singular, java.lang.String plural)
-
-