Package org.eclipse.jgit.api

Examples of org.eclipse.jgit.api.MergeResult

109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
        String prefixedHotfixName = gfConfig.getPrefixValue(JGitFlowConstants.PREFIXES.HOTFIX.configKey()) + hotfixName;

        requireLocalBranchExists(prefixedHotfixName);
        requireCleanWorkingTree();

        MergeResult developResult = new MergeResult(null,null,new ObjectId[] { null, null }, MergeResult.MergeStatus.ALREADY_UP_TO_DATE, MergeStrategy.RESOLVE,null);
        MergeResult masterResult = new MergeResult(null,null,new ObjectId[] { null, null }, MergeResult.MergeStatus.ALREADY_UP_TO_DATE,MergeStrategy.RESOLVE,null);
        try
        {
            if (fetch)
            {
                RefSpec developSpec = new RefSpec("+" + Constants.R_HEADS + gfConfig.getDevelop() + ":" + Constants.R_REMOTES + "origin/" + gfConfig.getDevelop());
                RefSpec masterSpec = new RefSpec("+" + Constants.R_HEADS + gfConfig.getMaster() + ":" + Constants.R_REMOTES + "origin/" + gfConfig.getMaster());

                git.fetch().setRemote(Constants.DEFAULT_REMOTE_NAME).setRefSpecs(masterSpec).call();
                git.fetch().setRemote(Constants.DEFAULT_REMOTE_NAME).setRefSpecs(developSpec).call();
                git.fetch().setRemote(Constants.DEFAULT_REMOTE_NAME).call();
            }

            if (GitHelper.remoteBranchExists(git, gfConfig.getMaster(), reporter))
            {
                requireLocalBranchNotBehindRemote(gfConfig.getMaster());
            }

            if (GitHelper.remoteBranchExists(git, gfConfig.getDevelop(), reporter))
            {
                requireLocalBranchNotBehindRemote(gfConfig.getDevelop());
            }

            Ref hotfixBranch = GitHelper.getLocalBranch(git, prefixedHotfixName);
            RevCommit hotfixCommit = GitHelper.getLatestCommit(git, prefixedHotfixName);
       
        /*
        try to merge into master
        in case a previous attempt to finish this release branch has failed,
        but the merge into master was successful, we skip it now
         */
            if (!GitHelper.isMergedInto(git, prefixedHotfixName, gfConfig.getMaster()))
            {
                git.checkout().setName(gfConfig.getMaster()).call();

                masterResult = git.merge().setFastForward(MergeCommand.FastForwardMode.NO_FF).include(hotfixBranch).call();
                if(masterResult.getMergeStatus().isSuccessful())
                {
                    git.commit().setMessage("merging " + prefixedHotfixName + "' into master").call();
                }
            }

View Full Code Here
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
                List<GitCommit> commitList = GitRepository.diffCommits(cloneRepository,
                        cloneAndFetch.getDestFromBranchName(), cloneAndFetch.getMergingBranchName());

                String mergedCommitIdFrom;
                MergeResult mergeResult;

                mergedCommitIdFrom =
                        cloneRepository.getRef(org.eclipse.jgit.lib.Constants.HEAD).getObjectId().getName();

                mergeResult = GitRepository.merge(cloneRepository, cloneAndFetch.getDestFromBranchName());

                if (mergeResult.getMergeStatus().isSuccessful()) {
                    // merge 커밋 메시지 수정
                    RevCommit mergeCommit = writeMergeCommitMessage(cloneRepository, commitList, sender);
                    String mergedCommitIdTo = mergeCommit.getId().getName();
                    pullRequest.mergedCommitIdFrom = mergedCommitIdFrom;
                    pullRequest.mergedCommitIdTo = mergedCommitIdTo;
View Full Code Here
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
                }
                pullRequestMergeResult.setGitCommits(commits);

                String mergedCommitIdFrom = clonedRepository
                        .getRef(org.eclipse.jgit.lib.Constants.HEAD).getObjectId().getName();
                MergeResult mergeResult = GitRepository.merge(clonedRepository,
                        cloneAndFetch.getDestFromBranchName());

                if (mergeResult.getMergeStatus() == MergeResult.MergeStatus.CONFLICTING) {
                    pullRequestMergeResult.setGitConflicts(new GitConflicts(clonedRepository, mergeResult));
                    pullRequestMergeResult.setConflictStateOfPullRequest();
                } else if (mergeResult.getMergeStatus().isSuccessful()) {
                    String mergedCommitIdTo = mergeResult.getNewHead().getName();
                    pullRequest.mergedCommitIdFrom = mergedCommitIdFrom;
                    pullRequest.mergedCommitIdTo = mergedCommitIdTo;
                    pullRequestMergeResult.setResolvedStateOfPullRequest();
                }
            }
