dugite 1.91.0 → 1.92.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.
- package/build/lib/errors.d.ts +4 -54
- package/build/lib/errors.js +8 -3
- package/build/lib/errors.js.map +1 -1
- package/build/lib/git-process.js +1 -2
- package/build/lib/git-process.js.map +1 -1
- package/package.json +1 -1
- package/script/config.js +21 -2
- package/script/embedded-git.json +12 -12
package/build/lib/errors.d.ts
CHANGED
|
@@ -50,63 +50,13 @@ export declare enum GitError {
|
|
|
50
50
|
PushWithPrivateEmail = 47,
|
|
51
51
|
ConfigLockFileAlreadyExists = 48,
|
|
52
52
|
RemoteAlreadyExists = 49,
|
|
53
|
-
TagAlreadyExists = 50
|
|
53
|
+
TagAlreadyExists = 50,
|
|
54
|
+
MergeWithLocalChanges = 51,
|
|
55
|
+
RebaseWithLocalChanges = 52
|
|
54
56
|
}
|
|
55
57
|
/** A mapping from regexes to the git error they identify. */
|
|
56
58
|
export declare const GitErrorRegexes: {
|
|
57
|
-
|
|
58
|
-
"fatal: Authentication failed for 'https://": GitError;
|
|
59
|
-
'fatal: Authentication failed': GitError;
|
|
60
|
-
'fatal: Could not read from remote repository.': GitError;
|
|
61
|
-
'The requested URL returned error: 403': GitError;
|
|
62
|
-
'fatal: The remote end hung up unexpectedly': GitError;
|
|
63
|
-
"fatal: unable to access '(.+)': Failed to connect to (.+): Host is down": GitError;
|
|
64
|
-
"Cloning into '(.+)'...\nfatal: unable to access '(.+)': Could not resolve host: (.+)": GitError;
|
|
65
|
-
'Failed to merge in the changes.': GitError;
|
|
66
|
-
'(Merge conflict|Automatic merge failed; fix conflicts and then commit the result)': GitError;
|
|
67
|
-
"fatal: repository '(.+)' not found": GitError;
|
|
68
|
-
'ERROR: Repository not found': GitError;
|
|
69
|
-
"\\((non-fast-forward|fetch first)\\)\nerror: failed to push some refs to '.*'": GitError;
|
|
70
|
-
"error: unable to delete '(.+)': remote ref does not exist": GitError;
|
|
71
|
-
'\\[remote rejected\\] (.+) \\(deletion of the current branch prohibited\\)': GitError;
|
|
72
|
-
"error: could not revert .*\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'": GitError;
|
|
73
|
-
"Applying: .*\nNo changes - did you forget to use 'git add'\\?\nIf there is nothing left to stage, chances are that something else\n.*": GitError;
|
|
74
|
-
'There are no candidates for (rebasing|merging) among the refs that you just fetched.\nGenerally this means that you provided a wildcard refspec which had no\nmatches on the remote end.': GitError;
|
|
75
|
-
"Your configuration specifies to merge with the ref '(.+)'\nfrom the remote, but no such ref was fetched.": GitError;
|
|
76
|
-
'nothing to commit': GitError;
|
|
77
|
-
"No submodule mapping found in .gitmodules for path '(.+)'": GitError;
|
|
78
|
-
"fatal: repository '(.+)' does not exist\nfatal: clone of '.+' into submodule path '(.+)' failed": GitError;
|
|
79
|
-
"Fetched in submodule path '(.+)', but it did not contain (.+). Direct fetching of that commit failed.": GitError;
|
|
80
|
-
"fatal: could not create work tree dir '(.+)'.*: Permission denied": GitError;
|
|
81
|
-
'merge: (.+) - not something we can merge': GitError;
|
|
82
|
-
'invalid upstream (.+)': GitError;
|
|
83
|
-
'fatal: Non-fast-forward commit does not make sense into an empty head': GitError;
|
|
84
|
-
'error: (.+): (patch does not apply|already exists in working directory)': GitError;
|
|
85
|
-
"fatal: A branch named '(.+)' already exists.": GitError;
|
|
86
|
-
"fatal: bad revision '(.*)'": GitError;
|
|
87
|
-
'fatal: [Nn]ot a git repository \\(or any of the parent directories\\): (.*)': GitError;
|
|
88
|
-
'fatal: refusing to merge unrelated histories': GitError;
|
|
89
|
-
'The .+ attribute should be .+ but is .+': GitError;
|
|
90
|
-
'fatal: Branch rename failed': GitError;
|
|
91
|
-
"fatal: path '(.+)' does not exist .+": GitError;
|
|
92
|
-
"fatal: invalid object name '(.+)'.": GitError;
|
|
93
|
-
"fatal: .+: '(.+)' is outside repository": GitError;
|
|
94
|
-
'Another git process seems to be running in this repository, e.g.': GitError;
|
|
95
|
-
'fatal: There is no merge to abort': GitError;
|
|
96
|
-
'error: (?:Your local changes to the following|The following untracked working tree) files would be overwritten by checkout:': GitError;
|
|
97
|
-
'You must edit all merge conflicts and then\nmark them as resolved using git add': GitError;
|
|
98
|
-
'error: GH001: ': GitError;
|
|
99
|
-
'error: GH002: ': GitError;
|
|
100
|
-
'error: GH003: Sorry, force-pushing to (.+) is not allowed.': GitError;
|
|
101
|
-
'error: GH005: Sorry, refs longer than (.+) bytes are not allowed': GitError;
|
|
102
|
-
'error: GH006: Protected branch update failed for (.+)\nremote: error: At least one approved review is required': GitError;
|
|
103
|
-
'error: GH006: Protected branch update failed for (.+)\nremote: error: Cannot force-push to a protected branch': GitError;
|
|
104
|
-
'error: GH006: Protected branch update failed for (.+)\nremote: error: Cannot delete a protected branch': GitError;
|
|
105
|
-
'error: GH006: Protected branch update failed for (.+).\nremote: error: Required status check "(.+)" is expected': GitError;
|
|
106
|
-
'error: GH007: Your push would publish a private email address.': GitError;
|
|
107
|
-
'error: could not lock config file (.+): File exists': GitError;
|
|
108
|
-
'fatal: remote (.+) already exists.': GitError;
|
|
109
|
-
"fatal: tag '(.+)' already exists": GitError;
|
|
59
|
+
[regexp: string]: GitError;
|
|
110
60
|
};
|
|
111
61
|
/**
|
|
112
62
|
* The error code for when git cannot be found. This most likely indicates a
|
package/build/lib/errors.js
CHANGED
|
@@ -42,7 +42,7 @@ var GitError;
|
|
|
42
42
|
GitError[GitError["NoMergeToAbort"] = 36] = "NoMergeToAbort";
|
|
43
43
|
GitError[GitError["LocalChangesOverwritten"] = 37] = "LocalChangesOverwritten";
|
|
44
44
|
GitError[GitError["UnresolvedConflicts"] = 38] = "UnresolvedConflicts";
|
|
45
|
-
// GitHub-specific error codes
|
|
45
|
+
// Start of GitHub-specific error codes
|
|
46
46
|
GitError[GitError["PushWithFileSizeExceedingLimit"] = 39] = "PushWithFileSizeExceedingLimit";
|
|
47
47
|
GitError[GitError["HexBranchNameRejected"] = 40] = "HexBranchNameRejected";
|
|
48
48
|
GitError[GitError["ForcePushRejected"] = 41] = "ForcePushRejected";
|
|
@@ -52,9 +52,12 @@ var GitError;
|
|
|
52
52
|
GitError[GitError["ProtectedBranchDeleteRejected"] = 45] = "ProtectedBranchDeleteRejected";
|
|
53
53
|
GitError[GitError["ProtectedBranchRequiredStatus"] = 46] = "ProtectedBranchRequiredStatus";
|
|
54
54
|
GitError[GitError["PushWithPrivateEmail"] = 47] = "PushWithPrivateEmail";
|
|
55
|
+
// End of GitHub-specific error codes
|
|
55
56
|
GitError[GitError["ConfigLockFileAlreadyExists"] = 48] = "ConfigLockFileAlreadyExists";
|
|
56
57
|
GitError[GitError["RemoteAlreadyExists"] = 49] = "RemoteAlreadyExists";
|
|
57
58
|
GitError[GitError["TagAlreadyExists"] = 50] = "TagAlreadyExists";
|
|
59
|
+
GitError[GitError["MergeWithLocalChanges"] = 51] = "MergeWithLocalChanges";
|
|
60
|
+
GitError[GitError["RebaseWithLocalChanges"] = 52] = "RebaseWithLocalChanges";
|
|
58
61
|
})(GitError = exports.GitError || (exports.GitError = {}));
|
|
59
62
|
/** A mapping from regexes to the git error they identify. */
|
|
60
63
|
exports.GitErrorRegexes = {
|
|
@@ -66,7 +69,7 @@ exports.GitErrorRegexes = {
|
|
|
66
69
|
'fatal: The remote end hung up unexpectedly': GitError.RemoteDisconnection,
|
|
67
70
|
"fatal: unable to access '(.+)': Failed to connect to (.+): Host is down": GitError.HostDown,
|
|
68
71
|
"Cloning into '(.+)'...\nfatal: unable to access '(.+)': Could not resolve host: (.+)": GitError.HostDown,
|
|
69
|
-
'
|
|
72
|
+
'Resolve all conflicts manually, mark them as resolved with': GitError.RebaseConflicts,
|
|
70
73
|
'(Merge conflict|Automatic merge failed; fix conflicts and then commit the result)': GitError.MergeConflicts,
|
|
71
74
|
"fatal: repository '(.+)' not found": GitError.HTTPSRepositoryNotFound,
|
|
72
75
|
'ERROR: Repository not found': GitError.SSHRepositoryNotFound,
|
|
@@ -111,7 +114,9 @@ exports.GitErrorRegexes = {
|
|
|
111
114
|
'error: GH007: Your push would publish a private email address.': GitError.PushWithPrivateEmail,
|
|
112
115
|
'error: could not lock config file (.+): File exists': GitError.ConfigLockFileAlreadyExists,
|
|
113
116
|
'fatal: remote (.+) already exists.': GitError.RemoteAlreadyExists,
|
|
114
|
-
"fatal: tag '(.+)' already exists": GitError.TagAlreadyExists
|
|
117
|
+
"fatal: tag '(.+)' already exists": GitError.TagAlreadyExists,
|
|
118
|
+
'error: Your local changes to the following files would be overwritten by merge:\n': GitError.MergeWithLocalChanges,
|
|
119
|
+
'error: cannot (pull with rebase|rebase): You have unstaged changes\\.\n\\s*error: [Pp]lease commit or stash them\\.': GitError.RebaseWithLocalChanges
|
|
115
120
|
};
|
|
116
121
|
/**
|
|
117
122
|
* The error code for when git cannot be found. This most likely indicates a
|
package/build/lib/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../lib/errors.ts"],"names":[],"mappings":";;AAAA,mEAAmE;AACnE,IAAY,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../lib/errors.ts"],"names":[],"mappings":"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"}
|
package/build/lib/git-process.js
CHANGED
|
@@ -120,9 +120,8 @@ class GitProcess {
|
|
|
120
120
|
}
|
|
121
121
|
/** Try to parse an error type from stderr. */
|
|
122
122
|
static parseError(stderr) {
|
|
123
|
-
for (const regex
|
|
123
|
+
for (const [regex, error] of Object.entries(errors_1.GitErrorRegexes)) {
|
|
124
124
|
if (stderr.match(regex)) {
|
|
125
|
-
const error = errors_1.GitErrorRegexes[regex];
|
|
126
125
|
return error;
|
|
127
126
|
}
|
|
128
127
|
}
|
|
@@ -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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"}
|
package/package.json
CHANGED
package/script/config.js
CHANGED
|
@@ -14,7 +14,26 @@ function getConfig() {
|
|
|
14
14
|
tempFile: ''
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
let arch = os.arch();
|
|
18
|
+
|
|
19
|
+
if (process.env.npm_config_arch) {
|
|
20
|
+
// If a specific npm_config_arch is set, we use that one instead of the OS arch (to support cross compilation)
|
|
21
|
+
console.log('npm_config_arch detected: ' + process.env.npm_config_arch);
|
|
22
|
+
arch = process.env.npm_config_arch;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
if (process.platform === 'win32' && arch === 'arm64') {
|
|
26
|
+
// Use the Dugite Native ia32 package for Windows arm64 (arm64 can run 32-bit code through emulation)
|
|
27
|
+
console.log('Downloading 32-bit Dugite Native for Windows arm64');
|
|
28
|
+
arch = 'ia32';
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
// Os.arch() calls it x32, we use x86 in actions, dugite-native calls it x86 and our embedded-git.json calls it ia32
|
|
32
|
+
if (arch === 'x32' || arch === 'x86') {
|
|
33
|
+
arch = 'ia32'
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
const key = `${process.platform}-${arch}`
|
|
18
37
|
|
|
19
38
|
const entry = embeddedGit[key]
|
|
20
39
|
|
|
@@ -22,7 +41,7 @@ function getConfig() {
|
|
|
22
41
|
config.checksum = entry.checksum
|
|
23
42
|
config.source = entry.url
|
|
24
43
|
} else {
|
|
25
|
-
console.log(`No embedded Git found for ${process.platform} and architecture ${
|
|
44
|
+
console.log(`No embedded Git found for ${process.platform} and architecture ${arch}`)
|
|
26
45
|
}
|
|
27
46
|
|
|
28
47
|
if (config.source !== '') {
|
package/script/embedded-git.json
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
{
|
|
2
2
|
"win32-x64": {
|
|
3
|
-
"name": "dugite-native-v2.26.
|
|
4
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.
|
|
5
|
-
"checksum": "
|
|
3
|
+
"name": "dugite-native-v2.26.2-0c90eda-windows-x64.tar.gz",
|
|
4
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2-1/dugite-native-v2.26.2-0c90eda-windows-x64.tar.gz",
|
|
5
|
+
"checksum": "4b729ed31c1972b4c0972f7ab8dbe64b867ce8c148b58fb103e0a3073695fdf0"
|
|
6
6
|
},
|
|
7
7
|
"win32-ia32": {
|
|
8
|
-
"name": "dugite-native-v2.26.
|
|
9
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.
|
|
10
|
-
"checksum": "
|
|
8
|
+
"name": "dugite-native-v2.26.2-0c90eda-windows-x86.tar.gz",
|
|
9
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2-1/dugite-native-v2.26.2-0c90eda-windows-x86.tar.gz",
|
|
10
|
+
"checksum": "5306075f99e23f402f4af96071b0c8b7e66ff433d2115755e22fafd5d7e2fe92"
|
|
11
11
|
},
|
|
12
12
|
"darwin-x64": {
|
|
13
|
-
"name": "dugite-native-v2.26.
|
|
14
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.
|
|
15
|
-
"checksum": "
|
|
13
|
+
"name": "dugite-native-v2.26.2-0c90eda-macOS.tar.gz",
|
|
14
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2-1/dugite-native-v2.26.2-0c90eda-macOS.tar.gz",
|
|
15
|
+
"checksum": "8613ce323c5b2ee36adb079137c3f2b907bffa194500d966ce663fe4e77e8bca"
|
|
16
16
|
},
|
|
17
17
|
"linux-x64": {
|
|
18
|
-
"name": "dugite-native-v2.26.
|
|
19
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.
|
|
20
|
-
"checksum": "
|
|
18
|
+
"name": "dugite-native-v2.26.2-0c90eda-ubuntu.tar.gz",
|
|
19
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2-1/dugite-native-v2.26.2-0c90eda-ubuntu.tar.gz",
|
|
20
|
+
"checksum": "0521c4e1786d59ad24f8c8fcd325ee7475496cdeac39bb87bb0d04f8f69cb0b9"
|
|
21
21
|
}
|
|
22
22
|
}
|