From 25acdd8850ba949d42417febe735dc518e29db80 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@github.com>
Date: Sat, 28 Jun 2014 20:24:46 +0200
Subject: [PATCH] [FIXED JENKINS-18902] Exclude lower bound of range from
 changes

---
 core/src/main/java/hudson/Functions.java           | 14 ++++++++++++++
 .../hudson/model/AbstractProject/changes.jelly     | 13 ++++++++++---
 .../model/AbstractProject/changes.properties       |  5 +++--
 .../model/AbstractProject/changes_da.properties    |  1 +
 .../model/AbstractProject/changes_de.properties    |  3 ++-
 .../model/AbstractProject/changes_es.properties    |  1 +
 .../model/AbstractProject/changes_fr.properties    |  1 +
 .../model/AbstractProject/changes_ja.properties    |  3 ++-
 .../model/AbstractProject/changes_lv.properties    |  1 +
 .../model/AbstractProject/changes_pt_BR.properties |  1 +
 .../model/AbstractProject/changes_ru.properties    |  1 +
 .../model/AbstractProject/changes_tr.properties    |  1 +
 .../model/AbstractProject/changes_zh_TW.properties |  1 +
 13 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index bbe1de2ddfda..db8f19e900e7 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -540,6 +540,20 @@ public static <V> SortedMap<Integer,V> filter(SortedMap<Integer,V> map, String f
         return map.subMap(Integer.parseInt(to),Integer.parseInt(from)-1);
     }
 
+    /**
+     * Creates a sub map by using the given range (upper end inclusive).
+     */
+    @Restricted(NoExternalUse.class)
+    public static <V> SortedMap<Integer,V> filterExcludingFrom(SortedMap<Integer,V> map, String from, String to) {
+        if(from==null && to==null)      return map;
+        if(to==null)
+            return map.headMap(Integer.parseInt(from));
+        if(from==null)
+            return map.tailMap(Integer.parseInt(to));
+
+        return map.subMap(Integer.parseInt(to),Integer.parseInt(from));
+    }
+
     private static final SimpleFormatter formatter = new SimpleFormatter();
 
     /**
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes.jelly b/core/src/main/resources/hudson/model/AbstractProject/changes.jelly
index 24ea219c5952..34e084a858cf 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes.jelly
@@ -36,10 +36,17 @@ THE SOFTWARE.
 
       <h1>
         ${%Changes}
-        <j:if test="${from!=null}">${%from.label(from)}</j:if>
-        <j:if test="${to!=null}">&#160;${%to.label(to)}</j:if>
+        <j:choose>
+          <j:when test="${from!=null and to!=null}">
+            ${%range.label(from, to)}
+          </j:when>
+          <j:otherwise>
+            <j:if test="${from!=null}">${%from.label(from)}</j:if>
+            <j:if test="${to!=null}">${%to.label(to)}</j:if>
+          </j:otherwise>
+        </j:choose>
       </h1>
-      <j:set var="builds" value="${h.filter(it.buildsAsMap,from,to).values()}" />
+      <j:set var="builds" value="${h.filterExcludingFrom(it.buildsAsMap,from,to).values()}" />
       <st:include it="${it.scm}" page="project-changes.jelly" />
     </l:main-panel>
   </l:layout>
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes.properties b/core/src/main/resources/hudson/model/AbstractProject/changes.properties
index 0a353fc07329..704f8dac46e1 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes.properties
@@ -21,5 +21,6 @@
 # THE SOFTWARE.
 
 changes.title={0} Changes
-from.label=from #{0}
-to.label=to #{0}
\ No newline at end of file
+from.label=since #{0}
+to.label=up to #{0}
+range.label=between #{0} and #{1}
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties
index 62e5d9fb042e..aa34c5954161 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties
@@ -23,4 +23,5 @@
 Changes=\u00c6ndringer
 from.label=# fra #{0}
 to.label=# til #{0}
+range.label=fra #{0} til #{1}
 changes.title=# {0} \u00c6ndringer
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties
index 48613c9e054e..e2eedb1b4f29 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties
@@ -22,5 +22,6 @@
 
 Changes=Änderungen
 changes.title=Änderungen in {0}
-from.label=von #{0}
+from.label=seit #{0}
 to.label=bis #{0}
+range.label=zwischen #{0} und #{1}
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties
index 58fbbca97d6a..b69f341e3209 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties
@@ -23,4 +23,5 @@
 changes.title={0} Cambios
 from.label=desde #{0}
 to.label=hasta #{0}
+range.label=desde #{0} hasta #{1}
 Changes=Cambios
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties
index faa831ea9476..d118a3158a2b 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties
@@ -24,3 +24,4 @@ changes.title=Changements dans {0}
 Changes=Modifications
 from.label=de #{0}
 to.label=à #{0}
+range.label=de #{0} à #{1}
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties
index 11ca4887af78..c6457516f13f 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties
@@ -23,4 +23,5 @@
 changes.title={0}\u306e\u5909\u66f4
 Changes=\u5909\u66f4\u5c65\u6b74
 from.label=#{0} \u304b\u3089
-to.label=#{0} \u307e\u3067
\ No newline at end of file
+to.label=#{0} \u307e\u3067
+range.label=#{0} \u304b\u3089 #{1} \u307e\u3067
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties
index 0a322242aaef..1bf3c61ec6bc 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties
@@ -23,3 +23,4 @@
 Changes=Izmai\u0146as
 from.label=no #{0}
 to.label=l\u012Bdz #{0}
+range.label=no #{0} l\u012Bdz #{1}
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties
index 61e6f418a723..427ebf3de592 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties
@@ -25,5 +25,6 @@ Changes=Mudan\u00e7as
 from.label=de #{0}
 # to #{0}
 to.label= para #{0}
+range.label=de #{0} para #{1}
 # {0} Changes
 changes.title={0} Mudan\u00e7as
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties
index 881ddd69eb68..9ac01a770f12 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties
@@ -23,3 +23,4 @@
 Changes=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
 from.label=\u0441 #{0}
 to.label=\u0434\u043E #{0}
+range.label=\u0441 #{0} \u0434\u043E #{1}
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties
index 244c86996b12..678996f3ade9 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties
@@ -24,3 +24,4 @@ Changes=De\u011fi\u015fiklikler
 changes.title={0} degi\u015fiklik
 from.label=#{0}'dan
 to.label=#{0}'a
+range.label=#{0}'dan #{1}'a
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties
index 7b7c358fcf4a..1e4364901d75 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties
@@ -25,3 +25,4 @@ changes.title={0} \u8b8a\u66f4
 Changes=\u8b8a\u66f4
 from.label=\u5f9e #{0}
 to.label=\u5230 #{0}
+range.label=\u5f9e #{0} \u5230 #{1}