isomorphic-git 1.42.4 → 1.42.6

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.
package/README.md CHANGED
@@ -455,6 +455,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
455
455
  <td align="center"><a href="https://github.com/amxmln"><img src="https://avatars.githubusercontent.com/u/15271679?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Amadeus Maximilian</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=amxmln" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Aamxmln" title="Bug reports">🐛</a></td>
456
456
  <td align="center"><a href="http://toxik.us/"><img src="https://avatars.githubusercontent.com/u/235319?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Alexandru Georoceanu</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=toxik" title="Code">💻</a></td>
457
457
  <td align="center"><a href="https://github.com/arisgk"><img src="https://avatars.githubusercontent.com/u/4354335?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Aris Goudouras</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=arisgk" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=arisgk" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=arisgk" title="Tests">⚠️</a> <a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Aarisgk" title="Bug reports">🐛</a></td>
458
+ <td align="center"><a href="https://github.com/TonyWu2333"><img src="https://avatars.githubusercontent.com/u/75903587?v=4?s=60" width="60px;" alt=""/><br /><sub><b>TonyWu</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=TonyWu2333" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=TonyWu2333" title="Tests">⚠️</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=TonyWu2333" title="Documentation">📖</a></td>
458
459
  </tr>
459
460
  </table>
460
461
 
package/index.cjs CHANGED
@@ -507,9 +507,54 @@ class BufferCursor {
507
507
  }
508
508
  }
509
509
 
510
+ // Code units from U+D800 up. Only these can make the two orders differ.
511
+ const NEEDS_CODE_POINT_ORDER = /[\ud800-￿]/;
512
+
513
+ // Is the code unit at index i a surrogate with no partner? Such a unit is not valid Unicode.
514
+ // A high surrogate needs a low one after it. A low surrogate needs a high one before it.
515
+ function isLoneSurrogate(s, i, unit) {
516
+ if (unit < 0xd800 || unit > 0xdfff) return false
517
+ if (unit < 0xdc00) {
518
+ const next = i + 1 < s.length ? s.charCodeAt(i + 1) : 0;
519
+ return next < 0xdc00 || next > 0xdfff
520
+ }
521
+ const prev = i > 0 ? s.charCodeAt(i - 1) : 0;
522
+ return prev < 0xd800 || prev > 0xdbff
523
+ }
524
+
525
+ /**
526
+ * Compare two strings by code point. This gives the same order as the UTF-8 bytes of the
527
+ * strings, and git sorts paths in that order. The `<` operator compares UTF-16 code units,
528
+ * so it puts a character above U+FFFF (a surrogate pair) before the characters from U+E000
529
+ * to U+FFFF. Git puts it after them. A lone surrogate counts as U+FFFD, because the UTF-8
530
+ * encoding of the path writes it that way.
531
+ *
532
+ * @param {string} a
533
+ * @param {string} b
534
+ * @returns {-1 | 0 | 1}
535
+ */
510
536
  function compareStrings(a, b) {
511
- // https://stackoverflow.com/a/40355107/2168416
512
- return -(a < b) || +(a > b)
537
+ if (!NEEDS_CODE_POINT_ORDER.test(a) && !NEEDS_CODE_POINT_ORDER.test(b)) {
538
+ // Both orders are the same, and the `<` operator is the fastest way.
539
+ return -(a < b) || +(a > b)
540
+ }
541
+ const length = Math.min(a.length, b.length);
542
+ for (let i = 0; i < length; i++) {
543
+ let x = a.charCodeAt(i);
544
+ let y = b.charCodeAt(i);
545
+ if (x !== y) {
546
+ if (isLoneSurrogate(a, i, x)) x = 0xfffd;
547
+ if (isLoneSurrogate(b, i, y)) y = 0xfffd;
548
+ if (x === y) continue
549
+ // Move the surrogates (U+D800 to U+DFFF) above U+FFFF, where their code points are.
550
+ if (x >= 0xd800 && y >= 0xd800) {
551
+ x += x >= 0xe000 ? -0x800 : 0x2000;
552
+ y += y >= 0xe000 ? -0x800 : 0x2000;
553
+ }
554
+ return x < y ? -1 : 1
555
+ }
556
+ }
557
+ return a.length < b.length ? -1 : a.length > b.length ? 1 : 0
513
558
  }
