sfdx-git-delta 6.1.0 → 6.1.1
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 +24 -1
- package/lib/adapter/GitAdapter.js +5 -4
- package/lib/adapter/GitAdapter.js.map +1 -1
- package/lib/commands/sgd/source/delta.js +4 -2
- package/lib/commands/sgd/source/delta.js.map +1 -1
- package/lib/{utils → constant}/cliConstants.js +2 -1
- package/lib/constant/cliConstants.js.map +1 -0
- package/lib/constant/gitConstants.d.ts +1 -0
- package/lib/constant/gitConstants.js +1 -0
- package/lib/constant/gitConstants.js.map +1 -1
- package/lib/post-processor/includeProcessor.d.ts +6 -9
- package/lib/post-processor/includeProcessor.js +38 -40
- package/lib/post-processor/includeProcessor.js.map +1 -1
- package/lib/utils/cliHelper.js +3 -2
- package/lib/utils/cliHelper.js.map +1 -1
- package/messages/delta.md +6 -2
- package/npm-shrinkwrap.json +5996 -698
- package/oclif.manifest.json +1 -1
- package/package.json +4 -4
- package/lib/utils/cliConstants.js.map +0 -1
- /package/lib/{utils → constant}/cliConstants.d.ts +0 -0
package/README.md
CHANGED
|
@@ -47,6 +47,7 @@
|
|
|
47
47
|
- [Execute sgd](#execute-sgd)
|
|
48
48
|
- [Deploy the delta metadata](#deploy-the-delta-metadata)
|
|
49
49
|
- [Advanced use-cases](#advanced-use-cases)
|
|
50
|
+
- [Test Changes Without Committing](#test-changes-without-committing)
|
|
50
51
|
- [Generate a folder containing only the added/modified sources](#generate-a-folder-containing-only-the-addedmodified-sources)
|
|
51
52
|
- [Exclude some metadata only from destructiveChanges.xml](#exclude-some-metadata-only-from-destructivechangesxml)
|
|
52
53
|
- [Explicitly including specific files for inclusion or destruction regardless of diff](#explicitly-including-specific-files-for-inclusion-or-destruction-regardless-of-diff)
|
|
@@ -187,7 +188,7 @@ FLAG DESCRIPTIONS
|
|
|
187
188
|
Override the api version used for api requests made by this command
|
|
188
189
|
```
|
|
189
190
|
|
|
190
|
-
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v6.1.
|
|
191
|
+
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v6.1.1/src/commands/sgd/source/delta.ts)_
|
|
191
192
|
<!-- commandsstop -->
|
|
192
193
|
|
|
193
194
|
### Windows users
|
|
@@ -352,6 +353,28 @@ sf project deploy start --pre-destructive-changes destructiveChanges/destructive
|
|
|
352
353
|
|
|
353
354
|
## Advanced use-cases
|
|
354
355
|
|
|
356
|
+
### Test Changes Without Committing
|
|
357
|
+
|
|
358
|
+
To check changes that aren't committed yet:
|
|
359
|
+
|
|
360
|
+
1. Make a temporary commit:
|
|
361
|
+
```sh
|
|
362
|
+
git add '<files>'
|
|
363
|
+
git commit -m 'temp: testing changes'
|
|
364
|
+
```
|
|
365
|
+
|
|
366
|
+
2. Run SGD:
|
|
367
|
+
```sh
|
|
368
|
+
sf sgd source delta --from <sha-pointer>
|
|
369
|
+
```
|
|
370
|
+
|
|
371
|
+
3. Undo the temporary commit while keeping your changes:
|
|
372
|
+
```sh
|
|
373
|
+
git reset --soft HEAD~1
|
|
374
|
+
```
|
|
375
|
+
|
|
376
|
+
Tip: For extra safety, do this in a temporary branch.
|
|
377
|
+
|
|
355
378
|
### Generate a folder containing only the added/modified sources
|
|
356
379
|
|
|
357
380
|
Using a package.xml for deployment is the simplest approach to delta deployments. But in some cases you may want to have only the actual recently changed source files.
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { join } from 'node:path/posix';
|
|
2
2
|
import { simpleGit } from 'simple-git';
|
|
3
|
+
import { TAB } from '../constant/cliConstants.js';
|
|
3
4
|
import { PATH_SEP, UTF8_ENCODING } from '../constant/fsConstants.js';
|
|
4
|
-
import { ADDITION, BLOB_TYPE, DELETION, IGNORE_WHITESPACE_PARAMS, MODIFICATION, NUM_STAT_CHANGE_INFORMATION, TREE_TYPE, } from '../constant/gitConstants.js';
|
|
5
|
-
import { TAB } from '../utils/cliConstants.js';
|
|
5
|
+
import { ADDITION, BLOB_TYPE, DELETION, HEAD, IGNORE_WHITESPACE_PARAMS, MODIFICATION, NUM_STAT_CHANGE_INFORMATION, TREE_TYPE, } from '../constant/gitConstants.js';
|
|
6
6
|
import { treatPathSep } from '../utils/fsUtils.js';
|
|
7
7
|
import { getLFSObjectContentPath, isLFS } from '../utils/gitLfsHelper.js';
|
|
8
8
|
import { readFile } from 'node:fs/promises';
|
|
@@ -32,7 +32,7 @@ export default class GitAdapter {
|
|
|
32
32
|
await this.simpleGit.addConfig('core.quotepath', 'off');
|
|
33
33
|
}
|
|
34
34
|
async parseRev(ref) {
|
|
35
|
-
return await this.simpleGit.revparse([ref]);
|
|
35
|
+
return await this.simpleGit.revparse(['--verify', ref]);
|
|
36
36
|
}
|
|
37
37
|
async pathExistsImpl(path) {
|
|
38
38
|
let doesPathExists = false;
|
|
@@ -57,7 +57,7 @@ export default class GitAdapter {
|
|
|
57
57
|
return doesPathExists;
|
|
58
58
|
}
|
|
59
59
|
async getFirstCommitRef() {
|
|
60
|
-
return await this.simpleGit.raw(['rev-list', '--max-parents=0',
|
|
60
|
+
return await this.simpleGit.raw(['rev-list', '--max-parents=0', HEAD]);
|
|
61
61
|
}
|
|
62
62
|
async getBufferContent(forRef) {
|
|
63
63
|
let content = await this.simpleGit.showBuffer(revPath(forRef));
|
|
@@ -139,6 +139,7 @@ export default class GitAdapter {
|
|
|
139
139
|
`--diff-filter=${changeType}`,
|
|
140
140
|
this.config.from,
|
|
141
141
|
this.config.to,
|
|
142
|
+
'--',
|
|
142
143
|
this.config.source,
|
|
143
144
|
])).split(EOL);
|
|
144
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GitAdapter.js","sourceRoot":"","sources":["../../src/adapter/GitAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAa,SAAS,EAAE,MAAM,YAAY,CAAA;AAEjD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,EACL,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,wBAAwB,EACxB,YAAY,EACZ,2BAA2B,EAC3B,SAAS,GACV,MAAM,6BAA6B,CAAA;AAGpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"GitAdapter.js","sourceRoot":"","sources":["../../src/adapter/GitAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
|
+
import { OUTPUT_DEFAULT_VALUE, REPO_DEFAULT_VALUE, SOURCE_DEFAULT_VALUE, TO_DEFAULT_VALUE, } from '../../../constant/cliConstants.js';
|
|
2
3
|
import sgd from '../../../main.js';
|
|
3
4
|
import { MessageService } from '../../../utils/MessageService.js';
|
|
4
|
-
import { OUTPUT_DEFAULT_VALUE, REPO_DEFAULT_VALUE, SOURCE_DEFAULT_VALUE, TO_DEFAULT_VALUE, } from '../../../utils/cliConstants.js';
|
|
5
5
|
const messages = new MessageService();
|
|
6
6
|
export default class SourceDeltaGenerate extends SfCommand {
|
|
7
7
|
static summary = messages.getMessage('summary');
|
|
@@ -103,6 +103,7 @@ export default class SourceDeltaGenerate extends SfCommand {
|
|
|
103
103
|
const output = {
|
|
104
104
|
'output-dir': config.output,
|
|
105
105
|
};
|
|
106
|
+
let finalMessage = messages.getMessage('info.CommandSuccess');
|
|
106
107
|
try {
|
|
107
108
|
const jobResult = await sgd(config);
|
|
108
109
|
for (const warning of jobResult.warnings) {
|
|
@@ -112,11 +113,12 @@ export default class SourceDeltaGenerate extends SfCommand {
|
|
|
112
113
|
}
|
|
113
114
|
catch (err) {
|
|
114
115
|
if (err instanceof Error) {
|
|
116
|
+
finalMessage = `${messages.getMessage('info.CommandFailure')}: ${err.message}`;
|
|
115
117
|
output.error = err.message;
|
|
116
118
|
}
|
|
117
119
|
process.exitCode = 1;
|
|
118
120
|
}
|
|
119
|
-
this.spinner.stop(
|
|
121
|
+
this.spinner.stop(finalMessage);
|
|
120
122
|
return output;
|
|
121
123
|
}
|
|
122
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../../src/commands/sgd/source/delta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAE9D,OAAO,
|
|
1
|
+
{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../../src/commands/sgd/source/delta.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliConstants.js","sourceRoot":"","sources":["../../src/constant/cliConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AACpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAA;AAC9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAA;AACtC,MAAM,CAAC,MAAM,GAAG,GAAG,IAAI,CAAA"}
|
|
@@ -3,6 +3,7 @@ export declare const BLOB_TYPE = "blob";
|
|
|
3
3
|
export declare const DELETION = "D";
|
|
4
4
|
export declare const GIT_DIFF_TYPE_REGEX: RegExp;
|
|
5
5
|
export declare const GIT_FOLDER = ".git";
|
|
6
|
+
export declare const HEAD = "HEAD";
|
|
6
7
|
export declare const IGNORE_WHITESPACE_PARAMS: string[];
|
|
7
8
|
export declare const MODIFICATION = "M";
|
|
8
9
|
export declare const NUM_STAT_CHANGE_INFORMATION: RegExp;
|
|
@@ -4,6 +4,7 @@ export const BLOB_TYPE = 'blob';
|
|
|
4
4
|
export const DELETION = 'D';
|
|
5
5
|
export const GIT_DIFF_TYPE_REGEX = /^.\s+/u;
|
|
6
6
|
export const GIT_FOLDER = '.git';
|
|
7
|
+
export const HEAD = 'HEAD';
|
|
7
8
|
export const IGNORE_WHITESPACE_PARAMS = [
|
|
8
9
|
'--ignore-all-space',
|
|
9
10
|
'--ignore-blank-lines',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/constant/gitConstants.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAA;AAC/B,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAC3C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAA;AAChC,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,oBAAoB;IACpB,sBAAsB;IACtB,oBAAoB;IACpB,mBAAmB;IACnB,iCAAiC;CAClC,CAAA;AACD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAA;AAC/B,MAAM,CAAC,MAAM,2BAA2B,GAAG,kBAAkB,CAAA;AAC7D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAA"}
|
|
1
|
+
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/constant/gitConstants.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAA;AAC/B,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAC3C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAA;AAChC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,oBAAoB;IACpB,sBAAsB;IACtB,oBAAoB;IACpB,mBAAmB;IACnB,iCAAiC;CAClC,CAAA;AACD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAA;AAC/B,MAAM,CAAC,MAAM,2BAA2B,GAAG,kBAAkB,CAAA;AAC7D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAA"}
|
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
import GitAdapter from '../adapter/GitAdapter.js';
|
|
2
|
+
import { ADDITION, DELETION } from '../constant/gitConstants.js';
|
|
2
3
|
import { MetadataRepository } from '../metadata/MetadataRepository.js';
|
|
3
4
|
import type { Work } from '../types/work.js';
|
|
4
|
-
import { IgnoreHelper } from '../utils/ignoreHelper.js';
|
|
5
5
|
import BaseProcessor from './baseProcessor.js';
|
|
6
|
+
type GitChange = typeof ADDITION | typeof DELETION;
|
|
6
7
|
export default class IncludeProcessor extends BaseProcessor {
|
|
7
8
|
protected readonly gitAdapter: GitAdapter;
|
|
8
|
-
protected from: string;
|
|
9
|
-
protected includeHelper: IgnoreHelper;
|
|
10
9
|
constructor(work: Work, metadata: MetadataRepository);
|
|
11
|
-
process(): Promise<void>;
|
|
12
10
|
protected _shouldProcess(): boolean;
|
|
13
|
-
|
|
14
|
-
protected
|
|
15
|
-
protected
|
|
16
|
-
protected _processIncludeDestructive(lines: string[]): Promise<void>;
|
|
17
|
-
protected _cleanup(): Promise<void>;
|
|
11
|
+
process(): Promise<void>;
|
|
12
|
+
protected _processIncludes(includeLines: Map<GitChange, string[]>): Promise<void>;
|
|
13
|
+
protected _processLines(lines: string[]): Promise<void>;
|
|
18
14
|
}
|
|
15
|
+
export {};
|
|
@@ -1,69 +1,67 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
import GitAdapter from '../adapter/GitAdapter.js';
|
|
3
|
+
import { TAB } from '../constant/cliConstants.js';
|
|
3
4
|
import { ADDITION, DELETION } from '../constant/gitConstants.js';
|
|
4
5
|
import DiffLineInterpreter from '../service/diffLineInterpreter.js';
|
|
5
|
-
import { TAB } from '../utils/cliConstants.js';
|
|
6
6
|
import { buildIncludeHelper } from '../utils/ignoreHelper.js';
|
|
7
7
|
import BaseProcessor from './baseProcessor.js';
|
|
8
8
|
export default class IncludeProcessor extends BaseProcessor {
|
|
9
9
|
gitAdapter;
|
|
10
|
-
from;
|
|
11
|
-
includeHelper;
|
|
12
10
|
constructor(work, metadata) {
|
|
13
11
|
super(work, metadata);
|
|
14
12
|
this.gitAdapter = GitAdapter.getInstance(this.config);
|
|
15
|
-
this.from = this.config.from;
|
|
16
|
-
}
|
|
17
|
-
async process() {
|
|
18
|
-
if (this._shouldProcess()) {
|
|
19
|
-
await this._prepare();
|
|
20
|
-
await this._process();
|
|
21
|
-
this._cleanup();
|
|
22
|
-
}
|
|
23
13
|
}
|
|
24
14
|
_shouldProcess() {
|
|
25
15
|
return !!this.config.include || !!this.config.includeDestructive;
|
|
26
16
|
}
|
|
27
|
-
async
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const
|
|
34
|
-
[ADDITION]: [],
|
|
35
|
-
[DELETION]: [],
|
|
36
|
-
};
|
|
17
|
+
async process() {
|
|
18
|
+
if (!this._shouldProcess()) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const includeHelper = await buildIncludeHelper(this.config);
|
|
22
|
+
const includeLines = new Map();
|
|
23
|
+
const gitChanges = [ADDITION, DELETION];
|
|
37
24
|
const lines = await this.gitAdapter.getFilesPath(this.config.source);
|
|
38
25
|
for (const line of lines) {
|
|
39
|
-
|
|
26
|
+
gitChanges.forEach((changeType) => {
|
|
40
27
|
const changedLine = `${changeType}${TAB}${line}`;
|
|
41
|
-
if (!
|
|
42
|
-
|
|
28
|
+
if (!includeHelper.keep(changedLine)) {
|
|
29
|
+
if (!includeLines.has(changeType)) {
|
|
30
|
+
includeLines.set(changeType, []);
|
|
31
|
+
}
|
|
32
|
+
includeLines.get(changeType)?.push(changedLine);
|
|
43
33
|
}
|
|
44
34
|
});
|
|
45
35
|
}
|
|
46
|
-
|
|
47
|
-
|
|
36
|
+
await this._processIncludes(includeLines);
|
|
37
|
+
}
|
|
38
|
+
async _processIncludes(includeLines) {
|
|
39
|
+
if (includeLines.size === 0) {
|
|
40
|
+
return;
|
|
48
41
|
}
|
|
49
|
-
|
|
50
|
-
|
|
42
|
+
const fromBackup = this.work.config.from;
|
|
43
|
+
const firsSHA = await this.gitAdapter.getFirstCommitRef();
|
|
44
|
+
// Compare with the whole history of the repository
|
|
45
|
+
// so it can get full file content for inFile metadata
|
|
46
|
+
// while reusing current way to do it on a minimal scope
|
|
47
|
+
if (includeLines.has(ADDITION)) {
|
|
48
|
+
this.work.config.from = firsSHA;
|
|
49
|
+
await this._processLines(includeLines.get(ADDITION));
|
|
51
50
|
}
|
|
51
|
+
if (includeLines.has(DELETION)) {
|
|
52
|
+
// Need to invert the SHA pointer for DELETION
|
|
53
|
+
// so all the addition are interpreted has deletion by MetadataDiff
|
|
54
|
+
// for the lines of InFile metadata type
|
|
55
|
+
this.work.config.from = this.work.config.to;
|
|
56
|
+
this.work.config.to = firsSHA;
|
|
57
|
+
await this._processLines(includeLines.get(DELETION));
|
|
58
|
+
this.work.config.to = this.work.config.from;
|
|
59
|
+
}
|
|
60
|
+
this.work.config.from = fromBackup;
|
|
52
61
|
}
|
|
53
|
-
async
|
|
54
|
-
const lineProcessor = new DiffLineInterpreter(this.work, this.metadata);
|
|
55
|
-
await lineProcessor.process(lines);
|
|
56
|
-
}
|
|
57
|
-
async _processIncludeDestructive(lines) {
|
|
58
|
-
const to = this.config.to;
|
|
59
|
-
this.config.to = this.config.from;
|
|
60
|
-
this.config.from = to;
|
|
62
|
+
async _processLines(lines) {
|
|
61
63
|
const lineProcessor = new DiffLineInterpreter(this.work, this.metadata);
|
|
62
64
|
await lineProcessor.process(lines);
|
|
63
|
-
this.config.to = to;
|
|
64
|
-
}
|
|
65
|
-
async _cleanup() {
|
|
66
|
-
this.config.from = this.from;
|
|
67
65
|
}
|
|
68
66
|
}
|
|
69
67
|
//# sourceMappingURL=includeProcessor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"includeProcessor.js","sourceRoot":"","sources":["../../src/post-processor/includeProcessor.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,UAAU,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAEhE,OAAO,mBAAmB,MAAM,mCAAmC,CAAA;AAEnE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"includeProcessor.js","sourceRoot":"","sources":["../../src/post-processor/includeProcessor.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/cliHelper.js
CHANGED
|
@@ -5,7 +5,8 @@ import { getLatestSupportedVersion, isVersionSupported, } from '../metadata/meta
|
|
|
5
5
|
import { MessageService } from './MessageService.js';
|
|
6
6
|
import { GIT_FOLDER } from '../constant/gitConstants.js';
|
|
7
7
|
import { fileExists, pathExists, readFile, sanitizePath } from './fsUtils.js';
|
|
8
|
-
const
|
|
8
|
+
const TO = 'to';
|
|
9
|
+
const FROM = 'from';
|
|
9
10
|
const SOURCE_API_VERSION_ATTRIBUTE = 'sourceApiVersion';
|
|
10
11
|
const SFDX_PROJECT_FILE_NAME = 'sfdx-project.json';
|
|
11
12
|
export default class CLIHelper {
|
|
@@ -21,7 +22,7 @@ export default class CLIHelper {
|
|
|
21
22
|
}
|
|
22
23
|
async _validateGitSha() {
|
|
23
24
|
const errors = [];
|
|
24
|
-
await Promise.all(
|
|
25
|
+
await Promise.all([FROM, TO].map(async (shaParameter) => {
|
|
25
26
|
const shaValue = this.config[shaParameter];
|
|
26
27
|
try {
|
|
27
28
|
const ref = await this.gitAdapter.parseRev(shaValue);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliHelper.js","sourceRoot":"","sources":["../../src/utils/cliHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,UAAU,MAAM,0BAA0B,CAAA;AACjD,OAAO,EACL,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,gCAAgC,CAAA;AAGvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE7E,MAAM,
|
|
1
|
+
{"version":3,"file":"cliHelper.js","sourceRoot":"","sources":["../../src/utils/cliHelper.ts"],"names":[],"mappings":"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"}
|
package/messages/delta.md
CHANGED
|
@@ -84,9 +84,13 @@ Attempt to delete the flow '%s' via destructiveChanges.xml may not work as expec
|
|
|
84
84
|
|
|
85
85
|
Generating incremental package
|
|
86
86
|
|
|
87
|
-
# info.
|
|
87
|
+
# info.CommandSuccess
|
|
88
88
|
|
|
89
|
-
|
|
89
|
+
Success
|
|
90
|
+
|
|
91
|
+
# info.CommandFailure
|
|
92
|
+
|
|
93
|
+
Failure
|
|
90
94
|
|
|
91
95
|
# info.EncourageSponsorship
|
|
92
96
|
|