Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.m2e.cliresolver30
AgeCommit message (Expand)AuthorFilesLines
2014-03-15clieresolver eclipse compiler settingsIgor Fedorenko1-3/+3
2014-02-27code formatIgor Fedorenko4-39/+496
2014-02-27429204 fixed run-as-maven workspace version range resolutionIgor Fedorenko1-2/+1
2014-02-01352962 fixed run-as maven fails to resolve workspace test dependenciesIgor Fedorenko1-1/+1
2011-07-31removed stale/redundant eclipse metadata filesIgor Fedorenko6-321/+0
2011-06-08new version 1.0.100-SNAPSHOTIgor Fedorenko1-1/+1
2011-04-01Rolled back incorrect version changevladt1-1/+1
2011-03-21new version 0.14.0-SNAPSHOTvladt1-1/+1
2011-02-24338149 fixed workspace dependency resolution in some casesIgor Fedorenko2-1/+277
2011-02-23335701 discover required m2e extensions during project importIgor Fedorenko2-3/+1
2011-02-11utf-8Igor Fedorenko1-2/+2
2011-02-10335972, 335722 new maven.runtime dependenciesIgor Fedorenko1-2/+2
2011-02-10Cosmetics/cleanupvladt1-0/+3
2011-02-08Cleanupvladt1-5/+0
2011-02-02335719: error marker when project configuration update is requiredIgor Fedorenko1-3/+0
2011-01-21.settings fileIgor Fedorenko1-0/+3
2011-01-21switched to org.eclipse.m2e for selfhostingIgor Fedorenko2-10/+2
2011-01-21MNGECLIPSE-2746 - Moved setting marker attributes into LifecycleMappingProble...Matthew Piggott1-3/+0
2010-12-22MNGECLIPSE-2676 workspace resolution does not work for external maven 3.0 run...Igor Fedorenko1-3/+3
2010-12-21Cleanupvladt1-0/+8
2010-12-21use proper groupId and artifactIdIgor Fedorenko1-6/+6
2010-12-21moved cliresolver from githubIgor Fedorenko10-0/+296

    Back to the top

    throw new RefNotFoundException(MessageFormat.format(
    JGitText.get().refNotResolved, Constants.HEAD));
    RevCommit headCommit = walk.lookupCommit(headId);
    + RevCommit upstream = walk.lookupCommit(upstreamCommit.getId());
    +
    + if (walk.isMergedInto(upstream, headCommit))
    + return RebaseResult.UP_TO_DATE_RESULT;
    + else if (walk.isMergedInto(headCommit, upstream)) {
    + // head is already merged into upstream, fast-foward
    + monitor.beginTask(MessageFormat.format(
    + JGitText.get().resettingHead,
    + upstreamCommit.getShortMessage()), ProgressMonitor.UNKNOWN);
    + checkoutCommit(upstreamCommit);
    + monitor.endTask();
    +
    + updateHead(headName, upstreamCommit);
    + return RebaseResult.FAST_FORWARD_RESULT;
    + }
    +
    monitor.beginTask(JGitText.get().obtainingCommitsForCherryPick,
    ProgressMonitor.UNKNOWN);
    + // determine the commits to be applied
    LogCommand cmd = new Git(repo).log().addRange(upstreamCommit,
    headCommit);
    Iterable<RevCommit> commitsToUse = cmd.call();
    +
    + List<RevCommit> cherryPickList = new ArrayList<RevCommit>();
    for (RevCommit commit : commitsToUse) {
    + if (commit.getParentCount() != 1)
    + throw new JGitInternalException(
    + JGitText.get().canOnlyCherryPickCommitsWithOneParent);
    cherryPickList.add(commit);
    }
    - // if the upstream commit is in a direct line to the current head,
    - // the log command will not report any commits; in this case,
    - // we create the cherry-pick list ourselves
    - if (cherryPickList.isEmpty()) {
    - Iterable<RevCommit> parents = new Git(repo).log().add(
    - upstreamCommit).call();
    - for (RevCommit parent : parents) {
    - if (parent.equals(headCommit))
    - break;
    - if (parent.getParentCount() != 1)
    - throw new JGitInternalException(
    - JGitText.get().canOnlyCherryPickCommitsWithOneParent);
    - cherryPickList.add(parent);
    - }
    - }
    -
    - // nothing to do: return with UP_TO_DATE_RESULT
    - if (cherryPickList.isEmpty())
    - return RebaseResult.UP_TO_DATE_RESULT;
    -
    Collections.reverse(cherryPickList);
    // create the folder for the meta information
    FileUtils.mkdir(rebaseDir);
    @@ -586,11 +591,13 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
    }
    monitor.endTask();
    +
    // we rewind to the upstream commit
    monitor.beginTask(MessageFormat.format(JGitText.get().rewinding,
    upstreamCommit.getShortMessage()), ProgressMonitor.UNKNOWN);
    checkoutCommit(upstreamCommit);
    monitor.endTask();
    +
    return null;
    }
    diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
    index c0e339017e..af070d6535 100644
    --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
    +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
    @@ -82,6 +82,10 @@ public class RebaseResult {
    FAST_FORWARD;
    }
    + static final RebaseResult OK_RESULT = new RebaseResult(Status.OK);
    +
    + static final RebaseResult ABORTED_RESULT = new RebaseResult(Status.ABORTED);
    +
    static final RebaseResult UP_TO_DATE_RESULT = new RebaseResult(
    Status.UP_TO_DATE);
    @@ -94,7 +98,7 @@ public class RebaseResult {
    private Map<String, MergeFailureReason> failingPaths;
    - RebaseResult(Status status) {
    + private RebaseResult(Status status) {
    this.mySatus = status;
    currentCommit = null;
    }

    Back to the top