(defun stgit (dir)
"Manage stgit patches"
(interactive "DDirectory: \n")
- (switch-to-stgit-buffer dir)
+ (switch-to-stgit-buffer (git-get-top-dir dir))
(stgit-refresh))
+(defun git-get-top-dir (dir)
+ "Retrieve the top-level directory of a git tree."
+ (let ((cdup (with-output-to-string
+ (with-current-buffer standard-output
+ (cd dir)
+ (unless (eq 0 (call-process "git" nil t nil
+ "rev-parse" "--show-cdup"))
+ (error "cannot find top-level git tree for %s." dir))))))
+ (expand-file-name (concat (file-name-as-directory dir)
+ (car (split-string cdup "\n"))))))
+
(defun switch-to-stgit-buffer (dir)
"Switch to a (possibly new) buffer displaying StGit patches for DIR"
(setq dir (file-name-as-directory dir))
(cond ((looking-at "Branch: \\(.*\\)")
(put-text-property (match-beginning 1) (match-end 1)
'face 'bold))
- ((looking-at "\\([>+-]\\)\\( \\)\\([^ ]+\\) *| \\(.*\\)")
+ ((looking-at "\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)")
(let ((state (match-string 1))
(patchsym (intern (match-string 3))))
(put-text-property
'face 'stgit-description-face)
(when (memq patchsym stgit-marked-patches)
(replace-match "*" nil nil nil 2)
- (setq marked (cons patchsym marked))))))
+ (setq marked (cons patchsym marked)))))
+ ((looking-at "stg series: Branch \".*\" not initialised")
+ (forward-line 1)
+ (insert "Run M-x stgit-init to initialise")))
(forward-line 1))
(setq stgit-marked-patches (nreverse marked)))))
(define-key stgit-mode-map "g" 'stgit-refresh)
(define-key stgit-mode-map "r" 'stgit-rename)
(define-key stgit-mode-map "e" 'stgit-edit)
+ (define-key stgit-mode-map "c" 'stgit-coalesce)
(define-key stgit-mode-map "N" 'stgit-new)
- (define-key stgit-mode-map "\C-r" 'stgit-repair)
+ (define-key stgit-mode-map "R" 'stgit-repair)
(define-key stgit-mode-map "C" 'stgit-commit)
(define-key stgit-mode-map "U" 'stgit-uncommit)
(define-key stgit-mode-map ">" 'stgit-push-next)
(define-key stgit-mode-map "<" 'stgit-pop-next)
(define-key stgit-mode-map "P" 'stgit-push-or-pop)
(define-key stgit-mode-map "G" 'stgit-goto)
- (define-key stgit-mode-map "=" 'stgit-show))
+ (define-key stgit-mode-map "=" 'stgit-show)
+ (define-key stgit-mode-map "D" 'stgit-delete))
(defun stgit-mode ()
"Major mode for interacting with StGit.
(match-string-no-properties 1)
nil)))
+(defun stgit-patches-marked-or-at-point ()
+ "Return the names of the marked patches, or the patch on the current line."
+ (if stgit-marked-patches
+ (stgit-marked-patches)
+ (let ((patch (stgit-patch-at-point)))
+ (if patch
+ (list patch)
+ '()))))
+
(defun stgit-goto-patch (patch)
"Move point to the line containing PATCH"
(let ((p (point)))
(goto-char p)
nil)))
+(defun stgit-init ()
+ "Run stg init"
+ (interactive)
+ (stgit-capture-output nil
+ (stgit-run "init"))
+ (stgit-refresh))
+
(defun stgit-mark ()
"Mark the patch under point"
(interactive)
(defun stgit-edit ()
"Edit the patch on the current line"
(interactive)
- (let ((patch (if (stgit-applied-at-point)
- (stgit-patch-at-point)
- (error "This patch is not applied")))
- (edit-buf (get-buffer-create "*stgit edit*"))
+ (let ((patch (stgit-patch-at-point))
+ (edit-buf (get-buffer-create "*StGit edit*"))
(dir default-directory))
(log-edit 'stgit-confirm-edit t nil edit-buf)
(set (make-local-variable 'stgit-edit-patch) patch)
(defun stgit-new ()
"Create a new patch"
(interactive)
- (let ((edit-buf (get-buffer-create "*stgit edit*")))
+ (let ((edit-buf (get-buffer-create "*StGit edit*")))
(log-edit 'stgit-confirm-new t nil edit-buf)))
(defun stgit-confirm-new ()
(interactive)
- (let ((file (make-temp-file "stgit-edit-"))
- (patch (stgit-create-patch-name
- (buffer-substring (point-min)
- (save-excursion (goto-char (point-min))
- (end-of-line)
- (point))))))
+ (let ((file (make-temp-file "stgit-edit-")))
(write-region (point-min) (point-max) file)
(stgit-capture-output nil
- (stgit-run "new" "-m" "placeholder" patch)
- (stgit-run "edit" "-f" file patch))
+ (stgit-run "new" "-f" file))
(with-current-buffer log-edit-parent-buffer
(stgit-refresh))))
(substring patch 0 20))
(t patch))))
+(defun stgit-delete (patch-names)
+ "Delete the named patches"
+ (interactive (list (stgit-patches-marked-or-at-point)))
+ (if (zerop (length patch-names))
+ (error "No patches to delete")
+ (when (yes-or-no-p (format "Really delete %d patches? "
+ (length patch-names)))
+ (stgit-capture-output nil
+ (apply 'stgit-run "delete" patch-names))
+ (stgit-refresh))))
+
+(defun stgit-coalesce (patch-names)
+ "Run stg coalesce on the named patches"
+ (interactive (list (stgit-marked-patches)))
+ (let ((edit-buf (get-buffer-create "*StGit edit*"))
+ (dir default-directory))
+ (log-edit 'stgit-confirm-coalesce t nil edit-buf)
+ (set (make-local-variable 'stgit-patches) patch-names)
+ (setq default-directory dir)
+ (let ((standard-output edit-buf))
+ (apply 'stgit-run "coalesce" "--save-template=-" patch-names))))
+
+(defun stgit-confirm-coalesce ()
+ (interactive)
+ (let ((file (make-temp-file "stgit-edit-")))
+ (write-region (point-min) (point-max) file)
+ (stgit-capture-output nil
+ (apply 'stgit-run "coalesce" "-f" file stgit-patches))
+ (with-current-buffer log-edit-parent-buffer
+ (stgit-refresh))))
+
(defun stgit-help ()
"Display help for the StGit mode."
(interactive)