@contrail/flexplm 1.3.1-alpha.97cfe70 → 1.3.1-alpha.f54fe36
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.
|
@@ -116,7 +116,6 @@ function buildCommitMessage(userMessage, fileId) {
|
|
|
116
116
|
exports.buildCommitMessage = buildCommitMessage;
|
|
117
117
|
async function commitToGit(absPath, fileId, options) {
|
|
118
118
|
const repoDir = path.dirname(absPath);
|
|
119
|
-
const relPath = path.basename(absPath);
|
|
120
119
|
const versionCheck = tryRunGit(['--version'], repoDir);
|
|
121
120
|
if (!versionCheck.ok) {
|
|
122
121
|
console.log('git command not available; skipping git commit.');
|
|
@@ -127,9 +126,9 @@ async function commitToGit(absPath, fileId, options) {
|
|
|
127
126
|
console.log(`Not inside a git working tree (${repoDir}); skipping git commit.`);
|
|
128
127
|
return;
|
|
129
128
|
}
|
|
130
|
-
const tracked = tryRunGit(['ls-files', '--error-unmatch',
|
|
129
|
+
const tracked = tryRunGit(['ls-files', '--error-unmatch', absPath], repoDir);
|
|
131
130
|
if (!tracked.ok) {
|
|
132
|
-
const answer = (await prompt(`File is not tracked by git: ${
|
|
131
|
+
const answer = (await prompt(`File is not tracked by git: ${absPath}\nAdd it to git? (y/N): `)).toLowerCase();
|
|
133
132
|
if (answer !== 'y' && answer !== 'yes') {
|
|
134
133
|
console.log('Nothing was done in git.');
|
|
135
134
|
return;
|
|
@@ -150,11 +149,11 @@ async function commitToGit(absPath, fileId, options) {
|
|
|
150
149
|
}
|
|
151
150
|
}
|
|
152
151
|
const finalMessage = buildCommitMessage(message, fileId);
|
|
153
|
-
const addResult = tryRunGit(['add', '--',
|
|
152
|
+
const addResult = tryRunGit(['add', '--', absPath], repoDir);
|
|
154
153
|
if (!addResult.ok) {
|
|
155
154
|
throw new Error(`git add failed: ${addResult.stderr.trim()}`);
|
|
156
155
|
}
|
|
157
|
-
const commitResult = tryRunGit(['commit', '-m', finalMessage, '--',
|
|
156
|
+
const commitResult = tryRunGit(['commit', '-m', finalMessage, '--', absPath], repoDir);
|
|
158
157
|
if (!commitResult.ok) {
|
|
159
158
|
throw new Error(`git commit failed: ${commitResult.stderr.trim() || commitResult.stdout.trim()}`);
|
|
160
159
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@contrail/flexplm",
|
|
3
|
-
"version": "1.3.1-alpha.
|
|
3
|
+
"version": "1.3.1-alpha.f54fe36",
|
|
4
4
|
"description": "Library used for integration with flexplm.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -55,9 +55,9 @@
|
|
|
55
55
|
"testEnvironment": "node"
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@contrail/app-framework": "^
|
|
58
|
+
"@contrail/app-framework": "^2.0.0",
|
|
59
59
|
"@contrail/sdk": "^1.5.10",
|
|
60
|
-
"@contrail/transform-data": "^1.3.2-alpha.
|
|
60
|
+
"@contrail/transform-data": "^1.3.2-alpha.fd132c3",
|
|
61
61
|
"@contrail/util": "^1.3.1",
|
|
62
62
|
"axios": "^1.4.0",
|
|
63
63
|
"p-limit": "^3.1.0"
|