aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-11-24 04:11:36 +0200
committerDmitry Gutov2014-11-24 04:11:36 +0200
commit5ceb233b2ddf189333a3ccd199d80ed639fe74c2 (patch)
treebe5df653ce7390ce5c0c9ed30a949df09c23b433
parent7aac8f171bc163972dfa972a2ffe0daa089b155b (diff)
downloademacs-5ceb233b2ddf189333a3ccd199d80ed639fe74c2.tar.gz
emacs-5ceb233b2ddf189333a3ccd199d80ed639fe74c2.zip
Fixes: debbugs:18579
* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/vc-hg.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c367b49cb8..5798e96c1b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-11-24 Dmitry Gutov <dgutov@yandex.ru> 12014-11-24 Dmitry Gutov <dgutov@yandex.ru>
2 2
3 * vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files.
4 (Bug#18579)
5
3 * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored 6 * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored
4 files. (Bug#18579) 7 files. (Bug#18579)
5 8
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index a66fb9f46f9..c8b811feecc 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -628,7 +628,7 @@ REV is the revision to check out into WORKFILE."
628 (vc-hg-after-dir-status update-function))) 628 (vc-hg-after-dir-status update-function)))
629 629
630(defun vc-hg-dir-status-files (dir files _default-state update-function) 630(defun vc-hg-dir-status-files (dir files _default-state update-function)
631 (apply 'vc-hg-command (current-buffer) 'async dir "status" "-C" files) 631 (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files)
632 (vc-run-delayed 632 (vc-run-delayed
633 (vc-hg-after-dir-status update-function))) 633 (vc-hg-after-dir-status update-function)))
634 634