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.
115 lines
3.6 KiB
115 lines
3.6 KiB
/* |
|
* Copyright (C) 2008-2009, Google Inc. |
|
* Copyright (C) 2009, Robin Rosenberg <robin.rosenberg@dewire.com> |
|
* and other copyright owners as documented in the project's IP log. |
|
* |
|
* This program and the accompanying materials are made available |
|
* under the terms of the Eclipse Distribution License v1.0 which |
|
* accompanies this distribution, is reproduced below, and is |
|
* available at http://www.eclipse.org/org/documents/edl-v10.php |
|
* |
|
* All rights reserved. |
|
* |
|
* Redistribution and use in source and binary forms, with or |
|
* without modification, are permitted provided that the following |
|
* conditions are met: |
|
* |
|
* - Redistributions of source code must retain the above copyright |
|
* notice, this list of conditions and the following disclaimer. |
|
* |
|
* - Redistributions in binary form must reproduce the above |
|
* copyright notice, this list of conditions and the following |
|
* disclaimer in the documentation and/or other materials provided |
|
* with the distribution. |
|
* |
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
|
* names of its contributors may be used to endorse or promote |
|
* products derived from this software without specific prior |
|
* written permission. |
|
* |
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
*/ |
|
|
|
package com.fr.third.eclipse.jgit.merge; |
|
|
|
import com.fr.third.eclipse.jgit.lib.ObjectId; |
|
import com.fr.third.eclipse.jgit.lib.Repository; |
|
|
|
import java.io.IOException; |
|
|
|
/** |
|
* Trivial merge strategy to make the resulting tree exactly match an input. |
|
* <p> |
|
* This strategy can be used to cauterize an entire side branch of history, by |
|
* setting the output tree to one of the inputs, and ignoring any of the paths |
|
* of the other inputs. |
|
*/ |
|
public class StrategyOneSided extends MergeStrategy { |
|
private final String strategyName; |
|
|
|
private final int treeIndex; |
|
|
|
/** |
|
* Create a new merge strategy to select a specific input tree. |
|
* |
|
* @param name |
|
* name of this strategy. |
|
* @param index |
|
* the position of the input tree to accept as the result. |
|
*/ |
|
protected StrategyOneSided(final String name, final int index) { |
|
strategyName = name; |
|
treeIndex = index; |
|
} |
|
|
|
@Override |
|
public String getName() { |
|
return strategyName; |
|
} |
|
|
|
@Override |
|
public Merger newMerger(final Repository db) { |
|
return new OneSide(db, treeIndex); |
|
} |
|
|
|
@Override |
|
public Merger newMerger(final Repository db, boolean inCore) { |
|
return new OneSide(db, treeIndex); |
|
} |
|
|
|
static class OneSide extends Merger { |
|
private final int treeIndex; |
|
|
|
protected OneSide(final Repository local, final int index) { |
|
super(local); |
|
treeIndex = index; |
|
} |
|
|
|
@Override |
|
protected boolean mergeImpl() throws IOException { |
|
return treeIndex < sourceTrees.length; |
|
} |
|
|
|
@Override |
|
public ObjectId getResultTreeId() { |
|
return sourceTrees[treeIndex]; |
|
} |
|
|
|
@Override |
|
public ObjectId getBaseCommitId() { |
|
return null; |
|
} |
|
} |
|
}
|
|
|