[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
vc-dir with Subversion
From: |
Nick Roberts |
Subject: |
vc-dir with Subversion |
Date: |
Fri, 3 Apr 2009 21:04:17 +1300 |
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 <address@hidden>
* 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)
" "
- vc-dir with Subversion,
Nick Roberts <=