Bump :emacs vc

rmuslimov/browse-at-remote@aeee6bf -> rmuslimov/browse-at-remote@771a307

Closes #2680
This commit is contained in:
Henrik Lissner 2020-03-08 13:06:04 -04:00
parent 83072d5440
commit a25dea91d8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
5 changed files with 13 additions and 24 deletions

View file

@ -238,7 +238,7 @@
;;; <leader> v --- versioning ;;; <leader> v --- versioning
(:prefix-map ("v" . "versioning") (:prefix-map ("v" . "versioning")
:desc "Git revert file" "R" #'vc-revert :desc "Git revert file" "R" #'vc-revert
:desc "Kill link to remote" "y" #'+vc/browse-at-remote-kill-file-or-region :desc "Kill link to remote" "y" #'browse-at-remote-kill
:desc "Kill link to homepage" "Y" #'+vc/browse-at-remote-kill-homepage :desc "Kill link to homepage" "Y" #'+vc/browse-at-remote-kill-homepage
(:when (featurep! :ui vc-gutter) (:when (featurep! :ui vc-gutter)
:desc "Git revert hunk" "r" #'git-gutter:revert-hunk :desc "Git revert hunk" "r" #'git-gutter:revert-hunk

View file

@ -398,7 +398,7 @@
;;; <leader> g --- git/version control ;;; <leader> g --- git/version control
(:prefix-map ("g" . "git") (:prefix-map ("g" . "git")
:desc "Revert file" "R" #'vc-revert :desc "Revert file" "R" #'vc-revert
:desc "Copy link to remote" "y" #'+vc/browse-at-remote-kill-file-or-region :desc "Copy link to remote" "y" #'browse-at-remote-kill
:desc "Copy link to homepage" "Y" #'+vc/browse-at-remote-kill-homepage :desc "Copy link to homepage" "Y" #'+vc/browse-at-remote-kill-homepage
(:when (featurep! :ui hydra) (:when (featurep! :ui hydra)
:desc "SMerge" "m" #'+vc/smerge-hydra/body) :desc "SMerge" "m" #'+vc/smerge-hydra/body)

View file

@ -1,19 +1,5 @@
;;; emacs/vc/autoload/vc.el -*- lexical-binding: t; -*- ;;; emacs/vc/autoload/vc.el -*- lexical-binding: t; -*-
(autoload 'browse-at-remote-get-url "browse-at-remote")
(autoload 'browse-at-remote--file-url "browse-at-remote")
;;;###autoload
(defun +vc/browse-at-remote-kill-file-or-region ()
"Copy the current file's remote URL to your clipboard.
If a selection is active, highlight them. Otherwise omits the #L<N> suffix in
the URL."
(interactive)
(let ((url (browse-at-remote-get-url)))
(kill-new url)
(message "Copied to clipboard: %S" url)))
(defun +vc--remote-homepage () (defun +vc--remote-homepage ()
(or (let ((url (browse-at-remote--remote-ref))) (or (let ((url (browse-at-remote--remote-ref)))
(cdr (browse-at-remote--get-url-from-remote (car url)))) (cdr (browse-at-remote--get-url-from-remote (car url))))

View file

@ -88,10 +88,13 @@ otherwise in default state."
(evil-insert-state))))) (evil-insert-state)))))
;; HACK `browse-at-remote' produces urls with `nil' in them, when the repo (after! browse-at-remote
;; detached. This creates broken links. I think it is more sensible to at (setq browse-at-remote-add-line-number-if-no-region-selected nil)
;; least refer to master in those case.
(defadvice! +vc--fallback-to-master-branch-a () ;; HACK `browse-at-remote' produces urls with `nil' in them, when the repo is
;; detached. This creates broken links. I think it is more sensible to
;; fall back to master in those cases.
(defadvice! +vc--fallback-to-master-branch-a ()
"Return 'master' in detached state." "Return 'master' in detached state."
:after-until #'browse-at-remote--get-local-branch :after-until #'browse-at-remote--get-local-branch
"master") "master"))

View file

@ -5,7 +5,7 @@
(package! vc-annotate :built-in t) (package! vc-annotate :built-in t)
(package! smerge-mode :built-in t) (package! smerge-mode :built-in t)
(package! browse-at-remote :pin "aeee6bf38f") (package! browse-at-remote :pin "771a3079e2")
(package! git-timemachine :pin "391eb61050") (package! git-timemachine :pin "391eb61050")
(package! gitconfig-mode :pin "55468314a5") (package! gitconfig-mode :pin "55468314a5")
(package! gitignore-mode :pin "55468314a5") (package! gitignore-mode :pin "55468314a5")