diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index e63e544ce..5f41a0883 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -133,7 +133,7 @@ :desc "Magit status" "g" #'magit-status :desc "Magit file delete" "x" #'magit-file-delete :desc "Magit blame" "B" #'magit-blame-addition - :desc "Magit clone" "C" #'+magit/clone + :desc "Magit clone" "C" #'magit-clone :desc "Magit fetch" "F" #'magit-fetch :desc "Magit buffer log" "L" #'magit-log :desc "Git stage file" "S" #'magit-stage-file @@ -162,7 +162,7 @@ :desc "List notifications" "n" #'forge-list-notifications) (:prefix ("c" . "create") :desc "Initialize repo" "r" #'magit-init - :desc "Clone repo" "R" #'+magit/clone + :desc "Clone repo" "R" #'magit-clone :desc "Commit" "c" #'magit-commit-create :desc "Fixup" "f" #'magit-commit-fixup :desc "Issue" "i" #'forge-create-issue diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 855eb6393..363ac1161 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -407,7 +407,7 @@ :desc "Magit status" "g" #'magit-status :desc "Magit file delete" "D" #'magit-file-delete :desc "Magit blame" "B" #'magit-blame-addition - :desc "Magit clone" "C" #'+magit/clone + :desc "Magit clone" "C" #'magit-clone :desc "Magit fetch" "F" #'magit-fetch :desc "Magit buffer log" "L" #'magit-log :desc "Git stage file" "S" #'magit-stage-file @@ -436,7 +436,7 @@ :desc "List notifications" "n" #'forge-list-notifications) (:prefix ("c" . "create") :desc "Initialize repo" "r" #'magit-init - :desc "Clone repo" "R" #'+magit/clone + :desc "Clone repo" "R" #'magit-clone :desc "Commit" "c" #'magit-commit-create :desc "Fixup" "f" #'magit-commit-fixup :desc "Branch" "b" #'magit-branch-and-checkout diff --git a/modules/tools/magit/autoload.el b/modules/tools/magit/autoload.el index 3dd37388c..bd42c1fdc 100644 --- a/modules/tools/magit/autoload.el +++ b/modules/tools/magit/autoload.el @@ -93,36 +93,3 @@ control in buffers." (run-with-timer 5 nil #'+magit--kill-buffer buf) (kill-process process) (kill-buffer buf))))))) - -(defvar +magit-clone-history nil - "History for `+magit/clone' prompt.") -;;;###autoload -(defun +magit/clone (url-or-repo dir) - "Like `magit-clone', but supports additional formats on top of absolute URLs: - -+ USER/REPO: assumes {`+magit-default-clone-url'}/USER/REPO -+ REPO: assumes {`+magit-default-clone-url'}/{USER}/REPO, where {USER} is - ascertained from your global gitconfig." - (interactive - (progn - (require 'ghub) - (let* ((user (ghub--username (ghub--host))) - (repo (read-from-minibuffer - "Clone repository (user/repo or url): " - (if user (concat user "/")) - nil nil '+magit-clone-history)) - (name (car (last (split-string repo "/" t))))) - (list repo - (read-directory-name - "Destination: " - magit-clone-default-directory - name nil name))))) - (magit-clone-regular - (cond ((string-match-p "^[^/]+$" url-or-repo) - (require 'ghub) - (format +magit-default-clone-url (ghub--username (ghub--host)) url-or-repo)) - ((string-match-p "^\\([^/]+\\)/\\([^/]+\\)/?$" url-or-repo) - (apply #'format +magit-default-clone-url (split-string url-or-repo "/" t))) - (url-or-repo)) - dir - nil)) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 483327e7d..13a818dc3 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -1,10 +1,5 @@ ;;; tools/magit/config.el -*- lexical-binding: t; -*- -(defvar +magit-default-clone-url "https://github.com/%s/%s" - "The default location for `+magit/clone' to clone relative URLs from. -It is passed a user and repository name.") - - ;; ;;; Packages