aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-12-29 23:00:36 +0000
committerDan Nicolaescu2007-12-29 23:00:36 +0000
commit03da37df7563649c2e4d18f87dbfe5ca03ed682f (patch)
tree8bf80ffd96ab1ad5275a9623875d3caa13cfee08
parent1da8a03154c40b46938d9c65375a2b3f8c09bddd (diff)
downloademacs-03da37df7563649c2e4d18f87dbfe5ca03ed682f.tar.gz
emacs-03da37df7563649c2e4d18f87dbfe5ca03ed682f.zip
(vc-hg-dir-state): Set the vc-backend property.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-hg.el6
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 585d64cd2ea..09919ee76e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-12-29 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-hg.el (vc-hg-dir-state): Set the vc-backend property.
4
12007-12-29 Eric S. Raymond <esr@snark.thyrsus.com> 52007-12-29 Eric S. Raymond <esr@snark.thyrsus.com>
2 6
3 * vc-svn.el (vc-svn-parse-status): Recognize 'unregistered, 7 * vc-svn.el (vc-svn-parse-status): Recognize 'unregistered,
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 6970ed72ccf..dd8cccb724b 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -200,15 +200,20 @@
200 ;; should not show up in vc-dired, so don't deal with them 200 ;; should not show up in vc-dired, so don't deal with them
201 ;; here. 201 ;; here.
202 ((eq status-char ?C) 202 ((eq status-char ?C)
203 (vc-file-setprop file 'vc-backend 'Hg)
203 (vc-file-setprop file 'vc-state 'up-to-date)) 204 (vc-file-setprop file 'vc-state 'up-to-date))
204 ((eq status-char ?A) 205 ((eq status-char ?A)
206 (vc-file-setprop file 'vc-backend 'Hg)
205 (vc-file-setprop file 'vc-working-revision "0") 207 (vc-file-setprop file 'vc-working-revision "0")
206 (vc-file-setprop file 'vc-state 'added)) 208 (vc-file-setprop file 'vc-state 'added))
207 ((eq status-char ?R) 209 ((eq status-char ?R)
210 (vc-file-setprop file 'vc-backend 'Hg)
208 (vc-file-setprop file 'vc-state 'removed)) 211 (vc-file-setprop file 'vc-state 'removed))
209 ((eq status-char ?M) 212 ((eq status-char ?M)
213 (vc-file-setprop file 'vc-backend 'Hg)
210 (vc-file-setprop file 'vc-state 'edited)) 214 (vc-file-setprop file 'vc-state 'edited))
211 ((eq status-char ?I) 215 ((eq status-char ?I)
216 (vc-file-setprop file 'vc-backend 'Hg)
212 (vc-file-setprop file 'vc-state 'ignored)) 217 (vc-file-setprop file 'vc-state 'ignored))
213 ((eq status-char ??) 218 ((eq status-char ??)
214 (vc-file-setprop file 'vc-backend 'none) 219 (vc-file-setprop file 'vc-backend 'none)
@@ -216,6 +221,7 @@
216 ((eq status-char ?!) 221 ((eq status-char ?!)
217 nil) 222 nil)
218 (t ;; Presently C, might change to = in 0.9.6 223 (t ;; Presently C, might change to = in 0.9.6
224 (vc-file-setprop file 'vc-backend 'Hg)
219 (vc-file-setprop file 'vc-state 'up-to-date))) 225 (vc-file-setprop file 'vc-state 'up-to-date)))
220 (forward-line))))) 226 (forward-line)))))
221 227