Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
24c05ae2
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24c05ae2
编写于
8月 10, 2017
作者:
J
Justin Horner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement rename branch command
上级
b3a977e3
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
46 addition
and
3 deletion
+46
-3
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+38
-0
extensions/git/src/model.ts
extensions/git/src/model.ts
+8
-3
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
24c05ae2
...
@@ -843,6 +843,44 @@ export class CommandCenter {
...
@@ -843,6 +843,44 @@ export class CommandCenter {
}
}
}
}
@
command
(
'
git.renameBranch
'
)
async
renameBranch
():
Promise
<
void
>
{
const
placeHolder
=
localize
(
'
provide branch name
'
,
"
Please provide a branch name
"
);
const
name
=
await
window
.
showInputBox
({
placeHolder
});
if
(
!
name
||
name
.
trim
().
length
===
0
)
{
return
;
}
const
run
=
force
=>
this
.
model
.
renameBranch
(
name
);
try
{
await
run
(
name
);
}
catch
(
err
)
{
console
.
log
(
err
);
if
(
err
.
gitErrorCode
!==
GitErrorCodes
.
InvalidBranchName
&&
err
.
gitErrorCode
!==
GitErrorCodes
.
BranchAlreadyExists
)
{
return
err
;
}
let
message
=
''
;
switch
(
err
.
gitErrorCode
)
{
case
GitErrorCodes
.
InvalidBranchName
:
message
=
localize
(
'
invalid branch name
'
,
'
Invalid branch name
'
);
break
;
case
GitErrorCodes
.
BranchAlreadyExists
:
message
=
localize
(
'
branch already exists
'
,
`A branch named '
${
name
}
' already exists`
);
break
;
}
if
(
!
message
)
{
return
;
}
window
.
showErrorMessage
(
message
);
}
}
@
command
(
'
git.merge
'
)
@
command
(
'
git.merge
'
)
async
merge
():
Promise
<
void
>
{
async
merge
():
Promise
<
void
>
{
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
...
...
extensions/git/src/model.ts
浏览文件 @
24c05ae2
...
@@ -213,9 +213,10 @@ export enum Operation {
...
@@ -213,9 +213,10 @@ export enum Operation {
Stage
=
1
<<
14
,
Stage
=
1
<<
14
,
GetCommitTemplate
=
1
<<
15
,
GetCommitTemplate
=
1
<<
15
,
DeleteBranch
=
1
<<
16
,
DeleteBranch
=
1
<<
16
,
Merge
=
1
<<
17
,
RenameBranch
=
1
<<
17
,
Ignore
=
1
<<
18
,
Merge
=
1
<<
18
,
Tag
=
1
<<
19
Ignore
=
1
<<
19
,
Tag
=
1
<<
20
}
}
// function getOperationName(operation: Operation): string {
// function getOperationName(operation: Operation): string {
...
@@ -463,6 +464,10 @@ export class Model implements Disposable {
...
@@ -463,6 +464,10 @@ export class Model implements Disposable {
await
this
.
run
(
Operation
.
DeleteBranch
,
()
=>
this
.
repository
.
deleteBranch
(
name
,
force
));
await
this
.
run
(
Operation
.
DeleteBranch
,
()
=>
this
.
repository
.
deleteBranch
(
name
,
force
));
}
}
async
renameBranch
(
name
:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
RenameBranch
,
()
=>
this
.
repository
.
renameBranch
(
name
));
}
async
merge
(
ref
:
string
):
Promise
<
void
>
{
async
merge
(
ref
:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Merge
,
()
=>
this
.
repository
.
merge
(
ref
));
await
this
.
run
(
Operation
.
Merge
,
()
=>
this
.
repository
.
merge
(
ref
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录