gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made l/L a little bit smarter.

Browse source
This commit is contained in:
John Wiegley 2009-02-03 20:31:55 -04:00
parent 8898ef7926
commit f73a222ed5
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
magit.el
View file

@ -904,8 +904,8 @@ Many Magit faces inherit from this one by default."
(define-key map (kbd "?") 'magit-describe-item) (define-key map (kbd "?") 'magit-describe-item)
(define-key map (kbd ".") 'magit-mark-item) (define-key map (kbd ".") 'magit-mark-item)
(define-key map (kbd "=") 'magit-diff-with-mark) (define-key map (kbd "=") 'magit-diff-with-mark)
(define-key map (kbd "l") 'magit-log-head) (define-key map (kbd "l") 'magit-log)
(define-key map (kbd "L") 'magit-log) (define-key map (kbd "L") 'magit-log-long)
(define-key map (kbd "h") 'magit-reflog-head) (define-key map (kbd "h") 'magit-reflog-head)
(define-key map (kbd "H") 'magit-reflog) (define-key map (kbd "H") 'magit-reflog)
(define-key map (kbd "d") 'magit-diff-working-tree) (define-key map (kbd "d") 'magit-diff-working-tree)
@ -965,8 +965,8 @@ Many Magit faces inherit from this one by default."
"---" "---"
["Diff working tree" magit-diff-working-tree t] ["Diff working tree" magit-diff-working-tree t]
["Diff" magit-diff t] ["Diff" magit-diff t]
["Log head" magit-log-head t]
["Log" magit-log t] ["Log" magit-log t]
["Long Log" magit-log-long t]
["Reflog head" magit-reflog-head t] ["Reflog head" magit-reflog-head t]
["Reflog" magit-reflog t] ["Reflog" magit-reflog t]
"---" "---"
@ -1431,10 +1431,11 @@ in log buffer."
" - ")) " - "))
(defun magit-wash-log-line () (defun magit-wash-log-line ()
(if (search-forward-regexp "[0-9a-fA-F]\\{40\\}" (line-end-position) t) (if (and (search-forward-regexp "[0-9a-fA-F]\\{40\\}" (line-end-position) t)
(goto-char (match-beginning 0))
(not (looking-back "commit ")))
(let ((commit (match-string-no-properties 0))) (let ((commit (match-string-no-properties 0)))
(delete-region (match-beginning 0) (match-end 0)) (delete-region (match-beginning 0) (match-end 0))
(goto-char (match-beginning 0))
(fixup-whitespace) (fixup-whitespace)
(goto-char (line-beginning-position)) (goto-char (line-beginning-position))
(when (search-forward-regexp "^[|*\\/ ]+\\((\\(tag:.+?\\|refs/.+?\\))\\)" (when (search-forward-regexp "^[|*\\/ ]+\\((\\(tag:.+?\\|refs/.+?\\))\\)"
@ -2231,29 +2232,39 @@ Prefix arg means justify as well."
(let ((res (magit-shell-exit-code "git log --decorate --max-count=0"))) (let ((res (magit-shell-exit-code "git log --decorate --max-count=0")))
(setq magit-have-decorate (eq res 0))))) (setq magit-have-decorate (eq res 0)))))
(defun magit-refresh-log-buffer (range args) (defun magit-refresh-log-buffer (range style args)
(magit-configure-have-graph) (magit-configure-have-graph)
(magit-configure-have-decorate) (magit-configure-have-decorate)
(magit-create-buffer-sections (magit-create-buffer-sections
(apply #'magit-insert-section nil (apply #'magit-insert-section nil
(magit-rev-range-describe range "Commits") (magit-rev-range-describe range "Commits")
'magit-wash-log 'magit-wash-log
`("git" "log" "--max-count=1000" "--pretty=oneline" `("git" "log" "--max-count=1000" ,style
,@(if magit-have-decorate (list "--decorate")) ,@(if magit-have-decorate (list "--decorate"))
,@(if magit-have-graph (list "--graph")) ,@(if magit-have-graph (list "--graph"))
,args "--")))) ,args "--"))))
(defun magit-log (range) (defun magit-log (&optional arg)
(interactive (list (magit-read-rev-range "Log" (magit-get-current-branch)))) (interactive "P")
(if range (let* ((range (if arg
(let* ((topdir (magit-get-top-dir default-directory)) (read-string "Show log for (default is HEAD): ")
"HEAD"))
(topdir (magit-get-top-dir default-directory))
(args (magit-rev-range-to-git range))) (args (magit-rev-range-to-git range)))
(switch-to-buffer "*magit-log*") (switch-to-buffer "*magit-log*")
(magit-mode-init topdir 'log #'magit-refresh-log-buffer range args)))) (magit-mode-init topdir 'log #'magit-refresh-log-buffer range
"--pretty=oneline" args)))
(defun magit-log-head () (defun magit-log-long (&optional arg)
(interactive) (interactive "P")
(magit-log "HEAD")) (let* ((range (if arg
(read-string "Show long log for (default is HEAD): ")
"HEAD"))
(topdir (magit-get-top-dir default-directory))
(args (magit-rev-range-to-git range)))
(switch-to-buffer "*magit-log*")
(magit-mode-init topdir 'log #'magit-refresh-log-buffer range
"--stat" args)))
;;; Reflog ;;; Reflog
@ -2472,7 +2483,7 @@ Prefix arg means justify as well."
(server-start) (server-start)
(let* ((section (get-text-property (point) 'magit-section)) (let* ((section (get-text-property (point) 'magit-section))
(commit (and (member 'commit (magit-section-context-type section)) (commit (and (member 'commit (magit-section-context-type section))
(setq commit (magit-section-info section)))) (magit-section-info section)))
(old-editor (getenv "GIT_EDITOR"))) (old-editor (getenv "GIT_EDITOR")))
(setenv "GIT_EDITOR" (expand-file-name "emacsclient" exec-directory)) (setenv "GIT_EDITOR" (expand-file-name "emacsclient" exec-directory))
(unwind-protect (unwind-protect