From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: [PATCH 2/2] Add .dirty to git org-version info if files are modified Date: Tue, 18 Aug 2009 13:22:43 -0400 Message-ID: <1250616163-11733-3-git-send-email-bernt@norang.ca> References: <1250616163-11733-1-git-send-email-bernt@norang.ca> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MdSPC-0001C4-4U for emacs-orgmode@gnu.org; Tue, 18 Aug 2009 13:23:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MdSP8-00019q-MB for emacs-orgmode@gnu.org; Tue, 18 Aug 2009 13:23:29 -0400 Received: from [199.232.76.173] (port=59059 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MdSP8-00019n-Di for emacs-orgmode@gnu.org; Tue, 18 Aug 2009 13:23:26 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:49636) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MdSP8-0000Fj-5K for emacs-orgmode@gnu.org; Tue, 18 Aug 2009 13:23:26 -0400 Received: from cpe000102d0fe75-cm0012256ecbde.cpe.net.cable.rogers.com ([99.239.148.180] helo=mail.norang.ca) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1MdSP7-000KTP-DG for emacs-orgmode@gnu.org; Tue, 18 Aug 2009 17:23:25 +0000 In-Reply-To: <1250616163-11733-1-git-send-email-bernt@norang.ca> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Bernt Hansen Shows files as modified by appending .dirty to indicate that you are running org-mode from a dirty working tree (some tracked files are modified) --- lisp/org.el | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 3560a50..26b2808 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -103,6 +103,7 @@ With prefix arg HERE, insert it at point." (interactive "P") (let* ((org-version org-version) + (git-version) (dir (concat (file-name-directory (locate-library "org")) "../" ))) (if (file-exists-p (expand-file-name ".git" dir)) (progn @@ -113,7 +114,11 @@ With prefix arg HERE, insert it at point." (replace-regexp "-" ".") (goto-char (point-min)) (re-search-forward "[^\n]+") - (setq org-version (concat org-version " (" (match-string 0) ")"))))) + (setq git-version (match-string 0)) + (shell-command (concat "cd " dir " && git diff-index --name-only HEAD --")) + (unless (eql 1 (point-max)) + (setq git-version (concat git-version ".dirty"))) + (setq org-version (concat org-version " (" git-version ")"))))) (let ((version (format "Org-mode version %s" org-version))) (message version) (if here -- 1.6.4