bug#31497: [Andrii Kolomoiets] bug#31497: 27.0.50; vc-hg doesn't separate standard error from standard output

[Andrii Kolomoiets <andreyk.mad@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 831 bytes --]

On 15 Oct 2019, at 03:33, Lars Ingebrigtsen <larsi@gnus.org> wrote:
> 
> (Please keep the debbugs address in the Cc list -- otherwise the bug
> tracker won't get the message.)

My bad. I emailed with "reply via email to" button on "Mail Archives"
site (https://lists.gnu.org/archive/html/), didn't know what address
must be specified in Cc.

>> There are option 'ui.report_untrusted' in hg since this commit:
>> https://www.mercurial-scm.org/repo/hg/rev/97369f6a6bb6
> 
> So that's 2007, so it should presumably be safe to add that.
> 
>> It present in mercurial 2.6.2, the earliest version I found in pip.
>> 
>> To filter out just "not trusting" warning I can propose to run hg like
>> this:
>> hg log --config ui.report_untrusted=0 -l 1 -r . -T '{rev}'
> 
> Could you propose a patch that adds this?

Please see attached patch.

[-- Attachment #2: hg-untrusted.patch --]
[-- Type: application/octet-stream, Size: 1507 bytes --]

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 61d5ee1d3a..cc737b30b1 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -237,6 +237,7 @@ vc-hg-state-slow
 			      process-environment)))
 			(process-file
 			 vc-hg-program nil t nil
+                         "--config" "ui.report_untrusted=0"
 			 "--config" "alias.status=status"
 			 "--config" "defaults.status="
 			 "status" "-A" (file-relative-name file)))
@@ -1436,7 +1437,7 @@ vc-hg-merge-branch
 	 (buffer (format "*vc-hg : %s*" (expand-file-name root)))
          ;; Disable pager.
          (process-environment (cons "HGPLAIN=1" process-environment)))
-    (apply 'vc-do-async-command buffer root vc-hg-program '("merge"))
+    (apply 'vc-do-async-command buffer root vc-hg-program '("--config" "ui.report_untrusted=0" "merge"))
     (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg)))
     (vc-set-async-update buffer)))
 
@@ -1447,7 +1448,8 @@ vc-hg-command
 This function differs from vc-do-command in that it invokes
 `vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS."
   ;; Disable pager.
-  (let ((process-environment (cons "HGPLAIN=1" process-environment)))
+  (let ((process-environment (cons "HGPLAIN=1" process-environment))
+        (flags (append '("--config" "ui.report_untrusted=0") flags)))
     (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list
            (if (stringp vc-hg-global-switches)
                (cons vc-hg-global-switches flags)