@yourfam/yf-merge-check 0.1.0 → 0.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/package.json +1 -1
- package/src/args.js +8 -0
- package/src/index.js +5 -1
package/package.json
CHANGED
package/src/args.js
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
|
+
import { createRequire } from "node:module";
|
|
1
2
|
import { CliError } from "./errors.js";
|
|
2
3
|
|
|
4
|
+
const require = createRequire(import.meta.url);
|
|
5
|
+
export const packageVersion = require("../package.json").version;
|
|
6
|
+
|
|
3
7
|
export const helpText = `Check whether a merge would conflict. The current branch is not changed.
|
|
4
8
|
|
|
5
9
|
Usage:
|
|
@@ -13,6 +17,7 @@ Options:
|
|
|
13
17
|
--stack Merge targets in order onto each other, starting from the base.
|
|
14
18
|
--fetch git fetch --all --prune before resolving names.
|
|
15
19
|
--gitignore Add yf-merge/ to the repository root .gitignore.
|
|
20
|
+
--version Print the version and exit.
|
|
16
21
|
-h, --help Show this help.
|
|
17
22
|
|
|
18
23
|
There is no default base and no default target.
|
|
@@ -23,6 +28,9 @@ export function parseArgs(argv) {
|
|
|
23
28
|
if (tokens.includes("--help") || tokens.includes("-h")) {
|
|
24
29
|
return { help: true };
|
|
25
30
|
}
|
|
31
|
+
if (tokens.includes("--version")) {
|
|
32
|
+
return { version: true };
|
|
33
|
+
}
|
|
26
34
|
|
|
27
35
|
let base;
|
|
28
36
|
let baseSet = false;
|
package/src/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { parseArgs, helpText } from "./args.js";
|
|
1
|
+
import { packageVersion, parseArgs, helpText } from "./args.js";
|
|
2
2
|
import { CliError } from "./errors.js";
|
|
3
3
|
import { fetchAll, mergeTargets, repoTop, resolveName, spawnGit } from "./git.js";
|
|
4
4
|
import { updateGitignore } from "./gitignore.js";
|
|
@@ -35,6 +35,10 @@ async function execute({ argv, stdout, stderr, cwd, spawnImpl, now }) {
|
|
|
35
35
|
stdout.write(helpText);
|
|
36
36
|
return 0;
|
|
37
37
|
}
|
|
38
|
+
if (args.version) {
|
|
39
|
+
stdout.write(`${packageVersion}\n`);
|
|
40
|
+
return 0;
|
|
41
|
+
}
|
|
38
42
|
|
|
39
43
|
const toplevel = await repoTop(spawnImpl, cwd);
|
|
40
44
|
if (args.fetch) await fetchAll(spawnImpl, toplevel);
|