@Override public MergeCommand setStrategy(MergeCommand.Strategy strategy) { if (strategy != null && !strategy.toString().isEmpty() && strategy != MergeCommand.Strategy.DEFAULT) { if (strategy == MergeCommand.Strategy.OURS) { this.strategy = MergeStrategy.OURS; return this; } if (strategy == MergeCommand.Strategy.RESOLVE) { this.strategy = MergeStrategy.RESOLVE; return this; } if (strategy == MergeCommand.Strategy.OCTOPUS) { this.strategy = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE; return this; } if (strategy == MergeCommand.Strategy.RECURSIVE_THEIRS) { this.strategy = MergeStrategy.THEIRS; return this; } listener.getLogger().println("[WARNING] JGit doesn't fully support merge strategies. This flag is ignored"); } return this; }
public MergeCommand.Strategy getMergeStrategy() { for (MergeCommand.Strategy strategy: MergeCommand.Strategy.values()) if (strategy.toString().equals(mergeStrategy)) return strategy; return MergeCommand.Strategy.DEFAULT; }
@Exported public MergeCommand.Strategy getMergeStrategy() { for (MergeCommand.Strategy strategy: MergeCommand.Strategy.values()) if (strategy.toString().equals(mergeStrategy)) return strategy; return MergeCommand.Strategy.DEFAULT; }
@Override public void execute() throws GitException, InterruptedException { ArgumentListBuilder args = new ArgumentListBuilder(); args.add("merge"); if(squash) { args.add("--squash"); } if(!commit){ args.add("--no-commit"); } if (comment != null && !comment.isEmpty()) { args.add("-m"); args.add(comment); } if (strategy != null && !strategy.isEmpty() && !strategy.equals(MergeCommand.Strategy.DEFAULT.toString())) { args.add("-s"); if(strategy.equals(MergeCommand.Strategy.RECURSIVE_THEIRS.toString())) { args.add("recursive"); args.add("--strategy-option"); args.add("theirs"); } else { args.add(strategy); } } args.add(fastForwardMode); args.add(rev.name()); launchCommand(args); } };
public void setMergeStrategy(MergeCommand.Strategy mergeStrategy) { this.mergeStrategy = mergeStrategy.toString(); }
/** * Construct UserMergeOptions from PreBuildMergeOptions. * @param pbm pre-build merge options used to construct UserMergeOptions */ public UserMergeOptions(PreBuildMergeOptions pbm) { this(pbm.getRemoteBranchName(), pbm.getMergeTarget(), pbm.getMergeStrategy().toString(), pbm.getFastForwardMode()); }
@Override public MergeCommand setStrategy(MergeCommand.Strategy strategy) { this.strategy = strategy.toString(); return this; }