From 7da1b876aa74d63b6ed454299c45915c91ceb833 Mon Sep 17 00:00:00 2001 From: Robert O'Connor Date: Thu, 20 Aug 2015 00:26:26 -0400 Subject: [PATCH] Add a rev number to SPC hds. Describe system information was useless if we don't know which rev. people are using. This adds this information. --- core/core-release-management.el | 23 ++++++++++++++++++++--- core/core-spacemacs.el | 3 ++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/core/core-release-management.el b/core/core-release-management.el index b8c5e2760..fff5c128e 100644 --- a/core/core-release-management.el +++ b/core/core-release-management.el @@ -208,11 +208,28 @@ version and the NEW version." (kill-buffer proc-buffer)))) (defun spacemacs/git-get-current-branch () - "Return the current branch. Return nil if an error occurred." - (let((proc-buffer "git-get-current-branch") + "Return the current branch. Return nil if an error occurred." + (let((proc-buffer "git-get-current-branch") + (default-directory (file-truename user-emacs-directory))) + (when (eq 0 (process-file "git" nil proc-buffer nil + "symbolic-ref" "--short" "-q" "HEAD")) + (with-current-buffer proc-buffer + (prog1 + (when (buffer-string) + (goto-char (point-min)) + (replace-regexp-in-string + "\n$" "" + (buffer-substring (line-beginning-position) + (line-end-position)))) + (kill-buffer proc-buffer)))))) + +(defun spacemacs/git-get-current-branch-rev () + "Returns the hash of the head commit on the current branch. +Returns nil if an error occurred." + (let((proc-buffer "git-get-current-branch-head-hash") (default-directory (file-truename user-emacs-directory))) (when (eq 0 (process-file "git" nil proc-buffer nil - "symbolic-ref" "--short" "-q" "HEAD")) + "rev-parse" "--short" "HEAD")) (with-current-buffer proc-buffer (prog1 (when (buffer-string) diff --git a/core/core-spacemacs.el b/core/core-spacemacs.el index aaa5ecd24..a39e90c5d 100644 --- a/core/core-spacemacs.el +++ b/core/core-spacemacs.el @@ -249,12 +249,13 @@ FILE-TO-LOAD is an explicit file to load after the installation." "- OS: %s\n" "- Emacs: %s\n" "- Spacemacs: %s\n" - "- Spacemacs branch: %s\n" + "- Spacemacs branch: %s (rev. %s)\n" "- Layers:\n```elisp\n%s```\n") system-type emacs-version spacemacs-version (spacemacs/git-get-current-branch) + (spacemacs/git-get-current-branch-rev) (pp dotspacemacs-configuration-layers)))) (kill-new sysinfo) (message sysinfo)