sf-git-merge-driver 1.2.1-dev-148.20575983510-1 → 1.2.1-dev-148.20576223604-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.
Files changed (6) hide show
  1. package/README.md +3 -3
  2. package/lib/service/uninstallService.js +6 -1
  3. package/lib/service/uninstallService.js.map +1 -1
  4. package/npm-shrinkwrap.json +2 -2
  5. package/oclif.manifest.json +1 -1
  6. package/package.json +1 -1
package/README.md CHANGED
@@ -194,7 +194,7 @@ EXAMPLES
194
194
  $ sf git merge driver install
195
195
  ```
196
196
 
197
- _See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575983510-1/src/commands/git/merge/driver/install.ts)_
197
+ _See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20576223604-1/src/commands/git/merge/driver/install.ts)_
198
198
 
199
199
  ## `sf git merge driver run`
200
200
 
@@ -238,7 +238,7 @@ EXAMPLES
238
238
  - output-file is the path to the file where the merged content will be written
239
239
  ```
240
240
 
241
- _See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575983510-1/src/commands/git/merge/driver/run.ts)_
241
+ _See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20576223604-1/src/commands/git/merge/driver/run.ts)_
242
242
 
243
243
  ## `sf git merge driver uninstall`
244
244
 
@@ -265,7 +265,7 @@ EXAMPLES
265
265
  $ sf git merge driver uninstall
266
266
  ```
267
267
 
268
- _See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20575983510-1/src/commands/git/merge/driver/uninstall.ts)_
268
+ _See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-148.20576223604-1/src/commands/git/merge/driver/uninstall.ts)_
269
269
  <!-- commandsstop -->
270
270
  ## Changelog
271
271
 
package/lib/service/uninstallService.js CHANGED
@@ -14,6 +14,11 @@ export class UninstallService {
14
14
  try {
15
15
  // Throws when the merge driver is not installed
16
16
  await git.raw(['config', '--remove-section', `merge.${DRIVER_NAME}`]);
17
+ }
18
+ catch (error) {
19
+ Logger.error('Merge driver uninstallation failed to cleanup git config', error);
20
+ }
21
+ try {
17
22
  const gitAttributesPath = await getGitAttributesPath();
18
23
  // Throws when the file does not exist
19
24
  const gitAttributes = await readFile(gitAttributesPath, {
@@ -25,7 +30,7 @@ export class UninstallService {
25
30
  await writeFile(gitAttributesPath, filteredAttributes.join(GIT_EOL));
26
31
  }
27
32
  catch (error) {
28
- Logger.error('Merge driver uninstallation failed', error);
33
+ Logger.error('Merge driver uninstallation failed to cleanup git attributes', error);
29
34
  }
30
35
  }
31
36
  }
package/lib/service/uninstallService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAEnD,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CACpC,MAAM,CAAC,GAAG,CAAA,oBAAoB,WAAW,MAAM,CAChD,CAAA;AAED,MAAM,OAAO,gBAAgB;IAEd,AAAN,KAAK,CAAC,oBAAoB;QAC/B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,IAAI,CAAC;YACH,gDAAgD;YAChD,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,WAAW,EAAE,CAAC,CAAC,CAAA;YAErE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;YACtD,sCAAsC;YACtC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE;gBACtD,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAA;YACF,MAAM,kBAAkB,GAAG,aAAa;iBACrC,KAAK,CAAC,OAAO,CAAC;iBACd,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAClD,MAAM,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;CACF;AAnBc;IADZ,GAAG;4DAmBH"}
1
+ {"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAEnD,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CACpC,MAAM,CAAC,GAAG,CAAA,oBAAoB,WAAW,MAAM,CAChD,CAAA;AAED,MAAM,OAAO,gBAAgB;IAEd,AAAN,KAAK,CAAC,oBAAoB;QAC/B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,IAAI,CAAC;YACH,gDAAgD;YAChD,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,WAAW,EAAE,CAAC,CAAC,CAAA;QACvE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,0DAA0D,EAC1D,KAAK,CACN,CAAA;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;YACtD,sCAAsC;YACtC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE;gBACtD,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAA;YACF,MAAM,kBAAkB,GAAG,aAAa;iBACrC,KAAK,CAAC,OAAO,CAAC;iBACd,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAClD,MAAM,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,8DAA8D,EAC9D,KAAK,CACN,CAAA;QACH,CAAC;IACH,CAAC;CACF;AA7Bc;IADZ,GAAG;4DA6BH"}
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "sf-git-merge-driver",
3
- "version": "1.2.1-dev-148.20575983510-1",
3
+ "version": "1.2.1-dev-148.20576223604-1",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "sf-git-merge-driver",
9
- "version": "1.2.1-dev-148.20575983510-1",
9
+ "version": "1.2.1-dev-148.20576223604-1",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
12
  "@oclif/core": "^4.8.0",
package/oclif.manifest.json CHANGED
@@ -284,5 +284,5 @@
284
284
  ]
285
285
  }
286
286
  },
287
- "version": "1.2.1-dev-148.20575983510-1"
287
+ "version": "1.2.1-dev-148.20576223604-1"
288
288
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "sf-git-merge-driver",
3
3
  "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
4
- "version": "1.2.1-dev-148.20575983510-1",
4
+ "version": "1.2.1-dev-148.20576223604-1",
5
5
  "exports": "./lib/driver/MergeDriver.js",
6
6
  "type": "module",
7
7
  "author": "Sébastien Colladon (colladonsebastien@gmail.com)",