simple-git
Advanced tools
Comparing version 3.0.3 to 3.0.4
# Changelog | ||
### [3.0.4](https://www.github.com/steveukx/git-js/compare/repo-v3.0.3...repo-v3.0.4) (2022-01-23) | ||
### Bug Fixes | ||
* support parsing empty responses ([91eb7fb](https://www.github.com/steveukx/git-js/commit/91eb7fb01fe466468537621cb94b9f932026506e)), closes [#713](https://www.github.com/steveukx/git-js/issues/713) | ||
### [3.0.3](https://www.github.com/steveukx/git-js/compare/repo-v3.0.2...repo-v3.0.3) (2022-01-20) | ||
@@ -4,0 +11,0 @@ |
@@ -5,3 +5,3 @@ { | ||
"private": false, | ||
"version": "3.0.3", | ||
"version": "3.0.4", | ||
"author": "Steve King <steve@mydev.co>", | ||
@@ -8,0 +8,0 @@ "contributors": [ |
import { PullDetail, PullResult } from '../../../typings'; | ||
import { PullFailedSummary } from '../responses/PullSummary'; | ||
import { TaskParser } from '../types'; | ||
export declare const parsePullDetail: TaskParser<string, PullDetail>; | ||
export declare const parsePullResult: TaskParser<string, PullResult>; | ||
export declare function parsePullErrorResult(stdOut: string, stdErr: string): "" | PullFailedSummary; |
@@ -1,2 +0,2 @@ | ||
import { PullDetailFileChanges, PullDetailSummary, PullResult } from '../../../typings'; | ||
import { PullDetailFileChanges, PullDetailSummary, PullFailedResult, PullResult } from '../../../typings'; | ||
export declare class PullSummary implements PullResult { | ||
@@ -13,1 +13,14 @@ remoteMessages: { | ||
} | ||
export declare class PullFailedSummary implements PullFailedResult { | ||
remote: string; | ||
hash: { | ||
local: string; | ||
remote: string; | ||
}; | ||
branch: { | ||
local: string; | ||
remote: string; | ||
}; | ||
message: string; | ||
toString(): string; | ||
} |
@@ -21,3 +21,3 @@ /// <reference types="node" /> | ||
export declare function last<T>(input: T, offset?: number): Maybe<unknown>; | ||
export declare function toLinesWithContent(input: string, trimmed?: boolean, separator?: string): string[]; | ||
export declare function toLinesWithContent(input?: string, trimmed?: boolean, separator?: string): string[]; | ||
declare type LineWithContentCallback<T = void> = (line: string) => T; | ||
@@ -24,0 +24,0 @@ export declare function forEachLineWithContent<T>(input: string, callback: LineWithContentCallback<T>): T[]; |
@@ -260,2 +260,19 @@ import { DefaultLogFields } from '../src/lib/tasks/log'; | ||
/** | ||
* Wrapped with the `GitResponseError` as the exception thrown from a `git.pull` task | ||
* to provide additional detail as to what failed. | ||
*/ | ||
export interface PullFailedResult { | ||
remote: string, | ||
hash: { | ||
local: string; | ||
remote: string; | ||
}, | ||
branch: { | ||
local: string; | ||
remote: string; | ||
}, | ||
message: string; | ||
} | ||
/** | ||
* Represents file name changes in a StatusResult | ||
@@ -262,0 +279,0 @@ */ |
@@ -445,3 +445,4 @@ import * as resp from './response'; | ||
/** | ||
* Fetch from and integrate with another repository or a local branch. | ||
* Fetch from and integrate with another repository or a local branch. In the case that the `git pull` fails with a | ||
* recognised fatal error, the exception thrown by this function will be a `GitResponseError<PullFailedResult>`. | ||
*/ | ||
@@ -448,0 +449,0 @@ pull(remote?: string, branch?: string, options?: types.TaskOptions, callback?: types.SimpleGitTaskCallback<resp.PullResult>): Response<resp.PullResult>; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
795188
9483