From ad27bab4e74178aa86a973acb20d6c0747aad894 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 10 Dec 2010 15:39:27 -0800 Subject: [PATCH] [FIXED HUDSON-53 HUDSON-4884] build displayName is now modifiable to arbitrary text. --- changelog.html | 4 ++++ core/src/main/java/hudson/tasks/MailSender.java | 2 +- .../main/resources/hudson/model/AbstractBuild/changes.jelly | 4 ++-- .../src/main/resources/hudson/model/AbstractBuild/index.jelly | 4 ++-- .../main/resources/hudson/model/ExternalRun/sidepanel.jelly | 4 ++-- .../main/resources/hudson/model/ParametersAction/index.jelly | 2 +- .../hudson/model/PermalinkProjectAction/Permalink/link.jelly | 4 ++-- .../model/PermalinkProjectAction/Permalink/link.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_da.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_de.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_es.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_fi.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_fr.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_it.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_ja.properties | 2 +- .../PermalinkProjectAction/Permalink/link_nb_NO.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_nl.properties | 2 +- .../PermalinkProjectAction/Permalink/link_pt_BR.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_ru.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_sl.properties | 2 +- .../PermalinkProjectAction/Permalink/link_sv_SE.properties | 2 +- .../model/PermalinkProjectAction/Permalink/link_tr.properties | 2 +- .../PermalinkProjectAction/Permalink/link_zh_CN.properties | 2 +- .../src/main/resources/hudson/model/Run/artifacts-index.jelly | 2 +- core/src/main/resources/hudson/model/Run/confirmDelete.jelly | 4 ++-- core/src/main/resources/hudson/model/Run/console.jelly | 2 +- .../hudson/scm/AbstractScmTagAction/inProgress.jelly | 4 ++-- .../resources/hudson/views/LastFailureColumn/column.jelly | 4 ++-- .../main/resources/hudson/views/LastStableColumn/column.jelly | 2 +- .../resources/hudson/views/LastSuccessColumn/column.jelly | 4 ++-- .../main/resources/hudson/widgets/HistoryWidget/entry.jelly | 2 +- core/src/main/resources/lib/hudson/buildListTable.jelly | 2 +- .../resources/hudson/maven/MavenBuild/executedMojos.jelly | 4 ++-- 33 files changed, 45 insertions(+), 41 deletions(-) diff --git a/changelog.html b/changelog.html index 196bee3c3b..083f97cf56 100644 --- a/changelog.html +++ b/changelog.html @@ -45,6 +45,10 @@ Upcoming changes (issue 5655)
  • Debian package init script now honors ~/.profile. +
  • + Build names (e.g., "#123") can be now modified by users/plugins to arbitrary text. + (issue 53, + issue 4884) diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index 0d861774c3..155a99f01c 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -393,7 +393,7 @@ public class MailSender { } private String getSubject(AbstractBuild build, String caption) { - return caption + ' ' + build.getProject().getFullDisplayName() + " #" + build.getNumber(); + return caption + ' ' + build.getFullDisplayName(); } /** diff --git a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly index 9f27ef0c53..ad4a0098ae 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly +++ b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly @@ -26,11 +26,11 @@ THE SOFTWARE. Displays the console output --> - + ${%Changes} - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly index c66658b7ad..db2146573c 100644 --- a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly +++ b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. --> - +
    @@ -47,7 +47,7 @@ THE SOFTWARE.
    - ${%Build} #${it.number} + ${%Build} ${it.displayName} () diff --git a/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly b/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly index e7c6edcd58..206f770981 100644 --- a/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/ExternalRun/sidepanel.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. Side panel for the build view. --> - + @@ -44,4 +44,4 @@ THE SOFTWARE. - \ No newline at end of file +
    diff --git a/core/src/main/resources/hudson/model/ParametersAction/index.jelly b/core/src/main/resources/hudson/model/ParametersAction/index.jelly index 007d6d12a2..b163b8f3aa 100644 --- a/core/src/main/resources/hudson/model/ParametersAction/index.jelly +++ b/core/src/main/resources/hudson/model/ParametersAction/index.jelly @@ -34,7 +34,7 @@ THE SOFTWARE. -

    ${%Build} #${build.number}

    +

    ${%Build} ${build.displayName}

  • - ${%format(it.displayName,b.number,b.timestampString)} + ${%format(it.displayName,b.displayName,b.timestampString)}
  • - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties index e283bf8b8d..7472ceddaa 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} ago \ No newline at end of file +format={0} ({1}), {2} ago diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_da.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_da.properties index bb7491113e..54cc8b3d6a 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_da.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_da.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} siden +format={0} ({1}), {2} siden diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties index 53641a6f88..754d70e282 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_de.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), vor {2} +format={0} ({1}), vor {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_es.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_es.properties index 337133b497..0b0157934a 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_es.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_es.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format="{0} (#{1}), hace {2}" +format="{0} ({1}), hace {2}" diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fi.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fi.properties index 9584df3862..4a6b5846bd 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fi.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fi.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} sitten +format={0} ({1}), {2} sitten diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties index fd98fe54ad..f061756de8 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_fr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), il y a {2} +format={0} ({1}), il y a {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_it.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_it.properties index 2b2b972de3..5f609250cd 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_it.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_it.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} fa +format={0} ({1}), {2} fa diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties index 01dd2de143..cdd0546a62 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ja.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} \ No newline at end of file +format={0} ({1}), {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nb_NO.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nb_NO.properties index 4d117d9e34..3bf3a32871 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nb_NO.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nb_NO.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} siden +format={0} ({1}), {2} siden diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties index 17fe161c10..a8a7540bee 100755 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_nl.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), sinds {2} +format={0} ({1}), sinds {2} diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties index 0e5a0b8754..7e0665bbd4 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_pt_BR.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} atr\u00e1s +format={0} ({1}), {2} atr\u00e1s diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties index 1a442c391e..8938df9ee6 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_ru.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} \u043d\u0430\u0437\u0430\u0434 +format={0} ({1}), {2} \u043d\u0430\u0437\u0430\u0434 diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sl.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sl.properties index 3b18d344fc..1c6a44c9c4 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sl.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sl.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format="{0} (#{1}), prej {2}" +format="{0} ({1}), prej {2}" diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sv_SE.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sv_SE.properties index def0997554..c404ec56c6 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sv_SE.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_sv_SE.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} sedan +format={0} ({1}), {2} sedan diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties index 15176b8aa4..ad3fa8b603 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_tr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0} (#{1}), {2} \u00f6nce +format={0} ({1}), {2} \u00f6nce diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_zh_CN.properties b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_zh_CN.properties index 7a8f739008..94705be936 100644 --- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_zh_CN.properties +++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link_zh_CN.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -format={0}(#{1}),{2}\u524D +format={0}({1}),{2}\u524D diff --git a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly index 6baa53e5b9..eafb2f00eb 100644 --- a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly +++ b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/model/Run/confirmDelete.jelly b/core/src/main/resources/hudson/model/Run/confirmDelete.jelly index b864d0e056..5db6153372 100644 --- a/core/src/main/resources/hudson/model/Run/confirmDelete.jelly +++ b/core/src/main/resources/hudson/model/Run/confirmDelete.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. - + @@ -39,4 +39,4 @@ THE SOFTWARE. - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly index 266e54a284..327ad26c54 100644 --- a/core/src/main/resources/hudson/model/Run/console.jelly +++ b/core/src/main/resources/hudson/model/Run/console.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. Displays the console output --> - + diff --git a/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly b/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly index 0ed31cd750..e20a434047 100644 --- a/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly +++ b/core/src/main/resources/hudson/scm/AbstractScmTagAction/inProgress.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. -

    Build #${it.build.number}

    +

    Build ${it.build.displayName}

    ${%Tagging is in progress:}

    @@ -34,4 +34,4 @@ THE SOFTWARE.
    - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly index deb4565c8e..9509766244 100644 --- a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly @@ -27,11 +27,11 @@ THE SOFTWARE. ${lfBuild.timestampString} - (#${lfBuild.number}) + (${lfBuild.displayName}) ${%N/A} - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly index b6159cb9d0..93d252b36f 100644 --- a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly @@ -28,7 +28,7 @@ THE SOFTWARE. ${lstBuild.timestampString} - (#${lstBuild.number}) + (${lstBuild.displayName}) ${%N/A} diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly index 1bf4eb94e8..b6c3032ddb 100644 --- a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly @@ -27,11 +27,11 @@ THE SOFTWARE. ${lsBuild.timestampString} - (#${lsBuild.number}) + (${lsBuild.displayName}) ${%N/A} - \ No newline at end of file + diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly index c27fa1aae2..2637129274 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly @@ -31,7 +31,7 @@ THE SOFTWARE. ${build.iconColor.description} - #${build.number} + ${build.displayName} diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly index d4c0e0067c..67b600522f 100644 --- a/core/src/main/resources/lib/hudson/buildListTable.jelly +++ b/core/src/main/resources/lib/hudson/buildListTable.jelly @@ -54,7 +54,7 @@ THE SOFTWARE. ${b.parent.fullDisplayName} - #${b.number} + ${b.displayName} ${b.timestampString} diff --git a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly index 77399f9e10..94d8967f6f 100644 --- a/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly +++ b/maven-plugin/src/main/resources/hudson/maven/MavenBuild/executedMojos.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> - +

    ${%Executed Mojos}

    @@ -78,4 +78,4 @@ THE SOFTWARE.
    - \ No newline at end of file + -- GitLab