From 5a779dbcb5b08e0cb76bf6aefa53c9d0e968a5c0 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 22 Jan 2019 15:16:45 +0100 Subject: [PATCH] Update git-timemachine. Signed-off-by: Andreas Gerler --- .../git-timemachine-pkg.el | 2 -- .../git-timemachine-autoloads.el | 0 .../git-timemachine-pkg.el | 2 ++ .../git-timemachine.el | 31 ++++++++++++++++--- elpa/git-timemachine-readme.txt | 2 -- 5 files changed, 28 insertions(+), 9 deletions(-) delete mode 100644 elpa/git-timemachine-20180607.820/git-timemachine-pkg.el rename elpa/{git-timemachine-20180607.820 => git-timemachine-20181204.1546}/git-timemachine-autoloads.el (100%) create mode 100644 elpa/git-timemachine-20181204.1546/git-timemachine-pkg.el rename elpa/{git-timemachine-20180607.820 => git-timemachine-20181204.1546}/git-timemachine.el (94%) delete mode 100644 elpa/git-timemachine-readme.txt diff --git a/elpa/git-timemachine-20180607.820/git-timemachine-pkg.el b/elpa/git-timemachine-20180607.820/git-timemachine-pkg.el deleted file mode 100644 index 2ea9376f..00000000 --- a/elpa/git-timemachine-20180607.820/git-timemachine-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "git-timemachine" "20180607.820" "Walk through git revisions of a file" '((emacs "24.3")) :commit "90a980578249c102da3e904fccdc9a2a5a0e7bcc" :keywords '("git") :authors '(("Peter Stiernström" . "peter@stiernstrom.se")) :maintainer '("Peter Stiernström" . "peter@stiernstrom.se") :url "https://github.com/pidu/git-timemachine") diff --git a/elpa/git-timemachine-20180607.820/git-timemachine-autoloads.el b/elpa/git-timemachine-20181204.1546/git-timemachine-autoloads.el similarity index 100% rename from elpa/git-timemachine-20180607.820/git-timemachine-autoloads.el rename to elpa/git-timemachine-20181204.1546/git-timemachine-autoloads.el diff --git a/elpa/git-timemachine-20181204.1546/git-timemachine-pkg.el b/elpa/git-timemachine-20181204.1546/git-timemachine-pkg.el new file mode 100644 index 00000000..8a4e1e0b --- /dev/null +++ b/elpa/git-timemachine-20181204.1546/git-timemachine-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "git-timemachine" "20181204.1546" "Walk through git revisions of a file" '((emacs "24.3")) :commit "3a4a7f11af613090122d1d4bb8823eaeed93398f" :keywords '("git") :authors '(("Peter Stiernström" . "peter@stiernstrom.se")) :maintainer '("Peter Stiernström" . "peter@stiernstrom.se") :url "https://gitlab.com/pidu/git-timemachine") diff --git a/elpa/git-timemachine-20180607.820/git-timemachine.el b/elpa/git-timemachine-20181204.1546/git-timemachine.el similarity index 94% rename from elpa/git-timemachine-20180607.820/git-timemachine.el rename to elpa/git-timemachine-20181204.1546/git-timemachine.el index 1e01e278..56ae06ac 100644 --- a/elpa/git-timemachine-20180607.820/git-timemachine.el +++ b/elpa/git-timemachine-20181204.1546/git-timemachine.el @@ -3,9 +3,9 @@ ;; Copyright (C) 2014 Peter Stiernström ;; Author: Peter Stiernström -;; Version: 4.6 -;; Package-Version: 20180607.820 -;; URL: https://github.com/pidu/git-timemachine +;; Version: 4.8 +;; Package-Version: 20181204.1546 +;; URL: https://gitlab.com/pidu/git-timemachine ;; Keywords: git ;; Package-Requires: ((emacs "24.3")) @@ -87,6 +87,12 @@ Available values are: :type 'list :group 'git-timemachine) +(defcustom git-timemachine-quit-to-invoking-buffer + t + "Switch to invoking buffer on ‘git-timemachine-quit’." + :type 'boolean + :group 'git-timemachine) + (defvar-local git-timemachine-directory nil) (defvar-local git-timemachine-revision nil) (defvar-local git-timemachine-file nil) @@ -296,7 +302,11 @@ respect to the window first line" (defun git-timemachine-quit () "Exit the timemachine." (interactive) - (kill-buffer)) + (let ((parent-buffer-name buffer-file-name)) + (kill-buffer) + (let ((parent-buffer (find-buffer-visiting parent-buffer-name))) + (when (and parent-buffer git-timemachine-quit-to-invoking-buffer) + (switch-to-buffer parent-buffer nil t))))) (defun git-timemachine-blame () "Call magit-blame on current revision." @@ -320,6 +330,16 @@ respect to the window first line" (message revision) (kill-new revision))) +(defun git-timemachine-show-commit () + "Show commit for current revision." + (interactive) + (let ((rev (car git-timemachine-revision))) + (if (fboundp 'magit-revision-mode) + (progn + (with-temp-buffer + (save-excursion (magit-mode-setup #'magit-revision-mode rev nil nil nil)))) + (message "You need to install magit to show commit")))) + (define-minor-mode git-timemachine-mode "Git Timemachine, feel the wings of history." :init-value nil @@ -332,7 +352,8 @@ respect to the window first line" ("q" . git-timemachine-quit) ("w" . git-timemachine-kill-abbreviated-revision) ("W" . git-timemachine-kill-revision) - ("b" . git-timemachine-blame)) + ("b" . git-timemachine-blame) + ("c" . git-timemachine-show-commit)) :group 'git-timemachine) (defun git-timemachine-validate (file) diff --git a/elpa/git-timemachine-readme.txt b/elpa/git-timemachine-readme.txt deleted file mode 100644 index 505580f3..00000000 --- a/elpa/git-timemachine-readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Use git-timemachine to browse historic versions of a file with p -(previous) and n (next). -- 2.47.3