Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
09e22b85
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,发现更多精彩内容 >>
提交
09e22b85
编写于
6月 14, 2017
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #27367
上级
a2107d10
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
21 addition
and
14 deletion
+21
-14
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+3
-3
extensions/git/src/git.ts
extensions/git/src/git.ts
+2
-6
extensions/git/src/model.ts
extensions/git/src/model.ts
+16
-5
未找到文件。
extensions/git/src/commands.ts
浏览文件 @
09e22b85
...
@@ -774,7 +774,7 @@ export class CommandCenter {
...
@@ -774,7 +774,7 @@ export class CommandCenter {
return
;
return
;
}
}
await
this
.
model
.
pull
(
true
);
await
this
.
model
.
pull
WithRebase
(
);
}
}
@
command
(
'
git.push
'
)
@
command
(
'
git.push
'
)
...
@@ -812,7 +812,7 @@ export class CommandCenter {
...
@@ -812,7 +812,7 @@ export class CommandCenter {
return
;
return
;
}
}
this
.
model
.
push
(
pick
.
label
,
branchName
);
this
.
model
.
push
To
(
pick
.
label
,
branchName
);
}
}
@
command
(
'
git.sync
'
)
@
command
(
'
git.sync
'
)
...
@@ -860,7 +860,7 @@ export class CommandCenter {
...
@@ -860,7 +860,7 @@ export class CommandCenter {
return
;
return
;
}
}
await
this
.
model
.
push
(
choice
,
branchName
,
{
setUpstream
:
true
}
);
await
this
.
model
.
push
To
(
choice
,
branchName
,
true
);
}
}
@
command
(
'
git.showOutput
'
)
@
command
(
'
git.showOutput
'
)
...
...
extensions/git/src/git.ts
浏览文件 @
09e22b85
...
@@ -21,10 +21,6 @@ export interface IGit {
...
@@ -21,10 +21,6 @@ export interface IGit {
version
:
string
;
version
:
string
;
}
}
export
interface
PushOptions
{
setUpstream
?:
boolean
;
}
export
interface
IFileStatus
{
export
interface
IFileStatus
{
x
:
string
;
x
:
string
;
y
:
string
;
y
:
string
;
...
@@ -762,10 +758,10 @@ export class Repository {
...
@@ -762,10 +758,10 @@ export class Repository {
}
}
}
}
async
push
(
remote
?:
string
,
name
?:
string
,
options
?:
PushOptions
):
Promise
<
void
>
{
async
push
(
remote
?:
string
,
name
?:
string
,
setUpstream
:
boolean
=
false
):
Promise
<
void
>
{
const
args
=
[
'
push
'
];
const
args
=
[
'
push
'
];
if
(
options
&&
options
.
setUpstream
)
{
if
(
setUpstream
)
{
args
.
push
(
'
-u
'
);
args
.
push
(
'
-u
'
);
}
}
...
...
extensions/git/src/model.ts
浏览文件 @
09e22b85
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
'
use strict
'
;
'
use strict
'
;
import
{
Uri
,
Command
,
EventEmitter
,
Event
,
SourceControlResourceState
,
SourceControlResourceDecorations
,
Disposable
,
ProgressLocation
,
window
,
workspace
}
from
'
vscode
'
;
import
{
Uri
,
Command
,
EventEmitter
,
Event
,
SourceControlResourceState
,
SourceControlResourceDecorations
,
Disposable
,
ProgressLocation
,
window
,
workspace
}
from
'
vscode
'
;
import
{
Git
,
Repository
,
Ref
,
Branch
,
Remote
,
PushOptions
,
Commit
,
GitErrorCodes
}
from
'
./git
'
;
import
{
Git
,
Repository
,
Ref
,
Branch
,
Remote
,
Commit
,
GitErrorCodes
}
from
'
./git
'
;
import
{
anyEvent
,
eventToPromise
,
filterEvent
,
EmptyDisposable
,
combinedDisposable
,
dispose
}
from
'
./util
'
;
import
{
anyEvent
,
eventToPromise
,
filterEvent
,
EmptyDisposable
,
combinedDisposable
,
dispose
}
from
'
./util
'
;
import
{
memoize
,
throttle
,
debounce
}
from
'
./decorators
'
;
import
{
memoize
,
throttle
,
debounce
}
from
'
./decorators
'
;
import
*
as
path
from
'
path
'
;
import
*
as
path
from
'
path
'
;
...
@@ -479,12 +479,23 @@ export class Model implements Disposable {
...
@@ -479,12 +479,23 @@ export class Model implements Disposable {
}
}
}
}
async
pull
(
rebase
?:
boolean
):
Promise
<
void
>
{
@
throttle
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
rebase
));
async
pull
():
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
());
}
@
throttle
async
pullWithRebase
():
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Pull
,
()
=>
this
.
repository
.
pull
(
true
));
}
@
throttle
async
push
():
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Push
,
()
=>
this
.
repository
.
push
());
}
}
async
push
(
remote
?:
string
,
name
?:
string
,
options
?:
PushOptions
):
Promise
<
void
>
{
async
push
To
(
remote
?:
string
,
name
?:
string
,
setUpstream
:
boolean
=
false
):
Promise
<
void
>
{
await
this
.
run
(
Operation
.
Push
,
()
=>
this
.
repository
.
push
(
remote
,
name
,
options
));
await
this
.
run
(
Operation
.
Push
,
()
=>
this
.
repository
.
push
(
remote
,
name
,
setUpstream
));
}
}
@
throttle
@
throttle
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录