diff options
| author | Dmitry Gutov | 2015-01-16 06:24:09 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2015-01-16 06:24:09 +0300 |
| commit | 255d2a5a53083d676977023e9772d97095c6db46 (patch) | |
| tree | bd7c23dd962e4edcbe8001955ac2a1589a89a321 | |
| parent | dfa8729c1086d6461de846aad47f2a0aba732176 (diff) | |
| download | emacs-255d2a5a53083d676977023e9772d97095c6db46.tar.gz emacs-255d2a5a53083d676977023e9772d97095c6db46.zip | |
vc-svn-dir-status-files: Parse output with the remote format
Fixes: debbugs:19429
* lisp/vc/vc-svn.el (vc-svn-dir-status-files): Pass t as
vc-svn-after-dir-status's second argument.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 64c3305d4fe..908c02788cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-01-16 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * vc/vc-svn.el (vc-svn-dir-status-files): Pass t as | ||
| 4 | vc-svn-after-dir-status's second argument. (Bug#19429) | ||
| 5 | |||
| 1 | 2015-01-16 Samer Masterson <samer@samertm.com> (tiny change) | 6 | 2015-01-16 Samer Masterson <samer@samertm.com> (tiny change) |
| 2 | 7 | ||
| 3 | * pcomplete.el (pcomplete-parse-arguments): Parse arguments | 8 | * pcomplete.el (pcomplete-parse-arguments): Parse arguments |
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index bae178df3f7..d74daf9c36f 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -164,6 +164,7 @@ If you want to force an empty list of arguments, use t." | |||
| 164 | 164 | ||
| 165 | ;; FIXME it would be better not to have the "remote" argument, | 165 | ;; FIXME it would be better not to have the "remote" argument, |
| 166 | ;; but to distinguish the two output formats based on content. | 166 | ;; but to distinguish the two output formats based on content. |
| 167 | ;; FIXME: the local format isn't used by the (sole) caller anymore. | ||
| 167 | (defun vc-svn-after-dir-status (callback &optional remote) | 168 | (defun vc-svn-after-dir-status (callback &optional remote) |
| 168 | (let ((state-map '((?A . added) | 169 | (let ((state-map '((?A . added) |
| 169 | (?C . conflict) | 170 | (?C . conflict) |
| @@ -208,7 +209,7 @@ CALLBACK is called as (CALLBACK RESULT BUFFER), where | |||
| 208 | RESULT is a list of conses (FILE . STATE) for directory DIR." | 209 | RESULT is a list of conses (FILE . STATE) for directory DIR." |
| 209 | ;; FIXME shouldn't this rather default to all the files in dir? | 210 | ;; FIXME shouldn't this rather default to all the files in dir? |
| 210 | (apply #'vc-svn-command (current-buffer) 'async nil "status" "-u" files) | 211 | (apply #'vc-svn-command (current-buffer) 'async nil "status" "-u" files) |
| 211 | (vc-run-delayed (vc-svn-after-dir-status callback))) | 212 | (vc-run-delayed (vc-svn-after-dir-status callback t))) |
| 212 | 213 | ||
| 213 | (defun vc-svn-dir-extra-headers (_dir) | 214 | (defun vc-svn-dir-extra-headers (_dir) |
| 214 | "Generate extra status headers for a Subversion working copy." | 215 | "Generate extra status headers for a Subversion working copy." |