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

Move stage-all to 'A'.

Browse source 
Added branch switching and creation.
This commit is contained in:
Marius Vollmer 2008-08-06 01:08:07 +03:00
parent 1092418d16
commit 59bb26ef47
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mgit.el
View file

@ -31,7 +31,6 @@
;;; TODO
;; - Hide titles of empty sections
;; - Branch creation/switching
;; - Explicit diffing/merging of branches
;; - Detect and handle renames and copies.
@ -147,11 +146,13 @@
(setq mgit-keymap (make-keymap))
(suppress-keymap mgit-keymap)
(define-key mgit-keymap (kbd "g") 'mgit-status)
(define-key mgit-keymap (kbd "S") 'mgit-stage-all)
(define-key mgit-keymap (kbd "A") 'mgit-stage-all)
(define-key mgit-keymap (kbd "a") 'mgit-stage-thing-at-point)
(define-key mgit-keymap (kbd "u") 'mgit-unstage-thing-at-point)
(define-key mgit-keymap (kbd "i") 'mgit-ignore-thing-at-point)
(define-key mgit-keymap (kbd "RET") 'mgit-visit-thing-at-point)
(define-key mgit-keymap (kbd "b") 'mgit-switch-branch)
(define-key mgit-keymap (kbd "B") 'mgit-create-branch)
(define-key mgit-keymap (kbd "U") 'mgit-pull)
(define-key mgit-keymap (kbd "P") 'mgit-push)
(define-key mgit-keymap (kbd "c") 'mgit-log-edit)
@ -336,6 +337,29 @@
(if position
(goto-line position))))))))
;;; Branches
(defun mgit-list-branches ()
(directory-files ".git/refs/heads/"))
(defun mgit-read-switch-branch-args ()
(list (completing-read "Switch to branch: " (mgit-list-branches))))
(defun mgit-switch-branch (branch)
(interactive (mgit-read-switch-branch-args))
(mgit-run "git" "checkout" branch))
(defun mgit-read-create-branch-args ()
(let* ((branches (mgit-list-branches))
(cur-branch (mgit-get-current-branch))
(branch (read-string "Create branch: "))
(parent (completing-read "Parent: " branches nil t cur-branch)))
(list branch parent)))
(defun mgit-create-branch (branch parent)
(interactive (mgit-read-create-branch-args))
(mgit-run "git" "checkout" "-b" branch parent))
;;; Push and pull
(defun mgit-pull ()