All Downloads are FREE. Search and download functionalities are using the official Maven repository.

org.ajoberstar.grgit.operation.BranchChangeOp.groovy Maven / Gradle / Ivy

There is a newer version: 1.8.0-rc.1
Show newest version
/*
 * Copyright 2012-2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.ajoberstar.grgit.operation

import java.util.concurrent.Callable

import org.ajoberstar.grgit.Branch
import org.ajoberstar.grgit.Repository
import org.ajoberstar.grgit.exception.GrgitException
import org.ajoberstar.grgit.service.ResolveService
import org.ajoberstar.grgit.util.JGitUtil

import org.eclipse.jgit.api.CreateBranchCommand
import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode
import org.eclipse.jgit.api.errors.GitAPIException
import org.eclipse.jgit.lib.Ref

/**
 * Changes a branch's start point and/or upstream branch. Returns the changed {@link Branch}.
 *
 * 

To change the branch to start at, but not track, a local start point.

* *
 * grgit.branch.change(name: 'existing-branch', startPoint: 'local-branch')
 * grgit.branch.change(name: 'existing-branch', startPoint: 'local-branch', mode: BranchChangeOp.Mode.NO_TRACK)
 * 
* *

To change the branch to start at and track a local start point.

* *
 * grgit.branch.change(name: 'existing-branch', startPoint: 'local-branch', mode: BranchChangeOp.Mode.TRACK)
 * 
* *

To change the branch to start from and track a remote start point.

* *
 * grgit.branch.change(name: 'existing-branch', startPoint: 'origin/remote-branch')
 * grgit.branch.change(name: 'existing-branch', startPoint: 'origin/remote-branch', mode: BranchChangeOp.Mode.TRACK)
 * 
* *

To change the branch to start from, but not track, a remote start point.

* *
 * grgit.branch.change(name: 'existing-branch', startPoint: 'origin/remote-branch', mode: BranchChangeOp.Mode.NO_TRACK)
 * 
* * See git-branch Manual Page. * * @since 0.2.0 * @see git-branch Manual Page */ class BranchChangeOp implements Callable { private final Repository repo /** * The name of the branch to change. */ String name /** * The commit the branch should now start at. * @see {@link ResolveService#toRevisionString(Object)} */ Object startPoint /** * The tracking mode to use. */ Mode mode BranchChangeOp(Repository repo) { this.repo = repo } Branch call() { if (!JGitUtil.resolveBranch(repo, name)) { throw new GrgitException("Branch does not exist: ${name}") } if (!startPoint) { throw new GrgitException('Must set new startPoint.') } CreateBranchCommand cmd = repo.jgit.branchCreate() cmd.name = name cmd.force = true if (startPoint) { String rev = new ResolveService(repo).toRevisionString(startPoint) cmd.startPoint = rev } if (mode) { cmd.upstreamMode = mode.jgit } try { Ref ref = cmd.call() return JGitUtil.resolveBranch(repo, ref) } catch (GitAPIException e) { throw new GrgitException('Problem changing branch.', e) } } static enum Mode { TRACK(SetupUpstreamMode.TRACK), NO_TRACK(SetupUpstreamMode.NOTRACK) private final SetupUpstreamMode jgit Mode(SetupUpstreamMode jgit) { this.jgit = jgit } } }




© 2015 - 2025 Weber Informatics LLC | Privacy Policy