procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vc-svn-dir-status-files: Parse output with the remote format

Browse source 
Fixes: debbugs:19429

* lisp/vc/vc-svn.el (vc-svn-dir-status-files): Pass t as
vc-svn-after-dir-status's second argument.
This commit is contained in:
Dmitry Gutov 2015-01-16 06:24:09 +03:00
parent dfa8729c10
commit 255d2a5a53
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2015-01-16 Dmitry Gutov <dgutov@yandex.ru>
* vc/vc-svn.el (vc-svn-dir-status-files): Pass t as
vc-svn-after-dir-status's second argument. (Bug#19429)
2015-01-16 Samer Masterson <samer@samertm.com> (tiny change)
* pcomplete.el (pcomplete-parse-arguments): Parse arguments

3
lisp/vc/vc-svn.el
View file

@ -164,6 +164,7 @@ If you want to force an empty list of arguments, use t."
;; FIXME it would be better not to have the "remote" argument,
;; but to distinguish the two output formats based on content.
;; FIXME: the local format isn't used by the (sole) caller anymore.
(defun vc-svn-after-dir-status (callback &optional remote)
(let ((state-map '((?A . added)
(?C . conflict)
@ -208,7 +209,7 @@ CALLBACK is called as (CALLBACK RESULT BUFFER), where
RESULT is a list of conses (FILE . STATE) for directory DIR."
;; FIXME shouldn't this rather default to all the files in dir?
(apply #'vc-svn-command (current-buffer) 'async nil "status" "-u" files)
(vc-run-delayed (vc-svn-after-dir-status callback)))
(vc-run-delayed (vc-svn-after-dir-status callback t)))
(defun vc-svn-dir-extra-headers (_dir)
"Generate extra status headers for a Subversion working copy."