From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nick Roberts Newsgroups: gmane.emacs.bugs Subject: bug#1046: 23.0.60; vc-dir with Subversion Date: Sat, 4 Oct 2008 20:53:57 +1200 Message-ID: <18663.12069.154443.910505@kahikatea.snap.net.nz> References: <18655.13103.295021.779321@kahikatea.snap.net.nz> Reply-To: Nick Roberts , 1046@emacsbugs.donarmstrong.com 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 1223111420 7775 80.91.229.12 (4 Oct 2008 09:10:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Oct 2008 09:10:20 +0000 (UTC) To: Glenn Morris , 1046@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Oct 04 11:11:14 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Km3AP-00071E-6a for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Oct 2008 11:11:13 +0200 Original-Received: from localhost ([127.0.0.1]:51788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Km39L-00029V-D9 for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Oct 2008 05:10:07 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Km39F-000298-RJ for bug-gnu-emacs@gnu.org; Sat, 04 Oct 2008 05:10:01 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Km39D-00028W-KU for bug-gnu-emacs@gnu.org; Sat, 04 Oct 2008 05:10:01 -0400 Original-Received: from [199.232.76.173] (port=60900 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Km39D-00028T-AV for bug-gnu-emacs@gnu.org; Sat, 04 Oct 2008 05:09:59 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:42963) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Km39D-00018B-5l for bug-gnu-emacs@gnu.org; Sat, 04 Oct 2008 05:09:59 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9499u8Z025128; Sat, 4 Oct 2008 02:09:56 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m949548I024075; Sat, 4 Oct 2008 02:05:04 -0700 X-Loop: don@donarmstrong.com Resent-From: Nick Roberts Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sat, 04 Oct 2008 09:05:04 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1046 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: patch Original-Received: via spool by 1046-submit@emacsbugs.donarmstrong.com id=B1046.122311053522011 (code B ref 1046); Sat, 04 Oct 2008 09:05:04 +0000 Original-Received: (at 1046) by emacsbugs.donarmstrong.com; 4 Oct 2008 08:55:35 +0000 Original-Received: from viper.snap.net.nz (viper.snap.net.nz [202.37.101.25]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m948tUrA022005 for <1046@emacsbugs.donarmstrong.com>; Sat, 4 Oct 2008 01:55:32 -0700 Original-Received: from kahikatea.snap.net.nz (102.31.255.123.static.snap.net.nz [123.255.31.102]) by viper.snap.net.nz (Postfix) with ESMTP id 4F0BF3D812A; Sat, 4 Oct 2008 21:55:29 +1300 (NZDT) Original-Received: by kahikatea.snap.net.nz (Postfix, from userid 1000) id 224848FC6D; Sat, 4 Oct 2008 20:53:58 +1200 (NZST) In-Reply-To: X-Mailer: VM 7.19 under Emacs 22.3.1 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Sat, 04 Oct 2008 05:10:00 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:21097 Archived-At: > >> In the past I've remarked that with CVS vc-dir ignores vc-stay-local (and > >> vc-cvs-stay-local) and consults the repository, in any case. > > > > Can you file a separate bug for that please, if it still applies? > > Never mind. For a limited time only, your initial bug report entitles > you to one complimentary patch for a second issue. I've glanced over it and tried it out and it looks good to me. Thanks, Nick > > *** vc-cvs.el 7 Sep 2008 20:24:27 -0000 1.148 > --- vc-cvs.el 1 Oct 2008 23:02:15 -0000 > *************** > *** 905,912 **** > --- 905,943 ---- > ;; (funcall update-function result))) > ) > > + ;; Based on vc-cvs-dir-state-heuristic. Perhaps mention that this function is only in pre Emacs 23. I'm not sure that I understand the current naming convention. Some functions now use 'status': vc-cvs-dir-status, while others still use 'state': vc-cvs-state-heuristic. > + (defun vc-cvs-dir-status-heuristic (dir update-function &optional basedir) > + "Find the CVS state of all files in DIR, using only local information." > + (let (file basename status result dirlist) (let (result dirlist) > + (with-temp-buffer > + (vc-cvs-get-entries dir) > + (goto-char (point-min)) > + (while (not (eobp)) > + (if (looking-at "D/\\([^/]*\\)////") > + (push (expand-file-name (match-string 1) dir) dirlist) > + ;; CVS-removed files are not taken under VC control. > + (when (looking-at "/\\([^/]*\\)/[^/-]") > + (setq basename (match-string 1) > + file (expand-file-name basename dir) > + status (or (vc-file-getprop file 'vc-state) > + (vc-cvs-parse-entry file t))) (let ((basename (match-string 1)) (file (expand-file-name basename dir)) (status (or (vc-file-getprop file 'vc-state) (vc-cvs-parse-entry file t)))) No big deal. Perhaps a bit clearer. ... -- Nick http://www.inet.net.nz/~nickrob