2
This code is derived from jgit (http://eclipse.org/jgit).
3
Copyright owners are documented in jgit's IP log.
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
12
Redistribution and use in source and binary forms, with or
13
without modification, are permitted provided that the following
16
- Redistributions of source code must retain the above copyright
17
notice, this list of conditions and the following disclaimer.
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.
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
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.
52
/// <summary>A merge of 2 trees, using a common base ancestor tree.</summary>
53
/// <remarks>A merge of 2 trees, using a common base ancestor tree.</remarks>
54
public abstract class ThreeWayMerger : Merger
56
private RevTree baseTree;
58
/// <summary>Create a new merge instance for a repository.</summary>
59
/// <remarks>Create a new merge instance for a repository.</remarks>
60
/// <param name="local">the repository this merger will read and write data on.</param>
61
protected internal ThreeWayMerger(Repository local) : base(local)
65
/// <summary>Create a new merge instance for a repository.</summary>
66
/// <remarks>Create a new merge instance for a repository.</remarks>
67
/// <param name="local">the repository this merger will read and write data on.</param>
68
/// <param name="inCore">perform the merge in core with no working folder involved</param>
69
protected internal ThreeWayMerger(Repository local, bool inCore) : this(local)
73
/// <summary>Set the common ancestor tree.</summary>
74
/// <remarks>Set the common ancestor tree.</remarks>
76
/// common base treeish; null to automatically compute the common
77
/// base from the input commits during
78
/// <see cref="Merge(NGit.AnyObjectId, NGit.AnyObjectId)">Merge(NGit.AnyObjectId, NGit.AnyObjectId)
82
/// <exception cref="NGit.Errors.IncorrectObjectTypeException">the object is not a treeish.
84
/// <exception cref="NGit.Errors.MissingObjectException">the object does not exist.</exception>
85
/// <exception cref="System.IO.IOException">the object could not be read.</exception>
86
public virtual void SetBase(AnyObjectId id)
90
baseTree = walk.ParseTree(id);
98
/// <summary>Merge together two tree-ish objects.</summary>
100
/// Merge together two tree-ish objects.
102
/// Any tree-ish may be supplied as inputs. Commits and/or tags pointing at
103
/// trees or commits may be passed as input objects.
105
/// <param name="a">source tree to be combined together.</param>
106
/// <param name="b">source tree to be combined together.</param>
108
/// true if the merge was completed without conflicts; false if the
109
/// merge strategy cannot handle this merge or there were conflicts
110
/// preventing it from automatically resolving all paths.
112
/// <exception cref="NGit.Errors.IncorrectObjectTypeException">
113
/// one of the input objects is not a commit, but the strategy
114
/// requires it to be a commit.
116
/// <exception cref="System.IO.IOException">
117
/// one or more sources could not be read, or outputs could not
118
/// be written to the Repository.
120
public virtual bool Merge(AnyObjectId a, AnyObjectId b)
122
return Merge(new AnyObjectId[] { a, b });
125
/// <exception cref="System.IO.IOException"></exception>
126
public override bool Merge(AnyObjectId[] tips)
128
if (tips.Length != 2)
132
return base.Merge(tips);
135
/// <summary>Create an iterator to walk the merge base.</summary>
136
/// <remarks>Create an iterator to walk the merge base.</remarks>
138
/// an iterator over the caller-specified merge base, or the natural
139
/// merge base of the two input commits.
141
/// <exception cref="System.IO.IOException">System.IO.IOException</exception>
142
protected internal virtual AbstractTreeIterator MergeBase()
144
if (baseTree != null)
146
return OpenTree(baseTree);
148
return MergeBase(0, 1);