123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123 |
- /*
- * Copyright (C) 2011, Christian Halstrick <christian.halstrick@sap.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 org.eclipse.jgit.pgm;
-
- import java.text.MessageFormat;
- import java.util.Map;
-
- import org.eclipse.jgit.api.Git;
- import org.eclipse.jgit.api.MergeResult;
- import org.eclipse.jgit.lib.ObjectId;
- import org.eclipse.jgit.merge.MergeStrategy;
- import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
- import org.kohsuke.args4j.Argument;
- import org.kohsuke.args4j.Option;
-
- @Command(common = true, usage = "usage_MergesTwoDevelopmentHistories")
- class Merge extends TextBuiltin {
-
- @Option(name = "--strategy", aliases = { "-s" }, usage = "usage_mergeStrategy")
- private String strategyName;
-
- private MergeStrategy mergeStrategy = MergeStrategy.RESOLVE;
-
- @Argument(required = true)
- private String ref;
-
- @Override
- protected void run() throws Exception {
- // determine the merge strategy
- if (strategyName != null) {
- mergeStrategy = MergeStrategy.get(strategyName);
- if (mergeStrategy == null)
- throw die(MessageFormat.format(
- CLIText.get().unknownMergeStratey, strategyName));
- }
-
- // determine the other revision we want to merge with HEAD
- final ObjectId src = db.resolve(ref + "^{commit}");
- if (src == null)
- throw die(MessageFormat.format(
- CLIText.get().refDoesNotExistOrNoCommit, ref));
-
- Git git = new Git(db);
- MergeResult result = git.merge().setStrategy(mergeStrategy)
- .include(src).call();
-
- switch (result.getMergeStatus()) {
- case ALREADY_UP_TO_DATE:
- case FAST_FORWARD:
- out.println(result.getMergeStatus().toString());
- break;
- case CONFLICTING:
- for (String collidingPath : result.getConflicts().keySet())
- out.println(MessageFormat.format(CLIText.get().mergeConflict,
- collidingPath));
- out.println(CLIText.get().mergeFailed);
- break;
- case FAILED:
- for (Map.Entry<String, MergeFailureReason> entry : result
- .getFailingPaths().entrySet())
- switch (entry.getValue()) {
- case DIRTY_WORKTREE:
- case DIRTY_INDEX:
- out.println(CLIText.get().dontOverwriteLocalChanges);
- out.println(" " + entry.getKey());
- break;
- case COULD_NOT_DELETE:
- out.println(CLIText.get().cannotDeleteFile);
- out.println(" " + entry.getKey());
- break;
- }
- break;
- case MERGED:
- out.println(MessageFormat.format(CLIText.get().mergeMadeBy,
- mergeStrategy.getName()));
- break;
- case NOT_SUPPORTED:
- out.println(MessageFormat.format(
- CLIText.get().unsupportedOperation, result.toString()));
- }
- }
- }
|