From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#39380: 26.3: Opening files in vc-dir-mode with differing root and working dir fails Date: Wed, 5 Feb 2020 18:56:01 +0300 Message-ID: References: <8eea69d2-46ed-0c41-b516-0120251dcc96@gmx.de> <504aedd0-54e5-aa62-b19f-41fbafa9aa17@gmx.de> <09ef5fcb-80b7-3b43-243a-2278b46281ba@yandex.ru> <5c7d9eab-59d1-21c1-c8e5-1c820cb2946b@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="49521"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 To: Wolfgang Scherer , 39380@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Feb 05 16:57:33 2020 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 1izN3V-000Cke-Pd for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 05 Feb 2020 16:57:33 +0100 Original-Received: from localhost ([::1]:51464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izN3U-0001Ua-RZ for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 05 Feb 2020 10:57:32 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43035) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izN31-0000ob-DO for bug-gnu-emacs@gnu.org; Wed, 05 Feb 2020 10:57:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izN30-0004P4-Cz for bug-gnu-emacs@gnu.org; Wed, 05 Feb 2020 10:57:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:40661) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izN30-0004Nk-8Z for bug-gnu-emacs@gnu.org; Wed, 05 Feb 2020 10:57:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1izN30-0007RD-6d for bug-gnu-emacs@gnu.org; Wed, 05 Feb 2020 10:57:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 05 Feb 2020 15:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39380 X-GNU-PR-Package: emacs Original-Received: via spool by 39380-submit@debbugs.gnu.org id=B39380.158091817228532 (code B ref 39380); Wed, 05 Feb 2020 15:57:02 +0000 Original-Received: (at 39380) by debbugs.gnu.org; 5 Feb 2020 15:56:12 +0000 Original-Received: from localhost ([127.0.0.1]:46634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izN2C-0007Q6-1E for submit@debbugs.gnu.org; Wed, 05 Feb 2020 10:56:12 -0500 Original-Received: from mail-lf1-f51.google.com ([209.85.167.51]:42750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izN2A-0007Po-4v for 39380@debbugs.gnu.org; Wed, 05 Feb 2020 10:56:11 -0500 Original-Received: by mail-lf1-f51.google.com with SMTP id y19so1834178lfl.9 for <39380@debbugs.gnu.org>; Wed, 05 Feb 2020 07:56:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=IICbPLkzo8MaWndOBew5rwV1mmT4EFse6Pod5CcwaLM=; b=RGzGNFPc5et1DrhK/C44tx7LQVsq6hDyjLk3cTL6MKvKSUV+A6C63s1SICKqSPy7ez njsvjSoRYbN6GT4t2+95fqLNDidYkvLQhL97PazRZknfZe/JuBV5yUrPwfaYuV5z7QOS uhPueZAMVh1M/hfD6Xfi36PwqhhJw3pnJVDYTn8uoFnBCqW8yXpxVc5yhtv5uIEtOzvi 3EWj28V9RoEGXYaCsYDVUQDNZi6YKsSJWV/7pBhAj3auenruo6bE7rX2OWwPQiwSJF9U vY04aXlREvdPrgPA8fFo+jiCZVZK+2eONJ9AwaFADPAhvs5n7VCkFlUpDRf2b2LdTuh1 eI3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=IICbPLkzo8MaWndOBew5rwV1mmT4EFse6Pod5CcwaLM=; b=DG6eLcGVo+6NOJDY5BVel3WNXRP9pjMRhZaaY+8nRBIvvh7a0A4N8aL+ymmyuJztqh YkLNrqBzZ/CZjIzt4vhmJen8Ftn9LvvkUBOwyP66I5b8Ma2X4bK7+Z+wk6+8itox8g8f 1uu8SH22HTE//axjryjKjvw1h8PO3O4Lfyuh1lblq1SUf/ZyEthIR10vuGv9Ao0oq5cF 0IWBlfIzuR5T0sQ7CY1TbpjB4dsv1kMLo02yoow8p1x6X3lHG6a53KNZQhIG5OQEVes0 NRuueV0R6udlHtTkBx4UgVGUbCPJIkZ8WMTZJREnEran8izICk32uzmBt9//MEkfXvQ/ joYw== X-Gm-Message-State: APjAAAUCbzrKLZhaWoOR54hSk26LIXAi0rB3b3pv0yPVkCXlzhuuQ0h3 UcCIZkSXvMT0iCV2dbDhdcMIYPjOQRw= X-Google-Smtp-Source: APXvYqyvL+1gucUYyLm47//eHnaODp+OqHmlf1Kj+XFE+d7ZLvPc5ZUNOl6p4j2k6eHqrzlJVuicIQ== X-Received: by 2002:ac2:5922:: with SMTP id v2mr18031692lfi.106.1580918163476; Wed, 05 Feb 2020 07:56:03 -0800 (PST) Original-Received: from [192.168.1.142] ([178.252.127.239]) by smtp.googlemail.com with ESMTPSA id n206sm12224916lfd.50.2020.02.05.07.56.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2020 07:56:02 -0800 (PST) In-Reply-To: <5c7d9eab-59d1-21c1-c8e5-1c820cb2946b@gmx.de> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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:175705 Archived-At: On 04.02.2020 19:04, Wolfgang Scherer wrote: > Reverting de76a167dc09dc695a5acebabb7ab354a6bf556e does not change anything for me. > > I had to revert 06083cf41c473404d246de9b91a0116f38c5485f to restore the correct behavior: > > Author: Dmitry Gutov > Date:   Sat Jan 30 06:55:32 2016 +0300 > >     Don't pass DIR to 'hg status' > >     * lisp/vc/vc-hg.el (vc-hg-dir-status-files): >     Don't pass DIR to 'hg status' (bug#22481). Good catch, thank you. Could you try this patch? diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index c9a2cb412e..a91e1f5ad6 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -1352,14 +1352,14 @@ vc-hg-after-dir-status ;; Follows vc-exec-after. (declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) -(defun vc-hg-dir-status-files (_dir files update-function) +(defun vc-hg-dir-status-files (dir files 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") + (let ((default-directory dir)) + (vc-hg-command (current-buffer) 'async files + "status" "re:" "-I" "." + (concat "-mardu" (if files "i")) + "-C")) (vc-run-delayed (vc-hg-after-dir-status update-function)))