branch: externals/repology
commit b8f2479a145c291d1b6d5324b690de6759a3daf9
Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <m...@nicolasgoaziou.fr>
Rename `repology-compare-version' as `repology-version-<'
* repology-utils.el (repology-version-<): Renamed from
`repology-compare-version'.
(repology-project-outdated-versions):
(repology--string-to-version):
* repology.el (repology-display-packages-columns):
(repology-display-projects-columns):
(repology-display-projects-default): Apply renaming.
---
repology-utils.el | 16 ++++++++--------
repology.el | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/repology-utils.el b/repology-utils.el
index d7ec127..85f935c 100644
--- a/repology-utils.el
+++ b/repology-utils.el
@@ -179,7 +179,7 @@ Versions are sorted in descending order."
(sort (mapcar (lambda (p) (repology-package-field p 'version))
outdated)
;; Return versions in decreasing order.
- (lambda (s1 s2) (repology-compare-versions s2 s1)))))
+ (lambda (s1 s2) (repology-version-< s2 s1)))))
;;; Problems
@@ -321,7 +321,7 @@ the request."
(defun repology--string-to-version (s)
"Return version associated to string S.
Version is a list of components (RANK . VALUE) suitable for comparison, with
-the function `repology-compare-versions'."
+the function `repology-version-<'."
(let ((split nil))
;; Explode string into numeric and alphabetic components.
;; Intermediate SPLIT result is in reverse order.
@@ -361,11 +361,11 @@ the function `repology-compare-versions'."
(push (cons rank component) result)))
result)))
-(defun repology-compare-versions (s1 s2)
- "Compare package versions associated to strings S1 and S2.
-Return t if version S1 is lower than version S2."
- (let ((v1 (repology--string-to-version s1))
- (v2 (repology--string-to-version s2)))
+(defun repology-version-< (v1 v2)
+ "Return t if version V1 is lower (older) than version V2.
+V1 and V2 are strings."
+ (let ((v1 (repology--string-to-version v1))
+ (v2 (repology--string-to-version v2)))
(catch :less?
(while (or v1 v2)
(pcase-let ((`(,r1 . ,v1)
@@ -383,7 +383,7 @@ Return t if version S1 is lower than version S2."
;; comparing their first letters.
(t (throw :less?
(string-lessp (substring v1 0 1) (substring v2 0 1)))))))
- ;; Strings S1 and S2 represent equal versions.
+ ;; Strings V1 and V2 represent equal versions.
nil)))
diff --git a/repology.el b/repology.el
index 37c7ccb..6f42ecb 100644
--- a/repology.el
+++ b/repology.el
@@ -208,7 +208,7 @@ problem argument. Its return value is then turned into a
string and displayed."
("Version"
repology-package-colorized-version
12
- ,(repology-display-sort-column "Version" #'repology-compare-versions))
+ ,(repology-display-sort-column "Version" #'repology-version-<))
("Category" categories 25 t)
("Maintainer(s)" maintainers 30 t))
"Columns format rules used to display a list of packages.
@@ -226,7 +226,7 @@ This library provides a few functions useful as VALUE.
See, for example,
You may also want to look into `repology-display-sort-column', along with
predicates like `repology-compare-texts', `repology-compare-numbers', or
-`repology-compare-versions' in order to build SORT values."
+`repology-version-<' in order to build SORT values."
:type
`(repeat
(list :tag "Column definition"
@@ -259,7 +259,7 @@ This library provides a few functions useful as VALUE.
See, for example,
You may also want to look into `repology-display-sort-column', along with
predicates like `repology-compare-texts', `repology-compare-numbers', or
-`repology-compare-versions' in order to build SORT values."
+`repology-version-<' in order to build SORT values."
:type '(choice
(repeat
(list :tag "Column definition"
@@ -712,7 +712,7 @@ or nil. This is the default value for
`repology-display-projects-columns'."
("Newest"
repology-project-newest-version
12
- ,(repology-display-sort-column "Newest" #'repology-compare-versions))
+ ,(repology-display-sort-column "Newest" #'repology-version-<))
("Outdated" repology-project-outdated-versions 30 nil)))
(defun repology-display-package (package)