View Full Code Here
172
173
174
175
176
177
178
179
180
181
182
        } catch (NoHeadException e) {
          throw new TeamException(CoreText.MergeOperation_MergeFailedNoHead, e);
        } catch (ConcurrentRefUpdateException e) {
          throw new TeamException(CoreText.MergeOperation_MergeFailedRefUpdate, e);
        } catch (CheckoutConflictException e) {
          mergeResult = new MergeResult(e.getConflictingPaths());
          return;
        } catch (GitAPIException e) {
          throw new TeamException(e.getLocalizedMessage(), e.getCause());
        } finally {
          ProjectUtil.refreshValidProjects(validProjects, new SubProgressMonitor(
View Full Code Here
130
131
132
133
134
135
136
137
138
139
140
141
  }

  private boolean refreshNeeded(PullResult pullResult) {
    if (pullResult == null)
      return true;
    MergeResult mergeResult = pullResult.getMergeResult();
    if (mergeResult == null)
      return true;
    if (mergeResult.getMergeStatus() == MergeStatus.ALREADY_UP_TO_DATE)
      return false;
    return true;
  }
View Full Code Here
70
71
72
73
74
75
76
77
78
    return fetchResult != null
        && !fetchResult.getTrackingRefUpdates().isEmpty();
  }

  private boolean hasMergeResults() {
    final MergeResult mergeResult = result.getMergeResult();
    return mergeResult != null
        && mergeResult.getMergeStatus() != MergeStatus.ALREADY_UP_TO_DATE;
  }
View Full Code Here
55
56
57
58
59
60
61
62
63
64
65
66
67
        .create();
    touchAndSubmit("master", "master");
    MergeOperation mergeOp = new MergeOperation(
        testRepository.getRepository(), "stable");
    mergeOp.execute(null);
    MergeResult mergeResult = mergeOp.getResult();
    assertThat(mergeResult.getMergeStatus(), is(MergeStatus.CONFLICTING));
    assertThat(mergeResult.getConflicts().keySet(),
        hasItem(path.toString()));

    IndexDiffCache cache = Activator.getDefault().getIndexDiffCache();
    cache.getIndexDiffCacheEntry(testRepository.getRepository());
    TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE);
View Full Code Here
132
133
134
135
136
137
138
139
140
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
         */
            if (!GitHelper.isMergedInto(git, prefixedHotfixName, gfConfig.getMaster()))
            {
                git.checkout().setName(gfConfig.getMaster()).call();

                MergeResult masterResult = masterResult = git.merge().setFastForward(MergeCommand.FastForwardMode.NO_FF).include(hotfixBranch).call();
            }

            if (!noTag)
            {
            /*
            try to tag the release
            in case a previous attempt to finish this release branch has failed,
            but the tag was successful, we skip it now
            */
                String tagName = gfConfig.getPrefixValue(JGitFlowConstants.PREFIXES.VERSIONTAG.configKey()) + hotfixName;
                if (!GitHelper.tagExists(git, tagName))
                {
                    git.tag().setName(tagName).setMessage(message).setObjectId(hotfixCommit).call();
                }
            }
       
        /*
        try to merge into develop
        in case a previous attempt to finish this release branch has failed,
        but the merge into develop was successful, we skip it now
         */
            if (!GitHelper.isMergedInto(git, prefixedHotfixName, gfConfig.getDevelop()))
            {
                git.checkout().setName(gfConfig.getDevelop()).call();

                MergeResult developResult = git.merge().setFastForward(MergeCommand.FastForwardMode.NO_FF).include(hotfixBranch).call();
            }

            if (!keepBranch)
            {
                //make sure we're on master
View Full Code Here
133
134
135
136
137
138
139
140
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
174
175
176
177
178
179
         */
            if (!GitHelper.isMergedInto(git, prefixedReleaseName, gfConfig.getMaster()))
            {
                git.checkout().setName(gfConfig.getMaster()).call();

                MergeResult masterResult = null;

                if (squash)
                {
                    masterResult = git.merge().setSquash(true).include(releaseBranch).call();
                    git.commit().call();
                }
                else
                {
                    masterResult = git.merge().setFastForward(MergeCommand.FastForwardMode.NO_FF).include(releaseBranch).call();
                }
            }

            if (!noTag)
            {
            /*
            try to tag the release
            in case a previous attempt to finish this release branch has failed,
            but the tag was successful, we skip it now
            */
                String tagName = gfConfig.getPrefixValue(JGitFlowConstants.PREFIXES.VERSIONTAG.configKey()) + releaseName;
                if (!GitHelper.tagExists(git, tagName))
                {
                    git.tag().setName(tagName).setMessage(message).setObjectId(releaseCommit).call();
                }
            }
       
        /*
        try to merge into develop
        in case a previous attempt to finish this release branch has failed,
        but the merge into develop was successful, we skip it now
         */
            if (!GitHelper.isMergedInto(git, prefixedReleaseName, gfConfig.getDevelop()))
            {
                git.checkout().setName(gfConfig.getDevelop()).call();

                MergeResult developResult = null;

                if (squash)
                {
                    developResult = git.merge().setSquash(true).include(releaseBranch).call();
                    git.commit().call();
View Full Code Here
100
101
102
103
104
105
106
107
108
109
110
111
112
        enforcer().requireGitFlowInitialized();
        enforcer().requireLocalBranchExists(prefixedBranchName);
        enforcer().requireCleanWorkingTree(isAllowUntracked());

        MergeResult developResult = createEmptyMergeResult();
        MergeResult masterResult = createEmptyMergeResult();
        MergeResult releaseResult = createEmptyMergeResult();
        try
        {
            doFetchIfNeeded(extension);

            ensureLocalBranchesNotBehindRemotes(prefixedBranchName, gfConfig.getMaster(), gfConfig.getDevelop());
View Full Code Here
TOP

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

  • com.atlassian.jgitflow.core.command.AbstractBranchMergingCommand
  • com.atlassian.jgitflow.core.command.FeatureFinishCommand
  • com.atlassian.jgitflow.core.command.HotfixFinishCommand
  • com.atlassian.jgitflow.core.command.ReleaseFinishCommand
  • com.atlassian.jgitflow.core.FeatureFinishCommand
  • com.atlassian.jgitflow.core.HotfixFinishCommand
  • com.atlassian.jgitflow.core.ReleaseFinishCommand
  • com.atlassian.maven.plugins.jgitflow.manager.DefaultFlowFeatureManager
  • com.gitblit.tests.GitServletTest
  • domain.Repo
    • 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.