From 5984931829deed473740f61beb2759e13d99a096 Mon Sep 17 00:00:00 2001
From: Chris Black <chris@ckblack.org>
Date: Thu, 3 Oct 2024 02:22:16 -0700
Subject: [PATCH] changelog

---
 CHANGELOG.md                  | 1 +
 base/all/NEWS.md              | 4 ++++
 base/all/R/pecan_version.R    | 6 +++---
 base/all/man/pecan_version.Rd | 6 +++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a17817da4b..0cbd0976ae5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ For more information about this file see also [Keep a Changelog](http://keepacha
     * Model packages `PEcAn.BASGRA`, `PEcAn.CLM45`, `PEcAn.DALEC`, `PEcAn.dvmdostem`, `PEcAn.FATES`, `PEcAn.GDAY`, `PEcAn.JULES`, `PEcAn.LDNDC`, `PEcAn.LINKAGES`, `PEcAn.LPJGUESS`, `PEcAn.MAAT`, `PEcAn.MAESPA`, `PEcAn.PRELES`, `PEcAn.SIBCASA`, `PEcAn.SIPNET`, `PEcAn.STICS`, and the new model package template.
     * Modules `PEcAn.allometry`, `PEcAn.assim.batch`, `PEcAn.data.mining`, `PEcAn.emulator`, `PEcAn.MA`, `PEcAn.photosynthesis`, `PEcAn.priors`, and `PEcAn.RTM`.
 - Renamed master branch to main
+- `PEcAn.all::pecan_version()` now reports commit hashes as well as version numbers for each installed package.
 
 ### Removed
 
diff --git a/base/all/NEWS.md b/base/all/NEWS.md
index 22b477b0daa..1c4ff017520 100644
--- a/base/all/NEWS.md
+++ b/base/all/NEWS.md
@@ -3,6 +3,10 @@
 ## License change
 * PEcAn.all is now distributed under the BSD three-clause license instead of the NCSA Open Source license.
 
+## Changed
+* `pecan_version()` now reports the Git revision (if known) for each package,
+  and prints its results more compactly for easier reading.
+
 # PEcAn.all 1.8.0
 
 ## Added
diff --git a/base/all/R/pecan_version.R b/base/all/R/pecan_version.R
index 3617d37b02c..76d7fe0a1e3 100644
--- a/base/all/R/pecan_version.R
+++ b/base/all/R/pecan_version.R
@@ -23,9 +23,9 @@
 #' @param exact Show only tags that exactly match `version`,
 #'  or all tags that have it as a substring?
 #' @return data frame with columns for package name, expected version(s),
-#'  and installed version.
-#'  If the `sessioninfo` package is installed, a fourth column reports where
-#'  each package was installed from: local, github, CRAN, etc.
+#'  installed version, and Git hash (if known).
+#'  If the `sessioninfo` package is installed, an additional column reports
+#'  where each package was installed from: local, github, CRAN, etc.
 #'
 #' @examples
 #' pecan_version()
diff --git a/base/all/man/pecan_version.Rd b/base/all/man/pecan_version.Rd
index a0275089a9a..1f3c9578b59 100644
--- a/base/all/man/pecan_version.Rd
+++ b/base/all/man/pecan_version.Rd
@@ -14,9 +14,9 @@ or all tags that have it as a substring?}
 }
 \value{
 data frame with columns for package name, expected version(s),
-and installed version.
-If the \code{sessioninfo} package is installed, a fourth column reports where
-each package was installed from: local, github, CRAN, etc.
+installed version, and Git hash (if known).
+If the \code{sessioninfo} package is installed, an additional column reports
+where each package was installed from: local, github, CRAN, etc.
 }
 \description{
 Reports the currently installed or loaded version(s) of each PEcAn package,