Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
cc7f3cbf
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,发现更多精彩内容 >>
提交
cc7f3cbf
编写于
3月 21, 2017
作者:
B
Benjamin Pasero
提交者:
GitHub
3月 21, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22957 from Microsoft/ben/16591
backups: stop lowercasing file paths (fixes #16591)
上级
f574b11a
ce19a2f3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
22 deletion
+3
-22
src/vs/workbench/services/backup/node/backupFileService.ts
src/vs/workbench/services/backup/node/backupFileService.ts
+1
-5
src/vs/workbench/services/backup/test/backupFileService.test.ts
.../workbench/services/backup/test/backupFileService.test.ts
+2
-17
未找到文件。
src/vs/workbench/services/backup/node/backupFileService.ts
浏览文件 @
cc7f3cbf
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
import
*
as
path
from
'
path
'
;
import
*
as
path
from
'
path
'
;
import
*
as
crypto
from
'
crypto
'
;
import
*
as
crypto
from
'
crypto
'
;
import
pfs
=
require
(
'
vs/base/node/pfs
'
);
import
pfs
=
require
(
'
vs/base/node/pfs
'
);
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
Uri
from
'
vs/base/common/uri
'
;
import
Uri
from
'
vs/base/common/uri
'
;
import
{
Queue
}
from
'
vs/base/common/async
'
;
import
{
Queue
}
from
'
vs/base/common/async
'
;
import
{
IBackupFileService
,
BACKUP_FILE_UPDATE_OPTIONS
}
from
'
vs/workbench/services/backup/common/backup
'
;
import
{
IBackupFileService
,
BACKUP_FILE_UPDATE_OPTIONS
}
from
'
vs/workbench/services/backup/common/backup
'
;
...
@@ -253,9 +252,6 @@ export class BackupFileService implements IBackupFileService {
...
@@ -253,9 +252,6 @@ export class BackupFileService implements IBackupFileService {
}
}
private
hashPath
(
resource
:
Uri
):
string
{
private
hashPath
(
resource
:
Uri
):
string
{
// Windows and Mac paths are case insensitive, we want backups to be too
return
crypto
.
createHash
(
'
md5
'
).
update
(
resource
.
fsPath
).
digest
(
'
hex
'
);
const
caseAwarePath
=
platform
.
isWindows
||
platform
.
isMacintosh
?
resource
.
fsPath
.
toLowerCase
()
:
resource
.
fsPath
;
return
crypto
.
createHash
(
'
md5
'
).
update
(
caseAwarePath
).
digest
(
'
hex
'
);
}
}
}
}
src/vs/workbench/services/backup/test/backupFileService.test.ts
浏览文件 @
cc7f3cbf
...
@@ -45,7 +45,7 @@ const barFile = Uri.file(platform.isWindows ? 'c:\\bar' : '/bar');
...
@@ -45,7 +45,7 @@ const barFile = Uri.file(platform.isWindows ? 'c:\\bar' : '/bar');
const
untitledFile
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
untitledFile
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
fooBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
fooFile
.
fsPath
).
digest
(
'
hex
'
));
const
fooBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
fooFile
.
fsPath
).
digest
(
'
hex
'
));
const
barBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
barFile
.
fsPath
).
digest
(
'
hex
'
));
const
barBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
barFile
.
fsPath
).
digest
(
'
hex
'
));
const
untitledBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
untitled
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
platform
.
isLinux
?
untitledFile
.
fsPath
:
untitledFile
.
fsPath
.
toLowerCase
()
).
digest
(
'
hex
'
));
const
untitledBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
untitled
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
untitledFile
.
fsPath
).
digest
(
'
hex
'
));
class
TestBackupFileService
extends
BackupFileService
{
class
TestBackupFileService
extends
BackupFileService
{
constructor
(
workspace
:
Uri
,
backupHome
:
string
,
workspacesJsonPath
:
string
)
{
constructor
(
workspace
:
Uri
,
backupHome
:
string
,
workspacesJsonPath
:
string
)
{
...
@@ -98,25 +98,10 @@ suite('BackupFileService', () => {
...
@@ -98,25 +98,10 @@ suite('BackupFileService', () => {
// Format should be: <backupHome>/<workspaceHash>/<scheme>/<filePath>
// Format should be: <backupHome>/<workspaceHash>/<scheme>/<filePath>
const
backupResource
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
backupResource
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
workspaceHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
workspaceResource
.
fsPath
).
digest
(
'
hex
'
);
const
workspaceHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
workspaceResource
.
fsPath
).
digest
(
'
hex
'
);
const
filePathHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
platform
.
isLinux
?
backupResource
.
fsPath
:
backupResource
.
fsPath
.
toLowerCase
()
).
digest
(
'
hex
'
);
const
filePathHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
backupResource
.
fsPath
).
digest
(
'
hex
'
);
const
expectedPath
=
Uri
.
file
(
path
.
join
(
backupHome
,
workspaceHash
,
'
untitled
'
,
filePathHash
)).
fsPath
;
const
expectedPath
=
Uri
.
file
(
path
.
join
(
backupHome
,
workspaceHash
,
'
untitled
'
,
filePathHash
)).
fsPath
;
assert
.
equal
(
service
.
getBackupResource
(
backupResource
).
fsPath
,
expectedPath
);
assert
.
equal
(
service
.
getBackupResource
(
backupResource
).
fsPath
,
expectedPath
);
});
});
test
(
'
should ignore case on Windows and Mac
'
,
()
=>
{
// Skip test on Linux
if
(
platform
.
isLinux
)
{
return
;
}
if
(
platform
.
isMacintosh
)
{
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
/foo
'
)).
fsPath
,
service
.
getBackupResource
(
Uri
.
file
(
'
/FOO
'
)).
fsPath
);
}
if
(
platform
.
isWindows
)
{
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
c:
\\
foo
'
)).
fsPath
,
service
.
getBackupResource
(
Uri
.
file
(
'
C:
\\
FOO
'
)).
fsPath
);
}
});
});
});
suite
(
'
hasBackup
'
,
()
=>
{
suite
(
'
hasBackup
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录