From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: jca@wxcvbn.org (=?UTF-8?Q?J=C3=A9r=C3=A9mie_?= =?UTF-8?Q?Courr=C3=A8ges-Anglas?=) Newsgroups: gmane.emacs.bugs Subject: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory Date: Sat, 15 Oct 2016 16:06:21 +0200 Message-ID: <87zim5u2oy.fsf@ritchie.wxcvbn.org> References: <87instda01.fsf@xi.bootis> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1476540539 23172 195.159.176.226 (15 Oct 2016 14:08:59 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 15 Oct 2016 14:08:59 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) Cc: 24082@debbugs.gnu.org, Dmitry Gutov To: =?UTF-8?Q?G=C3=B6ktu=C4=9F?= Kayaalp Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Oct 15 16:08:54 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvPdk-0004Mj-Ju for geb-bug-gnu-emacs@m.gmane.org; Sat, 15 Oct 2016 16:08:44 +0200 Original-Received: from localhost ([::1]:52036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvPdk-0004J0-90 for geb-bug-gnu-emacs@m.gmane.org; Sat, 15 Oct 2016 10:08:44 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvPd8-0003zK-Vr for bug-gnu-emacs@gnu.org; Sat, 15 Oct 2016 10:08:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bvPd4-0002J8-OT for bug-gnu-emacs@gnu.org; Sat, 15 Oct 2016 10:08:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53821) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bvPd4-0002J2-Ke for bug-gnu-emacs@gnu.org; Sat, 15 Oct 2016 10:08:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bvPd4-0000oU-DB for bug-gnu-emacs@gnu.org; Sat, 15 Oct 2016 10:08:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: jca@wxcvbn.org (=?UTF-8?Q?J=C3=A9r=C3=A9mie_?= =?UTF-8?Q?Courr=C3=A8ges-Anglas?=) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 15 Oct 2016 14:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24082 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 24082-submit@debbugs.gnu.org id=B24082.14765404373048 (code B ref 24082); Sat, 15 Oct 2016 14:08:02 +0000 Original-Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 14:07:17 +0000 Original-Received: from localhost ([127.0.0.1]:60006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvPcK-0000n6-Ou for submit@debbugs.gnu.org; Sat, 15 Oct 2016 10:07:17 -0400 Original-Received: from chomsky.autogeree.net ([91.216.110.36]:49242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvPcI-0000mw-Q6 for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 10:07:15 -0400 Original-Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.15.2/8.15.2) with ESMTP id u9FE6Ltb028708; Sat, 15 Oct 2016 16:06:21 +0200 (CEST) In-Reply-To: <87instda01.fsf@xi.bootis> ("=?UTF-8?Q?G=C3=B6ktu=C4=9F?= Kayaalp"'s message of "Sat, 15 Oct 2016 16:20:30 +0300") 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: 208.118.235.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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:124512 Archived-At: G=C3=B6ktu=C4=9F Kayaalp writes: > On 2016-10-15 15:36 +0300, Dmitry Gutov wrote: >> On 14.10.2016 23:33, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: >>> In the meantime, maybe a conservative approach would be better? >> >> Considering it introduces a feature regression (no unregistered and=20 >> ignored files in the listing) at least with some clients, I'm not sure=20 >> it's best. >> >> And since it your case the problem is only of visual nature (diffs and=20 >> navigation work all right, IIUC), the proposed more complex patch seems= =20 >> desirable. > > As I noted before I couldn't reproduce his issues and can't spot > anything that might cause it in the patch (the code does not change the > strings in any way, maybe apart from the call to =E2=80=98file-relative-n= ame=E2=80=99 in > the second hunk). Hope J=C3=A9r=C3=A9mie will be able to debug the issue. So..., You asked for the output of `cvs -fnq update', but in my tests the actual command that is run seems to be `cvs -fnq update ./'. Re-using your instructions in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#33 --8<-- ritchie /tmp/test$ cvs -fnq update ./ M .//testfil M .//subdir/subfil -->8-- The result looks like this in vc-dir: --8<-- VC backend : CVS Working dir: /tmp/test/ Repository : /tmp/cvsroot/ Module : test ./ edited .//testfil subdir/ edited .//subdir/subfil -->8-- This happens for all the *local repos* I have on this machine (including my mirrors of the OpenBSD source tree). Adding a few file-relative-name calls around `(match-string 1)' in vc-cvs-after-dir-status helps getting a nicer formatting. However, there could be a nastier problem with remote repos. --8<-- ritchie /tmp/test$ cvs -d jca@localhost:/tmp/cvsroot/ -fnq up M testfil M subdir/subfil -->8-- All is well... note how the file names are not prefixed with `./'. --8<-- ritchie /tmp/test$ cvs -d jca@localhost:/tmp/cvsroot/ -fnq up ./ cvs server: conflict: testfil is modified but no longer in the repository C testfil M subdir/subfil -->8-- Oops... cvs thinks what we want to run update from the cvs root directory (which doesn't contain `testfil'). Here I modified the Root entries to point to localhost: --8<-- ritchie /tmp/test$ cat CVS/Root jca@localhost:/tmp/cvsroot/ ritchie /tmp/test$ cat subdir/CVS/Root jca@localhost:/tmp/cvsroot/ ritchie /tmp/test$ cvs -fnq up M testfil M subdir/subfil ritchie /tmp/test$ cvs -fnq up ./ cvs server: conflict: testfil is modified but no longer in the repository C testfil M subdir/subfil -->8-- vc-dir shows: --8<-- VC backend : CVS Working dir: /tmp/test/ Repository : jca@localhost:/tmp/cvsroot/ Module : test ./ conflict testfil subdir/ edited subdir/subfil -->8-- So with `./', files in the current directory seem to be considered as if we were at the root of the cvs repo root directory. Subdirectories seem to be fine, vc-diff works fine on them. I can't see how the code would manage to pass `./' to cvs on my setup and not on others. I don't know if more recent cvs(1) versions handle `./' and remote repos in a nicer way. --=20 jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE