Examples of org.eclipse.jgit.merge.MergeConfig

org.eclipse.jgit.merge.MergeConfig
Holds configuration for merging into a given branch @since 3.3

  /**
   * Use values from the configuation if they have not been explicitly defined
   * via the setters
   */
  private void fallBackToConfiguration() {
    MergeConfig config = MergeConfig.getConfigForCurrentBranch(repo);
    if (squash == null)
      squash = Boolean.valueOf(config.isSquash());
    if (commit == null)
      commit = Boolean.valueOf(config.isCommit());
    if (fastForwardMode == null)
      fastForwardMode = config.getFastForwardMode();
  }

View Full Code Here

  public void testGetFastForwardMergeoptions() throws ConfigInvalidException {
    Config c = new Config(null); // not set
    assertSame(FastForwardMode.FF, c.getEnum(
        ConfigConstants.CONFIG_BRANCH_SECTION, "side",
        ConfigConstants.CONFIG_KEY_MERGEOPTIONS, FastForwardMode.FF));
    MergeConfig mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF, mergeConfig.getFastForwardMode());
    c = parse("[branch \"side\"]\n\tmergeoptions = --ff-only\n");
    assertSame(FastForwardMode.FF_ONLY, c.getEnum(
        ConfigConstants.CONFIG_BRANCH_SECTION, "side",
        ConfigConstants.CONFIG_KEY_MERGEOPTIONS,
        FastForwardMode.FF_ONLY));
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF_ONLY, mergeConfig.getFastForwardMode());
    c = parse("[branch \"side\"]\n\tmergeoptions = --ff\n");
    assertSame(FastForwardMode.FF, c.getEnum(
        ConfigConstants.CONFIG_BRANCH_SECTION, "side",
        ConfigConstants.CONFIG_KEY_MERGEOPTIONS, FastForwardMode.FF));
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF, mergeConfig.getFastForwardMode());
    c = parse("[branch \"side\"]\n\tmergeoptions = --no-ff\n");
    assertSame(FastForwardMode.NO_FF, c.getEnum(
        ConfigConstants.CONFIG_BRANCH_SECTION, "side",
        ConfigConstants.CONFIG_KEY_MERGEOPTIONS, FastForwardMode.NO_FF));
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.NO_FF, mergeConfig.getFastForwardMode());
  }

View Full Code Here

  public void testGetFastForwardMerge() throws ConfigInvalidException {
    Config c = new Config(null); // not set
    assertSame(FastForwardMode.Merge.TRUE, c.getEnum(
        ConfigConstants.CONFIG_KEY_MERGE, null,
        ConfigConstants.CONFIG_KEY_FF, FastForwardMode.Merge.TRUE));
    MergeConfig mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF, mergeConfig.getFastForwardMode());
    c = parse("[merge]\n\tff = only\n");
    assertSame(FastForwardMode.Merge.ONLY, c.getEnum(
        ConfigConstants.CONFIG_KEY_MERGE, null,
        ConfigConstants.CONFIG_KEY_FF, FastForwardMode.Merge.ONLY));
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF_ONLY, mergeConfig.getFastForwardMode());
    c = parse("[merge]\n\tff = true\n");
    assertSame(FastForwardMode.Merge.TRUE, c.getEnum(
        ConfigConstants.CONFIG_KEY_MERGE, null,
        ConfigConstants.CONFIG_KEY_FF, FastForwardMode.Merge.TRUE));
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF, mergeConfig.getFastForwardMode());
    c = parse("[merge]\n\tff = false\n");
    assertSame(FastForwardMode.Merge.FALSE, c.getEnum(
        ConfigConstants.CONFIG_KEY_MERGE, null,
        ConfigConstants.CONFIG_KEY_FF, FastForwardMode.Merge.FALSE));
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.NO_FF, mergeConfig.getFastForwardMode());
  }

View Full Code Here

  }


  @Test
  public void testCombinedMergeOptions() throws ConfigInvalidException {
    Config c = new Config(null); // not set
    MergeConfig mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF, mergeConfig.getFastForwardMode());
    assertTrue(mergeConfig.isCommit());
    assertFalse(mergeConfig.isSquash());
    // branch..mergeoptions should win over merge.ff
    c = parse("[merge]\n\tff = false\n"
        + "[branch \"side\"]\n\tmergeoptions = --ff-only\n");
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF_ONLY, mergeConfig.getFastForwardMode());
    assertTrue(mergeConfig.isCommit());
    assertFalse(mergeConfig.isSquash());
    // merge.ff used for ff setting if not set via mergeoptions
    c = parse("[merge]\n\tff = only\n"
        + "[branch \"side\"]\n\tmergeoptions = --squash\n");
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF_ONLY, mergeConfig.getFastForwardMode());
    assertTrue(mergeConfig.isCommit());
    assertTrue(mergeConfig.isSquash());
    // mergeoptions wins if it has ff options amongst other options
    c = parse("[merge]\n\tff = false\n"
        + "[branch \"side\"]\n\tmergeoptions = --ff-only --no-commit\n");
    mergeConfig = c.get(MergeConfig.getParser("side"));
    assertSame(FastForwardMode.FF_ONLY, mergeConfig.getFastForwardMode());
    assertFalse(mergeConfig.isCommit());
    assertFalse(mergeConfig.isSquash());
  }

View Full Code Here

   */
  public MergeTargetSelectionDialog(Shell parentShell, Repository repo) {
    super(parentShell, repo, getMergeTarget(repo), SHOW_LOCAL_BRANCHES
        | SHOW_REMOTE_BRANCHES | SHOW_TAGS | EXPAND_LOCAL_BRANCHES_NODE
        | getSelectSetting(repo));
    MergeConfig config = MergeConfig.getConfigForCurrentBranch(repo);
    fastForwardMode = config.getFastForwardMode();
    mergeSquash = config.isSquash();
    if (mergeSquash)
      mergeCommit = false;
    else
      mergeCommit = config.isCommit();
  }

View Full Code Here

TOP

Related Classes of org.eclipse.jgit.merge.MergeConfig

org.eclipse.egit.ui.internal.dialogs.MergeTargetSelectionDialog

org.eclipse.jgit.api.MergeCommand

org.eclipse.jgit.api.MergeCommand.FastForwardMode

org.eclipse.jgit.lib.ConfigTest

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.