]> git.bundesbrandschatzamt.de Git - emacsconfig.git/commitdiff
adding git-timemachine.
authorAndreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
Tue, 4 Nov 2014 19:13:47 +0000 (20:13 +0100)
committerAndreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
Tue, 4 Nov 2014 19:13:47 +0000 (20:13 +0100)
Signed-off-by: Andreas Gerler <baronNOSPAMbundesbrandschatzamt.de>
elpa/git-timemachine-20140825.951/git-timemachine-autoloads.el [new file with mode: 0644]
elpa/git-timemachine-20140825.951/git-timemachine-pkg.el [new file with mode: 0644]
elpa/git-timemachine-20140825.951/git-timemachine.el [new file with mode: 0644]
elpa/git-timemachine-readme.txt [new file with mode: 0644]

diff --git a/elpa/git-timemachine-20140825.951/git-timemachine-autoloads.el b/elpa/git-timemachine-20140825.951/git-timemachine-autoloads.el
new file mode 100644 (file)
index 0000000..1bd506c
--- /dev/null
@@ -0,0 +1,29 @@
+;;; git-timemachine-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+\f
+;;;### (autoloads (git-timemachine) "git-timemachine" "git-timemachine.el"
+;;;;;;  (21593 9364 0 0))
+;;; Generated autoloads from git-timemachine.el
+
+(autoload 'git-timemachine "git-timemachine" "\
+Enable git timemachine for file of current buffer.
+
+\(fn)" t nil)
+
+;;;***
+\f
+;;;### (autoloads nil nil ("git-timemachine-pkg.el") (21593 9364
+;;;;;;  475894 0))
+
+;;;***
+\f
+(provide 'git-timemachine-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; git-timemachine-autoloads.el ends here
diff --git a/elpa/git-timemachine-20140825.951/git-timemachine-pkg.el b/elpa/git-timemachine-20140825.951/git-timemachine-pkg.el
new file mode 100644 (file)
index 0000000..7f1c0c3
--- /dev/null
@@ -0,0 +1 @@
+(define-package "git-timemachine" "20140825.951" "Walk through git revisions of a file" (quote ((cl-lib "0.5"))))
diff --git a/elpa/git-timemachine-20140825.951/git-timemachine.el b/elpa/git-timemachine-20140825.951/git-timemachine.el
new file mode 100644 (file)
index 0000000..48407cf
--- /dev/null
@@ -0,0 +1,163 @@
+;;; git-timemachine.el --- Walk through git revisions of a file
+
+;; Copyright (C) 2014 Peter Stiernström
+
+;; Author: Peter Stiernström <peterNOSPAMstiernstrom.se>
+;; Version: 20140825.951
+;; X-Original-Version: 1.8
+;; URL: https://github.com/pidu/git-timemachine
+;; Package-Requires: ((cl-lib "0.5"))
+;; Keywords: git
+
+;; This file is not part of GNU Emacs
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Use git-timemachine to browse historic versions of a file with p
+;;; (previous) and n (next).
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'vc-git)
+
+(defcustom git-timemachine-abbreviation-length 12
+ "Number of chars from the full sha1 hash to use for abbreviation."
+ :group 'git-timemachine)
+
+(defvar git-timemachine-directory nil)
+(defvar git-timemachine-revision nil)
+(defvar git-timemachine-file nil)
+
+(make-variable-buffer-local 'git-timemachine-directory)
+(make-variable-buffer-local 'git-timemachine-revision)
+(make-variable-buffer-local 'git-timemachine-file)
+
+(defun git-timemachine--revisions ()
+ "List git revisions of current buffers file."
+ (let ((default-directory git-timemachine-directory)
+       (file git-timemachine-file))
+  (with-temp-buffer
+   (unless (zerop (process-file vc-git-program nil t nil "--no-pager" "log" "--pretty=format:%H" file))
+    (error "Failed: 'git log --pretty=format:%%H' %s" file))
+   (goto-char (point-min))
+   (let (lines)
+    (while (not (eobp))
+     (push (buffer-substring-no-properties (line-beginning-position) (line-end-position)) lines)
+     (forward-line 1))
+    (nreverse lines)))))
+
+(defun git-timemachine-show-current-revision ()
+ "Show last (current) revision of file."
+ (interactive)
+ (git-timemachine-show-revision (car (git-timemachine--revisions))))
+
+(defun git-timemachine-show-previous-revision ()
+ "Show previous revision of file."
+ (interactive)
+ (git-timemachine-show-revision (cadr (member git-timemachine-revision (git-timemachine--revisions)))))
+
+(defun git-timemachine-show-next-revision ()
+ "Show next revision of file."
+ (interactive)
+ (git-timemachine-show-revision (cadr (member git-timemachine-revision (reverse (git-timemachine--revisions))))))
+
+(defun git-timemachine-show-revision (revision)
+ "Show a REVISION (commit hash) of the current file."
+ (when revision
+  (let ((current-position (point)))
+   (setq buffer-read-only nil)
+   (erase-buffer)
+   (let ((default-directory git-timemachine-directory))
+    (process-file vc-git-program nil t nil "--no-pager" "show"
+     (concat revision ":" git-timemachine-file)))
+   (setq buffer-read-only t)
+   (set-buffer-modified-p nil)
+   (let* ((revisions (git-timemachine--revisions))
+          (n-of-m (format "(%d/%d)" (- (length revisions) (cl-position revision revisions :test 'equal)) (length revisions))))
+    (setq mode-line-buffer-identification
+     (list (propertized-buffer-identification "%12b") "@"
+      (propertize (git-timemachine-abbreviate revision) 'face 'bold) " " n-of-m)))
+   (setq git-timemachine-revision revision)
+   (goto-char current-position))))
+
+(defun git-timemachine-abbreviate (revision)
+ "Return REVISION abbreviated to `git-timemachine-abbreviation-length' chars."
+ (substring revision 0 git-timemachine-abbreviation-length))
+
+(defun git-timemachine-quit ()
+ "Exit the timemachine."
+ (interactive)
+ (kill-buffer))
+
+(defun git-timemachine-kill-revision ()
+ "Kill the current revisions abbreviated commit hash."
+ (interactive)
+ (message git-timemachine-revision)
+ (kill-new git-timemachine-revision))
+
+(defun git-timemachine-kill-abbreviated-revision ()
+ "Kill the current revisions full commit hash."
+ (interactive)
+ (let ((revision (git-timemachine-abbreviate git-timemachine-revision)))
+  (message revision)
+  (kill-new revision)))
+
+(define-minor-mode git-timemachine-mode
+ "Git Timemachine, feel the wings of history."
+ :init-value nil
+ :lighter " Timemachine"
+ :keymap
+ '(("p" . git-timemachine-show-previous-revision)
+   ("n" . git-timemachine-show-next-revision)
+   ("q" . git-timemachine-quit)
+   ("w" . git-timemachine-kill-abbreviated-revision)
+   ("W" . git-timemachine-kill-revision))
+ :group 'git-timemachine)
+
+(defun git-timemachine-validate (file)
+ "Validate that there is a FILE and that it belongs to a git repository.
+Call with the value of 'buffer-file-name."
+ (unless file
+  (error "This buffer is not visiting a file"))
+ (unless (vc-git-registered file)
+  (error "This file is not git tracked")))
+
+;;;###autoload
+(defun git-timemachine ()
+ "Enable git timemachine for file of current buffer."
+ (interactive)
+ (git-timemachine-validate (buffer-file-name))
+ (let ((git-directory (expand-file-name (vc-git-root (buffer-file-name))))
+       (file-name (buffer-file-name))
+       (timemachine-buffer (format "timemachine:%s" (buffer-name)))
+       (cur-line (line-number-at-pos))
+       (mode major-mode))
+  (with-current-buffer (get-buffer-create timemachine-buffer)
+   (setq buffer-file-name file-name)
+   (funcall mode)
+   (git-timemachine-mode)
+   (setq git-timemachine-directory git-directory
+         git-timemachine-file (file-relative-name file-name git-directory)
+         git-timemachine-revision nil)
+   (git-timemachine-show-current-revision)
+   (switch-to-buffer timemachine-buffer)
+   (goto-char (point-min))
+   (forward-line (1- cur-line)))))
+
+(provide 'git-timemachine)
+
+;;; git-timemachine.el ends here
diff --git a/elpa/git-timemachine-readme.txt b/elpa/git-timemachine-readme.txt
new file mode 100644 (file)
index 0000000..505580f
--- /dev/null
@@ -0,0 +1,2 @@
+Use git-timemachine to browse historic versions of a file with p
+(previous) and n (next).