Examples of MergeCommand

com.aragost.javahg.commands.MergeCommand
Command class for executing hg merge. Set flags from {@link MergeCommandFlags} and call the {@link #execute} method.
org.apache.accumulo.core.util.shell.commands.MergeCommand
org.apache.jackrabbit.mongomk.impl.command.MergeCommand
A {@code Command} for {@code MongoMicroKernel#merge(String, String)}
org.eclipse.jgit.api.MergeCommand
nel.org/pub/software/scm/git/docs/git-merge.html" >Git documentation about Merge

Examples of org.apache.accumulo.core.util.shell.commands.MergeCommand

        new UserCommand(), new WhoAmICommand()};
    Command[] tableCommands = {new CloneTableCommand(), new ConfigCommand(), new CreateTableCommand(), new DeleteTableCommand(), new DropTableCommand(),
        new DUCommand(), new ExportTableCommand(), new ImportTableCommand(), new OfflineCommand(), new OnlineCommand(), new RenameTableCommand(),
        new TablesCommand()};
    Command[] tableControlCommands = {new AddSplitsCommand(), new CompactCommand(), new ConstraintCommand(), new FlushCommand(), new GetGroupsCommand(),
        new GetSplitsCommand(), new MergeCommand(), new SetGroupsCommand()};
    Command[] userCommands = {new AddAuthsCommand(), new CreateUserCommand(), new DeleteUserCommand(), new DropUserCommand(), new GetAuthsCommand(),
        new PasswdCommand(), new SetAuthsCommand(), new UsersCommand()};
    commandGrouping.put("-- Writing, Reading, and Removing Data --", dataCommands);
    commandGrouping.put("-- Debugging Commands -------------------", debuggingCommands);
    commandGrouping.put("-- Shell Execution Commands -------------", execCommands);

View Full Code Here

Examples of org.apache.accumulo.core.util.shell.commands.MergeCommand

        new TableCommand(), new UserCommand(), new WhoAmICommand()};
    Command[] tableCommands = {new CloneTableCommand(), new ConfigCommand(), new CreateTableCommand(), new DeleteTableCommand(), new DropTableCommand(),
        new DUCommand(), new ExportTableCommand(), new ImportTableCommand(), new OfflineCommand(), new OnlineCommand(), new RenameTableCommand(),
        new TablesCommand(), new NamespacesCommand(), new CreateNamespaceCommand(), new DeleteNamespaceCommand(), new RenameNamespaceCommand()};
    Command[] tableControlCommands = {new AddSplitsCommand(), new CompactCommand(), new ConstraintCommand(), new FlushCommand(), new GetGroupsCommand(),
        new GetSplitsCommand(), new MergeCommand(), new SetGroupsCommand()};
    Command[] userCommands = {new AddAuthsCommand(), new CreateUserCommand(), new DeleteUserCommand(), new DropUserCommand(), new GetAuthsCommand(),
        new PasswdCommand(), new SetAuthsCommand(), new UsersCommand()};
    commandGrouping.put("-- Writing, Reading, and Removing Data --", dataCommands);
    commandGrouping.put("-- Debugging Commands -------------------", debuggingCommands);
    commandGrouping.put("-- Shell Execution Commands -------------", execCommands);

View Full Code Here

Examples of org.apache.jackrabbit.mongomk.impl.command.MergeCommand

        return commandExecutor.execute(command);
    }


    @Override
    public String merge(String branchRevisionId, String message) throws Exception {
        MergeCommand command = new MergeCommand(this, branchRevisionId, message);
        return commandExecutor.execute(command);
    }

View Full Code Here

Examples of org.eclipse.jgit.api.MergeCommand

      throw die(MessageFormat.format(
          CLIText.get().refDoesNotExistOrNoCommit, ref));


    Ref oldHead = db.getRef(Constants.HEAD);
    Git git = new Git(db);
    MergeCommand mergeCmd = git.merge().setStrategy(mergeStrategy)
        .setSquash(squash).setFastForward(ff).setCommit(!noCommit);
    if (srcRef != null)
      mergeCmd.include(srcRef);
    else
      mergeCmd.include(src);
    MergeResult result;
    try {
      result = mergeCmd.call();
    } catch (CheckoutConflictException e) {
      result = new MergeResult(e.getConflictingPaths()); // CHECKOUT_CONFLICT
    }


    switch (result.getMergeStatus()) {

View Full Code Here

Examples of org.eclipse.jgit.api.MergeCommand

      throw die(MessageFormat.format(
          CLIText.get().refDoesNotExistOrNoCommit, ref));


    Ref oldHead = db.getRef(Constants.HEAD);
    Git git = new Git(db);
    MergeCommand mergeCmd = git.merge().setStrategy(mergeStrategy)
        .setSquash(squash).setFastForward(ff).setCommit(!noCommit);
    if (srcRef != null)
      mergeCmd.include(srcRef);
    else
      mergeCmd.include(src);


    if (message != null)
      mergeCmd.setMessage(message);


    MergeResult result;
    try {
      result = mergeCmd.call();
    } catch (CheckoutConflictException e) {
      result = new MergeResult(e.getConflictingPaths()); // CHECKOUT_CONFLICT
    }


    switch (result.getMergeStatus()) {

View Full Code Here

Examples of org.eclipse.jgit.api.MergeCommand

      public void run(IProgressMonitor mymonitor) throws CoreException {
        IProject[] validProjects = ProjectUtil.getValidOpenProjects(repository);
        mymonitor.beginTask(NLS.bind(CoreText.MergeOperation_ProgressMerge, refName), 3);
        Git git = new Git(repository);
        mymonitor.worked(1);
        MergeCommand merge = git.merge();
        try {
          Ref ref = repository.getRef(refName);
          if (ref != null)
            merge.include(ref);
          else
            merge.include(ObjectId.fromString(refName));
        } catch (IOException e) {
          throw new TeamException(CoreText.MergeOperation_InternalError, e);
        }
        if (fastForwardMode != null)
          merge.setFastForward(fastForwardMode);
        if (commit != null)
          merge.setCommit(commit.booleanValue());
        if (squash != null)
          merge.setSquash(squash.booleanValue());
        if (mergeStrategy != null) {
          merge.setStrategy(mergeStrategy);
        }
        if (message != null)
          merge.setMessage(message);
        try {
          mergeResult = merge.call();
          mymonitor.worked(1);
          if (MergeResult.MergeStatus.NOT_SUPPORTED.equals(mergeResult.getMergeStatus()))
            throw new TeamException(new Status(IStatus.INFO, Activator.getPluginId(), mergeResult.toString()));
        } catch (NoHeadException e) {
          throw new TeamException(CoreText.MergeOperation_MergeFailedNoHead, e);

View Full Code Here

0 1

TOP

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.