From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: nickrob@snap.net.nz (Nick Roberts) Newsgroups: gmane.emacs.devel Subject: vc-dir with Subversion Date: Fri, 3 Apr 2009 21:04:17 +1300 Message-ID: <18901.49921.885006.143162@totara.tehura.co.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 1238745961 19692 80.91.229.12 (3 Apr 2009 08:06:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2009 08:06:01 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 10:07:19 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 1LpeQT-0003aI-Vq for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2009 10:06:58 +0200 Original-Received: from localhost ([127.0.0.1]:57045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LpeP6-0000zP-5b for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2009 04:05:32 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LpeOA-0000Mp-An for emacs-devel@gnu.org; Fri, 03 Apr 2009 04:04:34 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LpeO5-0000Is-3D for emacs-devel@gnu.org; Fri, 03 Apr 2009 04:04:33 -0400 Original-Received: from [199.232.76.173] (port=57553 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LpeO4-0000Ii-QX for emacs-devel@gnu.org; Fri, 03 Apr 2009 04:04:28 -0400 Original-Received: from mail.caverock.net.nz ([202.37.101.29]:46812 helo=viper.snap.net.nz) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LpeO3-0004t5-Ur for emacs-devel@gnu.org; Fri, 03 Apr 2009 04:04:28 -0400 Original-Received: from totara (unknown [123.255.30.137]) by viper.snap.net.nz (Postfix) with ESMTP id 1597D3DA2B4 for ; Fri, 3 Apr 2009 21:04:19 +1300 (NZDT) Original-Received: by totara (Postfix, from userid 1000) id EB9A8C080; Fri, 3 Apr 2009 21:04:17 +1300 (NZDT) X-Mailer: VM 7.19 under Emacs 22.2.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:110033 Archived-At: Using Subversion, vc-dir detects conflicts of two kinds: 1) Prior to updating. 2) After updating. but labels the status with the keyword `conflict' in both cases. In the latter case all other keywords use the past tense: removed, edited, unregistered etc. To avoid confusion I suggest that we use the keyword `conflicted' for this case. The patch below does this. OK to apply? -- Nick http://www.inet.net.nz/~nickrob 2009-04-03 Nick Roberts * vc-svn.el (vc-svn-after-dir-status): Use "conflicted" for a file with conflicts in it. * vc-dir.el (vc-default-dir-printer): Use font-lock-warning-face for keyword above. *** vc-svn.el.~1.112.~ 2009-02-10 18:59:14.000000000 +1300 --- vc-svn.el 2009-04-03 20:39:29.000000000 +1300 *************** want to force an empty list of arguments *** 156,162 **** ;; but to distinguish the two output formats based on content. (defun vc-svn-after-dir-status (callback &optional remote) (let ((state-map '((?A . added) ! (?C . conflict) (?D . removed) (?I . ignored) (?M . edited) --- 156,162 ---- ;; but to distinguish the two output formats based on content. (defun vc-svn-after-dir-status (callback &optional remote) (let ((state-map '((?A . added) ! (?C . conflicted) (?D . removed) (?I . ignored) (?M . edited) *** vc-dir.el.~1.38.~ 2009-03-21 09:41:38.000000000 +1300 --- vc-dir.el 2009-04-03 20:41:57.000000000 +1300 *************** Interactively, a prefix argument means t *** 1171,1177 **** (propertize (format "%-20s" state) 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) ! ((memq state '(missing conflict)) 'font-lock-warning-face) (t 'font-lock-variable-name-face)) 'mouse-face 'highlight) " " --- 1171,1177 ---- (propertize (format "%-20s" state) 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) ! ((memq state '(missing conflict conflicted)) 'font-lock-warning-face) (t 'font-lock-variable-name-face)) 'mouse-face 'highlight) " "