You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

MergeFormatterPass.java 5.8KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161
  1. /*
  2. * Copyright (C) 2009, Christian Halstrick <christian.halstrick@sap.com>
  3. * Copyright (C) 2014, André de Oliveira <andre.oliveira@liferay.com>
  4. * and other copyright owners as documented in the project's IP log.
  5. *
  6. * This program and the accompanying materials are made available
  7. * under the terms of the Eclipse Distribution License v1.0 which
  8. * accompanies this distribution, is reproduced below, and is
  9. * available at http://www.eclipse.org/org/documents/edl-v10.php
  10. *
  11. * All rights reserved.
  12. *
  13. * Redistribution and use in source and binary forms, with or
  14. * without modification, are permitted provided that the following
  15. * conditions are met:
  16. *
  17. * - Redistributions of source code must retain the above copyright
  18. * notice, this list of conditions and the following disclaimer.
  19. *
  20. * - Redistributions in binary form must reproduce the above
  21. * copyright notice, this list of conditions and the following
  22. * disclaimer in the documentation and/or other materials provided
  23. * with the distribution.
  24. *
  25. * - Neither the name of the Eclipse Foundation, Inc. nor the
  26. * names of its contributors may be used to endorse or promote
  27. * products derived from this software without specific prior
  28. * written permission.
  29. *
  30. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  31. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  32. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  33. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  34. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  35. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  36. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  37. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  38. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  39. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  40. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  41. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  42. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  43. */
  44. package org.eclipse.jgit.merge;
  45. import java.io.IOException;
  46. import java.io.OutputStream;
  47. import java.nio.charset.Charset;
  48. import java.util.List;
  49. import org.eclipse.jgit.diff.RawText;
  50. import org.eclipse.jgit.merge.MergeChunk.ConflictState;
  51. class MergeFormatterPass {
  52. private final EolAwareOutputStream out;
  53. private final MergeResult<RawText> res;
  54. private final List<String> seqName;
  55. private final Charset charset;
  56. private final boolean threeWayMerge;
  57. private String lastConflictingName; // is set to non-null whenever we are in
  58. // a conflict
  59. /**
  60. * @param out
  61. * the {@link java.io.OutputStream} where to write the textual
  62. * presentation
  63. * @param res
  64. * the merge result which should be presented
  65. * @param seqName
  66. * When a conflict is reported each conflicting range will get a
  67. * name. This name is following the "&lt;&lt;&lt;&lt;&lt;&lt;&lt;
  68. * " or "&gt;&gt;&gt;&gt;&gt;&gt;&gt; " conflict markers. The
  69. * names for the sequences are given in this list
  70. * @param charset
  71. * the character set used when writing conflict metadata
  72. */
  73. MergeFormatterPass(OutputStream out, MergeResult<RawText> res,
  74. List<String> seqName, Charset charset) {
  75. this.out = new EolAwareOutputStream(out);
  76. this.res = res;
  77. this.seqName = seqName;
  78. this.charset = charset;
  79. this.threeWayMerge = (res.getSequences().size() == 3);
  80. }
  81. void formatMerge() throws IOException {
  82. boolean missingNewlineAtEnd = false;
  83. for (MergeChunk chunk : res) {
  84. RawText seq = res.getSequences().get(chunk.getSequenceIndex());
  85. writeConflictMetadata(chunk);
  86. // the lines with conflict-metadata are written. Now write the chunk
  87. for (int i = chunk.getBegin(); i < chunk.getEnd(); i++)
  88. writeLine(seq, i);
  89. missingNewlineAtEnd = seq.isMissingNewlineAtEnd();
  90. }
  91. // one possible leftover: if the merge result ended with a conflict we
  92. // have to close the last conflict here
  93. if (lastConflictingName != null)
  94. writeConflictEnd();
  95. if (!missingNewlineAtEnd)
  96. out.beginln();
  97. }
  98. private void writeConflictMetadata(MergeChunk chunk) throws IOException {
  99. if (lastConflictingName != null
  100. && chunk.getConflictState() != ConflictState.NEXT_CONFLICTING_RANGE) {
  101. // found the end of an conflict
  102. writeConflictEnd();
  103. }
  104. if (chunk.getConflictState() == ConflictState.FIRST_CONFLICTING_RANGE) {
  105. // found the start of an conflict
  106. writeConflictStart(chunk);
  107. } else if (chunk.getConflictState() == ConflictState.NEXT_CONFLICTING_RANGE) {
  108. // found another conflicting chunk
  109. writeConflictChange(chunk);
  110. }
  111. }
  112. private void writeConflictEnd() throws IOException {
  113. writeln(">>>>>>> " + lastConflictingName); //$NON-NLS-1$
  114. lastConflictingName = null;
  115. }
  116. private void writeConflictStart(MergeChunk chunk) throws IOException {
  117. lastConflictingName = seqName.get(chunk.getSequenceIndex());
  118. writeln("<<<<<<< " + lastConflictingName); //$NON-NLS-1$
  119. }
  120. private void writeConflictChange(MergeChunk chunk) throws IOException {
  121. /*
  122. * In case of a non-three-way merge I'll add the name of the conflicting
  123. * chunk behind the equal signs. I also append the name of the last
  124. * conflicting chunk after the ending greater-than signs. If somebody
  125. * knows a better notation to present non-three-way merges - feel free
  126. * to correct here.
  127. */
  128. lastConflictingName = seqName.get(chunk.getSequenceIndex());
  129. writeln(threeWayMerge ? "=======" : "======= " //$NON-NLS-1$ //$NON-NLS-2$
  130. + lastConflictingName);
  131. }
  132. private void writeln(String s) throws IOException {
  133. out.beginln();
  134. out.write((s + "\n").getBytes(charset)); //$NON-NLS-1$
  135. }
  136. private void writeLine(RawText seq, int i) throws IOException {
  137. out.beginln();
  138. seq.writeLine(out, i);
  139. // still BOL? It was a blank line. But writeLine won't lf, so we do.
  140. if (out.isBeginln())
  141. out.write('\n');
  142. }
  143. }