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.

StrategyOneSided.java 3.5KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115
  1. /*
  2. * Copyright (C) 2008-2009, Google Inc.
  3. * Copyright (C) 2009, Robin Rosenberg <robin.rosenberg@dewire.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 org.eclipse.jgit.lib.ObjectId;
  47. import org.eclipse.jgit.lib.Repository;
  48. /**
  49. * Trivial merge strategy to make the resulting tree exactly match an input.
  50. * <p>
  51. * This strategy can be used to cauterize an entire side branch of history, by
  52. * setting the output tree to one of the inputs, and ignoring any of the paths
  53. * of the other inputs.
  54. */
  55. public class StrategyOneSided extends MergeStrategy {
  56. private final String strategyName;
  57. private final int treeIndex;
  58. /**
  59. * Create a new merge strategy to select a specific input tree.
  60. *
  61. * @param name
  62. * name of this strategy.
  63. * @param index
  64. * the position of the input tree to accept as the result.
  65. */
  66. protected StrategyOneSided(final String name, final int index) {
  67. strategyName = name;
  68. treeIndex = index;
  69. }
  70. @Override
  71. public String getName() {
  72. return strategyName;
  73. }
  74. @Override
  75. public Merger newMerger(final Repository db) {
  76. return new OneSide(db, treeIndex);
  77. }
  78. @Override
  79. public Merger newMerger(final Repository db, boolean inCore) {
  80. return new OneSide(db, treeIndex);
  81. }
  82. static class OneSide extends Merger {
  83. private final int treeIndex;
  84. protected OneSide(final Repository local, final int index) {
  85. super(local);
  86. treeIndex = index;
  87. }
  88. @Override
  89. protected boolean mergeImpl() throws IOException {
  90. return treeIndex < sourceTrees.length;
  91. }
  92. @Override
  93. public ObjectId getResultTreeId() {
  94. return sourceTrees[treeIndex];
  95. }
  96. @Override
  97. public ObjectId getBaseCommitId() {
  98. return null;
  99. }
  100. }
  101. }