From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernt Hansen <bernt@norang.ca>
Subject: Re: [PATCH 0/2] Teach org-version to include git version information
Date: Wed, 19 Aug 2009 09:32:17 -0400
Message-ID: <87eir8ylni.fsf@gollum.intra.norang.ca>
References: <1250616163-11733-1-git-send-email-bernt@norang.ca>
	<668A7B70-E1E0-485E-9537-64C5A039DEF4@gmail.com>
	<87bpmdaqff.fsf@gollum.intra.norang.ca>
	<4D2E35AC-DBAB-499C-946A-2BB86D6C2AA3@gmail.com>
	<e7cdbe30908190310y75c5adenda4e035a2cbcabad@mail.gmail.com>
	<87tz04yrk0.fsf@gollum.intra.norang.ca>
	<e7cdbe30908190501t29a27c3cua1c30d9661acbbc@mail.gmail.com>
	<87prasypiv.fsf@gollum.intra.norang.ca>
	<e7cdbe30908190519k65819bf0x2b744ac93beb2d11@mail.gmail.com>
	<87iqgkyoic.fsf@gollum.intra.norang.ca>
	<e7cdbe30908190620x5f20543eo4ab77dc9b8911453@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MdlH8-0004zu-KB
	for emacs-orgmode@gnu.org; Wed, 19 Aug 2009 09:32:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MdlH4-0004zB-5s
	for emacs-orgmode@gnu.org; Wed, 19 Aug 2009 09:32:25 -0400
Received: from [199.232.76.173] (port=34282 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MdlH3-0004z8-VO
	for emacs-orgmode@gnu.org; Wed, 19 Aug 2009 09:32:22 -0400
Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:57310)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <bernt@norang.ca>) id 1MdlH3-0006dF-G8
	for emacs-orgmode@gnu.org; Wed, 19 Aug 2009 09:32:21 -0400
In-Reply-To: <e7cdbe30908190620x5f20543eo4ab77dc9b8911453@mail.gmail.com>
	(Manish's message of "Wed\, 19 Aug 2009 18\:50\:12 +0530")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Manish <mailtomanish.sharma@gmail.com>
Cc: emacs-orgmode@gnu.org

Manish <mailtomanish.sharma@gmail.com> writes:

> On Wed, Aug 19, 2009 at 6:00 PM, Bernt Hansen<bernt@norang.ca> wrote:
>> Manish,
>>
>> Could you try this patch - does it work?
>
> Patch application fails.  I tried with patch -p1 as well.
>
> ,----
> | [Wed 19 18:47] (2118) ~/elisp/org-mode.git $ git apply
> org-version-patch-by-bernt.patch
> | error: patch failed: lisp/org.el:104
> | error: lisp/org.el: patch does not apply
> `----
>
> -- 
> Manish

Can you try evaluating this? and then M-x org-version and report the
results?

(defun org-version (&optional here)
  "Show the org-mode version in the echo area.
With prefix arg HERE, insert it at point."
  (interactive "P")
  (let* ((org-version org-version)
	 (git-version)
	 (dir (file-truename (concat (file-name-directory (locate-library "org")) "../" ))))
    (if (file-exists-p (expand-file-name ".git" dir))
	(progn
	 (shell-command (concat "GITDIR=" dir " && git describe --abbrev=4 HEAD"))
	 (save-excursion
	   (set-buffer "*Shell Command Output*")
	   (goto-char (point-min))
	   (replace-regexp "-" ".")
	   (goto-char (point-min))
	   (re-search-forward "[^\n]+")
	   (setq git-version (match-string 0))
	   (shell-command (concat "GITDIR=" 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)))
      (if here (insert version))
      (message version)
      version)))

-Bernt