From 9ce402e001205770aeb0134f94d39a7d30cd7b75 Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Tue, 21 Jan 2020 10:11:49 -0500
Subject: [PATCH] lib: add bt_version_get_vcs_revision_description()

For a non-release build, this function returns the Git revision's
description.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Iec5e5fb1bb220c3477bfecab3c3f35b103c0592e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2837
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
---
 include/babeltrace2/version.h | 48 +++++++++++++++++++++++++----------
 src/lib/babeltrace2.c         |  7 +++++
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/include/babeltrace2/version.h b/include/babeltrace2/version.h
index d7b2822a..8ced70e1 100644
--- a/include/babeltrace2/version.h
+++ b/include/babeltrace2/version.h
@@ -37,8 +37,8 @@ extern "C" {
 @brief
     Library version getters.
 
-This module contains four functions to get the four parts of the
-library's version:
+This module contains four functions to information about the library's
+version:
 
 <dl>
   <dt>Major version</dt>
@@ -50,12 +50,18 @@ library's version:
   <dt>Patch version</dt>
   <dd>bt_version_get_patch()</dd>
 
-  <dt>Development stage</dt>
+  <dt>\bt_dt_opt Development stage</dt>
   <dd>bt_version_get_development_stage()</dd>
-</dl>
 
-You can also get the version's name and description if available with
-bt_version_get_name() and bt_version_get_name_description().
+  <dt>\bt_dt_opt Version control system revision's description</dt>
+  <dd>bt_version_get_vcs_revision_description()</dd>
+
+  <dt>\bt_dt_opt Release name</dt>
+  <dd>bt_version_get_name()</dd>
+
+  <dt>\bt_dt_opt Release name's description</dt>
+  <dd>bt_version_get_name_description()</dd>
+</dl>
 */
 
 /*! @{ */
@@ -101,31 +107,45 @@ extern const char *bt_version_get_development_stage(void);
 
 /*!
 @brief
-    Returns libbabeltrace2's version name.
+    Returns the version control system (VCS) revision's description of
+    libbabeltrace2's version.
+
+The VCS revision description is only available for a non-release build
+of the library.
+
+@returns
+    Version control system revision's description of the library's
+    version, or \c NULL if none.
+*/
+extern const char *bt_version_get_vcs_revision_description(void);
+
+/*!
+@brief
+    Returns libbabeltrace2's release name.
 
-If the version name is not available, which can be the case for a
+If the release name is not available, which can be the case for a
 development build, this function returns \c NULL.
 
 @returns
-    Library's version name, or \c NULL if not available.
+    Library's release name, or \c NULL if not available.
 
 @sa bt_version_get_name_description() &mdash;
-    Returns the description of libbabeltrace2's version name.
+    Returns the description of libbabeltrace2's release name.
 */
 extern const char *bt_version_get_name(void);
 
 /*!
 @brief
-    Returns libbabeltrace2's version name's description.
+    Returns libbabeltrace2's release name's description.
 
-If the version name's description is not available, which can be the
+If the release name's description is not available, which can be the
 case for a development build, this function returns \c NULL.
 
 @returns
-    Library's version name's description, or \c NULL if not available.
+    Library's release name's description, or \c NULL if not available.
 
 @sa bt_version_get_name() &mdash;
-    Returns libbabeltrace2's version name.
+    Returns libbabeltrace2's release name.
 */
 extern const char *bt_version_get_name_description(void);
 
diff --git a/src/lib/babeltrace2.c b/src/lib/babeltrace2.c
index 2f5d2123..ce01e728 100644
--- a/src/lib/babeltrace2.c
+++ b/src/lib/babeltrace2.c
@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common/version.h"
+
 unsigned int bt_version_get_major(void)
 {
 	return BT_VERSION_MAJOR;
@@ -46,6 +48,11 @@ const char *bt_version_get_development_stage(void)
 	return strlen(BT_VERSION_DEV_STAGE) == 0 ? NULL : BT_VERSION_DEV_STAGE;
 }
 
+const char *bt_version_get_vcs_revision_description(void)
+{
+	return strlen(BT_VERSION_GIT) == 0 ? NULL : BT_VERSION_GIT;
+}
+
 const char *bt_version_get_name(void)
 {
 	return strlen(BT_VERSION_NAME) == 0 ? NULL : BT_VERSION_NAME;
-- 
2.34.1