Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
741925db
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
741925db
编写于
10月 19, 2020
作者:
T
tomerstav
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implemented rebase onto
上级
74ef0a92
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
81 addition
and
0 deletion
+81
-0
extensions/git/package.json
extensions/git/package.json
+12
-0
extensions/git/package.nls.json
extensions/git/package.nls.json
+1
-0
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+37
-0
extensions/git/src/git.ts
extensions/git/src/git.ts
+18
-0
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+13
-0
未找到文件。
extensions/git/package.json
浏览文件 @
741925db
...
...
@@ -298,6 +298,11 @@
"title"
:
"%command.merge%"
,
"category"
:
"Git"
},
{
"command"
:
"git.rebaseOnto"
,
"title"
:
"%command.rebaseOnto%"
,
"category"
:
"Git"
},
{
"command"
:
"git.createTag"
,
"title"
:
"%command.createTag%"
,
...
...
@@ -703,6 +708,10 @@
"command"
:
"git.merge"
,
"when"
:
"config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command"
:
"git.rebaseOnto"
,
"when"
:
"config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command"
:
"git.createTag"
,
"when"
:
"config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
...
...
@@ -1433,6 +1442,9 @@
{
"command"
:
"git.merge"
},
{
"command"
:
"git.rebaseOnto"
},
{
"command"
:
"git.branch"
},
...
...
extensions/git/package.nls.json
浏览文件 @
741925db
...
...
@@ -50,6 +50,7 @@
"command.deleteBranch"
:
"Delete Branch..."
,
"command.renameBranch"
:
"Rename Branch..."
,
"command.merge"
:
"Merge Branch..."
,
"command.rebaseOnto"
:
"Rebase Branch Onto..."
,
"command.createTag"
:
"Create Tag"
,
"command.deleteTag"
:
"Delete Tag"
,
"command.fetch"
:
"Fetch"
,
...
...
extensions/git/src/commands.ts
浏览文件 @
741925db
...
...
@@ -99,6 +99,18 @@ class MergeItem implements QuickPickItem {
}
}
class
RebaseOntoItem
implements
QuickPickItem
{
get
label
():
string
{
return
this
.
ref
.
name
||
''
;
}
get
description
():
string
{
return
this
.
ref
.
name
||
''
;
}
constructor
(
protected
ref
:
Ref
)
{
}
async
run
(
repository
:
Repository
):
Promise
<
void
>
{
await
repository
.
rebaseOnto
(
repository
.
HEAD
,
this
.
ref
);
}
}
class
CreateBranchItem
implements
QuickPickItem
{
constructor
(
private
cc
:
CommandCenter
)
{
}
...
...
@@ -1848,6 +1860,31 @@ export class CommandCenter {
await
choice
.
run
(
repository
);
}
@
command
(
'
git.rebaseOnto
'
,
{
repository
:
true
})
async
rebaseOnto
(
repository
:
Repository
):
Promise
<
void
>
{
const
config
=
workspace
.
getConfiguration
(
'
git
'
);
const
checkoutType
=
config
.
get
<
string
>
(
'
checkoutType
'
)
||
'
all
'
;
const
includeRemotes
=
checkoutType
===
'
all
'
||
checkoutType
===
'
remote
'
;
const
heads
=
repository
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
Head
)
.
filter
(
ref
=>
ref
.
name
||
ref
.
commit
)
.
map
(
ref
=>
new
RebaseOntoItem
(
ref
as
Branch
));
const
remoteHeads
=
(
includeRemotes
?
repository
.
refs
.
filter
(
ref
=>
ref
.
type
===
RefType
.
RemoteHead
)
:
[])
.
filter
(
ref
=>
ref
.
name
||
ref
.
commit
)
.
map
(
ref
=>
new
RebaseOntoItem
(
ref
as
Branch
));
const
picks
=
[...
heads
,
...
remoteHeads
];
const
placeHolder
=
localize
(
'
select a branch to rebase onto
'
,
'
Select a branch to rebase onto
'
);
const
choice
=
await
window
.
showQuickPick
<
RebaseOntoItem
>
(
picks
,
{
placeHolder
});
if
(
!
choice
)
{
return
;
}
await
choice
.
run
(
repository
);
}
@
command
(
'
git.createTag
'
,
{
repository
:
true
})
async
createTag
(
repository
:
Repository
):
Promise
<
void
>
{
const
inputTagName
=
await
window
.
showInputBox
({
...
...
extensions/git/src/git.ts
浏览文件 @
741925db
...
...
@@ -1608,6 +1608,24 @@ export class Repository {
}
}
async rebase(branch: string, options: PullOptions = {}): Promise<void> {
const args = ['rebase'];
args.push(branch);
try {
await this.run(args, options);
} catch (err) {
if (/^CONFLICT \([^)]+\): \b/m.test(err.stdout || '')) {
err.gitErrorCode = GitErrorCodes.Conflict;
} else if (/cannot rebase onto multiple branches/i.test(err.stderr || '')) {
err.gitErrorCode = GitErrorCodes.CantRebaseMultipleBranches;
}
throw err;
}
}
async push(remote?: string, name?: string, setUpstream: boolean = false, tags = false, forcePushMode?: ForcePushMode): Promise<void> {
const args = ['push'];
...
...
extensions/git/src/repository.ts
浏览文件 @
741925db
...
...
@@ -300,6 +300,7 @@ export const enum Operation {
RenameBranch
=
'
RenameBranch
'
,
DeleteRef
=
'
DeleteRef
'
,
Merge
=
'
Merge
'
,
Rebase
=
'
Rebase
'
,
Ignore
=
'
Ignore
'
,
Tag
=
'
Tag
'
,
DeleteTag
=
'
DeleteTag
'
,
...
...
@@ -1067,6 +1068,10 @@ export class Repository implements Disposable {
await
this
.
run
(
Operation
.
Merge
,
()
=>
this
.
repository
.
merge
(
ref
));
}
async
rebase
(
branch
:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Rebase
,
()
=>
this
.
repository
.
rebase
(
branch
));
}
async
tag
(
name
:
string
,
message
?:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Tag
,
()
=>
this
.
repository
.
tag
(
name
,
message
));
}
...
...
@@ -1143,6 +1148,14 @@ export class Repository implements Disposable {
return
this
.
pullFrom
(
true
,
remote
,
branch
);
}
@
throttle
async
rebaseOnto
(
head
:
Branch
|
undefined
,
branch
:
Branch
|
undefined
):
Promise
<
void
>
{
if
(
head
?.
name
&&
branch
?.
name
)
{
await
this
.
checkout
(
branch
.
name
);
await
this
.
rebase
(
head
.
name
);
}
}
@
throttle
async
pull
(
head
?:
Branch
,
unshallow
?:
boolean
):
Promise
<
void
>
{
let
remote
:
string
|
undefined
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录