From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tim Van Holder Newsgroups: gmane.emacs.bugs Subject: bug#18975: 24.4; vc-svn does not recognize file externals as svn-managed files Date: Thu, 06 Nov 2014 13:48:16 +0100 Message-ID: <87egtga41b.fsf@leeloo.anubex.internal> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415279434 11253 80.91.229.3 (6 Nov 2014 13:10:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 6 Nov 2014 13:10:34 +0000 (UTC) To: 18975@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 06 14:10:27 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XmMpV-0002lJ-AW for geb-bug-gnu-emacs@m.gmane.org; Thu, 06 Nov 2014 14:10:25 +0100 Original-Received: from localhost ([::1]:52995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmMpU-0008Op-Kp for geb-bug-gnu-emacs@m.gmane.org; Thu, 06 Nov 2014 08:10:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmMpI-0008NY-5X for bug-gnu-emacs@gnu.org; Thu, 06 Nov 2014 08:10:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XmMp8-0002os-Sy for bug-gnu-emacs@gnu.org; Thu, 06 Nov 2014 08:10:12 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmMp8-0002oU-QR for bug-gnu-emacs@gnu.org; Thu, 06 Nov 2014 08:10:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XmMp8-0007rT-2Y for bug-gnu-emacs@gnu.org; Thu, 06 Nov 2014 08:10:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tim Van Holder Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 06 Nov 2014 13:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 18975 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141527934430131 (code B ref -1); Thu, 06 Nov 2014 13:10:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 Nov 2014 13:09:04 +0000 Original-Received: from localhost ([127.0.0.1]:51180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XmMoB-0007pu-Vf for submit@debbugs.gnu.org; Thu, 06 Nov 2014 08:09:04 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33544) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XmMo9-0007pR-A9 for submit@debbugs.gnu.org; Thu, 06 Nov 2014 08:09:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XmMnz-0002Yi-Qk for submit@debbugs.gnu.org; Thu, 06 Nov 2014 08:09:01 -0500 Original-Received: from lists.gnu.org ([208.118.235.17]:47416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmMnz-0002Yd-Nw for submit@debbugs.gnu.org; Thu, 06 Nov 2014 08:08:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmMnt-0008DN-BH for bug-gnu-emacs@gnu.org; Thu, 06 Nov 2014 08:08:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XmMnn-0002WA-4F for bug-gnu-emacs@gnu.org; Thu, 06 Nov 2014 08:08:45 -0500 Original-Received: from [212.123.25.122] (port=16809 helo=leeloo.anubex.internal) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmMnm-0002Vv-Tg for bug-gnu-emacs@gnu.org; Thu, 06 Nov 2014 08:08:39 -0500 Original-Received: from tim.vanholder by leeloo.anubex.internal with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1XmMU4-0007u0-Ht; Thu, 06 Nov 2014 13:48:16 +0100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:95609 I added a file external to an SVN tree. Opening the file does not add any SVN information to the mode line, and operations like [C-x v l] report "File is not under version control". svn status reports the file just fine (but with the X in column 5 to indicate that it's an external). Looking at vc-svn-parse-status, that's the problem - it explicitly ignores files with 'X' markers. However, if its argument is expected to be a file, not a directory, I don't think that makes sense. If it's a file inside a directory external, vc-svn-root would report that directory external, and a status on it would not include the X (it would only be shown on status output from above the external). Changing (while (re-search-forward ;; Ignore the files with status X. "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) to (while (re-search-forward "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ SX]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) resolves my issue, but I can't be sure it doesn't cause problems elsewhere. In GNU Emacs 24.4.1 (x86_64-pc-linux-gnu, GTK+ Version 3.14.3) of 2014-10-25 on trouble, modified by Debian Windowing system distributor `HC-Consult', version 11.0.11500001 System Description: Debian GNU/Linux testing (jessie) Configured using: `configure --build x86_64-linux-gnu --prefix=/usr --sharedstatedir=/var/lib --libexecdir=/usr/lib --localstatedir=/var/lib --infodir=/usr/share/info --mandir=/usr/share/man --with-pop=yes --enable-locallisppath=/etc/emacs24:/etc/emacs:/usr/local/share/emacs/24.4/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/24.4/site-lisp:/usr/share/emacs/site-lisp --build x86_64-linux-gnu --prefix=/usr --sharedstatedir=/var/lib --libexecdir=/usr/lib --localstatedir=/var/lib --infodir=/usr/share/info --mandir=/usr/share/man --with-pop=yes --enable-locallisppath=/etc/emacs24:/etc/emacs:/usr/local/share/emacs/24.4/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/24.4/site-lisp:/usr/share/emacs/site-lisp --with-x=yes --with-x-toolkit=gtk3 --with-toolkit-scroll-bars 'CFLAGS=-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wall' CPPFLAGS=-D_FORTIFY_SOURCE=2 LDFLAGS=-Wl,-z,relro' Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Features: (shadow sort mail-extr emacsbug message format-spec rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums find-func python json grep compile make-mode diff-mode vc-cvs vc-rcs vc-dir ewoc shell pcomplete comint ansi-color ring add-log log-view easy-mmode pcvs-util vc help-mode misearch multi-isearch vc-dispatcher vc-svn cperl-mode easymenu dired whitespace zastai jka-compr paren gnus gnus-ems nnheader gnus-util mail-utils mm-util help-fns mail-prsvr wid-edit cl-loaddefs cl-lib time delsel cus-start cus-load 50magit devhelp time-date tooltip electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind gfilenotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) Memory information: ((conses 16 162376 11391) (symbols 48 24144 0) (miscs 40 108 620) (strings 32 27856 5500) (string-bytes 1 841486) (vectors 16 14973) (vector-slots 8 442867 10009) (floats 8 81 443) (intervals 56 5084 590) (buffers 960 24) (heap 1024 22599 906))