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.

MergeConfig.java 6.2KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204
  1. /*******************************************************************************
  2. * Copyright (c) 2014 Konrad Kügler
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. *******************************************************************************/
  43. package org.eclipse.jgit.merge;
  44. import java.io.IOException;
  45. import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
  46. import org.eclipse.jgit.lib.Config;
  47. import org.eclipse.jgit.lib.Config.SectionParser;
  48. import org.eclipse.jgit.lib.ConfigConstants;
  49. import org.eclipse.jgit.lib.Repository;
  50. /**
  51. * Holds configuration for merging into a given branch
  52. *
  53. * @since 3.3
  54. */
  55. public class MergeConfig {
  56. /**
  57. * Get merge configuration for the current branch of the repository
  58. *
  59. * @param repo
  60. * a {@link org.eclipse.jgit.lib.Repository} object.
  61. * @return merge configuration for the current branch of the repository
  62. */
  63. public static MergeConfig getConfigForCurrentBranch(Repository repo) {
  64. try {
  65. String branch = repo.getBranch();
  66. if (branch != null)
  67. return repo.getConfig().get(getParser(branch));
  68. } catch (IOException e) {
  69. // ignore
  70. }
  71. // use defaults if branch can't be determined
  72. return new MergeConfig();
  73. }
  74. /**
  75. * Get a parser for use with
  76. * {@link org.eclipse.jgit.lib.Config#get(SectionParser)}
  77. *
  78. * @param branch
  79. * short branch name to get the configuration for, as returned
  80. * e.g. by {@link org.eclipse.jgit.lib.Repository#getBranch()}
  81. * @return a parser for use with
  82. * {@link org.eclipse.jgit.lib.Config#get(SectionParser)}
  83. */
  84. public static final SectionParser<MergeConfig> getParser(
  85. final String branch) {
  86. return new MergeConfigSectionParser(branch);
  87. }
  88. private final FastForwardMode fastForwardMode;
  89. private final boolean squash;
  90. private final boolean commit;
  91. private MergeConfig(String branch, Config config) {
  92. String[] mergeOptions = getMergeOptions(branch, config);
  93. fastForwardMode = getFastForwardMode(config, mergeOptions);
  94. squash = isMergeConfigOptionSet("--squash", mergeOptions); //$NON-NLS-1$
  95. commit = !isMergeConfigOptionSet("--no-commit", mergeOptions); //$NON-NLS-1$
  96. }
  97. private MergeConfig() {
  98. fastForwardMode = FastForwardMode.FF;
  99. squash = false;
  100. commit = true;
  101. }
  102. /**
  103. * Get the fast forward mode configured for this branch
  104. *
  105. * @return the fast forward mode configured for this branch
  106. */
  107. public FastForwardMode getFastForwardMode() {
  108. return fastForwardMode;
  109. }
  110. /**
  111. * Whether merges into this branch are configured to be squash merges, false
  112. * otherwise
  113. *
  114. * @return true if merges into this branch are configured to be squash
  115. * merges, false otherwise
  116. */
  117. public boolean isSquash() {
  118. return squash;
  119. }
  120. /**
  121. * Whether {@code --no-commit} option is not set.
  122. *
  123. * @return {@code false} if --no-commit is configured for this branch,
  124. * {@code true} otherwise (even if --squash is configured)
  125. */
  126. public boolean isCommit() {
  127. return commit;
  128. }
  129. private static FastForwardMode getFastForwardMode(Config config,
  130. String[] mergeOptions) {
  131. for (String option : mergeOptions) {
  132. for (FastForwardMode mode : FastForwardMode.values())
  133. if (mode.matchConfigValue(option))
  134. return mode;
  135. }
  136. FastForwardMode ffmode = FastForwardMode.valueOf(config.getEnum(
  137. ConfigConstants.CONFIG_KEY_MERGE, null,
  138. ConfigConstants.CONFIG_KEY_FF, FastForwardMode.Merge.TRUE));
  139. return ffmode;
  140. }
  141. private static boolean isMergeConfigOptionSet(String optionToLookFor,
  142. String[] mergeOptions) {
  143. for (String option : mergeOptions) {
  144. if (optionToLookFor.equals(option))
  145. return true;
  146. }
  147. return false;
  148. }
  149. private static String[] getMergeOptions(String branch, Config config) {
  150. String mergeOptions = config.getString(
  151. ConfigConstants.CONFIG_BRANCH_SECTION, branch,
  152. ConfigConstants.CONFIG_KEY_MERGEOPTIONS);
  153. if (mergeOptions != null) {
  154. return mergeOptions.split("\\s"); //$NON-NLS-1$
  155. }
  156. return new String[0];
  157. }
  158. private static class MergeConfigSectionParser implements
  159. SectionParser<MergeConfig> {
  160. private final String branch;
  161. public MergeConfigSectionParser(String branch) {
  162. this.branch = branch;
  163. }
  164. @Override
  165. public MergeConfig parse(Config cfg) {
  166. return new MergeConfig(branch, cfg);
  167. }
  168. @Override
  169. public boolean equals(Object obj) {
  170. if (obj instanceof MergeConfigSectionParser) {
  171. return branch.equals(((MergeConfigSectionParser) obj).branch);
  172. }
  173. return false;
  174. }
  175. @Override
  176. public int hashCode() {
  177. return branch.hashCode();
  178. }
  179. }
  180. }