From fdf31e5d6e79047fd0c0a30a5fb64dbc033f3169 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 30 May 2015 11:54:32 +0200 Subject: [PATCH] Improve Tramp traces. * lisp/net/trampver.el (tramp-repository-get-version): New defun. * lisp/net/tramp.el (tramp-debug-message): Use it. --- lisp/net/tramp.el | 7 ++++++- lisp/net/trampver.el | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 7bfd225c374..40bba145454 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1433,7 +1433,12 @@ ARGUMENTS to actually emit the message (if applicable)." (format ";; %sEmacs: %s Tramp: %s -*- mode: outline; -*-" (if (featurep 'sxemacs) "SX" (if (featurep 'xemacs) "X" "GNU ")) - emacs-version tramp-version))) + emacs-version tramp-version)) + (when (>= tramp-verbose 10) + (insert + (format + "\n;; Location: %s Git: %s" + (locate-library "tramp") (tramp-repository-get-version))))) (unless (bolp) (insert "\n")) ;; Timestamp. diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 226ec9f194a..c5e57053513 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -38,6 +38,18 @@ (defconst tramp-bug-report-address "tramp-devel@gnu.org" "Email address to send bug reports to.") +(defun tramp-repository-get-version () + "Try to return as a string the repository revision of the Tramp sources." + (let ((dir (funcall 'locate-dominating-file (locate-library "tramp") ".git"))) + (when dir + (with-temp-buffer + (let ((default-directory (file-name-as-directory dir))) + (and (zerop + (ignore-errors + (call-process "git" nil '(t nil) nil "rev-parse" "HEAD"))) + (not (zerop (buffer-size))) + (replace-regexp-in-string "\n" "" (buffer-string)))))))) + ;; Check for (X)Emacs version. (let ((x (if (or (>= emacs-major-version 22) (and (featurep 'xemacs) -- 2.39.2