From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?J=C3=B6rg?= Sommer Newsgroups: gmane.emacs.bugs Subject: bug#74352: 29.4; emerge-files with tramp + local file fails Date: Thu, 14 Nov 2024 18:27:39 +0100 Message-ID: References: <86frnul2hf.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rh23bxie22l3bwfq" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32505"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 74352@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Nov 14 18:30:34 2024 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 1tBdfs-00088x-MT for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 14 Nov 2024 18:30:33 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBdfV-0003hY-SZ; Thu, 14 Nov 2024 12:30:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tBdfQ-0003dS-Oj for bug-gnu-emacs@gnu.org; Thu, 14 Nov 2024 12:30:05 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tBdfQ-00022j-Ew for bug-gnu-emacs@gnu.org; Thu, 14 Nov 2024 12:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=pbmCvunrRQ1ay1UzLn/1a12Wz1jO9Z0SHcC1MkGE5ck=; b=Krhbsluff0RaGTbtnM7bLkRKtOvP9O/to/S7EAgOVxO2VKtxqs2p3ybA97pPqsHpVGZwVSqweu3GsWF7R8uyomy5dpl4C1uatnb0fKF0DLYyu6ZjdSUQAd3SwPGXNVrSk7/+Oxc+jSBD3lOh6GrGOn+yCJkDcAlCYs7zxUGOXaRzfSzwk35tFChXdU2AyGJSJzyzoQ07Ry0K3SXeD/XTfDLDQHuKpvb0BoV3t4X5vUfFKfsFFxre8cTTkrocyrsROzDs7Vislw1uMpw7b+rfzyO3K2vCpKkiToY2iJL/dxVhc1g/UEALlqkMuQlgKkKTsV/ufQ1UdXCd4H7hwlfe2A==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBdfP-00025A-R7 for bug-gnu-emacs@gnu.org; Thu, 14 Nov 2024 12:30:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?J=C3=B6rg?= Sommer Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 Nov 2024 17:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74352 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 74352-submit@debbugs.gnu.org id=B74352.17316053977917 (code B ref 74352); Thu, 14 Nov 2024 17:30:03 +0000 Original-Received: (at 74352) by debbugs.gnu.org; 14 Nov 2024 17:29:57 +0000 Original-Received: from localhost ([127.0.0.1]:47034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBdfJ-00023d-3B for submit@debbugs.gnu.org; Thu, 14 Nov 2024 12:29:57 -0500 Original-Received: from s1.jo-so.de ([37.221.195.157]:55731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBdfF-00023R-9a for 74352@debbugs.gnu.org; Thu, 14 Nov 2024 12:29:56 -0500 Original-Received: from mail-relay (helo=jo-so.de) by s1.jo-so.de with local-bsmtp (Exim 4.96) (envelope-from ) id 1tBdd5-001ZsY-2d; Thu, 14 Nov 2024 18:27:39 +0100 Original-Received: from joerg by zenbook.jo-so.de with local (Exim 4.98) (envelope-from ) id 1tBdd5-000000008mG-0IUP; Thu, 14 Nov 2024 18:27:39 +0100 Content-Disposition: inline In-Reply-To: <86frnul2hf.fsf@gnu.org> 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:295352 Archived-At: --rh23bxie22l3bwfq Content-Type: text/plain; protected-headers=v1; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: bug#74352: 29.4; emerge-files with tramp + local file fails MIME-Version: 1.0 Eli Zaretskii schrieb am Do 14. Nov, 09:05 (+0200): > > Date: Wed, 13 Nov 2024 20:11:10 +0100 > > From: J=F6rg Sommer > >=20 > > when running `emerge-files` with `/ssh:remote:file` and `~/local-file` = I get > > the buffer `*emerge-diff-errors*` with: > >=20 > > ``` > > diff: /tmp/tramp.wlcRNL: No such file or directory > > diff: /home/joerg/local-file: No such file or directory > > ``` > >=20 > > This change solves the problem: > >=20 > > ```diff > > diff --git lisp/vc/emerge.el lisp/vc/emerge.el > > index ca48f2f3c7b..562041e4232 100644 > > --- lisp/vc/emerge.el > > +++ lisp/vc/emerge.el > > @@ -581,6 +581,7 @@ emerge-make-diff-list > > (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*")) > > (with-current-buffer > > emerge-diff-buffer > > + (setq default-directory (file-name-directory file-A)) >=20 > Thanks, but why file-A? Isn't the problem symmetric wrt the two > files? Or what am I missing? In *emerge-setup* above is this code: ``` ;; create the merge buffer from buffer A, so it inherits buffer A's ;; default directory, etc. (merge-buffer (with-current-buffer buffer-A (get-buffer-create merge-buffer-name)))) ``` But I think it doesn't matter if A or B. The problem is that emerge-diff-buffer has the remote directory and shell command tries to execute the command on the remote side even through file-A and file-B were copied to local side in *emerge-files-internal*. Kind regards, J=F6rg --=20 Die am Lautesten reden, haben stets am wenigsten zu sagen. --rh23bxie22l3bwfq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABEIAB0WIQS1pYxd0T/67YejVyF9LJoj0a6jdQUCZzYzAwAKCRB9LJoj0a6j dZThAQCOQy4ACfLi6+z36kqt9rkXh3VoSPazwxK4XdJv8DITVwD8DlLnT8AAZB30 rLstRVzUPBNf2tTDW7gikI4zrJECdYU= =j5lr -----END PGP SIGNATURE----- --rh23bxie22l3bwfq--