Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2125bcf9
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,发现更多精彩内容 >>
提交
2125bcf9
编写于
10月 17, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
1852e0c7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
16 deletion
+19
-16
extensions/git/package.nls.json
extensions/git/package.nls.json
+1
-1
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+18
-15
未找到文件。
extensions/git/package.nls.json
浏览文件 @
2125bcf9
...
...
@@ -53,7 +53,7 @@
"command.removeRemote"
:
"Remove Remote"
,
"command.sync"
:
"Sync"
,
"command.syncRebase"
:
"Sync (Rebase)"
,
"command.publish"
:
"Publish Branch"
,
"command.publish"
:
"Publish Branch
...
"
,
"command.showOutput"
:
"Show Git Output"
,
"command.ignore"
:
"Add to .gitignore"
,
"command.revealInExplorer"
:
"Reveal in Explorer"
,
...
...
extensions/git/src/commands.ts
浏览文件 @
2125bcf9
...
...
@@ -1747,7 +1747,7 @@ export class CommandCenter {
const
remoteRefs
=
repository
.
refs
;
const
remoteRefsFiltered
=
remoteRefs
.
filter
(
r
=>
(
r
.
remote
===
remotePick
.
label
));
const
branchPicks
=
remoteRefsFiltered
.
map
(
r
=>
({
label
:
r
.
name
}))
as
{
label
:
string
;
description
:
string
}[]
;
const
branchPicks
=
remoteRefsFiltered
.
map
(
r
=>
({
label
:
r
.
name
!
}))
;
const
branchPlaceHolder
=
localize
(
'
pick branch pull
'
,
"
Pick a branch to pull from
"
);
const
branchPick
=
await
window
.
showQuickPick
(
branchPicks
,
{
placeHolder
:
branchPlaceHolder
});
...
...
@@ -1854,15 +1854,24 @@ export class CommandCenter {
}
}
else
{
const
branchName
=
repository
.
HEAD
.
name
;
const
picks
=
remotes
.
filter
(
r
=>
r
.
pushUrl
!==
undefined
).
map
(
r
=>
({
label
:
r
.
name
,
description
:
r
.
pushUrl
!
}));
const
addRemote
=
new
AddRemoteItem
(
this
);
const
picks
=
[...
remotes
.
filter
(
r
=>
r
.
pushUrl
!==
undefined
).
map
(
r
=>
({
label
:
r
.
name
,
description
:
r
.
pushUrl
})),
addRemote
];
const
placeHolder
=
localize
(
'
pick remote
'
,
"
Pick a remote to publish the branch '{0}' to:
"
,
branchName
);
const
pick
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
const
choice
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
if
(
!
pick
)
{
if
(
!
choice
)
{
return
;
}
await
repository
.
pushTo
(
pick
.
label
,
branchName
,
undefined
,
forcePushMode
);
if
(
choice
===
addRemote
)
{
const
newRemote
=
await
this
.
addRemote
(
repository
);
if
(
newRemote
)
{
await
repository
.
pushTo
(
newRemote
,
branchName
,
undefined
,
forcePushMode
);
}
}
else
{
await
repository
.
pushTo
(
choice
.
label
,
branchName
,
undefined
,
forcePushMode
);
}
}
}
...
...
@@ -2057,10 +2066,8 @@ export class CommandCenter {
}
const
addRemote
=
new
AddRemoteItem
(
this
);
const
picks
=
[...
repository
.
remotes
.
map
(
r
=>
({
label
:
r
.
name
,
description
:
r
.
pushUrl
})),
addRemote
];
const
branchName
=
repository
.
HEAD
&&
repository
.
HEAD
.
name
||
''
;
const
picks
=
[...
repository
.
remotes
.
map
(
r
=>
({
label
:
r
.
name
,
description
:
''
})),
addRemote
];
const
placeHolder
=
localize
(
'
pick remote
'
,
"
Pick a remote to publish the branch '{0}' to:
"
,
branchName
);
const
choice
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
...
...
@@ -2068,19 +2075,15 @@ export class CommandCenter {
return
;
}
let
remote
=
choice
.
label
;
if
(
choice
===
addRemote
)
{
const
newRemote
=
await
this
.
addRemote
(
repository
);
if
(
newRemote
)
{
remote
=
newRemote
;
}
else
{
return
;
await
repository
.
pushTo
(
newRemote
,
branchName
,
true
);
}
}
else
{
await
repository
.
pushTo
(
choice
.
label
,
branchName
,
true
);
}
await
repository
.
pushTo
(
remote
,
branchName
,
true
);
}
@
command
(
'
git.ignore
'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录