aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrii Kolomoiets2019-10-17 04:25:10 +0200
committerLars Ingebrigtsen2019-10-17 04:25:31 +0200
commit1610d67051f5160f3c3e74c8ea396368cfb0bbd7 (patch)
treef655ef96129b8c5b8e446e29f976583eb56304c8
parent3ad407005bf6560f4db40cab9dbeeabe554fb457 (diff)
downloademacs-1610d67051f5160f3c3e74c8ea396368cfb0bbd7.tar.gz
emacs-1610d67051f5160f3c3e74c8ea396368cfb0bbd7.zip
Add ui.report_untrusted=0 to vc-hg log commands
* lisp/vc/vc-hg.el (vc-hg-state-slow, vc-hg-merge-branch) (vc-hg-command): Add "--config" "ui.report_untrusted=0" to the log commands to avoid "Hg-not trusting file " messages in the mode line (bug#31497). Copyright-paperwork-exempt: yes
-rw-r--r--lisp/vc/vc-hg.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 61d5ee1d3af..cc737b30b15 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -237,6 +237,7 @@ highlighting the Log View buffer."
237 process-environment))) 237 process-environment)))
238 (process-file 238 (process-file
239 vc-hg-program nil t nil 239 vc-hg-program nil t nil
240 "--config" "ui.report_untrusted=0"
240 "--config" "alias.status=status" 241 "--config" "alias.status=status"
241 "--config" "defaults.status=" 242 "--config" "defaults.status="
242 "status" "-A" (file-relative-name file))) 243 "status" "-A" (file-relative-name file)))
@@ -1436,7 +1437,7 @@ This runs the command \"hg merge\"."
1436 (buffer (format "*vc-hg : %s*" (expand-file-name root))) 1437 (buffer (format "*vc-hg : %s*" (expand-file-name root)))
1437 ;; Disable pager. 1438 ;; Disable pager.
1438 (process-environment (cons "HGPLAIN=1" process-environment))) 1439 (process-environment (cons "HGPLAIN=1" process-environment)))
1439 (apply 'vc-do-async-command buffer root vc-hg-program '("merge")) 1440 (apply 'vc-do-async-command buffer root vc-hg-program '("--config" "ui.report_untrusted=0" "merge"))
1440 (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg))) 1441 (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg)))
1441 (vc-set-async-update buffer))) 1442 (vc-set-async-update buffer)))
1442 1443
@@ -1447,7 +1448,8 @@ This runs the command \"hg merge\"."
1447This function differs from vc-do-command in that it invokes 1448This function differs from vc-do-command in that it invokes
1448`vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS." 1449`vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS."
1449 ;; Disable pager. 1450 ;; Disable pager.
1450 (let ((process-environment (cons "HGPLAIN=1" process-environment))) 1451 (let ((process-environment (cons "HGPLAIN=1" process-environment))
1452 (flags (append '("--config" "ui.report_untrusted=0") flags)))
1451 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list 1453 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list
1452 (if (stringp vc-hg-global-switches) 1454 (if (stringp vc-hg-global-switches)
1453 (cons vc-hg-global-switches flags) 1455 (cons vc-hg-global-switches flags)