@contrail/flexplm 1.3.1-alpha.763fca8 → 1.3.1-alpha.97cfe70
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,6 +116,7 @@ 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);
|
|
119
120
|
const versionCheck = tryRunGit(['--version'], repoDir);
|
|
120
121
|
if (!versionCheck.ok) {
|
|
121
122
|
console.log('git command not available; skipping git commit.');
|
|
@@ -126,9 +127,9 @@ async function commitToGit(absPath, fileId, options) {
|
|
|
126
127
|
console.log(`Not inside a git working tree (${repoDir}); skipping git commit.`);
|
|
127
128
|
return;
|
|
128
129
|
}
|
|
129
|
-
const tracked = tryRunGit(['ls-files', '--error-unmatch',
|
|
130
|
+
const tracked = tryRunGit(['ls-files', '--error-unmatch', relPath], repoDir);
|
|
130
131
|
if (!tracked.ok) {
|
|
131
|
-
const answer = (await prompt(`File is not tracked by git: ${
|
|
132
|
+
const answer = (await prompt(`File is not tracked by git: ${relPath}\nAdd it to git? (y/N): `)).toLowerCase();
|
|
132
133
|
if (answer !== 'y' && answer !== 'yes') {
|
|
133
134
|
console.log('Nothing was done in git.');
|
|
134
135
|
return;
|
|
@@ -149,11 +150,11 @@ async function commitToGit(absPath, fileId, options) {
|
|
|
149
150
|
}
|
|
150
151
|
}
|
|
151
152
|
const finalMessage = buildCommitMessage(message, fileId);
|
|
152
|
-
const addResult = tryRunGit(['add', '--',
|
|
153
|
+
const addResult = tryRunGit(['add', '--', relPath], repoDir);
|
|
153
154
|
if (!addResult.ok) {
|
|
154
155
|
throw new Error(`git add failed: ${addResult.stderr.trim()}`);
|
|
155
156
|
}
|
|
156
|
-
const commitResult = tryRunGit(['commit', '-m', finalMessage, '--',
|
|
157
|
+
const commitResult = tryRunGit(['commit', '-m', finalMessage, '--', relPath], repoDir);
|
|
157
158
|
if (!commitResult.ok) {
|
|
158
159
|
throw new Error(`git commit failed: ${commitResult.stderr.trim() || commitResult.stdout.trim()}`);
|
|
159
160
|
}
|
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.97cfe70",
|
|
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": "^1.4.3",
|
|
59
59
|
"@contrail/sdk": "^1.5.10",
|
|
60
|
-
"@contrail/transform-data": "^1.3.2-alpha.
|
|
60
|
+
"@contrail/transform-data": "^1.3.2-alpha.40a88b2",
|
|
61
61
|
"@contrail/util": "^1.3.1",
|
|
62
62
|
"axios": "^1.4.0",
|
|
63
63
|
"p-limit": "^3.1.0"
|