Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
疯人忠
Cvat
提交
10c80610
C
Cvat
项目概览
疯人忠
/
Cvat
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
Cvat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
10c80610
编写于
4月 24, 2019
作者:
B
Boris Sekachev
提交者:
Nikita Manovich
4月 24, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed keys in git push (#423)
上级
6363d742
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
12 deletion
+27
-12
cvat/apps/dashboard/static/dashboard/js/dashboard.js
cvat/apps/dashboard/static/dashboard/js/dashboard.js
+1
-1
cvat/apps/git/git.py
cvat/apps/git/git.py
+26
-11
未找到文件。
cvat/apps/dashboard/static/dashboard/js/dashboard.js
浏览文件 @
10c80610
...
...
@@ -376,7 +376,7 @@ class DashboardView {
const
params
=
{};
const
search
=
e
.
target
.
value
.
replace
(
/
\s
+/g
,
'
'
).
replace
(
/
\s
*:+
\s
*/g
,
'
:
'
).
trim
();
for
(
let
field
of
[
'
name
'
,
'
mode
'
,
'
owner
'
,
'
assignee
'
,
'
status
'
])
{
for
(
let
field
of
[
'
name
'
,
'
mode
'
,
'
owner
'
,
'
assignee
'
,
'
status
'
,
'
id
'
])
{
for
(
let
param
of
search
.
split
(
'
and
'
))
{
if
(
param
.
includes
(
'
:
'
))
{
param
=
param
.
split
(
'
:
'
);
...
...
cvat/apps/git/git.py
浏览文件 @
10c80610
...
...
@@ -39,6 +39,17 @@ def _have_no_access_exception(ex):
raise
ex
def
_read_old_diffs
(
diff_dir
,
summary
):
diff_files
=
list
(
map
(
lambda
x
:
os
.
path
.
join
(
diff_dir
,
x
),
os
.
listdir
(
diff_dir
)))
for
diff_file
in
diff_files
:
diff_file
=
open
(
diff_file
,
'r'
)
diff
=
json
.
loads
(
diff_file
.
read
())
for
action_key
in
diff
:
summary
[
action_key
]
+=
sum
([
diff
[
action_key
][
key
]
for
key
in
diff
[
action_key
]])
class
Git
:
def
__init__
(
self
,
db_git
,
tid
,
user
):
self
.
_db_git
=
db_git
...
...
@@ -273,13 +284,20 @@ class Git:
self
.
_rep
.
git
.
add
(
self
.
_annotation_file
)
# Merge diffs
summary_diff
=
{}
summary_diff
=
{
"update"
:
0
,
"create"
:
0
,
"delete"
:
0
}
old_diffs_dir
=
os
.
path
.
join
(
os
.
path
.
dirname
(
self
.
_diffs_dir
),
'repos_diffs'
)
if
(
os
.
path
.
isdir
(
old_diffs_dir
)):
_read_old_diffs
(
old_diffs_dir
,
summary_diff
)
for
diff_name
in
list
(
map
(
lambda
x
:
os
.
path
.
join
(
self
.
_diffs_dir
,
x
),
os
.
listdir
(
self
.
_diffs_dir
))):
with
open
(
diff_name
,
'r'
)
as
f
:
diff
=
json
.
loads
(
f
.
read
())
for
key
in
diff
:
if
key
not
in
summary_diff
:
summary_diff
[
key
]
=
0
summary_diff
[
key
]
+=
diff
[
key
]
message
=
"CVAT Annotation updated by {}.
\n
"
.
format
(
self
.
_user
[
"name"
])
...
...
@@ -297,6 +315,7 @@ class Git:
self
.
_rep
.
index
.
commit
(
message
)
self
.
_rep
.
git
.
push
(
"origin"
,
self
.
_branch_name
,
"--force"
)
shutil
.
rmtree
(
old_diffs_dir
,
True
)
shutil
.
rmtree
(
self
.
_diffs_dir
,
True
)
...
...
@@ -438,14 +457,10 @@ def _onsave(jid, user, data, action):
"create"
:
0
,
"delete"
:
0
}
if
os
.
path
.
isdir
(
diff_dir
)
and
not
os
.
path
.
isdir
(
diff_dir_v2
):
diff_files
=
list
(
map
(
lambda
x
:
os
.
path
.
join
(
diff_dir
,
x
),
os
.
listdir
(
diff_dir
)))
for
diff_file
in
diff_files
:
diff_file
=
open
(
diff_file
,
'r'
)
diff
=
json
.
loads
(
diff_file
.
read
())
for
action_key
in
diff
:
summary
[
action_key
]
+=
sum
([
diff
[
action_key
][
key
]
for
key
in
diff
[
action_key
]])
if
os
.
path
.
isdir
(
diff_dir
):
_read_old_diffs
(
diff_dir
,
summary
)
shutil
.
rmtree
(
diff_dir
,
True
)
os
.
makedirs
(
diff_dir_v2
,
exist_ok
=
True
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录