Package org.eclipse.jgit.api

Examples of org.eclipse.jgit.api.MergeCommand

113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
      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
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
      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
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
      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
TOP

Related Classes of org.eclipse.jgit.api.MergeCommand

  • org.eclipse.egit.core.op.MergeOperation
  • org.eclipse.jgit.api.MergeResult.MergeStatus
  • org.eclipse.jgit.dircache.DirCacheCheckout
  • org.eclipse.jgit.lib.GitIndex
  • org.eclipse.jgit.lib.ObjectId
  • org.eclipse.jgit.lib.Ref
  • org.eclipse.jgit.lib.RefUpdate
  • org.eclipse.jgit.lib.RefUpdate.Result
  • org.eclipse.jgit.lib.WorkDirCheckout
  • org.eclipse.jgit.merge.MergeConfig
    • Copyright © 2018 www.massapicom. All rights reserved.
    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.