From 357c7df734471eb154f5c45fb5b89d71dc4cfc43 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Tue, 2 Feb 2016 13:32:08 +0100
Subject: [PATCH] emacs "deadlocked" after using mercurial with huge amounts of
 ignored files in the repository (#1232422)

Resolves: #1232422
---
 emacs-mercurial.patch | 22 ++++++++++++++++++++++
 emacs.spec            |  6 ++++++
 2 files changed, 28 insertions(+)
 create mode 100644 emacs-mercurial.patch

diff --git a/emacs-mercurial.patch b/emacs-mercurial.patch
new file mode 100644
index 0000000..8645133
--- /dev/null
+++ b/emacs-mercurial.patch
@@ -0,0 +1,22 @@
+--- a/lisp/vc/vc-hg.el	2015-04-02 09:23:06.000000000 +0200
++++ b/lisp/vc/vc-hg.el	2016-02-02 10:53:23.248829159 +0100
+@@ -627,10 +627,16 @@ REV is the revision to check out into WO
+   (vc-run-delayed
+    (vc-hg-after-dir-status update-function)))
+ 
+-(defun vc-hg-dir-status-files (dir files _default-state update-function)
+-  (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files)
++(defun vc-hg-dir-status-files (_dir files _default-state update-function)
++  ;; XXX: We can't pass DIR directly to 'hg status' because that
++  ;; returns all ignored files if FILES is non-nil (bug#22481).
++  ;; If honoring DIR ever becomes important, try using '-I DIR/'.
++  (vc-hg-command (current-buffer) 'async files
++                 "status"
++                 (concat "-mardu" (if files "i"))
++                 "-C")
+   (vc-run-delayed
+-   (vc-hg-after-dir-status update-function)))
++    (vc-hg-after-dir-status update-function)))
+ 
+ (defun vc-hg-dir-extra-header (name &rest commands)
+   (concat (propertize name 'face 'font-lock-type-face)
diff --git a/emacs.spec b/emacs.spec
index ddd92ac..60573dd 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -27,6 +27,8 @@ Patch2:        emacs-pdf-default.patch
 Patch3:        emacs-grep-deprecated.patch
 Patch4:        emacs-system-crypto-policies.patch
 Patch5:        emacs-bbdb.patch
+# http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=06083cf41c473404d246de9b91a0116f38c5485f
+Patch6:        emacs-mercurial.patch
 
 BuildRequires: atk-devel
 BuildRequires: cairo-devel
@@ -170,6 +172,7 @@ packages that add functionality to Emacs.
 %patch3 -p1 -b .grep-deprecated
 %patch4 -p1 -b .system-crypto-policies
 %patch5 -p1 -b .bbdb
+%patch6 -p1
 autoconf
 
 # We prefer our emacs.desktop file
@@ -441,6 +444,9 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Tue Feb  2 2016 Jan Synáček <jsynacek@redhat.com> - 1:24.5-9
+- emacs "deadlocked" after using mercurial with huge amounts of ignored files in the repository (#1232422)
+
 * Tue Jan  5 2016 Jan Synáček <jsynacek@redhat.com> - 1:24.5-9
 - set default value for smime-CA-directory (#1131558)
 - remove emacsclient.desktop (#1175969)