Search in sources :

Example 1 with CommitInfo

use of org.uberfire.java.nio.fs.jgit.util.model.CommitInfo in project appformer by kiegroup.

the class AbstractTestInfra method setupGit.

protected Git setupGit(final File tempDir) throws IOException, GitAPIException {
    final Git git = Git.createRepository(tempDir);
    new Commit(git, "master", new CommitInfo(null, "name", "name@example.com", "cool1", null, null), false, null, new DefaultCommitContent(new HashMap<String, File>() {

        {
            put("file1.txt", tempFile("content"));
            put("file2.txt", tempFile("content2"));
        }
    })).execute();
    return git;
}
Also used : Git(org.uberfire.java.nio.fs.jgit.util.Git) Commit(org.uberfire.java.nio.fs.jgit.util.commands.Commit) CommitInfo(org.uberfire.java.nio.fs.jgit.util.model.CommitInfo) DefaultCommitContent(org.uberfire.java.nio.fs.jgit.util.model.DefaultCommitContent) File(java.io.File)

Example 2 with CommitInfo

use of org.uberfire.java.nio.fs.jgit.util.model.CommitInfo in project appformer by kiegroup.

the class JGitFileSystemProvider method buildCommitInfo.

private CommitInfo buildCommitInfo(final String defaultMessage, final Collection<? extends Option> options) {
    String sessionId = null;
    String name = null;
    String email = null;
    String message = defaultMessage;
    TimeZone timeZone = null;
    Date when = null;
    if (options != null && !options.isEmpty()) {
        final CommentedOption op = extractCommentedOption(options);
        if (op != null) {
            sessionId = op.getSessionId();
            name = op.getName();
            email = op.getEmail();
            if (op.getMessage() != null && !op.getMessage().trim().isEmpty()) {
                message = op.getMessage() + " " + defaultMessage;
            }
            timeZone = op.getTimeZone();
            when = op.getWhen();
        }
    }
    return new CommitInfo(sessionId, name, email, message, timeZone, when);
}
Also used : TimeZone(java.util.TimeZone) CommentedOption(org.uberfire.java.nio.base.options.CommentedOption) CommitInfo(org.uberfire.java.nio.fs.jgit.util.model.CommitInfo) Date(java.util.Date)

Example 3 with CommitInfo

use of org.uberfire.java.nio.fs.jgit.util.model.CommitInfo in project appformer by kiegroup.

the class ChangeRequestServiceImpl method mergeChangeRequest.

@Override
public Boolean mergeChangeRequest(final String spaceName, final String repositoryAlias, final Long changeRequestId) {
    checkNotEmpty(SPACE_NAME_PARAM, spaceName);
    checkNotEmpty(REPOSITORY_ALIAS_PARAM, repositoryAlias);
    checkNotNull(CHANGE_REQUEST_ID_PARAM, changeRequestId);
    final ChangeRequest changeRequest = getChangeRequestById(spaceName, repositoryAlias, false, changeRequestId);
    if (changeRequest.getStatus() != ChangeRequestStatus.OPEN) {
        throw new IllegalStateException("Cannot accept a change request that is not open");
    }
    final Repository repository = resolveRepository(spaceName, repositoryAlias);
    final CommitInfo commitInfo = buildCommitInfo(String.format(MessageCommitInfo.MERGE_MESSAGE, changeRequest.getSourceBranch()));
    return tryMergeChangeRequest(repository, changeRequest, commitInfo, false);
}
Also used : Repository(org.guvnor.structure.repositories.Repository) CommitInfo(org.uberfire.java.nio.fs.jgit.util.model.CommitInfo) MessageCommitInfo(org.uberfire.java.nio.fs.jgit.util.model.MessageCommitInfo) ChangeRequest(org.guvnor.structure.repositories.changerequest.portable.ChangeRequest)

Example 4 with CommitInfo

use of org.uberfire.java.nio.fs.jgit.util.model.CommitInfo in project appformer by kiegroup.

the class ChangeRequestServiceImpl method squashChangeRequest.

@Override
public Boolean squashChangeRequest(final String spaceName, final String repositoryAlias, final Long changeRequestId, final String commitMessage) {
    checkNotEmpty(SPACE_NAME_PARAM, spaceName);
    checkNotEmpty(REPOSITORY_ALIAS_PARAM, repositoryAlias);
    checkNotNull(CHANGE_REQUEST_ID_PARAM, changeRequestId);
    checkNotNull(COMMIT_MESSAGE_PARAM, commitMessage);
    final ChangeRequest changeRequest = getChangeRequestById(spaceName, repositoryAlias, false, changeRequestId);
    if (changeRequest.getStatus() != ChangeRequestStatus.OPEN) {
        throw new IllegalStateException("Cannot squash a change request that is not open");
    }
    final Repository repository = resolveRepository(spaceName, repositoryAlias);
    final CommitInfo commitInfo = buildCommitInfo(commitMessage);
    return tryMergeChangeRequest(repository, changeRequest, commitInfo, true);
}
Also used : Repository(org.guvnor.structure.repositories.Repository) CommitInfo(org.uberfire.java.nio.fs.jgit.util.model.CommitInfo) MessageCommitInfo(org.uberfire.java.nio.fs.jgit.util.model.MessageCommitInfo) ChangeRequest(org.guvnor.structure.repositories.changerequest.portable.ChangeRequest)

Example 5 with CommitInfo

use of org.uberfire.java.nio.fs.jgit.util.model.CommitInfo in project appformer by kiegroup.

the class JGitFileSystemImpl method buildCommitInfo.

@Override
public CommitInfo buildCommitInfo(final String defaultMessage, final CommentedOption op) {
    String sessionId = null;
    String name = null;
    String email = null;
    String message = defaultMessage;
    TimeZone timeZone = null;
    Date when = null;
    if (op != null) {
        sessionId = op.getSessionId();
        name = op.getName();
        email = op.getEmail();
        if (op.getMessage() != null && !op.getMessage().trim().isEmpty()) {
            message = op.getMessage();
        }
        timeZone = op.getTimeZone();
        when = op.getWhen();
    }
    return new CommitInfo(sessionId, name, email, message, timeZone, when);
}
Also used : TimeZone(java.util.TimeZone) CommitInfo(org.uberfire.java.nio.fs.jgit.util.model.CommitInfo) Date(java.util.Date)

Aggregations

CommitInfo (org.uberfire.java.nio.fs.jgit.util.model.CommitInfo)5 Date (java.util.Date)2 TimeZone (java.util.TimeZone)2 Repository (org.guvnor.structure.repositories.Repository)2 ChangeRequest (org.guvnor.structure.repositories.changerequest.portable.ChangeRequest)2 MessageCommitInfo (org.uberfire.java.nio.fs.jgit.util.model.MessageCommitInfo)2 File (java.io.File)1 CommentedOption (org.uberfire.java.nio.base.options.CommentedOption)1 Git (org.uberfire.java.nio.fs.jgit.util.Git)1 Commit (org.uberfire.java.nio.fs.jgit.util.commands.Commit)1 DefaultCommitContent (org.uberfire.java.nio.fs.jgit.util.model.DefaultCommitContent)1