From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nick Roberts Newsgroups: gmane.emacs.devel Subject: vc-svn-after-dir-status Date: Thu, 5 Feb 2009 20:11:10 +1300 Message-ID: <18826.37134.246157.940138@kahikatea.snap.net.nz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1233819176 7302 80.91.229.12 (5 Feb 2009 07:32:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 5 Feb 2009 07:32:56 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 05 08:34:10 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LUykM-0001qp-Bd for ged-emacs-devel@m.gmane.org; Thu, 05 Feb 2009 08:34:02 +0100 Original-Received: from localhost ([127.0.0.1]:39837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUyj3-0001Xa-9h for ged-emacs-devel@m.gmane.org; Thu, 05 Feb 2009 02:32:41 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LUyiy-0001XP-Oy for emacs-devel@gnu.org; Thu, 05 Feb 2009 02:32:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LUyiv-0001Wp-8r for emacs-devel@gnu.org; Thu, 05 Feb 2009 02:32:36 -0500 Original-Received: from [199.232.76.173] (port=35549 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUyiv-0001Wl-5e for emacs-devel@gnu.org; Thu, 05 Feb 2009 02:32:33 -0500 Original-Received: from viper.snap.net.nz ([202.37.101.23]:33391) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LUyiu-0001Gw-Mk for emacs-devel@gnu.org; Thu, 05 Feb 2009 02:32:33 -0500 Original-Received: from kahikatea.snap.net.nz (89.61.255.123.dynamic.snap.net.nz [123.255.61.89]) by viper.snap.net.nz (Postfix) with ESMTP id 35D033DB9A8 for ; Thu, 5 Feb 2009 20:11:14 +1300 (NZDT) Original-Received: by kahikatea.snap.net.nz (Postfix, from userid 1000) id 0DF7F8FC6D; Thu, 5 Feb 2009 20:11:10 +1300 (NZDT) X-Mailer: VM 7.19 under Emacs 22.3.1 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:108780 Archived-At: The regexp in vc-svn-after-dir-status is wrong for unregistered files in the remote case as "svn status -u" doesn't output a revision number for such a state. This means that files in this state aren't displayed in this case. I think the patch below fixes it but couldn't test it as I encountered bugs which stopped vc-dir from working. These were in vc-dir-update in vc-dir.el, and occurred because prev-node in (vc-dir-node-directory prev-node) was nil when files needed updating and expand-file-name somwhere had a nil argument when there were no files that needed updating. -- Nick http://www.inet.net.nz/~nickrob 2009-02-05 Nick Roberts * (vc-svn-after-dir-status): Use shy group for revision number as it isn't present for unregistered files. --- vc-svn.el.~1.111.~ 2009-02-05 09:37:04.000000000 +1300 +++ vc-svn.el 2009-02-05 12:23:41.000000000 +1300 @@ -164,7 +164,7 @@ want to force an empty list of arguments (?? . unregistered) ;; This is what vc-svn-parse-status does. (?~ . edited))) - (re (if remote "^\\(.\\)..... \\([ *]\\) +[-0-9]+ +\\(.*\\)$" + (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(:?[-0-9]+\\)? +\\(.*\\)$" ;; Subexp 2 is a dummy in this case, so the numbers match. "^\\(.\\)....\\(.\\) \\(.*\\)$")) result)