Move request pull to git library
This commit is contained in:
parent
636c985bdd
commit
1b942fbcf1
2 changed files with 60 additions and 29 deletions
|
@ -141,35 +141,6 @@ MODE1 is enabled and vice-versa."
|
|||
"Set the `disabled' property for each item in FUNCTIONS to nil."
|
||||
(mapc #'(lambda (f) (put f 'disabled nil)) functions))
|
||||
|
||||
(defun oni:request-pull ()
|
||||
"Start a mail to request pulling from a git repository."
|
||||
(interactive)
|
||||
(let* ((default-directory
|
||||
(expand-file-name
|
||||
(or (locate-dominating-file default-directory ".git")
|
||||
(magit-read-top-dir nil))))
|
||||
(refs (magit-list-interesting-refs magit-uninteresting-refs))
|
||||
(from (cdr (assoc (completing-read "From: " refs) refs)))
|
||||
(url (read-from-minibuffer "Pull URL: "))
|
||||
(to (symbol-name (read-from-minibuffer "Up to (HEAD): "
|
||||
nil nil t nil "HEAD")))
|
||||
(patchp (and current-prefix-arg (listp current-prefix-arg))))
|
||||
(message "Requesting pull for %s from %s to %s at %s with%s patch"
|
||||
default-directory from to url (if patchp "" "out"))
|
||||
|
||||
(compose-mail
|
||||
nil (concat
|
||||
"Requesting pull for "
|
||||
(file-name-base (directory-file-name default-directory))))
|
||||
|
||||
(save-excursion
|
||||
(goto-char (point-max))
|
||||
(insert
|
||||
(shell-command-to-string
|
||||
(concat "git --git-dir='" default-directory ".git' --work-tree='"
|
||||
default-directory "' request-pull " (when patchp "-p ")
|
||||
from " " url " " to))))))
|
||||
|
||||
(defun oni:reset-default-directory ()
|
||||
"Reset `default-directory' to HOME."
|
||||
(setq default-directory (getenv "HOME")))
|
||||
|
|
60
emacs/.emacs.d/site-lisp/oni-git.el
Normal file
60
emacs/.emacs.d/site-lisp/oni-git.el
Normal file
|
@ -0,0 +1,60 @@
|
|||
;;; oni-git.el --- Extra git functions and commands -*- lexical-binding: t; -*-
|
||||
|
||||
;; Copyright (C) 2015 Tom Willemse
|
||||
|
||||
;; Author: Tom Willemse <tom@ryuslash.org>
|
||||
;; Keywords:
|
||||
|
||||
;; 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:
|
||||
|
||||
;; Here are some extra commands and functions for git.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'magit)
|
||||
|
||||
;;;###autoload
|
||||
(defun oni:request-pull ()
|
||||
"Start a mail to request pulling from a git repository."
|
||||
(interactive)
|
||||
(let* ((default-directory
|
||||
(expand-file-name
|
||||
(or (locate-dominating-file default-directory ".git")
|
||||
(magit-read-repository))))
|
||||
(refs (magit-list-refs))
|
||||
(from (cdr (assoc (completing-read "From: " refs) refs)))
|
||||
(url (read-from-minibuffer "Pull URL: "))
|
||||
(to (symbol-name (read-from-minibuffer "Up to (HEAD): "
|
||||
nil nil t nil "HEAD")))
|
||||
(patchp (and current-prefix-arg (listp current-prefix-arg))))
|
||||
(message "Requesting pull for %s from %s to %s at %s with%s patch"
|
||||
default-directory from to url (if patchp "" "out"))
|
||||
|
||||
(compose-mail
|
||||
nil (concat
|
||||
"Requesting pull for "
|
||||
(file-name-base (directory-file-name default-directory))))
|
||||
|
||||
(save-excursion
|
||||
(goto-char (point-max))
|
||||
(insert
|
||||
(shell-command-to-string
|
||||
(concat "git --git-dir='" default-directory ".git' --work-tree='"
|
||||
default-directory "' request-pull " (when patchp "-p ")
|
||||
from " " url " " to))))))
|
||||
|
||||
(provide 'oni-git)
|
||||
;;; oni-git.el ends here
|
Loading…
Reference in a new issue