Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
aa5ff541
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aa5ff541
编写于
5月 02, 2017
作者:
A
Andrew Bayer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Forgot to remove SCMTriggerItem everywhere in View
上级
99baf7a6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
31 addition
and
34 deletion
+31
-34
core/src/main/java/hudson/model/View.java
core/src/main/java/hudson/model/View.java
+31
-34
未找到文件。
core/src/main/java/hudson/model/View.java
浏览文件 @
aa5ff541
...
...
@@ -64,7 +64,6 @@ import jenkins.model.item_category.Categories;
import
jenkins.model.item_category.Category
;
import
jenkins.model.item_category.ItemCategory
;
import
jenkins.scm.RunWithSCM
;
import
jenkins.triggers.SCMTriggerItem
;
import
jenkins.util.ProgressiveRendering
;
import
jenkins.util.xml.XMLUtils
;
...
...
@@ -829,44 +828,42 @@ public abstract class View extends AbstractModelObject implements AccessControll
int
itemCount
=
0
;
for
(
Item
item
:
items
)
{
for
(
Job
<?,?>
job
:
item
.
getAllJobs
())
{
if
(
job
instanceof
SCMTriggerItem
)
{
RunList
<?
extends
Run
<?,?>>
builds
=
job
.
getBuilds
();
int
buildCount
=
0
;
for
(
Run
<?,?>
r
:
builds
)
{
if
(
canceled
())
{
return
;
}
if
(!(
r
instanceof
RunWithSCM
))
{
continue
;
}
RunList
<?
extends
Run
<?,
?>>
builds
=
job
.
getBuilds
();
int
buildCount
=
0
;
for
(
Run
<?,
?>
r
:
builds
)
{
if
(
canceled
())
{
return
;
}
if
(!(
r
instanceof
RunWithSCM
))
{
continue
;
}
RunWithSCM
<?,?>
runWithSCM
=
(
RunWithSCM
<?,?>)
r
;
for
(
ChangeLogSet
<?
extends
ChangeLogSet
.
Entry
>
c
:
runWithSCM
.
getChangeSets
())
{
for
(
ChangeLogSet
.
Entry
entry
:
c
)
{
User
user
=
entry
.
getAuthor
();
UserInfo
info
=
users
.
get
(
user
);
if
(
info
==
null
)
{
UserInfo
userInfo
=
new
UserInfo
(
user
,
job
,
r
.
getTimestamp
());
userInfo
.
avatar
=
UserAvatarResolver
.
resolveOrNull
(
user
,
iconSize
);
synchronized
(
this
)
{
users
.
put
(
user
,
userInfo
);
modified
.
add
(
user
);
}
}
else
if
(
info
.
getLastChange
().
before
(
r
.
getTimestamp
()))
{
synchronized
(
this
)
{
info
.
project
=
job
;
info
.
lastChange
=
r
.
getTimestamp
();
modified
.
add
(
user
);
}
RunWithSCM
<?,
?>
runWithSCM
=
(
RunWithSCM
<?,
?>)
r
;
for
(
ChangeLogSet
<?
extends
ChangeLogSet
.
Entry
>
c
:
runWithSCM
.
getChangeSets
())
{
for
(
ChangeLogSet
.
Entry
entry
:
c
)
{
User
user
=
entry
.
getAuthor
();
UserInfo
info
=
users
.
get
(
user
);
if
(
info
==
null
)
{
UserInfo
userInfo
=
new
UserInfo
(
user
,
job
,
r
.
getTimestamp
());
userInfo
.
avatar
=
UserAvatarResolver
.
resolveOrNull
(
user
,
iconSize
);
synchronized
(
this
)
{
users
.
put
(
user
,
userInfo
);
modified
.
add
(
user
);
}
}
else
if
(
info
.
getLastChange
().
before
(
r
.
getTimestamp
()))
{
synchronized
(
this
)
{
info
.
project
=
job
;
info
.
lastChange
=
r
.
getTimestamp
();
modified
.
add
(
user
);
}
}
}
// TODO consider also adding the user of the UserCause when applicable
buildCount
++;
// TODO this defeats lazy-loading. Should rather do a breadth-first search, as in hudson.plugins.view.dashboard.builds.LatestBuilds
// (though currently there is no quick implementation of RunMap.size() ~ idOnDisk.size(), which would be needed for proper progress)
progress
((
itemCount
+
1.0
*
buildCount
/
builds
.
size
())
/
(
items
.
size
()
+
1
));
}
// TODO consider also adding the user of the UserCause when applicable
buildCount
++;
// TODO this defeats lazy-loading. Should rather do a breadth-first search, as in hudson.plugins.view.dashboard.builds.LatestBuilds
// (though currently there is no quick implementation of RunMap.size() ~ idOnDisk.size(), which would be needed for proper progress)
progress
((
itemCount
+
1.0
*
buildCount
/
builds
.
size
())
/
(
items
.
size
()
+
1
));
}
}
itemCount
++;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录