From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#57870: 27.1; vc-tor has no effect Date: Fri, 16 Sep 2022 16:22:04 -0700 Message-ID: <87illmq50j.fsf@melete.silentflame.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23034"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) To: 57870@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Sep 17 01:23:15 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oZKfw-0005m6-U6 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 17 Sep 2022 01:23:14 +0200 Original-Received: from localhost ([::1]:54128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZKfv-000445-Ds for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 16 Sep 2022 19:23:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZKfm-00043c-Eg for bug-gnu-emacs@gnu.org; Fri, 16 Sep 2022 19:23:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZKfm-0003Zb-79 for bug-gnu-emacs@gnu.org; Fri, 16 Sep 2022 19:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZKfl-00042i-Os for bug-gnu-emacs@gnu.org; Fri, 16 Sep 2022 19:23:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 16 Sep 2022 23:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57870 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.166337053615482 (code B ref -1); Fri, 16 Sep 2022 23:23:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Sep 2022 23:22:16 +0000 Original-Received: from localhost ([127.0.0.1]:44592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZKf2-00041e-2N for submit@debbugs.gnu.org; Fri, 16 Sep 2022 19:22:16 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:38146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZKew-00041Q-K0 for submit@debbugs.gnu.org; Fri, 16 Sep 2022 19:22:14 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZKew-00041J-7h for bug-gnu-emacs@gnu.org; Fri, 16 Sep 2022 19:22:10 -0400 Original-Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:33349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZKeu-0003Nc-3z for bug-gnu-emacs@gnu.org; Fri, 16 Sep 2022 19:22:09 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 4D7803200A56 for ; Fri, 16 Sep 2022 19:22:06 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 16 Sep 2022 19:22:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:content-type:date:date:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to; s=fm1; t= 1663370525; x=1663456925; bh=y1OCx82z9EcXD7VNCYpNPdCmI8Z6cnoR1+y 1hCQNQK0=; b=2L4Bv0Qfisxs0NjNPysG/1Pxz04xbc+2lzWIMSLH+A1pdJPM/Vq iEIyidBNA/fnRyyR5IxUvdfVwkNb88fkOwh6At9IUy51bWgJmi0QRJuNwy5BwLHE OcKxMMyssMeIBTPa6KWTbLThD5hfbEnXglUi3UlPt6hqq+LL21tj9SH1m7WwaE1M V8QbGluYL+WsEKhFoV1jqNndzKtiq5vxdoAH5smdwszWJn4jitjk9kN23qdF+GO1 LCPlmhpLzlKLwLhfdc6tM+yEU2ucFXGIfT9xm/KkR6owSSFTXnJqHRfko37re2Ky FxYBmTqP07bEZCePqS/Tavg3cn+gODTVpEw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:message-id:mime-version :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1663370525; x= 1663456925; bh=y1OCx82z9EcXD7VNCYpNPdCmI8Z6cnoR1+y1hCQNQK0=; b=s wuvBO4ob12I3tJjnA4m5ENouDLCB0r4ZKaRHckJryMwc1b5qfq5u4ze+D20I8Mhb B5rtPSpPn+FlAuO5Kq8B26TeesZIaMmQ9NltmDjF6f1cOqujwe8eS+QuUlKzrPAT l4laflWQqUksKYQ4+zNHuSsG9ogXvQdZdgJ8C2kbJpQBf6M1eGQny//V72Cl9NCz L3+d960F6MFSZxVXTL6oHEQ556F8zc+FV6tRiD+WnUQ05EU7X2PqjxnuqA6xbFII 9B/PRFNytA5FLP8PQa9sktbBZwh7QowZT4E8ejoGZQ6ChMdUGmSkgSCdivVAlA8T fCR2CANSG6WAt0okITClA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedvuddgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkfgggtgesmhdttdertd ertdenucfhrhhomhepufgvrghnucghhhhithhtohhnuceoshhpfihhihhtthhonhesshhp fihhihhtthhonhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeelieehheetkedvfedtvd egkeegleeugeegheelgfdvieffgfefvefhleeuudevhfenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsphifhhhithhtohhnsehsphifhhhith htohhnrdhnrghmvg X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 16 Sep 2022 19:22:05 -0400 (EDT) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 30BA57E3C62; Fri, 16 Sep 2022 16:22:04 -0700 (MST) Received-SPF: pass client-ip=64.147.123.25; envelope-from=spwhitton@spwhitton.name; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:242818 Archived-At: --=-=-= Content-Type: text/plain Hello, >From reading vc-do-command, it looks to me that the vc-tor defcustom has never actually had any effect on the commands that are run. The full-command variable is used only in messages displayed to the user. If someone else could verify this, I'll push the attached. This is blocking my work on #57807. Thanks. -- Sean Whitton --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-vc-do-command-Actually-include-torsocks-in-the-comma.patch >From ee62f2aed8f6339dc0442fb140d3df01d98ce659 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 16 Sep 2022 16:18:35 -0700 Subject: [PATCH] vc-do-command: Actually include "torsocks" in the command * lisp/vc/vc-dispatcher.el (vc-do-command): When vc-tor is non-nil, actually include "torsocks" in the command to be run (bug#XXXXX). --- lisp/vc/vc-dispatcher.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 36a6f27891..fff53fbcba 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -298,6 +298,9 @@ vc-do-command that is inserted into the command line before the filename. Return the return value of the slave command in the synchronous case, and the process object in the asynchronous case." + (when vc-tor + (push command flags) + (setq command "torsocks")) ;; FIXME: file-relative-name can return a bogus result because ;; it doesn't look at the actual file-system to see if symlinks ;; come into play. @@ -310,8 +313,7 @@ vc-do-command ;; due to potential truncation of long messages. (message-truncate-lines t) (full-command - (concat (if vc-tor "torsocks " "") - (if (string= (substring command -1) "\n") + (concat (if (string= (substring command -1) "\n") (substring command 0 -1) command) " " (vc-delistify flags) -- 2.30.2 --=-=-=--