Browse Source

Remove some TODOs

master
10sr 6 years ago
parent
commit
e869df6fd7
Signed by: 10sr GPG Key ID: 7BEC428194130EB2
1 changed files with 15 additions and 14 deletions
  1. +15
    -14
      emacs.el

+ 15
- 14
emacs.el View File

@@ -1,6 +1,6 @@
;;; emacs.el --- 10sr emacs initialization ;;; emacs.el --- 10sr emacs initialization


;; Time-stamp: <2018-10-15 19:36:35 JST 10sr>
;; Time-stamp: <2018-10-15 20:02:55 JST 10sr>


;;; Code: ;;; Code:


@@ -2268,22 +2268,24 @@ use for the buffer. It defaults to \"*recetf-show*\"."
"Repository root path of current buffer.") "Repository root path of current buffer.")
(make-variable-buffer-local 'git-walktree-repository-root) (make-variable-buffer-local 'git-walktree-repository-root)


(defun git-walktree--commitish-fordisplay (commitish)
"Convert COMMITISH and return is a suitable format for displaying."
(if (and commitish
(string-match-p "\\`[0-9a-f]+\\'"
commitish)
(>= (length commitish) 32))
(git-walktree--git-plumbing "rev-parse"
"--short"
commitish)
commitish))

(defun git-walktree--create-buffer (commitish name) (defun git-walktree--create-buffer (commitish name)
;; TODO: check repository
"Create and return buffer for NAME." "Create and return buffer for NAME."
(let* ((root (git-walktree--git-plumbing "rev-parse" (let* ((root (git-walktree--git-plumbing "rev-parse"
"--show-toplevel")) "--show-toplevel"))
(commitish-display (if (and commitish
;; TODO: Add git-walktree--commitish-fordisplay
(string-match-p "\\`[0-9a-f]+\\'"
commitish)
(>= (length commitish) 32))
(git-walktree--git-plumbing "rev-parse"
"--short"
commitish)
commitish))
(commitish-display (git-walktree--commitish-fordisplay commitish))
(name (format "%s:%s" (name (format "%s:%s"
(or commitish "")
(or commitish-display "")
name))) name)))


(with-current-buffer (get-buffer-create name) (with-current-buffer (get-buffer-create name)
@@ -2335,7 +2337,7 @@ use for the buffer. It defaults to \"*recetf-show*\"."
(point)) (point))
(insert "\n") (insert "\n")
(insert (format "Contents of '%s:%s':\n" (insert (format "Contents of '%s:%s':\n"
commitish
(git-walktree--commitish-fordisplay commitish)
path))) path)))
(insert (format "Contents of treeish object '%s:\n" (insert (format "Contents of treeish object '%s:\n"
treeish))) treeish)))
@@ -2357,7 +2359,6 @@ use for the buffer. It defaults to \"*recetf-show*\"."
(when (and git-walktree-try-cd (when (and git-walktree-try-cd
(file-directory-p dir)) (file-directory-p dir))
(cd dir))) (cd dir)))
;; FIXME: Somehow point go back to point-min when reopen the buffer
(when (= (point) (point-min)) (when (= (point) (point-min))
(goto-char point-tree-start) (goto-char point-tree-start)
) )


Loading…
Cancel
Save