1 /*
2 * Copyright (C) 2012, Research In Motion Limited
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
44 package org.eclipse.jgit.merge;
45
46 import org.eclipse.jgit.lib.Config;
47 import org.eclipse.jgit.lib.ObjectInserter;
48 import org.eclipse.jgit.lib.Repository;
49
50 /**
51 * A three-way merge strategy performing a content-merge if necessary
52 *
53 * @since 3.0
54 */
55 public class StrategyRecursive extends StrategyResolve {
56
57 /** {@inheritDoc} */
58 @Override
59 public ThreeWayMerger newMerger(Repository db) {
60 return new RecursiveMerger(db, false);
61 }
62
63 /** {@inheritDoc} */
64 @Override
65 public ThreeWayMerger newMerger(Repository db, boolean inCore) {
66 return new RecursiveMerger(db, inCore);
67 }
68
69 /** {@inheritDoc} */
70 @Override
71 public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) {
72 return new RecursiveMerger(inserter, config);
73 }
74
75 /** {@inheritDoc} */
76 @Override
77 public String getName() {
78 return "recursive"; //$NON-NLS-1$
79 }
80 }