git-rebase-branches 0.3.1 → 0.4.0
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/build/index.js +45 -19
- package/build/index.js.map +1 -1
- package/build/utils.js +5 -6
- package/build/utils.js.map +1 -1
- package/package.json +6 -3
- package/CHANGELOG.md +0 -22
package/build/index.js
CHANGED
|
@@ -1,23 +1,49 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
exports
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var dateFns = require("date-fns");
|
|
4
4
|
var utils_1 = require("./utils");
|
|
5
|
-
var
|
|
6
|
-
if (argvSet.has('--help')) {
|
|
5
|
+
var showHelp = function () {
|
|
7
6
|
console.log('git-rebase-branches');
|
|
7
|
+
console.log('git-rebase-branches --sinceMonths 2');
|
|
8
8
|
console.log('git-rebase-branches --push');
|
|
9
9
|
console.log('git-rebase-branches --help');
|
|
10
10
|
process.exit(0);
|
|
11
|
+
};
|
|
12
|
+
(function () {
|
|
13
|
+
var argvSet = new Set(process.argv.slice(2, Infinity));
|
|
14
|
+
if (argvSet.has('--help')) {
|
|
15
|
+
showHelp();
|
|
16
|
+
}
|
|
17
|
+
})();
|
|
18
|
+
var params = [];
|
|
19
|
+
var flagsWithParams = new Set(['sinceMonths']);
|
|
20
|
+
var flags = {};
|
|
21
|
+
for (var i = 2; i < process.argv.length; i++) {
|
|
22
|
+
if (typeof process.argv[i] === 'string' && process.argv[i].startsWith('--')) {
|
|
23
|
+
var flagName = process.argv[i].slice(2);
|
|
24
|
+
if (flagsWithParams.has(flagName)) {
|
|
25
|
+
var value = process.argv[i + 1];
|
|
26
|
+
flags[flagName] = value;
|
|
27
|
+
i++;
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
flags[flagName] = true;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
params.push(process.argv[i]);
|
|
35
|
+
}
|
|
11
36
|
}
|
|
12
|
-
var currentUser = utils_1.gitMultilineResults('config user.email')[0];
|
|
13
|
-
console.log("git config user.email: \""
|
|
14
|
-
var currentBranch = utils_1.gitMultilineResults('rev-parse --abbrev-ref HEAD')[0];
|
|
37
|
+
var currentUser = (0, utils_1.gitMultilineResults)('config user.email')[0];
|
|
38
|
+
console.log("git config user.email: \"".concat(currentUser, "\""));
|
|
39
|
+
var currentBranch = (0, utils_1.gitMultilineResults)('rev-parse --abbrev-ref HEAD')[0];
|
|
15
40
|
if (currentBranch !== 'master') {
|
|
16
41
|
console.log('checkout master');
|
|
17
|
-
utils_1.git('checkout master');
|
|
42
|
+
(0, utils_1.git)('checkout master');
|
|
18
43
|
}
|
|
19
|
-
var branchList = utils_1.gitMultilineResults("branch --sort=-committerdate --format='%(refname:short)|%(committerdate:iso)|%(authoremail)' --no-merged");
|
|
44
|
+
var branchList = (0, utils_1.gitMultilineResults)("branch --sort=-committerdate --format='%(refname:short)|%(committerdate:iso)|%(authoremail)' --no-merged");
|
|
20
45
|
var splitBranchInfoRegex = /^([^|]+)\|([^|]+)\|<(.*)>$/;
|
|
46
|
+
var sinceMonths = typeof flags.sinceMonths === 'string' ? parseInt(flags.sinceMonths, 10) : 2;
|
|
21
47
|
branchList = branchList
|
|
22
48
|
.map(function (line) {
|
|
23
49
|
line = line.replace(/^'/, '').replace(/'$/, '');
|
|
@@ -26,7 +52,7 @@ branchList = branchList
|
|
|
26
52
|
return;
|
|
27
53
|
}
|
|
28
54
|
var commitDate = new Date(res[2]);
|
|
29
|
-
if (!dateFns.isAfter(commitDate, dateFns.subMonths(new Date(),
|
|
55
|
+
if (!dateFns.isAfter(commitDate, dateFns.subMonths(new Date(), sinceMonths))) {
|
|
30
56
|
return;
|
|
31
57
|
}
|
|
32
58
|
var branchName = res[1];
|
|
@@ -41,17 +67,17 @@ var succeded = [];
|
|
|
41
67
|
var failed = [];
|
|
42
68
|
for (var _i = 0, branchList_1 = branchList; _i < branchList_1.length; _i++) {
|
|
43
69
|
var branchName = branchList_1[_i];
|
|
44
|
-
console.log("rebasing "
|
|
45
|
-
utils_1.git("checkout "
|
|
70
|
+
console.log("rebasing ".concat(branchName));
|
|
71
|
+
(0, utils_1.git)("checkout ".concat(branchName));
|
|
46
72
|
if (process.exitCode) {
|
|
47
73
|
console.error('checkout failed with exit code', process.exitCode);
|
|
48
74
|
failed.push(branchName);
|
|
49
75
|
continue;
|
|
50
76
|
}
|
|
51
|
-
utils_1.git('rebase origin/master');
|
|
77
|
+
(0, utils_1.git)('rebase origin/master');
|
|
52
78
|
if (process.exitCode) {
|
|
53
79
|
console.error('rebase failed with exit code', process.exitCode);
|
|
54
|
-
utils_1.git('rebase --abort');
|
|
80
|
+
(0, utils_1.git)('rebase --abort');
|
|
55
81
|
failed.push(branchName);
|
|
56
82
|
continue;
|
|
57
83
|
}
|
|
@@ -60,21 +86,21 @@ for (var _i = 0, branchList_1 = branchList; _i < branchList_1.length; _i++) {
|
|
|
60
86
|
console.log('');
|
|
61
87
|
if (failed.length) {
|
|
62
88
|
console.error('Failed to rebase:');
|
|
63
|
-
failed.forEach(function (branch) { return console.error("* "
|
|
89
|
+
failed.forEach(function (branch) { return console.error("* ".concat(branch)); });
|
|
64
90
|
}
|
|
65
91
|
else {
|
|
66
92
|
console.info('All rebased!');
|
|
67
93
|
}
|
|
68
94
|
if (currentBranch !== 'master') {
|
|
69
|
-
console.log("\ncheckout "
|
|
70
|
-
utils_1.git("checkout "
|
|
95
|
+
console.log("\ncheckout ".concat(currentBranch));
|
|
96
|
+
(0, utils_1.git)("checkout ".concat(currentBranch));
|
|
71
97
|
}
|
|
72
98
|
console.log('');
|
|
73
|
-
if (
|
|
99
|
+
if (flags.push) {
|
|
74
100
|
for (var _a = 0, succeded_1 = succeded; _a < succeded_1.length; _a++) {
|
|
75
101
|
var branchName = succeded_1[_a];
|
|
76
|
-
console.log("git push origin "
|
|
77
|
-
utils_1.git("push origin "
|
|
102
|
+
console.log("git push origin ".concat(branchName, " --force-with-lease"));
|
|
103
|
+
(0, utils_1.git)("push origin ".concat(branchName, " --force-with-lease"));
|
|
78
104
|
}
|
|
79
105
|
}
|
|
80
106
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,kCAAoC;AACpC,iCAAmD;AAEnD,IAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/build/utils.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
exports
|
|
3
|
-
exports.
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.git = git;
|
|
4
|
+
exports.gitMultilineResults = gitMultilineResults;
|
|
4
5
|
var child_process_1 = require("child_process");
|
|
5
6
|
function exec(cmd, args, stdio) {
|
|
6
|
-
var result = child_process_1.spawnSync(cmd, args.split(' '), {
|
|
7
|
+
var result = (0, child_process_1.spawnSync)(cmd, args.split(' '), {
|
|
7
8
|
encoding: 'utf8',
|
|
8
|
-
stdio: stdio
|
|
9
|
+
stdio: stdio,
|
|
9
10
|
});
|
|
10
11
|
var error = result.error, stdout = result.stdout;
|
|
11
12
|
var status = result.status;
|
|
@@ -24,11 +25,9 @@ function exec(cmd, args, stdio) {
|
|
|
24
25
|
function git(args) {
|
|
25
26
|
return exec('git', args, 'pipe');
|
|
26
27
|
}
|
|
27
|
-
exports.git = git;
|
|
28
28
|
function gitMultilineResults(args) {
|
|
29
29
|
return git(args)
|
|
30
30
|
.split('\n')
|
|
31
31
|
.filter(function (line) { return !!line; });
|
|
32
32
|
}
|
|
33
|
-
exports.gitMultilineResults = gitMultilineResults;
|
|
34
33
|
//# sourceMappingURL=utils.js.map
|
package/build/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAqBA,kBAEC;AAED,kDAIC;AA7BD,+CAAwD;AAExD,SAAS,IAAI,CAAC,GAAW,EAAE,IAAY,EAAE,KAAmB;IAC3D,IAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC9C,QAAQ,EAAE,MAAM;QAChB,KAAK,OAAA;KACL,CAAC,CAAC;IACK,IAAA,KAAK,GAAa,MAAM,MAAnB,EAAE,MAAM,GAAK,MAAM,OAAX,CAAY;IAC3B,IAAA,MAAM,GAAK,MAAM,OAAX,CAAY;IACxB,IAAI,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,GAAG,CAAC,CAAC;IACZ,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC;IAC3B,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAgB,GAAG,CAAC,IAAY;IAC/B,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,mBAAmB,CAAC,IAAY;IAC/C,OAAO,GAAG,CAAC,IAAI,CAAC;SACd,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,CAAC,CAAC,IAAI,EAAN,CAAM,CAAC,CAAC;AAC1B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "git-rebase-branches",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "A simple script for rebasing your recent git branches",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -37,14 +37,17 @@
|
|
|
37
37
|
},
|
|
38
38
|
"homepage": "https://github.com/balena-io-modules/git-rebase-branches#readme",
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@types/node": "^
|
|
40
|
+
"@types/node": "^22.0.0",
|
|
41
41
|
"husky": "^4.0.0",
|
|
42
42
|
"lint-staged": "^10.0.0",
|
|
43
43
|
"prettier": "^1.19.1",
|
|
44
44
|
"resin-lint": "^3.1.1",
|
|
45
|
-
"typescript": "^
|
|
45
|
+
"typescript": "^5.9.3"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"date-fns": "^2.9.0"
|
|
49
|
+
},
|
|
50
|
+
"versionist": {
|
|
51
|
+
"publishedAt": "2026-01-16T08:35:26.068Z"
|
|
49
52
|
}
|
|
50
53
|
}
|
package/CHANGELOG.md
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
# Change Log
|
|
2
|
-
|
|
3
|
-
All notable changes to this project will be documented in this file
|
|
4
|
-
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
5
|
-
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
|
-
|
|
7
|
-
# v0.3.1
|
|
8
|
-
## (2020-11-12)
|
|
9
|
-
|
|
10
|
-
* Fix the published files [Thodoris Greasidis]
|
|
11
|
-
|
|
12
|
-
## 0.3.0 - 2020-01-31
|
|
13
|
-
|
|
14
|
-
* Add --push option [Thodoris Greasidis]
|
|
15
|
-
|
|
16
|
-
## 0.2.0 - 2020-01-27
|
|
17
|
-
|
|
18
|
-
* Initial code commit [Thodoris Greasidis]
|
|
19
|
-
|
|
20
|
-
## v0.1.0 - 2020-01-24
|
|
21
|
-
|
|
22
|
-
* Initialize repository
|