feat(tazjin/emacs): Add magit-find-file-worktree function

This will look up a file in the current worktree of the git repository
enclosing `default-directory'.

In combination with project-find-file this lets me toggle between
switching to a file within a project, and within the whole depot.

Change-Id: Ie1011f10051fc2c4bd4279b0944a79c7edf92f3b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1838
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Vincent Ambo 2020-08-24 00:42:50 +01:00 committed by tazjin
parent 937469509b
commit 35b214ae9f
2 changed files with 10 additions and 3 deletions

View file

@ -32,12 +32,12 @@
(global-set-key (kbd "C-x r q") 'save-buffers-kill-terminal) (global-set-key (kbd "C-x r q") 'save-buffers-kill-terminal)
(global-set-key (kbd "C-x C-c") 'ignore) (global-set-key (kbd "C-x C-c") 'ignore)
;; Open Fefes Blog
(global-set-key (kbd "C-c C-f") 'fefes-blog)
;; Open a file in project: ;; Open a file in project:
(global-set-key (kbd "C-c f") 'project-find-file) (global-set-key (kbd "C-c f") 'project-find-file)
;; Open a file via magit:
(global-set-key (kbd "C-c C-f") #'magit-find-file-worktree)
;; Insert TODO comments ;; Insert TODO comments
(global-set-key (kbd "C-c t") 'insert-todo-comment) (global-set-key (kbd "C-c t") 'insert-todo-comment)

View file

@ -289,4 +289,11 @@
(add-to-list 'project-find-functions #'find-depot-project) (add-to-list 'project-find-functions #'find-depot-project)
(defun magit-find-file-worktree ()
(interactive)
"Find a file in the current (ma)git worktree."
(magit-find-file--internal "{worktree}"
(magit-read-file-from-rev "HEAD" "Find file")
#'pop-to-buffer-same-window))
(provide 'functions) (provide 'functions)