Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2cc47810
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,发现更多精彩内容 >>
提交
2cc47810
编写于
9月 13, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix merging: Do not sync if there are no changes
上级
5d401635
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
44 deletion
+21
-44
src/vs/workbench/services/userData/common/settingsSync.ts
src/vs/workbench/services/userData/common/settingsSync.ts
+21
-44
未找到文件。
src/vs/workbench/services/userData/common/settingsSync.ts
浏览文件 @
2cc47810
...
...
@@ -216,66 +216,43 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
}
if
(
fileContent
&&
remoteUserData
)
{
const
localContent
:
string
=
fileContent
.
value
.
toString
();
const
remoteContent
:
string
=
remoteUserData
.
content
;
const
lastSyncData
=
this
.
getLastSyncUserData
();
// Already in Sync.
if
(
localContent
===
remoteUserData
.
content
)
{
this
.
logService
.
trace
(
'
Settings Sync: Settings file and remote contents are in sync.
'
);
settingsPreview
=
localContent
;
return
{
settingsPreview
,
hasLocalChanged
,
hasRemoteChanged
,
hasConflicts
};
}
// First time Sync to Local
if
(
!
lastSyncData
)
{
this
.
logService
.
trace
(
'
Settings Sync: Syncing remote contents with settings file for the first time.
'
);
hasLocalChanged
=
hasRemoteChanged
=
true
;
const
mergeResult
=
this
.
mergeContents
(
localContent
,
remoteContent
,
null
);
return
{
settingsPreview
:
mergeResult
.
settingsPreview
,
hasLocalChanged
,
hasRemoteChanged
,
hasConflicts
:
mergeResult
.
hasConflicts
};
}
// Remote has moved forward
if
(
remoteUserData
.
ref
!==
lastSyncData
.
ref
)
{
this
.
logService
.
trace
(
'
Settings Sync: Remote contents have changed. Merge and Sync.
'
);
hasLocalChanged
=
true
;
hasRemoteChanged
=
lastSyncData
.
content
!==
localContent
;
const
mergeResult
=
this
.
mergeContents
(
localContent
,
remoteContent
,
lastSyncData
.
content
);
return
{
settingsPreview
:
mergeResult
.
settingsPreview
,
hasLocalChanged
,
hasRemoteChanged
,
hasConflicts
:
mergeResult
.
hasConflicts
};
}
// Remote data is same as last synced data
if
(
lastSyncData
.
ref
===
remoteUserData
.
ref
)
{
// Local contents are same as last synced data. No op.
if
(
lastSyncData
.
content
===
localContent
)
{
this
.
logService
.
trace
(
'
Settings Sync: Settings file and remote contents have not changed. So no sync needed.
'
);
if
(
!
lastSyncData
// First time sync
||
lastSyncData
.
content
!==
localContent
// Local has moved forwarded
||
lastSyncData
.
content
!==
remoteContent
// Remote has moved forwarded
)
{
this
.
logService
.
trace
(
'
Settings Sync: Merging remote contents with settings file.
'
);
const
{
settingsPreview
,
hasChanges
,
hasConflicts
}
=
this
.
mergeContents
(
localContent
,
remoteContent
,
lastSyncData
?
lastSyncData
.
content
:
null
);
if
(
hasChanges
)
{
// Sync only if there are changes
hasLocalChanged
=
settingsPreview
!==
localContent
;
// Local has changed
hasRemoteChanged
=
settingsPreview
!==
remoteContent
;
// Remote has changed
return
{
settingsPreview
,
hasLocalChanged
,
hasRemoteChanged
,
hasConflicts
};
}
// New local contents. Sync with Local.
this
.
logService
.
trace
(
'
Settings Sync: Remote contents have not changed. Settings file has changed. So sync with settings file.
'
);
hasRemoteChanged
=
true
;
settingsPreview
=
localContent
;
return
{
settingsPreview
,
hasLocalChanged
,
hasRemoteChanged
,
hasConflicts
};
}
}
this
.
logService
.
trace
(
'
Settings Sync: No changes.
'
);
return
{
settingsPreview
,
hasLocalChanged
,
hasRemoteChanged
,
hasConflicts
};
}
private
mergeContents
(
localContent
:
string
,
remoteContent
:
string
,
lastSyncedContent
:
string
|
null
):
{
settingsPreview
:
string
,
hasConflicts
:
boolean
}
{
private
mergeContents
(
localContent
:
string
,
remoteContent
:
string
,
lastSyncedContent
:
string
|
null
):
{
settingsPreview
:
string
,
hasC
hanges
:
boolean
;
hasC
onflicts
:
boolean
}
{
const
local
=
parse
(
localContent
);
const
remote
=
parse
(
remoteContent
);
const
base
=
lastSyncedContent
?
parse
(
lastSyncedContent
)
:
null
;
const
settingsPreviewModel
=
this
.
modelService
.
createModel
(
localContent
,
this
.
modeService
.
create
(
'
jsonc
'
));
const
localToRemote
=
this
.
compare
(
local
,
remote
);
if
(
localToRemote
.
added
.
size
===
0
&&
localToRemote
.
removed
.
size
===
0
&&
localToRemote
.
updated
.
size
===
0
)
{
// No changes found between local and remote.
return
{
settingsPreview
:
localContent
,
hasChanges
:
false
,
hasConflicts
:
false
};
}
const
settingsPreviewModel
=
this
.
modelService
.
createModel
(
localContent
,
this
.
modeService
.
create
(
'
jsonc
'
));
const
base
=
lastSyncedContent
?
parse
(
lastSyncedContent
)
:
null
;
const
baseToLocal
=
base
?
this
.
compare
(
base
,
local
)
:
{
added
:
Object
.
keys
(
local
).
reduce
((
r
,
k
)
=>
{
r
.
add
(
k
);
return
r
;
},
new
Set
<
string
>
()),
removed
:
new
Set
<
string
>
(),
updated
:
new
Set
<
string
>
()
};
const
baseToRemote
=
base
?
this
.
compare
(
base
,
remote
)
:
{
added
:
Object
.
keys
(
remote
).
reduce
((
r
,
k
)
=>
{
r
.
add
(
k
);
return
r
;
},
new
Set
<
string
>
()),
removed
:
new
Set
<
string
>
(),
updated
:
new
Set
<
string
>
()
};
const
localToRemote
=
this
.
compare
(
local
,
remote
);
const
conflicts
:
Set
<
string
>
=
new
Set
<
string
>
();
...
...
@@ -384,7 +361,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
}
}
return
{
settingsPreview
:
settingsPreviewModel
.
getValue
(),
hasConflicts
:
conflicts
.
size
>
0
};
return
{
settingsPreview
:
settingsPreviewModel
.
getValue
(),
hasC
hanges
:
true
,
hasC
onflicts
:
conflicts
.
size
>
0
};
}
private
compare
(
from
:
{
[
key
:
string
]:
any
},
to
:
{
[
key
:
string
]:
any
}):
{
added
:
Set
<
string
>
,
removed
:
Set
<
string
>
,
updated
:
Set
<
string
>
}
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录