release 7.1.0

saqqdy · saqqdy · commit b53bcf322a8c · 2024-06-18T11:10:21.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # 更新日志
 
+## 2024.06.18 v7.1.0
+
+1. 增加`--push`传值，是否在copy之后推送目标分支到远程
+
 ## 2024.05.10 v7.0.1
 
 1. 修复版本控制BUG
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/monorepo",
 	"description": "这是一个git工作流工具",
-	"version": "7.0.1",
+	"version": "7.1.0",
 	"packageManager": "pnpm@9.1.0",
 	"main": "index.js",
 	"files": [
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/api",
 	"description": "gitmars api",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/build",
 	"description": "gitmars build",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/cache",
 	"description": "gitmars cache",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/core",
 	"description": "gitmars核心程序",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/docs/api/index.md b/packages/docs/api/index.md
@@ -421,10 +421,11 @@ gitm ct -l
 #### 短指令：gitm cp
 
 > v4.0.0 重构指令，改造成自选提交记录的方式
+> v7.1.0 增加`--push`传值，是否在copy之后推送目标分支到远程
 
 复制当前分支上的提交记录到目标分支
 
-- 使用：`gitm copy [commitid...]` 或者 `gitm copy [--lastet [lastet]] [--limit [limit]] [--no-merges]`
+- 使用：`gitm copy [commitid...]` 或者 `gitm copy [--lastet [lastet]] [--limit [limit]] [--no-merges] [-p -push]`
 - 参数：
 
 <div class="table-prop">
@@ -444,6 +445,7 @@ gitm ct -l
 | --no-merge | -    | 排除 merge 记录                                        | `Boolean` | -      | 否       | `false` |
 | --lastet   | -    | 查询在某个时间之后的日志，填写格式：10s/2m/2h/3d/4M/5y | `String`  | -      | 否       | '7d'    |
 | --limit    | -    | 最多查询的日志条数                                     | `Number`  | -      | 否       | 20      |
+| --push     | -p   | 推送目标分支到远程                                     | `boolean` | -      | 否       | `false` |
 
 </div>
 
diff --git a/packages/docs/changelog.md b/packages/docs/changelog.md
@@ -1,5 +1,9 @@
 # 更新日志
 
+## 2024.06.18 v7.1.0
+
+1. 增加`--push`传值，是否在copy之后推送目标分支到远程
+
 ## 2024.05.10 v7.0.1
 
 1. 修复版本控制BUG
diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/docs",
 	"description": "gitmars文档库",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"files": [
 		"dist",
diff --git a/packages/git/package.json b/packages/git/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/git",
 	"description": "gitmars git",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json
@@ -2,7 +2,7 @@
 	"name": "gitmars",
 	"description": "这是一个git工作流工具",
 	"type": "module",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"bin": {
 		"gitm": "lib/gitm.mjs"
diff --git a/packages/gitmars/src/conf/copy.ts b/packages/gitmars/src/conf/copy.ts
@@ -55,6 +55,18 @@ export const cmdConfig: GitmarsOptionType = {
 			negate: false,
 			description: t('The maximum number of logs to be queried'),
 			defaultValue: ''
+		},
+		{
+			flags: '-p, --push',
+			required: false,
+			optional: false,
+			variadic: false,
+			mandatory: false,
+			short: '-p',
+			long: '--push',
+			negate: false,
+			description: t('Push target branch'),
+			recommend: false
 		}
 	],
 	// validator opts
diff --git a/packages/gitmars/src/gitm-copy.ts b/packages/gitmars/src/gitm-copy.ts
@@ -35,14 +35,15 @@ interface GitmCopyOption {
 	merges: boolean
 	lastet: string
 	limit: number
+	push: boolean
 }
 
 /**
  * gitm copy
  */
 program
 	.name('gitm copy')
-	.usage('[commitid...] [--lastet [lastet]] [--limit [limit]] [--no-merges]')
+	.usage('[commitid...] [--lastet [lastet]] [--limit [limit]] [--no-merges] [-p --push]')
 	.description(
 		t(
 			'cherry-pick batch version, copy a record from a branch and merge it into the current branch'
@@ -55,6 +56,7 @@ options.forEach((o: GitmarsOptionOptionsType) => {
 // .option('--no-merges', t('Whether to exclude merge's log'), false)
 // .option('--lastet [lastet]', t('Query logs after a certain time, fill in the format: 10s/2m/2h/3d/4M/5y'), '')
 // .option('--limit [limit]', t('The maximum number of logs to be queried'))
+// .option('-p --push', t('Push target branch'))
 program.action(async (commitid: string[], opts: GitmCopyOption) => {
 	const keys: GitLogKeysType[] = ['%H', '%T', '%P', '%aI', '%an', '%s', '%b']
 	const current = getCurrentBranch()
@@ -132,10 +134,12 @@ program.action(async (commitid: string[], opts: GitmCopyOption) => {
 				success: t('Record merge successful'),
 				fail: t('Merge failed, please follow the instructions')
 			}
-		},
-		`git checkout ${current}`
+		}
 	]
 
+	if (opts.push) cmd.push('git push')
+	cmd.push(`git checkout ${current}`)
+
 	// 执行
 	queue(cmd)
 })
diff --git a/packages/gitmars/src/locales/zh-CN.ts b/packages/gitmars/src/locales/zh-CN.ts
@@ -461,5 +461,6 @@ export default {
 	'Enter wechat account': '输入微信号',
 	'Implementation success': '执行成功',
 	'Select wechat account': '选择微信账号',
-	'Confirm unbind wechat account': '是否确认解绑体验者'
+	'Confirm unbind wechat account': '是否确认解绑体验者',
+	'Push target branch': '推送目标分支到远程'
 }
diff --git a/packages/go/package.json b/packages/go/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/go",
 	"description": "gitmars go",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/hook/package.json b/packages/hook/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/hook",
 	"description": "gitmars hook",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/utils",
 	"description": "gitmars utils",
-	"version": "7.0.0-beta.34",
+	"version": "7.1.0",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/monorepo",`
`3`	`3`	`"description": "这是一个git工作流工具",`
`4`		`- "version": "7.0.1",`
	`4`	`+ "version": "7.1.0",`
`5`	`5`	`"packageManager": "[email protected]",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/api",`
`3`	`3`	`"description": "gitmars api",`
`4`		`- "version": "7.0.0-beta.34",`
	`4`	`+ "version": "7.1.0",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/build",`
`3`	`3`	`"description": "gitmars build",`
`4`		`- "version": "7.0.0-beta.34",`
	`4`	`+ "version": "7.1.0",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/cache",`
`3`	`3`	`"description": "gitmars cache",`
`4`		`- "version": "7.0.0-beta.34",`
	`4`	`+ "version": "7.1.0",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/core",`
`3`	`3`	`"description": "gitmars核心程序",`
`4`		`- "version": "7.0.0-beta.34",`
	`4`	`+ "version": "7.1.0",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/docs",`
`3`	`3`	`"description": "gitmars文档库",`
`4`		`- "version": "7.0.0-beta.34",`
	`4`	`+ "version": "7.1.0",`
`5`	`5`	`"private": false,`
`6`	`6`	`"files": [`
`7`	`7`	`"dist",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/git",`
`3`	`3`	`"description": "gitmars git",`
`4`		`- "version": "7.0.0-beta.34",`
	`4`	`+ "version": "7.1.0",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`