Package org.eclipse.jgit.api

Examples of org.eclipse.jgit.api.MergeCommand.include()

116
117
118
119
120
121
122
123
124
125
126
    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();
View Full Code Here
118
119
120
121
122
123
124
125
126
127
128
    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
View Full Code Here
123
124
125
126
127
128
129
130
131
132
133
    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);
View Full Code Here
125
126
127
128
129
130
131
132
133
134
135
    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;
View Full Code Here
145
146
147
148
149
150
151
152
153
154
155
        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);
        }
View Full Code Here
147
148
149
150
151
152
153
154
155
156
157
        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);
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. 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.