qgis_query_version(): don't require the commit hash for regular releases

DESCRIPTION

@@ -25,7 +25,7 @@ License: GPL-3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.2
 Imports: 
     processx (>= 3.5.2),
     stringr,

R/qgis-configure.R

@@ -385,18 +385,29 @@ qgis_query_version <- function(quiet = FALSE) {
   lines <- readLines(textConnection(result$stdout))
   match <- stringr::str_match(
     lines,
-    "QGIS\\s(\\d{1,2}\\.\\d+.*-\\p{L}+)\\s.*\\(([0-9a-f]{8,})\\)"
+    "QGIS\\s(\\d{1,2}\\.\\d+.*-\\p{L}+)\\s.*\\((.+)\\)"
   )[, 2:3, drop = TRUE]
   match <- match[!is.na(match)]
   if (length(match) == 0L) abort_query_version(lines = lines)
   if (
-    stringr::str_detect(match[1], "[Mm]aster") ||
-    stringr::str_detect(match[1], "^\\d{1,2}\\.\\d*[13579][\\.-]")
+    !stringr::str_detect(match[1], "-[Mm]a(ster|in)$") &&
+    !stringr::str_detect(match[1], "^\\d{1,2}\\.\\d*[13579][\\.-]")
   ) {
+    return(match[1])
+  } else {
     if (length(match) < 2L) abort_query_version(lines = lines)
+    if (!stringr::str_detect(match[2], "^[0-9a-f]{7,}$")) {
+      warning("Please consider building the QGIS development version from ",
+              "within the QGIS git repository, in order to have a unique ",
+              "version identifier of QGIS, or propose the people making the ",
+              "QGIS build to do so. ",
+              "Currently the specific version identifier is '",
+              match[2],
+              "'.",
+              call. = TRUE)
+      match[2] <- paste("unclear:", match[2])
+    }
     return(paste0(match[1], ", development state ", match[2]))
-  } else {
-    return(match[1])
   }
 }
 

tests/testthat/test-qgis-configure.R

@@ -24,9 +24,13 @@ test_that("qgis_query_version() works for development versions of QGIS", {
 
   expect_match(
     qversion,
-    "^\\d{1,2}\\.\\d+.*-\\p{L}+, development state [0-9a-f]{8,}",
+    "^\\d{1,2}\\.\\d+.*-\\p{L}+, development state ([0-9a-f]{7,}|unclear:.+)",
     perl = TRUE
   )
+
+  if (stringr::str_detect(qversion, ".+development state unclear:.+")) {
+    expect_warning(qgis_query_version(), "version identifier")
+  }
 })
 
 test_that("qgis_algorithms() works", {