From 620c0a80febb6709622d02f79da4f67082509363 Mon Sep 17 00:00:00 2001 From: timeless Date: Fri, 1 Apr 2016 13:04:41 +0000 Subject: [PATCH] hghave: replace has_svn13/has_svn15 with checkvers This would make it possible to easily add a svn14 or svn16 or... --- tests/hghave.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/hghave.py b/tests/hghave.py index 9196553c76..40f3c323f0 100644 --- a/tests/hghave.py +++ b/tests/hghave.py @@ -248,13 +248,10 @@ def getsvnversion(): return (0, 0) return (int(m.group(1)), int(m.group(2))) -@check("svn15", "subversion client and admin tools >= 1.5") -def has_svn15(): - return getsvnversion() >= (1, 5) - -@check("svn13", "subversion client and admin tools >= 1.3") -def has_svn13(): - return getsvnversion() >= (1, 3) +@checkvers("svn", "subversion client and admin tools >= %s", (1.3, 1.5)) +def has_svn_range(v): + major, minor = v.split('.')[0:2] + return getsvnversion() >= (int(major), int(minor)) @check("svn", "subversion client and admin tools") def has_svn():