From 255d2a5a53083d676977023e9772d97095c6db46 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 16 Jan 2015 06:24:09 +0300 Subject: [PATCH] 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. --- lisp/ChangeLog | 5 +++++ lisp/vc/vc-svn.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 64c3305d4fe..908c02788cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-16 Dmitry Gutov + + * 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 (tiny change) * 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." ;; 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." -- 2.39.2