@salesforce/plugin-deploy-retrieve 1.5.1 → 1.5.4
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/CHANGELOG.md +16 -0
- package/README.md +35 -10
- package/lib/commands/deploy/metadata/quick.d.ts +0 -1
- package/lib/commands/deploy/metadata/quick.js +3 -7
- package/lib/commands/deploy/metadata/quick.js.map +1 -1
- package/lib/commands/deploy/metadata/resume.d.ts +0 -1
- package/lib/commands/deploy/metadata/resume.js +4 -5
- package/lib/commands/deploy/metadata/resume.js.map +1 -1
- package/lib/commands/deploy/metadata/validate.d.ts +0 -1
- package/lib/commands/deploy/metadata/validate.js +3 -5
- package/lib/commands/deploy/metadata/validate.js.map +1 -1
- package/lib/commands/deploy/metadata.d.ts +3 -2
- package/lib/commands/deploy/metadata.js +26 -10
- package/lib/commands/deploy/metadata.js.map +1 -1
- package/lib/commands/deploy.d.ts +1 -1
- package/lib/commands/deploy.js +25 -12
- package/lib/commands/deploy.js.map +1 -1
- package/lib/commands/retrieve/metadata.d.ts +3 -0
- package/lib/commands/retrieve/metadata.js +51 -16
- package/lib/commands/retrieve/metadata.js.map +1 -1
- package/lib/utils/conflicts.d.ts +2 -0
- package/lib/utils/conflicts.js +22 -0
- package/lib/utils/conflicts.js.map +1 -0
- package/lib/utils/deploy.d.ts +5 -3
- package/lib/utils/deploy.js +48 -21
- package/lib/utils/deploy.js.map +1 -1
- package/lib/utils/metadataDeployer.d.ts +2 -2
- package/lib/utils/metadataDeployer.js +10 -7
- package/lib/utils/metadataDeployer.js.map +1 -1
- package/lib/utils/output.js +17 -26
- package/lib/utils/output.js.map +1 -1
- package/lib/utils/progressBar.js +1 -2
- package/lib/utils/progressBar.js.map +1 -1
- package/messages/deploy.md +36 -0
- package/messages/deploy.metadata.md +23 -1
- package/messages/retrieve.metadata.md +23 -1
- package/messages/tracking.md +3 -0
- package/oclif.manifest.json +1 -1
- package/package.json +32 -28
package/lib/utils/output.js
CHANGED
|
@@ -29,7 +29,7 @@ function success(message) {
|
|
|
29
29
|
function table(responses, columns, options) {
|
|
30
30
|
// Interfaces cannot be casted to Record<string, unknown> so we have to cast to unknown first
|
|
31
31
|
// See https://github.com/microsoft/TypeScript/issues/15300
|
|
32
|
-
core_1.CliUx.ux.table(responses, columns, options
|
|
32
|
+
core_1.CliUx.ux.table(responses, columns, options ?? {});
|
|
33
33
|
}
|
|
34
34
|
function colorStatus(status) {
|
|
35
35
|
if (status === source_deploy_retrieve_1.RequestStatus.Succeeded)
|
|
@@ -56,7 +56,7 @@ function sortFileResponses(fileResponses) {
|
|
|
56
56
|
if (i.filePath === j.filePath) {
|
|
57
57
|
return i.fullName > j.fullName ? 1 : -1;
|
|
58
58
|
}
|
|
59
|
-
return
|
|
59
|
+
return i?.filePath > j?.filePath ? 1 : -1;
|
|
60
60
|
}
|
|
61
61
|
return i.type > j.type ? 1 : -1;
|
|
62
62
|
});
|
|
@@ -79,7 +79,6 @@ function toArray(entryOrArray) {
|
|
|
79
79
|
}
|
|
80
80
|
exports.toArray = toArray;
|
|
81
81
|
function getVersionMessage(action, componentSet, api) {
|
|
82
|
-
var _a;
|
|
83
82
|
// commands pass in the.componentSet, which may not exist in some tests or mdapi deploys
|
|
84
83
|
if (!componentSet) {
|
|
85
84
|
return `*** ${action} with ${api} ***`;
|
|
@@ -92,7 +91,7 @@ function getVersionMessage(action, componentSet, api) {
|
|
|
92
91
|
if (!componentSet.sourceApiVersion ||
|
|
93
92
|
!componentSet.apiVersion ||
|
|
94
93
|
componentSet.sourceApiVersion === componentSet.apiVersion) {
|
|
95
|
-
return `*** ${action} with ${api} API v${
|
|
94
|
+
return `*** ${action} with ${api} API v${componentSet.apiVersion ?? componentSet.sourceApiVersion} ***`;
|
|
96
95
|
}
|
|
97
96
|
// has both but they don't match
|
|
98
97
|
return `*** ${action} v${componentSet.sourceApiVersion} metadata with ${api} API v${componentSet.apiVersion} connection ***`;
|
|
@@ -100,10 +99,9 @@ function getVersionMessage(action, componentSet, api) {
|
|
|
100
99
|
exports.getVersionMessage = getVersionMessage;
|
|
101
100
|
class DeployResultFormatter {
|
|
102
101
|
constructor(result, flags) {
|
|
103
|
-
var _a;
|
|
104
102
|
this.result = result;
|
|
105
103
|
this.flags = flags;
|
|
106
|
-
this.absoluteFiles = sortFileResponses(
|
|
104
|
+
this.absoluteFiles = sortFileResponses(this.result.getFileResponses() ?? []);
|
|
107
105
|
this.relativeFiles = asRelativePaths(this.absoluteFiles);
|
|
108
106
|
this.testLevel = this.flags['test-level'] || types_1.TestLevel.NoTestRun;
|
|
109
107
|
this.verbosity = this.determineVerbosity();
|
|
@@ -133,7 +131,7 @@ class DeployResultFormatter {
|
|
|
133
131
|
}
|
|
134
132
|
displaySuccesses() {
|
|
135
133
|
const successes = this.relativeFiles.filter((f) => f.state !== 'Failed');
|
|
136
|
-
if (!successes.length)
|
|
134
|
+
if (!successes.length || this.result.response.status === source_deploy_retrieve_1.RequestStatus.Failed)
|
|
137
135
|
return;
|
|
138
136
|
const columns = {
|
|
139
137
|
state: { header: 'State' },
|
|
@@ -175,7 +173,6 @@ class DeployResultFormatter {
|
|
|
175
173
|
table(deletions, columns, options);
|
|
176
174
|
}
|
|
177
175
|
displayTestResults() {
|
|
178
|
-
var _a, _b, _c, _d;
|
|
179
176
|
if (this.testLevel === types_1.TestLevel.NoTestRun) {
|
|
180
177
|
core_1.CliUx.ux.log();
|
|
181
178
|
return;
|
|
@@ -187,10 +184,10 @@ class DeployResultFormatter {
|
|
|
187
184
|
}
|
|
188
185
|
core_1.CliUx.ux.log();
|
|
189
186
|
core_1.CliUx.ux.log(tableHeader('Test Results Summary'));
|
|
190
|
-
const passing =
|
|
191
|
-
const failing =
|
|
192
|
-
const total =
|
|
193
|
-
const time =
|
|
187
|
+
const passing = this.result.response.numberTestsCompleted ?? 0;
|
|
188
|
+
const failing = this.result.response.numberTestErrors ?? 0;
|
|
189
|
+
const total = this.result.response.numberTestsTotal ?? 0;
|
|
190
|
+
const time = this.result.response.details.runTestResult.totalTime ?? 0;
|
|
194
191
|
core_1.CliUx.ux.log(`Passing: ${passing}`);
|
|
195
192
|
core_1.CliUx.ux.log(`Failing: ${failing}`);
|
|
196
193
|
core_1.CliUx.ux.log(`Total: ${total}`);
|
|
@@ -198,8 +195,7 @@ class DeployResultFormatter {
|
|
|
198
195
|
core_1.CliUx.ux.log(`Time: ${time}`);
|
|
199
196
|
}
|
|
200
197
|
displayVerboseTestSuccesses() {
|
|
201
|
-
|
|
202
|
-
const successes = toArray((_a = this.result.response.details.runTestResult) === null || _a === void 0 ? void 0 : _a.successes);
|
|
198
|
+
const successes = toArray(this.result.response.details.runTestResult?.successes);
|
|
203
199
|
if (successes.length > 0) {
|
|
204
200
|
const testSuccesses = sortTestResults(successes);
|
|
205
201
|
core_1.CliUx.ux.log();
|
|
@@ -211,11 +207,10 @@ class DeployResultFormatter {
|
|
|
211
207
|
}
|
|
212
208
|
}
|
|
213
209
|
displayVerboseTestFailures() {
|
|
214
|
-
var _a, _b;
|
|
215
210
|
if (!this.result.response.numberTestErrors)
|
|
216
211
|
return;
|
|
217
|
-
const failures = toArray(
|
|
218
|
-
const failureCount =
|
|
212
|
+
const failures = toArray(this.result.response.details.runTestResult?.failures);
|
|
213
|
+
const failureCount = this.result.response.details.runTestResult?.numFailures;
|
|
219
214
|
const testFailures = sortTestResults(failures);
|
|
220
215
|
core_1.CliUx.ux.log();
|
|
221
216
|
core_1.CliUx.ux.log(error(`Test Failures [${failureCount}]`));
|
|
@@ -229,8 +224,7 @@ class DeployResultFormatter {
|
|
|
229
224
|
}
|
|
230
225
|
}
|
|
231
226
|
displayVerboseTestCoverage() {
|
|
232
|
-
|
|
233
|
-
const codeCoverage = toArray((_a = this.result.response.details.runTestResult) === null || _a === void 0 ? void 0 : _a.codeCoverage);
|
|
227
|
+
const codeCoverage = toArray(this.result.response.details.runTestResult?.codeCoverage);
|
|
234
228
|
if (codeCoverage.length) {
|
|
235
229
|
const coverage = codeCoverage.sort((a, b) => {
|
|
236
230
|
return a.name.toUpperCase() > b.name.toUpperCase() ? 1 : -1;
|
|
@@ -317,8 +311,7 @@ class DeployCancelResultFormatter {
|
|
|
317
311
|
this.result = result;
|
|
318
312
|
}
|
|
319
313
|
getJson() {
|
|
320
|
-
|
|
321
|
-
return { ...this.result.response, files: (_a = this.result.getFileResponses()) !== null && _a !== void 0 ? _a : [] };
|
|
314
|
+
return { ...this.result.response, files: this.result.getFileResponses() ?? [] };
|
|
322
315
|
}
|
|
323
316
|
display() {
|
|
324
317
|
if (this.result.response.status === source_deploy_retrieve_1.RequestStatus.Canceled) {
|
|
@@ -346,10 +339,9 @@ class AsyncDeployCancelResultFormatter {
|
|
|
346
339
|
exports.AsyncDeployCancelResultFormatter = AsyncDeployCancelResultFormatter;
|
|
347
340
|
class RetrieveResultFormatter {
|
|
348
341
|
constructor(result, packageNames) {
|
|
349
|
-
var _a;
|
|
350
342
|
this.result = result;
|
|
351
343
|
this.packageNames = packageNames;
|
|
352
|
-
this.files = sortFileResponses(asRelativePaths(
|
|
344
|
+
this.files = sortFileResponses(asRelativePaths(this.result.getFileResponses() ?? []));
|
|
353
345
|
}
|
|
354
346
|
getJson() {
|
|
355
347
|
return { ...this.result.response, files: this.files };
|
|
@@ -375,7 +367,7 @@ class RetrieveResultFormatter {
|
|
|
375
367
|
}
|
|
376
368
|
async displayPackages() {
|
|
377
369
|
const packages = await this.getPackages();
|
|
378
|
-
if (packages
|
|
370
|
+
if (packages?.length) {
|
|
379
371
|
const columns = {
|
|
380
372
|
name: { header: 'Package Name' },
|
|
381
373
|
fullPath: { header: 'Converted Location' },
|
|
@@ -387,10 +379,9 @@ class RetrieveResultFormatter {
|
|
|
387
379
|
}
|
|
388
380
|
}
|
|
389
381
|
async getPackages() {
|
|
390
|
-
var _a;
|
|
391
382
|
const packages = [];
|
|
392
383
|
const projectPath = await core_2.SfProject.resolveProjectPath();
|
|
393
|
-
|
|
384
|
+
this.packageNames?.forEach((name) => {
|
|
394
385
|
const packagePath = path.join(projectPath, name);
|
|
395
386
|
packages.push({ name, path: packagePath, fullPath: path.resolve(packagePath) });
|
|
396
387
|
});
|
package/lib/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/progressBar.js
CHANGED
|
@@ -20,7 +20,6 @@ class DeployProgress extends sf_plugins_core_1.Progress {
|
|
|
20
20
|
start() {
|
|
21
21
|
super.start(0, { status: 'Waiting' }, DeployProgress.OPTIONS);
|
|
22
22
|
this.deploy.onUpdate((data) => {
|
|
23
|
-
var _a;
|
|
24
23
|
// the numCompTot. isn't computed right away, wait to start until we know how many we have
|
|
25
24
|
if (data.numberComponentsTotal) {
|
|
26
25
|
this.setTotal(data.numberComponentsTotal + data.numberTestsTotal);
|
|
@@ -29,7 +28,7 @@ class DeployProgress extends sf_plugins_core_1.Progress {
|
|
|
29
28
|
});
|
|
30
29
|
}
|
|
31
30
|
else {
|
|
32
|
-
this.update(0, { status:
|
|
31
|
+
this.update(0, { status: mdTrasferMessages.getMessage(data.status) ?? 'Waiting' });
|
|
33
32
|
}
|
|
34
33
|
// the numTestsTot. isn't computed until validated as tests by the server, update the PB once we know
|
|
35
34
|
if (data.numberTestsTotal && data.numberComponentsTotal) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progressBar.js","sourceRoot":"","sources":["../../src/utils/progressBar.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAuE;AAEvE,2CAA4C;AAC5C,iEAAuD;AAEvD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,iBAAiB,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,mBAAmB,CAAC,CAAC;AAE3G,MAAa,cAAe,SAAQ,0BAAQ;IAS1C,YAA2B,MAAyB,EAAE,WAAW,GAAG,KAAK;QACvE,KAAK,CAAC,CAAC,WAAW,IAAI,cAAG,CAAC,UAAU,CAAC,0BAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC,CAAC;QAD5D,WAAM,GAAN,MAAM,CAAmB;IAEpD,CAAC;IAEM,KAAK;QACV,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"progressBar.js","sourceRoot":"","sources":["../../src/utils/progressBar.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAuE;AAEvE,2CAA4C;AAC5C,iEAAuD;AAEvD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,iBAAiB,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,mBAAmB,CAAC,CAAC;AAE3G,MAAa,cAAe,SAAQ,0BAAQ;IAS1C,YAA2B,MAAyB,EAAE,WAAW,GAAG,KAAK;QACvE,KAAK,CAAC,CAAC,WAAW,IAAI,cAAG,CAAC,UAAU,CAAC,0BAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC,CAAC;QAD5D,WAAM,GAAN,MAAM,CAAmB;IAEpD,CAAC;IAEM,KAAK;QACV,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,0FAA0F;YAC1F,IAAI,IAAI,CAAC,qBAAqB,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,EAAE;oBACrE,MAAM,EAAE,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;iBAClD,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;aACpF;YAED,qGAAqG;YACrG,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,qBAAqB,EAAE;gBACvD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACnE;QACH,CAAC,CAAC,CAAC;QAEH,8CAA8C;QAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5G,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAY,EAAE,EAAE;YACnC,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;;AAzCH,wCA0CC;AAzCgB,sBAAO,GAAG;IACvB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,mDAAmD;IAC3D,eAAe,EAAE,QAAQ;IACzB,iBAAiB,EAAE,QAAQ;IAC3B,QAAQ,EAAE,IAAI;CACf,CAAC"}
|
package/messages/deploy.md
CHANGED
|
@@ -44,3 +44,39 @@ Initialization Failures. The following table describes each failure:
|
|
|
44
44
|
# warning.TargetOrgIsExpired
|
|
45
45
|
|
|
46
46
|
The target-org, "%s", is expired. Do you want to pick another org?
|
|
47
|
+
|
|
48
|
+
# AnalyzingProject
|
|
49
|
+
|
|
50
|
+
Analyzing project
|
|
51
|
+
|
|
52
|
+
# UsingOptionsFromFile
|
|
53
|
+
|
|
54
|
+
Using options found in %s.
|
|
55
|
+
|
|
56
|
+
# FoundNothingToDeploy
|
|
57
|
+
|
|
58
|
+
Found nothing in the project to deploy.
|
|
59
|
+
|
|
60
|
+
# NothingSelectedToDeploy
|
|
61
|
+
|
|
62
|
+
Nothing was selected to deploy.
|
|
63
|
+
|
|
64
|
+
# DeployOptionsSavedToFile
|
|
65
|
+
|
|
66
|
+
Your deploy options have been saved to %s.
|
|
67
|
+
|
|
68
|
+
# DeployOptionsIncludedInGitIgnore
|
|
69
|
+
|
|
70
|
+
We added %s to the .gitignore for you.
|
|
71
|
+
|
|
72
|
+
# DeployersHaveNonZeroExitCode
|
|
73
|
+
|
|
74
|
+
One or more of the selected deployers exited with a non-zero exit code.
|
|
75
|
+
|
|
76
|
+
# DeployerExitCode
|
|
77
|
+
|
|
78
|
+
Deployer "%s" exited with code %d.
|
|
79
|
+
|
|
80
|
+
# save.as.default
|
|
81
|
+
|
|
82
|
+
Save username %s as default?
|
|
@@ -6,12 +6,16 @@ Deploy metadata in source format to an org from your local project.
|
|
|
6
6
|
|
|
7
7
|
You must run this command from within a project.
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
If your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production org, never allow source tracking. You can also use the "--no-track-source" flag when you create a scratch or sandbox org to disable source tracking.
|
|
10
10
|
|
|
11
11
|
To deploy multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.
|
|
12
12
|
|
|
13
13
|
# examples
|
|
14
14
|
|
|
15
|
+
- Deploy local changes not in the org:
|
|
16
|
+
|
|
17
|
+
<%= config.bin %> <%= command.id %>
|
|
18
|
+
|
|
15
19
|
- Deploy the source files in a directory:
|
|
16
20
|
|
|
17
21
|
<%= config.bin %> <%= command.id %> --source-dir path/to/source
|
|
@@ -106,6 +110,14 @@ All child components are included. If you specify this flag, don’t specify --m
|
|
|
106
110
|
|
|
107
111
|
Validate deploy and run Apex tests but don’t save to the org.
|
|
108
112
|
|
|
113
|
+
# flags.ignore-conflicts.summary
|
|
114
|
+
|
|
115
|
+
Ignore conflicts and deploy local files, even if they overwrite changes in the org.
|
|
116
|
+
|
|
117
|
+
# flags.ignore-conflicts.description
|
|
118
|
+
|
|
119
|
+
This flag applies only to orgs that allow source tracking. It has no effect on orgs that don't allow it, such as production orgs.
|
|
120
|
+
|
|
109
121
|
# flags.ignore-errors.summary
|
|
110
122
|
|
|
111
123
|
Ignore any errors and don’t roll back deployment.
|
|
@@ -182,3 +194,13 @@ You must specify tests using the --tests flag if the --test-level flag is set to
|
|
|
182
194
|
# error.ClientTimeout
|
|
183
195
|
|
|
184
196
|
The client has timed out. Use sf deploy metadata resume to resume watching this deploy.
|
|
197
|
+
|
|
198
|
+
# error.Conflicts
|
|
199
|
+
|
|
200
|
+
There are changes in the org that conflict with the local changes you're trying to deploy.
|
|
201
|
+
|
|
202
|
+
# error.Conflicts.Actions
|
|
203
|
+
|
|
204
|
+
- To overwrite the remote changes, rerun this command with the --ignore-conflicts flag.
|
|
205
|
+
|
|
206
|
+
- To overwrite the local changes, run the "sf retrieve metadata" command with the --ignore-conflicts flag.
|
|
@@ -6,12 +6,16 @@ Retrieve metadata in source format from an org to your local project.
|
|
|
6
6
|
|
|
7
7
|
You must run this command from within a project.
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
If your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production org, never allow source tracking. You can also use the "--no-track-source" flag when you create a scratch or sandbox org to disable source tracking.
|
|
10
10
|
|
|
11
11
|
To retrieve multiple metadata components, either use multiple --metadata <name> flags or use a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.
|
|
12
12
|
|
|
13
13
|
# examples
|
|
14
14
|
|
|
15
|
+
- Retrieve remote changes:
|
|
16
|
+
|
|
17
|
+
<%= config.bin %> <%= command.id %>
|
|
18
|
+
|
|
15
19
|
- Retrieve the source files in a directory:
|
|
16
20
|
|
|
17
21
|
<%= config.bin %> <%= command.id %> --source-dir path/to/source
|
|
@@ -55,6 +59,14 @@ Target API version for the retrieve.
|
|
|
55
59
|
|
|
56
60
|
Use this flag to override the default API version, which is the latest version supported the CLI, with the API version in your package.xml file.
|
|
57
61
|
|
|
62
|
+
# flags.ignore-conflicts.summary
|
|
63
|
+
|
|
64
|
+
Ignore conflicts and retrieve and save files to your local filesystem, even if they overwrite your local changes.
|
|
65
|
+
|
|
66
|
+
# flags.ignore-conflicts.description
|
|
67
|
+
|
|
68
|
+
This flag applies only to orgs that allow source tracking. It has no effect on orgs that don't allow it, such as production orgs.
|
|
69
|
+
|
|
58
70
|
# flags.manifest.summary
|
|
59
71
|
|
|
60
72
|
File path for the manifest (package.xml) that specifies the components to retrieve.
|
|
@@ -106,3 +118,13 @@ Sending request to org (metadata API version %s)
|
|
|
106
118
|
# spinner.polling
|
|
107
119
|
|
|
108
120
|
Waiting for the org to respond
|
|
121
|
+
|
|
122
|
+
# error.Conflicts
|
|
123
|
+
|
|
124
|
+
There are changes in your local files that conflict with the org changes you're trying to retrieve.
|
|
125
|
+
|
|
126
|
+
# error.Conflicts.Actions
|
|
127
|
+
|
|
128
|
+
- To overwrite the local changes, rerun this command with the --ignore-conflicts flag.
|
|
129
|
+
|
|
130
|
+
- To overwrite the remote changes, run the "sf deploy metadata" command with the --ignore-conflicts flag.
|