514
559
 
515
560
  function comparePath(a, b) {
@@ -3843,6 +3888,23 @@ class CheckoutConflictError extends BaseError {
3843
3888
  /** @type {'CheckoutConflictError'} */
3844
3889
  CheckoutConflictError.code = 'CheckoutConflictError';
3845
3890
 
3891
+ class CherryPickLocalChangesError extends BaseError {
3892
+ /**
3893
+ * @param {string[]} filepaths
3894
+ */
3895
+ constructor(filepaths) {
3896
+ super(
3897
+ `Your local changes to the following files would be overwritten by cherry-pick: ${filepaths.join(
3898
+ ', '
3899
+ )}`
3900
+ );
3901
+ this.code = this.name = CherryPickLocalChangesError.code;
3902
+ this.data = { filepaths };
3903
+ }
3904
+ }
3905
+ /** @type {'CherryPickLocalChangesError'} */
3906
+ CherryPickLocalChangesError.code = 'CherryPickLocalChangesError';
3907
+
3846
3908
  class CherryPickMergeCommitError extends BaseError {
3847
3909
  /**
3848
3910
  * @param {string} oid
@@ -4199,6 +4261,7 @@ var Errors = /*#__PURE__*/Object.freeze({
4199
4261
  AlreadyExistsError: AlreadyExistsError,
4200
4262
  AmbiguousError: AmbiguousError,
4201
4263
  CheckoutConflictError: CheckoutConflictError,
4264
+ CherryPickLocalChangesError: CherryPickLocalChangesError,
4202
4265
  CherryPickMergeCommitError: CherryPickMergeCommitError,
4203
4266
  CherryPickRootCommitError: CherryPickRootCommitError,
4204
4267
  CommitNotFetchedError: CommitNotFetchedError,
@@ -8832,6 +8895,27 @@ async function _cherryPick({
8832
8895
  oid: cherryParentOid,
8833
8896
  });
8834
8897
 
8898
+ // The working tree is rewritten after a successful cherry-pick, and also when
8899
+ // conflicts are written out. Like `git cherry-pick`, refuse to start if that
8900
+ // would overwrite local changes to the files the picked commit touches.
8901
+ // Writing out conflicts rewrites every tracked file, so in that mode any local
8902
+ // change to a tracked file is in the way.
8903
+ if (dir && ((!dryRun && !noUpdateBranch) || !abortOnConflict)) {
8904
+ const filepaths = await findLocalChanges({
8905
+ fs,
8906
+ cache,
8907
+ dir,
8908
+ gitdir,
8909
+ headTree: currentCommit.tree,
8910
+ baseTree: cherryParent.tree,
8911
+ theirTree: cherryCommit.tree,
8912
+ allTracked: !abortOnConflict,
8913
+ });
8914
+ if (filepaths.length > 0) {
8915
+ throw new CherryPickLocalChangesError(filepaths)
8916
+ }
8917
+ }
8918
+
8835
8919
  // Three-way merge
8836
8920
  // - ourOid: current HEAD tree
8837
8921
  // - baseOid: parent of commit being cherry-picked
@@ -8894,11 +8978,96 @@ async function _cherryPick({
8894
8978
  return newOid
8895
8979
  }
8896
8980
 
8981
+ /**
8982
+ * Lists the files changed between `baseTree` and `theirTree` whose index or
8983
+ * working tree copy differs from `headTree`, including untracked files that
8984
+ * would be replaced. With `allTracked`, every file tracked in `headTree` is
8985
+ * checked as well.
8986
+ *
8987
+ * @param {object} args
8988
+ * @param {import('../models/FileSystem.js').FileSystem} args.fs
8989
+ * @param {object} args.cache
8990
+ * @param {string} args.dir
8991
+ * @param {string} args.gitdir
8992
+ * @param {string} args.headTree
8993
+ * @param {string} args.baseTree
8994
+ * @param {string} args.theirTree
8995
+ * @param {boolean} args.allTracked
8996
+ *
8997
+ * @returns {Promise<string[]>}
8998
+ */
8999
+ async function findLocalChanges({
9000
+ fs,
9001
+ cache,
9002
+ dir,
9003
+ gitdir,
9004
+ headTree,
9005
+ baseTree,
9006
+ theirTree,
9007
+ allTracked,
9008
+ }) {
9009
+ /** @type {string[]} */
9010
+ const changed = await _walk({
9011
+ fs,
9012
+ cache,
9013
+ dir,
9014
+ gitdir,
9015
+ trees: [TREE({ ref: baseTree }), TREE({ ref: theirTree })],
9016
+ map: async (filepath, [base, their]) => {
9017
+ if (filepath === '.') return
9018
+ if (base && their && (await base.oid()) === (await their.oid())) {
9019
+ return null
9020
+ }
9021
+ const types = [
9022
+ base ? await base.type() : undefined,
9023
+ their ? await their.type() : undefined,
9024
+ ];
9025
+ if (types.includes('blob')) return filepath
9026
+ },
9027
+ });
9028
+ if (changed.length === 0 && !allTracked) return []
9029
+
9030
+ return _walk({
9031
+ fs,
9032
+ cache,
9033
+ dir,
9034
+ gitdir,
9035
+ trees: [TREE({ ref: headTree }), STAGE(), WORKDIR()],
9036
+ map: async (filepath, [head, stage, workdir]) => {
9037
+ if (filepath === '.') return
9038
+ if (!allTracked && !changed.some(path => worthWalking(filepath, path))) {
9039
+ return null
9040
+ }
9041
+ const headOid =
9042
+ head && (await head.type()) === 'blob' ? await head.oid() : undefined;
9043
+ if (!changed.includes(filepath) && !(allTracked && headOid)) return
9044
+
9045
+ const stageOid = stage ? await stage.oid() : undefined;
9046
+ // Staged changes would be replaced by the cherry-picked version.
9047
+ if (stageOid !== headOid) return filepath
9048
+ // A file missing from the working tree has nothing to lose.
9049
+ if (!workdir) return
9050
+ // Untracked files, directories in the way, and unstaged edits.
9051
+ if (
9052
+ !headOid ||
9053
+ (await workdir.type()) !== 'blob' ||
9054
+ (await workdir.oid()) !== headOid
9055
+ ) {
9056
+ return filepath
9057
+ }
9058
+ },
9059
+ })
9060
+ }
9061
+
8897
9062
  // @ts-check
8898
9063
 
8899
9064
  /**
8900
9065
  * Cherry-pick a commit onto the current branch
8901
9066
  *
9067
+ * Like `git cherry-pick`, this refuses to run when it would overwrite local changes in the working tree.
9068
+ * If a file the picked commit changes has staged or unstaged changes, or an untracked file is in the way,
9069
+ * a `CherryPickLocalChangesError` listing those files is thrown before anything is written.
9070
+ *
8902
9071
  * @param {object} args
8903
9072
  * @param {FsClient} args.fs - a file system implementation
8904
9073
  * @param {string} [args.dir] - The [working tree](dir-vs-gitdir.md) directory path
@@ -9806,8 +9975,8 @@ function filterCapabilities(server, client) {
9806
9975
 
9807
9976
  const pkg = {
9808
9977
  name: 'isomorphic-git',
9809
- version: '1.42.4',
9810
- agent: 'git/isomorphic-git@1.42.4',
9978
+ version: '1.42.6',
9979
+ agent: 'git/isomorphic-git@1.42.6',
9811
9980
  };
9812
9981
 
9813
9982
  class FIFO {
package/index.d.cts CHANGED
@@ -638,6 +638,7 @@ export var Errors: Readonly<{
638
638
  AlreadyExistsError: typeof AlreadyExistsError;
639
639
  AmbiguousError: typeof AmbiguousError;
640
640
  CheckoutConflictError: typeof CheckoutConflictError;
641
+ CherryPickLocalChangesError: typeof CherryPickLocalChangesError;
641
642
  CherryPickMergeCommitError: typeof CherryPickMergeCommitError;
642
643
  CherryPickRootCommitError: typeof CherryPickRootCommitError;
643
644
  CommitNotFetchedError: typeof CommitNotFetchedError;
@@ -996,6 +997,10 @@ export function checkout({ fs, onProgress, onPostCheckout, dir, gitdir, remote,
996
997
  /**
997
998
  * Cherry-pick a commit onto the current branch
998
999
  *
1000
+ * Like `git cherry-pick`, this refuses to run when it would overwrite local changes in the working tree.
1001
+ * If a file the picked commit changes has staged or unstaged changes, or an untracked file is in the way,
1002
+ * a `CherryPickLocalChangesError` listing those files is thrown before anything is written.
1003
+ *
999
1004
  * @param {object} args
1000
1005
  * @param {FsClient} args.fs - a file system implementation
1001
1006
  * @param {string} [args.dir] - The [working tree](dir-vs-gitdir.md) directory path
@@ -3984,6 +3989,21 @@ declare namespace CheckoutConflictError {
3984
3989
  let code_2: "CheckoutConflictError";
3985
3990
  export { code_2 as code };
3986
3991
  }
3992
+ declare class CherryPickLocalChangesError extends BaseError {
3993
+ /**
3994
+ * @param {string[]} filepaths
3995
+ */
3996
+ constructor(filepaths: string[]);
3997
+ code: "CherryPickLocalChangesError";
3998
+ name: "CherryPickLocalChangesError";
3999
+ data: {
4000
+ filepaths: string[];
4001
+ };
4002
+ }
4003
+ declare namespace CherryPickLocalChangesError {
4004
+ let code_3: "CherryPickLocalChangesError";
4005
+ export { code_3 as code };
4006
+ }
3987
4007
  declare class CherryPickMergeCommitError extends BaseError {
3988
4008
  /**
3989
4009
  * @param {string} oid
@@ -3998,8 +4018,8 @@ declare class CherryPickMergeCommitError extends BaseError {
3998
4018
  };
3999
4019
  }
4000
4020
  declare namespace CherryPickMergeCommitError {
4001
- let code_3: "CherryPickMergeCommitError";
4002
- export { code_3 as code };
4021
+ let code_4: "CherryPickMergeCommitError";
4022
+ export { code_4 as code };
4003
4023
  }
4004
4024
  declare class CherryPickRootCommitError extends BaseError {
4005
4025
  /**
@@ -4013,8 +4033,8 @@ declare class CherryPickRootCommitError extends BaseError {
4013
4033
  };
4014
4034
  }
4015
4035
  declare namespace CherryPickRootCommitError {
4016
- let code_4: "CherryPickRootCommitError";
4017
- export { code_4 as code };
4036
+ let code_5: "CherryPickRootCommitError";
4037
+ export { code_5 as code };
4018
4038
  }
4019
4039
  declare class CommitNotFetchedError extends BaseError {
4020
4040
  /**
@@ -4030,8 +4050,8 @@ declare class CommitNotFetchedError extends BaseError {
4030
4050
  };
4031
4051
  }
4032
4052
  declare namespace CommitNotFetchedError {
4033
- let code_5: "CommitNotFetchedError";
4034
- export { code_5 as code };
4053
+ let code_6: "CommitNotFetchedError";
4054
+ export { code_6 as code };
4035
4055
  }
4036
4056
  declare class EmptyCommitError extends BaseError {
4037
4057
  constructor();
@@ -4040,8 +4060,8 @@ declare class EmptyCommitError extends BaseError {
4040
4060
  data: {};
4041
4061
  }
4042
4062
  declare namespace EmptyCommitError {
4043
- let code_6: "EmptyCommitError";
4044
- export { code_6 as code };
4063
+ let code_7: "EmptyCommitError";
4064
+ export { code_7 as code };
4045
4065
  }
4046
4066
  declare class EmptyServerResponseError extends BaseError {
4047
4067
  constructor();
@@ -4050,8 +4070,8 @@ declare class EmptyServerResponseError extends BaseError {
4050
4070
  data: {};
4051
4071
  }
4052
4072
  declare namespace EmptyServerResponseError {
4053
- let code_7: "EmptyServerResponseError";
4054
- export { code_7 as code };
4073
+ let code_8: "EmptyServerResponseError";
4074
+ export { code_8 as code };
4055
4075
  }
4056
4076
  declare class FastForwardError extends BaseError {
4057
4077
  constructor();
@@ -4060,8 +4080,8 @@ declare class FastForwardError extends BaseError {
4060
4080
  data: {};
4061
4081
  }
4062
4082
  declare namespace FastForwardError {
4063
- let code_8: "FastForwardError";
4064
- export { code_8 as code };
4083
+ let code_9: "FastForwardError";
4084
+ export { code_9 as code };
4065
4085
  }
4066
4086
  declare class GitPushError extends BaseError {
4067
4087
  /**
@@ -4077,8 +4097,8 @@ declare class GitPushError extends BaseError {
4077
4097
  };
4078
4098
  }
4079
4099
  declare namespace GitPushError {
4080
- let code_9: "GitPushError";
4081
- export { code_9 as code };
4100
+ let code_10: "GitPushError";
4101
+ export { code_10 as code };
4082
4102
  }
4083
4103
  declare class HttpError extends BaseError {
4084
4104
  /**
@@ -4096,8 +4116,8 @@ declare class HttpError extends BaseError {
4096
4116
  };
4097
4117
  }
4098
4118
  declare namespace HttpError {
4099
- let code_10: "HttpError";
4100
- export { code_10 as code };
4119
+ let code_11: "HttpError";
4120
+ export { code_11 as code };
4101
4121
  }
4102
4122
  declare class InternalError extends BaseError {
4103
4123
  /**
@@ -4111,8 +4131,8 @@ declare class InternalError extends BaseError {
4111
4131
  };
4112
4132
  }
4113
4133
  declare namespace InternalError {
4114
- let code_11: "InternalError";
4115
- export { code_11 as code };
4134
+ let code_12: "InternalError";
4135
+ export { code_12 as code };
4116
4136
  }
4117
4137
  declare class InvalidFilepathError extends BaseError {
4118
4138
  /**
@@ -4126,8 +4146,8 @@ declare class InvalidFilepathError extends BaseError {
4126
4146
  };
4127
4147
  }
4128
4148
  declare namespace InvalidFilepathError {
4129
- let code_12: "InvalidFilepathError";
4130
- export { code_12 as code };
4149
+ let code_13: "InvalidFilepathError";
4150
+ export { code_13 as code };
4131
4151
  }
4132
4152
  declare class InvalidOidError extends BaseError {
4133
4153
  /**
@@ -4141,8 +4161,8 @@ declare class InvalidOidError extends BaseError {
4141
4161
  };
4142
4162
  }
4143
4163
  declare namespace InvalidOidError {
4144
- let code_13: "InvalidOidError";
4145
- export { code_13 as code };
4164
+ let code_14: "InvalidOidError";
4165
+ export { code_14 as code };
4146
4166
  }
4147
4167
  declare class InvalidRefNameError extends BaseError {
4148
4168
  /**
@@ -4159,8 +4179,8 @@ declare class InvalidRefNameError extends BaseError {
4159
4179
  };
4160
4180
  }
4161
4181
  declare namespace InvalidRefNameError {
4162
- let code_14: "InvalidRefNameError";
4163
- export { code_14 as code };
4182
+ let code_15: "InvalidRefNameError";
4183
+ export { code_15 as code };
4164
4184
  }
4165
4185
  declare class MaxDepthError extends BaseError {
4166
4186
  /**
@@ -4174,8 +4194,8 @@ declare class MaxDepthError extends BaseError {
4174
4194
  };
4175
4195
  }
4176
4196
  declare namespace MaxDepthError {
4177
- let code_15: "MaxDepthError";
4178
- export { code_15 as code };
4197
+ let code_16: "MaxDepthError";
4198
+ export { code_16 as code };
4179
4199
  }
4180
4200
  declare class MergeNotSupportedError extends BaseError {
4181
4201
  constructor();
@@ -4184,8 +4204,8 @@ declare class MergeNotSupportedError extends BaseError {
4184
4204
  data: {};
4185
4205
  }
4186
4206
  declare namespace MergeNotSupportedError {
4187
- let code_16: "MergeNotSupportedError";
4188
- export { code_16 as code };
4207
+ let code_17: "MergeNotSupportedError";
4208
+ export { code_17 as code };
4189
4209
  }
4190
4210
  declare class MergeConflictError extends BaseError {
4191
4211
  /**
@@ -4205,8 +4225,8 @@ declare class MergeConflictError extends BaseError {
4205
4225
  };
4206
4226
  }
4207
4227
  declare namespace MergeConflictError {
4208
- let code_17: "MergeConflictError";
4209
- export { code_17 as code };
4228
+ let code_18: "MergeConflictError";
4229
+ export { code_18 as code };
4210
4230
  }
4211
4231
  declare class MissingNameError extends BaseError {
4212
4232
  /**
@@ -4220,8 +4240,8 @@ declare class MissingNameError extends BaseError {
4220
4240
  };
4221
4241
  }
4222
4242
  declare namespace MissingNameError {
4223
- let code_18: "MissingNameError";
4224
- export { code_18 as code };
4243
+ let code_19: "MissingNameError";
4244
+ export { code_19 as code };
4225
4245
  }
4226
4246
  declare class MissingParameterError extends BaseError {
4227
4247
  /**
@@ -4235,8 +4255,8 @@ declare class MissingParameterError extends BaseError {
4235
4255
  };
4236
4256
  }
4237
4257
  declare namespace MissingParameterError {
4238
- let code_19: "MissingParameterError";
4239
- export { code_19 as code };
4258
+ let code_20: "MissingParameterError";
4259
+ export { code_20 as code };
4240
4260
  }
4241
4261
  declare class MultipleGitError extends BaseError {
4242
4262
  /**
@@ -4252,8 +4272,8 @@ declare class MultipleGitError extends BaseError {
4252
4272
  errors: Error[];
4253
4273
  }
4254
4274
  declare namespace MultipleGitError {
4255
- let code_20: "MultipleGitError";
4256
- export { code_20 as code };
4275
+ let code_21: "MultipleGitError";
4276
+ export { code_21 as code };
4257
4277
  }
4258
4278
  declare class NoRefspecError extends BaseError {
4259
4279
  /**
@@ -4267,8 +4287,8 @@ declare class NoRefspecError extends BaseError {
4267
4287
  };
4268
4288
  }
4269
4289
  declare namespace NoRefspecError {
4270
- let code_21: "NoRefspecError";
4271
- export { code_21 as code };
4290
+ let code_22: "NoRefspecError";
4291
+ export { code_22 as code };
4272
4292
  }
4273
4293
  declare class NotFoundError extends BaseError {
4274
4294
  /**
@@ -4282,8 +4302,8 @@ declare class NotFoundError extends BaseError {
4282
4302
  };
4283
4303
  }
4284
4304
  declare namespace NotFoundError {
4285
- let code_22: "NotFoundError";
4286
- export { code_22 as code };
4305
+ let code_23: "NotFoundError";
4306
+ export { code_23 as code };
4287
4307
  }
4288
4308
  declare class ObjectTypeError extends BaseError {
4289
4309
  /**
@@ -4303,8 +4323,8 @@ declare class ObjectTypeError extends BaseError {
4303
4323
  };
4304
4324
  }
4305
4325
  declare namespace ObjectTypeError {
4306
- let code_23: "ObjectTypeError";
4307
- export { code_23 as code };
4326
+ let code_24: "ObjectTypeError";
4327
+ export { code_24 as code };
4308
4328
  }
4309
4329
  declare class ParseError extends BaseError {
4310
4330
  /**
@@ -4320,8 +4340,8 @@ declare class ParseError extends BaseError {
4320
4340
  };
4321
4341
  }
4322
4342
  declare namespace ParseError {
4323
- let code_24: "ParseError";
4324
- export { code_24 as code };
4343
+ let code_25: "ParseError";
4344
+ export { code_25 as code };
4325
4345
  }
4326
4346
  declare class PushRejectedError extends BaseError {
4327
4347
  /**
@@ -4335,8 +4355,8 @@ declare class PushRejectedError extends BaseError {
4335
4355
  };
4336
4356
  }
4337
4357
  declare namespace PushRejectedError {
4338
- let code_25: "PushRejectedError";
4339
- export { code_25 as code };
4358
+ let code_26: "PushRejectedError";
4359
+ export { code_26 as code };
4340
4360
  }
4341
4361
  declare class RemoteCapabilityError extends BaseError {
4342
4362
  /**
@@ -4352,8 +4372,8 @@ declare class RemoteCapabilityError extends BaseError {
4352
4372
  };
4353
4373
  }
4354
4374
  declare namespace RemoteCapabilityError {
4355
- let code_26: "RemoteCapabilityError";
4356
- export { code_26 as code };
4375
+ let code_27: "RemoteCapabilityError";
4376
+ export { code_27 as code };
4357
4377
  }
4358
4378
  declare class SmartHttpError extends BaseError {
4359
4379
  /**
@@ -4369,8 +4389,8 @@ declare class SmartHttpError extends BaseError {
4369
4389
  };
4370
4390
  }
4371
4391
  declare namespace SmartHttpError {
4372
- let code_27: "SmartHttpError";
4373
- export { code_27 as code };
4392
+ let code_28: "SmartHttpError";
4393
+ export { code_28 as code };
4374
4394
  }
4375
4395
  declare class UnknownTransportError extends BaseError {
4376
4396
  /**
@@ -4388,8 +4408,8 @@ declare class UnknownTransportError extends BaseError {
4388
4408
  };
4389
4409
  }
4390
4410
  declare namespace UnknownTransportError {
4391
- let code_28: "UnknownTransportError";
4392
- export { code_28 as code };
4411
+ let code_29: "UnknownTransportError";
4412
+ export { code_29 as code };
4393
4413
  }
4394
4414
  declare class UnsafeFilepathError extends BaseError {
4395
4415
  /**
@@ -4403,8 +4423,8 @@ declare class UnsafeFilepathError extends BaseError {
4403
4423
  };
4404
4424
  }
4405
4425
  declare namespace UnsafeFilepathError {
4406
- let code_29: "UnsafeFilepathError";
4407
- export { code_29 as code };
4426
+ let code_30: "UnsafeFilepathError";
4427
+ export { code_30 as code };
4408
4428
  }
4409
4429
  declare class UrlParseError extends BaseError {
4410
4430
  /**
@@ -4418,8 +4438,8 @@ declare class UrlParseError extends BaseError {
4418
4438
  };
4419
4439
  }
4420
4440
  declare namespace UrlParseError {
4421
- let code_30: "UrlParseError";
4422
- export { code_30 as code };
4441
+ let code_31: "UrlParseError";
4442
+ export { code_31 as code };
4423
4443
  }
4424
4444
  declare class UserCanceledError extends BaseError {
4425
4445
  constructor();
@@ -4428,8 +4448,8 @@ declare class UserCanceledError extends BaseError {
4428
4448
  data: {};
4429
4449
  }
4430
4450
  declare namespace UserCanceledError {
4431
- let code_31: "UserCanceledError";
4432
- export { code_31 as code };
4451
+ let code_32: "UserCanceledError";
4452
+ export { code_32 as code };
4433
4453
  }
4434
4454
  declare class UnmergedPathsError extends BaseError {
4435
4455
  /**
@@ -4443,8 +4463,8 @@ declare class UnmergedPathsError extends BaseError {
4443
4463
  };
4444
4464
  }
4445
4465
  declare namespace UnmergedPathsError {
4446
- let code_32: "UnmergedPathsError";
4447
- export { code_32 as code };
4466
+ let code_33: "UnmergedPathsError";
4467
+ export { code_33 as code };
4448
4468
  }
4449
4469
  declare class IndexResetError extends BaseError {
4450
4470
  /**
@@ -4458,8 +4478,8 @@ declare class IndexResetError extends BaseError {
4458
4478
  };
4459
4479
  }
4460
4480
  declare namespace IndexResetError {
4461
- let code_33: "IndexResetError";
4462
- export { code_33 as code };
4481
+ let code_34: "IndexResetError";
4482
+ export { code_34 as code };
4463
4483
  }
4464
4484
  declare class NoCommitError extends BaseError {
4465
4485
  /**
@@ -4473,8 +4493,8 @@ declare class NoCommitError extends BaseError {
4473
4493
  };
4474
4494
  }
4475
4495
  declare namespace NoCommitError {
4476
- let code_34: "NoCommitError";
4477
- export { code_34 as code };
4496
+ let code_35: "NoCommitError";
4497
+ export { code_35 as code };
4478
4498
  }
4479
4499
  /**
4480
4500
  * @typedef {Object} GitProgressEvent