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.

MergeMessageFormatter.java 4.5KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133
  1. /*
  2. * Copyright (C) 2010, Robin Stocker <robin@nibor.org>
  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.util.ArrayList;
  45. import java.util.List;
  46. import org.eclipse.jgit.lib.Constants;
  47. import org.eclipse.jgit.lib.Ref;
  48. import org.eclipse.jgit.lib.Repository;
  49. import org.eclipse.jgit.util.StringUtils;
  50. /**
  51. * Formatter for constructing the commit message for a merge commit.
  52. * <p>
  53. * The format should be the same as C Git does it, for compatibility.
  54. */
  55. public class MergeMessageFormatter {
  56. /**
  57. * Construct the merge commit message.
  58. *
  59. * @param refsToMerge
  60. * the refs which will be merged
  61. * @param target
  62. * the branch ref which will be merged into
  63. * @return merge commit message
  64. */
  65. public String format(List<Ref> refsToMerge, Ref target) {
  66. StringBuilder sb = new StringBuilder();
  67. sb.append("Merge ");
  68. List<String> branches = new ArrayList<String>();
  69. List<String> remoteBranches = new ArrayList<String>();
  70. List<String> tags = new ArrayList<String>();
  71. List<String> commits = new ArrayList<String>();
  72. List<String> others = new ArrayList<String>();
  73. for (Ref ref : refsToMerge) {
  74. if (ref.getName().startsWith(Constants.R_HEADS))
  75. branches.add("'" + Repository.shortenRefName(ref.getName())
  76. + "'");
  77. else if (ref.getName().startsWith(Constants.R_REMOTES))
  78. remoteBranches.add("'"
  79. + Repository.shortenRefName(ref.getName()) + "'");
  80. else if (ref.getName().startsWith(Constants.R_TAGS))
  81. tags.add("'" + Repository.shortenRefName(ref.getName()) + "'");
  82. else if (ref.getName().equals(ref.getObjectId().getName()))
  83. commits.add("'" + ref.getName() + "'");
  84. else
  85. others.add(ref.getName());
  86. }
  87. List<String> listings = new ArrayList<String>();
  88. if (!branches.isEmpty())
  89. listings.add(joinNames(branches, "branch", "branches"));
  90. if (!remoteBranches.isEmpty())
  91. listings.add(joinNames(remoteBranches, "remote branch",
  92. "remote branches"));
  93. if (!tags.isEmpty())
  94. listings.add(joinNames(tags, "tag", "tags"));
  95. if (!commits.isEmpty())
  96. listings.add(joinNames(commits, "commit", "commits"));
  97. if (!others.isEmpty())
  98. listings.add(StringUtils.join(others, ", ", " and "));
  99. sb.append(StringUtils.join(listings, ", "));
  100. String targetName = target.getLeaf().getName();
  101. if (!targetName.equals(Constants.R_HEADS + Constants.MASTER)) {
  102. String targetShortName = Repository
  103. .shortenRefName(target.getName());
  104. sb.append(" into " + targetShortName);
  105. }
  106. return sb.toString();
  107. }
  108. private static String joinNames(List<String> names, String singular,
  109. String plural) {
  110. if (names.size() == 1)
  111. return singular + " " + names.get(0);
  112. else
  113. return plural + " " + StringUtils.join(names, ", ", " and ");
  114. }
  115. }