aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2016-01-30 06:55:32 +0300
committerDmitry Gutov2016-01-30 06:56:08 +0300
commit06083cf41c473404d246de9b91a0116f38c5485f (patch)
tree0a8fb59343f51166c0c3f55ffe1706764ecb3dbe
parent545ad84a8cbe6f05999aa6b7cc1003801817c314 (diff)
downloademacs-06083cf41c473404d246de9b91a0116f38c5485f.tar.gz
emacs-06083cf41c473404d246de9b91a0116f38c5485f.zip
Don't pass DIR to 'hg status'
* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Don't pass DIR to 'hg status' (bug#22481).
-rw-r--r--lisp/vc/vc-hg.el12
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 8cb3547b13b..2d8bab70598 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -647,10 +647,14 @@ REV is the revision to check out into WORKFILE."
647;; Follows vc-exec-after. 647;; Follows vc-exec-after.
648(declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) 648(declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
649 649
650(defun vc-hg-dir-status-files (dir files update-function) 650(defun vc-hg-dir-status-files (_dir files update-function)
651 (apply 'vc-hg-command (current-buffer) 'async dir "status" 651 ;; XXX: We can't pass DIR directly to 'hg status' because that
652 (concat "-mardu" (if files "i")) 652 ;; returns all ignored files if FILES is non-nil (bug#22481).
653 "-C" files) 653 ;; If honoring DIR ever becomes important, try using '-I DIR/'.
654 (vc-hg-command (current-buffer) 'async files
655 "status"
656 (concat "-mardu" (if files "i"))
657 "-C")
654 (vc-run-delayed 658 (vc-run-delayed
655 (vc-hg-after-dir-status update-function))) 659 (vc-hg-after-dir-status update-function)))
656 660