Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ce4fb6e3
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,发现更多精彩内容 >>
未验证
提交
ce4fb6e3
编写于
11月 06, 2020
作者:
J
João Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #96264
上级
0cc93f5c
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
53 addition
and
28 deletion
+53
-28
extensions/git/package.json
extensions/git/package.json
+5
-0
extensions/git/package.nls.json
extensions/git/package.nls.json
+1
-0
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+39
-24
extensions/git/src/git.ts
extensions/git/src/git.ts
+5
-1
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+2
-2
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+1
-1
未找到文件。
extensions/git/package.json
浏览文件 @
ce4fb6e3
...
...
@@ -278,6 +278,11 @@
"title"
:
"%command.checkout%"
,
"category"
:
"Git"
},
{
"command"
:
"git.checkoutDetached"
,
"title"
:
"%command.checkoutDetached%"
,
"category"
:
"Git"
},
{
"command"
:
"git.branch"
,
"title"
:
"%command.branch%"
,
...
...
extensions/git/package.nls.json
浏览文件 @
ce4fb6e3
...
...
@@ -46,6 +46,7 @@
"command.restoreCommitTemplate"
:
"Restore Commit Template"
,
"command.undoCommit"
:
"Undo Last Commit"
,
"command.checkout"
:
"Checkout to..."
,
"command.checkoutDetached"
:
"Checkout to (Detached)..."
,
"command.branch"
:
"Create Branch..."
,
"command.branchFrom"
:
"Create Branch From..."
,
"command.deleteBranch"
:
"Delete Branch..."
,
...
...
extensions/git/src/commands.ts
浏览文件 @
ce4fb6e3
...
...
@@ -31,14 +31,14 @@ class CheckoutItem implements QuickPickItem {
constructor
(
protected
ref
:
Ref
)
{
}
async
run
(
repository
:
Repository
):
Promise
<
void
>
{
async
run
(
repository
:
Repository
,
opts
?:
{
detached
?:
boolean
}
):
Promise
<
void
>
{
const
ref
=
this
.
ref
.
name
;
if
(
!
ref
)
{
return
;
}
await
repository
.
checkout
(
ref
);
await
repository
.
checkout
(
ref
,
opts
);
}
}
...
...
@@ -114,31 +114,21 @@ class RebaseItem implements QuickPickItem {
}
class
CreateBranchItem
implements
QuickPickItem
{
constructor
(
private
cc
:
CommandCenter
)
{
}
get
label
():
string
{
return
'
$(plus)
'
+
localize
(
'
create branch
'
,
'
Create new branch...
'
);
}
get
description
():
string
{
return
''
;
}
get
alwaysShow
():
boolean
{
return
true
;
}
async
run
(
repository
:
Repository
):
Promise
<
void
>
{
await
this
.
cc
.
branch
(
repository
);
}
}
class
CreateBranchFromItem
implements
QuickPickItem
{
constructor
(
private
cc
:
CommandCenter
)
{
}
get
label
():
string
{
return
'
$(plus)
'
+
localize
(
'
create branch from
'
,
'
Create new branch from...
'
);
}
get
description
():
string
{
return
''
;
}
get
alwaysShow
():
boolean
{
return
true
;
}
}
async
run
(
repository
:
Repository
):
Promise
<
void
>
{
await
this
.
cc
.
branch
(
repository
);
}
class
CheckoutDetachedItem
implements
QuickPickItem
{
get
label
():
string
{
return
'
$(debug-disconnect)
'
+
localize
(
'
checkout detached
'
,
'
Checkout detached...
'
);
}
get
description
():
string
{
return
''
;
}
get
alwaysShow
():
boolean
{
return
true
;
}
}
class
HEADItem
implements
QuickPickItem
{
...
...
@@ -1739,20 +1729,43 @@ export class CommandCenter {
}
@
command
(
'
git.checkout
'
,
{
repository
:
true
})
async
checkout
(
repository
:
Repository
,
treeish
:
string
):
Promise
<
boolean
>
{
async
checkout
(
repository
:
Repository
,
treeish
?
:
string
):
Promise
<
boolean
>
{
if
(
typeof
treeish
===
'
string
'
)
{
await
repository
.
checkout
(
treeish
);
return
true
;
}
const
createBranch
=
new
CreateBranchItem
(
this
);
const
createBranchFrom
=
new
CreateBranchFromItem
(
this
);
const
picks
=
[
createBranch
,
createBranchFrom
,
...
createCheckoutItems
(
repository
)];
const
placeHolder
=
localize
(
'
select a ref to checkout
'
,
'
Select a ref to checkout
'
);
return
this
.
_checkout
(
repository
);
}
@
command
(
'
git.checkoutDetached
'
,
{
repository
:
true
})
async
checkoutDetached
(
repository
:
Repository
,
treeish
?:
string
):
Promise
<
boolean
>
{
if
(
typeof
treeish
===
'
string
'
)
{
await
repository
.
checkout
(
treeish
,
{
detached
:
true
});
return
true
;
}
return
this
.
_checkout
(
repository
,
{
detached
:
true
});
}
private
async
_checkout
(
repository
:
Repository
,
opts
?:
{
detached
?:
boolean
}):
Promise
<
boolean
>
{
const
createBranch
=
new
CreateBranchItem
();
const
createBranchFrom
=
new
CreateBranchFromItem
();
const
checkoutDetached
=
new
CheckoutDetachedItem
();
const
picks
:
QuickPickItem
[]
=
[];
if
(
!
opts
?.
detached
)
{
picks
.
push
(
createBranch
,
createBranchFrom
,
checkoutDetached
);
}
picks
.
push
(...
createCheckoutItems
(
repository
));
const
quickpick
=
window
.
createQuickPick
();
quickpick
.
items
=
picks
;
quickpick
.
placeholder
=
placeHolder
;
quickpick
.
placeholder
=
opts
?.
detached
?
localize
(
'
select a ref to checkout detached
'
,
'
Select a ref to checkout in detached mode
'
)
:
localize
(
'
select a ref to checkout
'
,
'
Select a ref to checkout
'
);
quickpick
.
show
();
const
choice
=
await
new
Promise
<
QuickPickItem
|
undefined
>
(
c
=>
quickpick
.
onDidAccept
(()
=>
c
(
quickpick
.
activeItems
[
0
])));
...
...
@@ -1766,8 +1779,10 @@ export class CommandCenter {
await
this
.
_branch
(
repository
,
quickpick
.
value
);
}
else
if
(
choice
===
createBranchFrom
)
{
await
this
.
_branch
(
repository
,
quickpick
.
value
,
true
);
}
else
if
(
choice
===
checkoutDetached
)
{
return
this
.
_checkout
(
repository
,
{
detached
:
true
});
}
else
{
await
(
choice
as
CheckoutItem
).
run
(
repository
);
await
(
choice
as
CheckoutItem
).
run
(
repository
,
opts
);
}
return
true
;
...
...
extensions/git/src/git.ts
浏览文件 @
ce4fb6e3
...
...
@@ -1299,13 +1299,17 @@ export class Repository {
await this.run(['update-index', add, '--cacheinfo', mode, hash, path]);
}
async checkout(treeish: string, paths: string[], opts: { track?: boolean } = Object.create(null)): Promise<void> {
async checkout(treeish: string, paths: string[], opts: { track?: boolean
, detached?: boolean
} = Object.create(null)): Promise<void> {
const args = ['checkout', '-q'];
if (opts.track) {
args.push('--track');
}
if (opts.detached) {
args.push('--detach');
}
if (treeish) {
args.push(treeish);
}
...
...
extensions/git/src/repository.ts
浏览文件 @
ce4fb6e3
...
...
@@ -1087,8 +1087,8 @@ export class Repository implements Disposable {
await
this
.
run
(
Operation
.
DeleteTag
,
()
=>
this
.
repository
.
deleteTag
(
name
));
}
async
checkout
(
treeish
:
string
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Checkout
,
()
=>
this
.
repository
.
checkout
(
treeish
,
[]));
async
checkout
(
treeish
:
string
,
opts
?:
{
detached
?:
boolean
}
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Checkout
,
()
=>
this
.
repository
.
checkout
(
treeish
,
[]
,
opts
));
}
async
checkoutTracking
(
treeish
:
string
):
Promise
<
void
>
{
...
...
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
浏览文件 @
ce4fb6e3
...
...
@@ -366,7 +366,7 @@ registerThemingParticipant((theme, collector) => {
const
debugIconDisconnectColor
=
theme
.
getColor
(
debugIconDisconnectForeground
);
if
(
debugIconDisconnectColor
)
{
collector
.
addRule
(
`.monaco-workbench .codicon-debug-disconnect { color:
${
debugIconDisconnectColor
}
!important; }`
);
collector
.
addRule
(
`.monaco-workbench .
debug-view-content .codicon-debug-disconnect, .monaco-workbench .debug-toolbar .
codicon-debug-disconnect { color:
${
debugIconDisconnectColor
}
!important; }`
);
}
const
debugIconRestartColor
=
theme
.
getColor
(
debugIconRestartForeground
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录