dugite 1.103.0 → 1.106.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -118,7 +118,7 @@ exports.GitErrorRegexes = {
118
118
  'error: GH006: Protected branch update failed for (.+).\nremote: error: Required status check "(.+)" is expected': GitError.ProtectedBranchRequiredStatus,
119
119
  'error: GH007: Your push would publish a private email address.': GitError.PushWithPrivateEmail,
120
120
  'error: could not lock config file (.+): File exists': GitError.ConfigLockFileAlreadyExists,
121
- 'fatal: remote (.+) already exists.': GitError.RemoteAlreadyExists,
121
+ 'error: remote (.+) already exists.': GitError.RemoteAlreadyExists,
122
122
  "fatal: tag '(.+)' already exists": GitError.TagAlreadyExists,
123
123
  'error: Your local changes to the following files would be overwritten by merge:\n': GitError.MergeWithLocalChanges,
124
124
  'error: cannot (pull with rebase|rebase): You have unstaged changes\\.\n\\s*error: [Pp]lease commit or stash them\\.': GitError.RebaseWithLocalChanges,
@@ -82,6 +82,35 @@ export declare class GitProcess {
82
82
  * information.
83
83
  */
84
84
  static exec(args: string[], path: string, options?: IGitExecutionOptions): Promise<IGitResult>;
85
+ /**
86
+ * Execute a command and read the output using the embedded Git environment.
87
+ *
88
+ * The returned GitTask will will contain `result`, `setPid`, `cancel`
89
+ * `result` will be a promise, which will reject when the git
90
+ * executable fails to launch, in which case the thrown Error will
91
+ * have a string `code` property. See `errors.ts` for some of the
92
+ * known error codes.
93
+ * See the result's `stderr` and `exitCode` for any potential git error
94
+ * information.
95
+ *
96
+ * As for, `setPid(pid)`, this is to set the PID
97
+ *
98
+ * And `cancel()` will try to cancel the git process
99
+ */
100
+ static execTask(args: string[], path: string, options?: IGitExecutionOptions): IGitTask;
85
101
  /** Try to parse an error type from stderr. */
86
102
  static parseError(stderr: string): GitError | null;
87
103
  }
104
+ export declare enum GitTaskCancelResult {
105
+ successfulCancel = 0,
106
+ processAlreadyEnded = 1,
107
+ noProcessIdDefined = 2,
108
+ failedToCancel = 3
109
+ }
110
+ /** This interface represents a git task (process). */
111
+ export interface IGitTask {
112
+ /** Result of the git process. */
113
+ readonly result: Promise<IGitResult>;
114
+ /** Allows to cancel the process if it's running. Returns true if the process was killed. */
115
+ readonly cancel: () => Promise<GitTaskCancelResult>;
116
+ }
@@ -1,6 +1,15 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
2
10
  Object.defineProperty(exports, "__esModule", { value: true });
3
11
  const fs = require("fs");
12
+ const process_1 = require("process");
4
13
  const child_process_1 = require("child_process");
5
14
  const errors_1 = require("./errors");
6
15
  const git_environment_1 = require("./git-environment");
@@ -46,7 +55,29 @@ class GitProcess {
46
55
  * information.
47
56
  */
48
57
  static exec(args, path, options) {
49
- return new Promise(function (resolve, reject) {
58
+ return this.execTask(args, path, options).result;
59
+ }
60
+ /**
61
+ * Execute a command and read the output using the embedded Git environment.
62
+ *
63
+ * The returned GitTask will will contain `result`, `setPid`, `cancel`
64
+ * `result` will be a promise, which will reject when the git
65
+ * executable fails to launch, in which case the thrown Error will
66
+ * have a string `code` property. See `errors.ts` for some of the
67
+ * known error codes.
68
+ * See the result's `stderr` and `exitCode` for any potential git error
69
+ * information.
70
+ *
71
+ * As for, `setPid(pid)`, this is to set the PID
72
+ *
73
+ * And `cancel()` will try to cancel the git process
74
+ */
75
+ static execTask(args, path, options) {
76
+ let pidResolve;
77
+ const pidPromise = new Promise(function (resolve) {
78
+ pidResolve = resolve;
79
+ });
80
+ let result = new GitTask(new Promise(function (resolve, reject) {
50
81
  let customEnv = {};
51
82
  if (options && options.env) {
52
83
  customEnv = options.env;
@@ -64,6 +95,7 @@ class GitProcess {
64
95
  env
65
96
  };
66
97
  const spawnedProcess = child_process_1.execFile(gitLocation, args, execOptions, function (err, stdout, stderr) {
98
+ result.updateProcessEnded();
67
99
  if (!err) {
68
100
  resolve({ stdout, stderr, exitCode: 0 });
69
101
  return;
@@ -108,6 +140,7 @@ class GitProcess {
108
140
  reject(err);
109
141
  }
110
142
  });
143
+ pidResolve(spawnedProcess.pid);
111
144
  ignoreClosedInputStream(spawnedProcess);
112
145
  if (options && options.stdin !== undefined) {
113
146
  // See https://github.com/nodejs/node/blob/7b5ffa46fe4d2868c1662694da06eb55ec744bde/test/parallel/test-stdin-pipe-large.js
@@ -116,7 +149,8 @@ class GitProcess {
116
149
  if (options && options.processCallback) {
117
150
  options.processCallback(spawnedProcess);
118
151
  }
119
- });
152
+ }), pidPromise);
153
+ return result;
120
154
  }
121
155
  /** Try to parse an error type from stderr. */
122
156
  static parseError(stderr) {
@@ -189,4 +223,38 @@ function ignoreClosedInputStream(process) {
189
223
  }
190
224
  });
191
225
  }
226
+ var GitTaskCancelResult;
227
+ (function (GitTaskCancelResult) {
228
+ GitTaskCancelResult[GitTaskCancelResult["successfulCancel"] = 0] = "successfulCancel";
229
+ GitTaskCancelResult[GitTaskCancelResult["processAlreadyEnded"] = 1] = "processAlreadyEnded";
230
+ GitTaskCancelResult[GitTaskCancelResult["noProcessIdDefined"] = 2] = "noProcessIdDefined";
231
+ GitTaskCancelResult[GitTaskCancelResult["failedToCancel"] = 3] = "failedToCancel";
232
+ })(GitTaskCancelResult = exports.GitTaskCancelResult || (exports.GitTaskCancelResult = {}));
233
+ class GitTask {
234
+ constructor(result, pid) {
235
+ this.result = result;
236
+ this.pid = pid;
237
+ this.processEnded = false;
238
+ }
239
+ updateProcessEnded() {
240
+ this.processEnded = true;
241
+ }
242
+ cancel() {
243
+ return __awaiter(this, void 0, void 0, function* () {
244
+ if (this.processEnded) {
245
+ return GitTaskCancelResult.processAlreadyEnded;
246
+ }
247
+ const pid = yield this.pid;
248
+ if (pid === undefined) {
249
+ return GitTaskCancelResult.noProcessIdDefined;
250
+ }
251
+ try {
252
+ process_1.kill(pid);
253
+ return GitTaskCancelResult.successfulCancel;
254
+ }
255
+ catch (e) { }
256
+ return GitTaskCancelResult.failedToCancel;
257
+ });
258
+ }
259
+ }
192
260
  //# sourceMappingURL=git-process.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"git-process.js","sourceRoot":"","sources":["../../lib/git-process.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git-process.js","sourceRoot":"","sources":["../../lib/git-process.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
- export { GitProcess, IGitResult, IGitExecutionOptions } from './git-process';
1
+ export { GitProcess, IGitResult, IGitExecutionOptions, IGitTask, GitTaskCancelResult } from './git-process';
2
2
  export { GitError, RepositoryDoesNotExistErrorCode, GitNotFoundErrorCode } from './errors';
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  var git_process_1 = require("./git-process");
4
4
  exports.GitProcess = git_process_1.GitProcess;
5
+ exports.GitTaskCancelResult = git_process_1.GitTaskCancelResult;
5
6
  var errors_1 = require("./errors");
6
7
  exports.GitError = errors_1.GitError;
7
8
  exports.RepositoryDoesNotExistErrorCode = errors_1.RepositoryDoesNotExistErrorCode;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;AAAA,6CAA4E;AAAnE,mCAAA,UAAU,CAAA;AACnB,mCAA0F;AAAjF,4BAAA,QAAQ,CAAA;AAAE,mDAAA,+BAA+B,CAAA;AAAE,wCAAA,oBAAoB,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;AAAA,6CAMsB;AALpB,mCAAA,UAAU,CAAA;AAIV,4CAAA,mBAAmB,CAAA;AAErB,mCAA0F;AAAjF,4BAAA,QAAQ,CAAA;AAAE,mDAAA,+BAA+B,CAAA;AAAE,wCAAA,oBAAoB,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dugite",
3
- "version": "1.103.0",
3
+ "version": "1.106.0",
4
4
  "description": "Elegant bindings for Git",
5
5
  "main": "./build/lib/index.js",
6
6
  "typings": "./build/lib/index.d.ts",
@@ -1,27 +1,27 @@
1
1
  {
2
2
  "win32-x64": {
3
- "name": "dugite-native-v2.29.3-3d467be-windows-x64.tar.gz",
4
- "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-windows-x64.tar.gz",
5
- "checksum": "8ea2d0d3c9d9e4615069913207371ffe892dc10fb93975972f2f6e668f2e3b3a"
3
+ "name": "dugite-native-v2.35.2-a4271c2-windows-x64.tar.gz",
4
+ "url": "https://github.com/desktop/dugite-native/releases/download/v2.35.2/dugite-native-v2.35.2-a4271c2-windows-x64.tar.gz",
5
+ "checksum": "f3be1e4bde1e68af5577f5049d88a123aac2edd612ecccaddcb644eb23ef5db3"
6
6
  },
7
7
  "win32-ia32": {
8
- "name": "dugite-native-v2.29.3-3d467be-windows-x86.tar.gz",
9
- "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-windows-x86.tar.gz",
10
- "checksum": "d3ed6c82be7302fa7ed7e378ba902afc49b9a3c157cc6816ad4c80da26675c8d"
8
+ "name": "dugite-native-v2.35.2-a4271c2-windows-x86.tar.gz",
9
+ "url": "https://github.com/desktop/dugite-native/releases/download/v2.35.2/dugite-native-v2.35.2-a4271c2-windows-x86.tar.gz",
10
+ "checksum": "670900bda1b1646ceb30377dfc4649ec9110affee2a7e6f5a54d9fa274c201ad"
11
11
  },
12
12
  "darwin-x64": {
13
- "name": "dugite-native-v2.29.3-3d467be-macOS-x64.tar.gz",
14
- "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-macOS-x64.tar.gz",
15
- "checksum": "726bf34cf449de7b74d2fa45f05ed76df650a4cd23e44ab80c92e3b939832fe2"
13
+ "name": "dugite-native-v2.35.2-a4271c2-macOS-x64.tar.gz",
14
+ "url": "https://github.com/desktop/dugite-native/releases/download/v2.35.2/dugite-native-v2.35.2-a4271c2-macOS-x64.tar.gz",
15
+ "checksum": "609b5f62eac5d0b6bba39b5c6608d08a51e99f0c27764e08735ee02782393362"
16
16
  },
17
17
  "darwin-arm64": {
18
- "name": "dugite-native-v2.29.3-3d467be-macOS-arm64.tar.gz",
19
- "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-macOS-arm64.tar.gz",
20
- "checksum": "b04a63b0fdd6d492c2498b8dc5d6b47f8826702f582614f2e9221d8f16d23e11"
18
+ "name": "dugite-native-v2.35.2-a4271c2-macOS-arm64.tar.gz",
19
+ "url": "https://github.com/desktop/dugite-native/releases/download/v2.35.2/dugite-native-v2.35.2-a4271c2-macOS-arm64.tar.gz",
20
+ "checksum": "1d9d122944a8b1285fe43b05b2bf2a40b18e9d75ff678eda3881589395d752fd"
21
21
  },
22
22
  "linux-x64": {
23
- "name": "dugite-native-v2.29.3-3d467be-ubuntu.tar.gz",
24
- "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-ubuntu.tar.gz",
25
- "checksum": "288d3b64dd9c7ecd73e289bf622ce226dc7b832f1b42cddecc039d0d3fd16b32"
23
+ "name": "dugite-native-v2.35.2-a4271c2-ubuntu.tar.gz",
24
+ "url": "https://github.com/desktop/dugite-native/releases/download/v2.35.2/dugite-native-v2.35.2-a4271c2-ubuntu.tar.gz",
25
+ "checksum": "20c49eee8d8746455f30a001abdf8655f26fe5037b672b3ba59df802ff83599c"
26
26
  }
27
27
  }