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

Merge branch 'better-annotated-tagging'

Browse source
This commit is contained in:
Phil Jackson 2010-08-04 10:14:59 +01:00
commit 2af1a122e5
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
magit.el
View file

@ -1695,6 +1695,7 @@ FUNC should leave point at the end of the modified region"
(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 "t") 'magit-tag) (define-key map (kbd "t") 'magit-tag)
(define-key map (kbd "T") 'magit-annotated-tag)
map)) map))
(defvar magit-reflog-mode-map (defvar magit-reflog-mode-map
@ -2463,9 +2464,12 @@ insert a line to tell how to insert more of them"
(magit-create-buffer-sections (magit-create-buffer-sections
(magit-git-section nil nil (magit-git-section nil nil
'magit-wash-commit 'magit-wash-commit
"log" "--max-count=1" "log"
"--decorate=full"
"--max-count=1"
"--pretty=medium" "--pretty=medium"
"--cc" "-p" commit))) "--cc"
"-p" commit)))
(define-minor-mode magit-commit-mode (define-minor-mode magit-commit-mode
"Minor mode to view git commit" "Minor mode to view git commit"
@ -3244,7 +3248,8 @@ toggled on. When it's toggled on for the first time, return
(sign-off (if sign-off-field (sign-off (if sign-off-field
(equal (cdr sign-off-field) "yes") (equal (cdr sign-off-field) "yes")
magit-commit-signoff)) magit-commit-signoff))
(tag (cdr (assq 'tag fields))) (tag-rev (cdr (assq 'tag-rev fields)))
(tag-name (cdr (assq 'tag-name fields)))
(author (cdr (assq 'author fields)))) (author (cdr (assq 'author fields))))
(magit-log-edit-push-to-comment-ring (buffer-string)) (magit-log-edit-push-to-comment-ring (buffer-string))
(magit-log-edit-setup-author-env author) (magit-log-edit-setup-author-env author)
@ -3254,8 +3259,8 @@ toggled on. When it's toggled on for the first time, return
(insert "(Empty description)\n")) (insert "(Empty description)\n"))
(let ((commit-buf (current-buffer))) (let ((commit-buf (current-buffer)))
(with-current-buffer (magit-find-buffer 'status default-directory) (with-current-buffer (magit-find-buffer 'status default-directory)
(cond (tag (cond (tag-name
(magit-run-git-with-input commit-buf "tag" tag "-a" "-F" "-")) (magit-run-git-with-input commit-buf "tag" tag-name "-a" "-F" "-" tag-rev))
(t (t
(apply #'magit-run-async-with-input commit-buf (apply #'magit-run-async-with-input commit-buf
magit-git-executable magit-git-executable
@ -3263,7 +3268,7 @@ toggled on. When it's toggled on for the first time, return
(list "commit" "-F" "-") (list "commit" "-F" "-")
(if (and commit-all (not allow-empty)) '("--all") '()) (if (and commit-all (not allow-empty)) '("--all") '())
(if amend '("--amend") '()) (if amend '("--amend") '())
(if allow-empty '("--allow-empty")) (if allow-empty '("--allow-empty"))
(if sign-off '("--signoff") '()))))))) (if sign-off '("--signoff") '())))))))
(erase-buffer) (erase-buffer)
(bury-buffer) (bury-buffer)
@ -3324,7 +3329,6 @@ This means that the eventual commit does 'git commit --allow-empty'."
(if (y-or-n-p "Rebase in progress. Continue it? ") (if (y-or-n-p "Rebase in progress. Continue it? ")
(magit-run-git "rebase" "--continue"))) (magit-run-git "rebase" "--continue")))
(t (t
(magit-log-edit-set-field 'tag nil)
(when (and magit-commit-all-when-nothing-staged (when (and magit-commit-all-when-nothing-staged
(not (magit-anything-staged-p))) (not (magit-anything-staged-p)))
(cond ((eq magit-commit-all-when-nothing-staged 'ask-stage) (cond ((eq magit-commit-all-when-nothing-staged 'ask-stage)
@ -3403,11 +3407,15 @@ This means that the eventual commit does 'git commit --allow-empty'."
(magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD")))) (magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
(magit-run-git "tag" name rev)) (magit-run-git "tag" name rev))
(magit-define-command annotated-tag (name) (magit-define-command annotated-tag (name rev)
"Start composing an annotated tag with the given NAME. "Start composing an annotated tag with the given NAME.
Tag will point to the current 'HEAD'." Tag will point to the current 'HEAD'."
(interactive "sNew annotated tag name: ") (interactive
(magit-log-edit-set-field 'tag name) (list
(read-string "Tag name: ")
(magit-read-rev "Place tag on: " (or (magit-default-rev) "HEAD"))))
(magit-log-edit-set-field 'tag-name name)
(magit-log-edit-set-field 'tag-rev rev)
(magit-pop-to-log-edit "tag")) (magit-pop-to-log-edit "tag"))
;;; Stashing ;;; Stashing