Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d8aaf716
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,发现更多精彩内容 >>
提交
d8aaf716
编写于
10月 17, 2018
作者:
L
laphets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fulfill local branch checking when checkout to an remote branch
上级
4f09f1aa
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
41 addition
and
4 deletion
+41
-4
extensions/git/src/api/git.d.ts
extensions/git/src/api/git.d.ts
+5
-0
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+14
-2
extensions/git/src/git.ts
extensions/git/src/git.ts
+16
-1
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+6
-1
未找到文件。
extensions/git/src/api/git.d.ts
浏览文件 @
d8aaf716
...
...
@@ -26,6 +26,11 @@ export interface Ref {
readonly
remote
?:
string
;
}
export
interface
Trackingship
{
readonly
local
:
string
;
readonly
upstarem
:
string
;
}
export
interface
UpstreamRef
{
readonly
remote
:
string
;
readonly
name
:
string
;
...
...
extensions/git/src/commands.ts
浏览文件 @
d8aaf716
...
...
@@ -52,11 +52,20 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
}
async
run
(
repository
:
Repository
):
Promise
<
void
>
{
if
(
!
this
.
ref
.
name
)
{
const
ref
=
this
.
ref
.
name
;
if
(
!
ref
)
{
return
;
}
await
repository
.
checkoutTracking
(
this
.
ref
.
name
);
// Check whether there's a local branch which already has the target branch as an upstream
const
trackings
=
await
repository
.
getTracking
(
ref
);
if
(
trackings
.
length
>
0
)
{
//Just checkout the local branch
await
repository
.
checkout
(
trackings
[
0
].
local
);
}
else
{
// Default
await
repository
.
checkoutTracking
(
ref
);
}
}
}
...
...
@@ -1373,6 +1382,9 @@ export class CommandCenter {
const
placeHolder
=
localize
(
'
select a ref to checkout
'
,
'
Select a ref to checkout
'
);
const
choice
=
await
window
.
showQuickPick
(
picks
,
{
placeHolder
});
// TODO: Judge whether it's local branch
console
.
log
(
choice
);
if
(
!
choice
)
{
return
false
;
}
...
...
extensions/git/src/git.ts
浏览文件 @
d8aaf716
...
...
@@ -14,7 +14,7 @@ import * as filetype from 'file-type';
import
{
assign
,
groupBy
,
denodeify
,
IDisposable
,
toDisposable
,
dispose
,
mkdirp
,
readBytes
,
detectUnicodeEncoding
,
Encoding
,
onceEvent
}
from
'
./util
'
;
import
{
CancellationToken
}
from
'
vscode
'
;
import
{
detectEncoding
}
from
'
./encoding
'
;
import
{
Ref
,
RefType
,
Branch
,
Remote
,
GitErrorCodes
}
from
'
./api/git
'
;
import
{
Ref
,
RefType
,
Branch
,
Remote
,
GitErrorCodes
,
Trackingship
}
from
'
./api/git
'
;
const
readfile
=
denodeify
<
string
,
string
|
null
,
string
>
(
fs
.
readFile
);
...
...
@@ -1374,6 +1374,21 @@ export class Repository {
}
}
async
GetTracking
(
upstreamBranch
:
string
):
Promise
<
Trackingship
[]
>
{
const
result
=
await
this
.
run
([
'
for-each-ref
'
,
'
--format
'
,
'
%(if)%(upstream:short)%(then)%(refname:short)->%(upstream:short) %(else)* %(end)
'
,
'
refs/heads
'
]);
return
result
.
stdout
.
trim
().
split
(
'
\n
'
)
.
map
(
line
=>
line
.
trim
())
.
filter
(
line
=>
line
!==
'
*
'
)
.
map
(
line
=>
{
const
splited
=
line
.
split
(
'
->
'
);
return
{
local
:
splited
[
0
],
upstarem
:
splited
[
1
]
}
as
Trackingship
;
})
.
filter
(
trackingShip
=>
trackingShip
.
upstarem
===
upstreamBranch
);
}
async
getRefs
():
Promise
<
Ref
[]
>
{
const
result
=
await
this
.
run
([
'
for-each-ref
'
,
'
--format
'
,
'
%(refname) %(objectname)
'
,
'
--sort
'
,
'
-committerdate
'
]);
...
...
extensions/git/src/repository.ts
浏览文件 @
d8aaf716
...
...
@@ -13,7 +13,7 @@ import * as path from 'path';
import
*
as
nls
from
'
vscode-nls
'
;
import
*
as
fs
from
'
fs
'
;
import
{
StatusBarCommands
}
from
'
./statusbar
'
;
import
{
Branch
,
Ref
,
Remote
,
RefType
,
GitErrorCodes
}
from
'
./api/git
'
;
import
{
Branch
,
Ref
,
Remote
,
RefType
,
GitErrorCodes
,
Trackingship
}
from
'
./api/git
'
;
const
timeout
=
(
millis
:
number
)
=>
new
Promise
(
c
=>
setTimeout
(
c
,
millis
));
...
...
@@ -311,6 +311,7 @@ export const enum Operation {
GetObjectDetails
=
'
GetObjectDetails
'
,
SubmoduleUpdate
=
'
SubmoduleUpdate
'
,
RebaseContinue
=
'
RebaseContinue
'
,
GetTracking
=
'
GetTracking
'
}
function
isReadOnly
(
operation
:
Operation
):
boolean
{
...
...
@@ -880,6 +881,10 @@ export class Repository implements Disposable {
await
this
.
run
(
Operation
.
CheckoutTracking
,
()
=>
this
.
repository
.
checkout
(
treeish
,
[],
{
track
:
true
}));
}
async
getTracking
(
treeish
:
string
):
Promise
<
Trackingship
[]
>
{
return
await
this
.
run
(
Operation
.
GetTracking
,
()
=>
this
.
repository
.
GetTracking
(
treeish
));
}
async
getCommit
(
ref
:
string
):
Promise
<
Commit
>
{
return
await
this
.
repository
.
getCommit
(
ref
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录