undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vc-git.el: Take into account the destination name in vc-checkout.

Browse Source 
This is necessary for vc-version-other-window. Based on a patch by Sam
Vilain <sam.vilain@catalyst.net.nz>.

Currently, the vc-git-checkout function uses `git checkout' to fetch a
file from the git repository to the working copy.  However, it is
completely ignoring the input argument that specifies the destination
file.  `git-checkout' does not support specifying this, so we have to
use `git-cat-file', capture the output in a buffer and then save it.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Alexandre Julliard 2007-01-26 11:57:50 +01:00 committed by Junio C Hamano
parent 7f9acb2a16
commit 40d6dc0f9d
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/emacs/vc-git.el
View File

@ -53,10 +53,6 @@
(let ((name (file-relative-name file)))
(eq 0 (apply #'call-process "git" nil (get-buffer "*Messages") nil (append args (list name))))))
(defun vc-git--run-command-out (output &rest args)
"Run a git command, output to output."
(eq 0 (apply #'call-process "git" nil output nil (append args))))
(defun vc-git-registered (file)
"Check whether FILE is registered with git."
(with-temp-buffer
@ -125,26 +121,14 @@
(defun vc-git-checkout (file &optional editable rev destfile)
(if destfile
(let ((mybuff (get-buffer-create "vc-git-checkout-tmp")))
(let ((rv
(vc-git--run-command-out
mybuff "cat-file" "blob"
(concat (or rev "HEAD")
":"
(let ((output (vc-git--run-command-string
(file-relative-name file)
"ls-files" "--full-name")))
(string-match "\\(.*\\)" output)
(match-string 1 output))
)))
)
(if rv
(save-current-buffer
(set-buffer mybuff)
(set-visited-file-name destfile t)
(save-buffer)
)
rv)))
(let ((fullname (substring
(vc-git--run-command-string file "ls-files" "-z" "--full-name" "--")
0 -1))
(coding-system-for-read 'no-conversion)
(coding-system-for-write 'no-conversion))
(with-temp-file destfile
(eq 0 (call-process "git" nil t nil "cat-file" "blob"
(concat (or rev "HEAD") ":" fullname)))))
(vc-git--run-command file "checkout" (or rev "HEAD"))))
(defun vc-git-annotate-command (file buf &optional rev)