Documented Cherrypick

This commit is contained in:
Dolan
2017-06-08 02:41:41 +01:00
parent 79e1866c4d
commit 9dd615be31
2 changed files with 58 additions and 0 deletions
+24
View File
@@ -2,8 +2,32 @@ import { MergeOptions } from './merge-options';
import { CheckoutOptions } from './checkout-options';
export interface CherrypickOptions {
/**
*
*
* @type {number}
* @memberof CherrypickOptions
*/
version: number;
/**
*
*
* @type {number}
* @memberof CherrypickOptions
*/
mainline: number;
/**
*
*
* @type {MergeOptions}
* @memberof CherrypickOptions
*/
mergeOpts: MergeOptions;
/**
*
*
* @type {CheckoutOptions}
* @memberof CherrypickOptions
*/
checkoutOpts: CheckoutOptions;
}
+34
View File
@@ -4,7 +4,41 @@ import { MergeOptions } from './merge-options';
import { CherrypickOptions } from './cherry-pick-options';
export class Cherrypick {
/**
* Cherrypick a commit and, changing the index and working directory
*
* @static
* @param {Repository} repo
* @param {Commit} commit
* @param {CherrypickOptions} [options]
* @returns {Promise<number>}
*
* @memberof Cherrypick
*/
static cherrypick(repo: Repository, commit: Commit, options?: CherrypickOptions): Promise<number>;
/**
* Cherrypicks the given commit against "our" commit, producing an index that reflects the result of the cherrypick. The index is not backed by a repo.
*
* @static
* @param {Repository} repo
* @param {Commit} cherrypickCommit
* @param {Commit} ourCommit
* @param {number} mainline
* @param {MergeOptions} [mergeOptions]
* @returns {Promise<number>}
*
* @memberof Cherrypick
*/
static commit(repo: Repository, cherrypickCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions?: MergeOptions): Promise<number>;
/**
*
*
* @static
* @param {CherrypickOptions} opts
* @param {number} version
* @returns {number}
*
* @memberof Cherrypick
*/
static initOptions(opts: CherrypickOptions, version: number): number;
}