List of featureFinish() Examples

Examples of featureFinish()

com.atlassian.jgitflow.core.JGitFlow.featureFinish()

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

        //make sure develop doesn't have our commits yet
        assertFalse(GitHelper.isMergedInto(git, commit, flow.getDevelopBranchName()));
        assertFalse(GitHelper.isMergedInto(git, commit2, flow.getDevelopBranchName()));


        //try to finish
        flow.featureFinish("my-feature").setSquash(true).call();


        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());


        //feature branch should be gone

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

        File junkFile = new File(remoteGit.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");
        remoteGit.add().addFilepattern(junkFile.getName()).call();
        remoteGit.commit().setMessage("adding junk file").call();


        flow.featureFinish("my-feature").setFetchDevelop(true).call();


    }


    @Test(expected = MergeConflictsNotResolvedException.class)
    public void finishFeatureMergeConflict() throws Exception

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

        git.commit().setMessage("committing junk file").call();


        //try to finish
        try
        {
            flow.featureFinish("my-feature").setKeepBranch(true).call();
        }
        catch (Exception e)
        {
            File gitFlowDir = new File(git.getRepository().getDirectory(), JGitFlowConstants.GITFLOW_DIR);
            File mergeBase = new File(gitFlowDir, JGitFlowConstants.MERGE_BASE);

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()


        boolean gotException = false;
        //try to finish
        try
        {
            flow.featureFinish("my-feature").call();
        }
        catch (Exception e)
        {
            gotException = true;
            File gitFlowDir = new File(git.getRepository().getDirectory(), JGitFlowConstants.GITFLOW_DIR);

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

        git.add().addFilepattern(junkFile.getName()).setUpdate(true).call();
        git.commit().setMessage("merging").call();


        //try to finish again
        git.checkout().setName(flow.getFeatureBranchPrefix() + "my-feature").call();
        flow.featureFinish("my-feature").call();


        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());


        //feature branch should be gone

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

                    throw new JGitFlowReleaseException("Error building: " + e.getMessage(), e);
                }
            }


            getLogger().info("running jgitflow feature finish...");
            flow.featureFinish(featureLabel)
                .setKeepBranch(ctx.isKeepBranch())
                .setSquash(ctx.isSquash())
                .setRebase(ctx.isFeatureRebase())
                .setAllowUntracked(ctx.isAllowUntracked())
                .setPush(ctx.isPushFeatures())

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

                    throw new JGitFlowReleaseException("Error building: " + e.getMessage(), e);
                }
            }


            getLogger().info("running jgitflow feature finish...");
            flow.featureFinish(featureLabel)
                .setKeepBranch(ctx.isKeepBranch())
                .setSquash(ctx.isSquash())
                .setRebase(ctx.isFeatureRebase())
                .setAllowUntracked(ctx.isAllowUntracked())
                .setPush(ctx.isPushFeatures())

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()


            JGitFlowReporter reporter = flow.getReporter();


            getLogger().info("running jgitflow feature finish...");
            
            MergeResult mergeResult = flow.featureFinish(featureLabel)
                .setKeepBranch(ctx.isKeepBranch())
                .setSquash(ctx.isSquash())
                .setRebase(ctx.isFeatureRebase())
                .setAllowUntracked(ctx.isAllowUntracked())
                .setPush(ctx.isPushFeatures())

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

                    throw new JGitFlowReleaseException("Error building: " + e.getMessage(), e);
                }
            }


            getLogger().info("running jgitflow feature finish...");
            flow.featureFinish(featureLabel)
                .setKeepBranch(ctx.isKeepBranch())
                .setSquash(ctx.isSquash())
                .setRebase(ctx.isFeatureRebase())
                .setAllowUntracked(ctx.isAllowUntracked())
                .setPush(ctx.isPushFeatures())

View Full Code Here

Examples of com.atlassian.jgitflow.core.JGitFlow.featureFinish()

                    throw new JGitFlowReleaseException("Error building: " + e.getMessage(), e);
                }
            }


            getLogger().info("running jgitflow feature finish...");
            flow.featureFinish(featureLabel)
                .setKeepBranch(ctx.isKeepBranch())
                .setSquash(ctx.isSquash())
                .setRebase(ctx.isFeatureRebase())
                .setAllowUntracked(ctx.isAllowUntracked())
                .setPush(ctx.isPushFeatures())

View Full Code Here

0 1 2 3 4

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.