diff options
| author | Dan Nicolaescu | 2008-01-01 19:47:21 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-01-01 19:47:21 +0000 |
| commit | 21838dc0deff03c2992908e9fea5bbe5369c27c8 (patch) | |
| tree | ba748a02d2360f570ad88b46e7dc9dc9136fcb28 | |
| parent | 905373c5048424a7b783ac88509924d3b6fd94f7 (diff) | |
| download | emacs-21838dc0deff03c2992908e9fea5bbe5369c27c8.tar.gz emacs-21838dc0deff03c2992908e9fea5bbe5369c27c8.zip | |
(vc-git-dir-state): Set the vc-backend property. Do
not disable undo, with-temp-buffer does it by default.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-git.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04925a7fc1c..7c836942698 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-01-01 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-git.el (vc-git-dir-state): Set the vc-backend property. Do | ||
| 4 | not disable undo, with-temp-buffer does it by default. | ||
| 5 | |||
| 1 | 2008-01-01 Eric S. Raymond <esr@snark.thyrsus.com> | 6 | 2008-01-01 Eric S. Raymond <esr@snark.thyrsus.com> |
| 2 | 7 | ||
| 3 | * vc-svn.el (vc-svn-parse-status): Set the 'unregisted property | 8 | * vc-svn.el (vc-svn-parse-status): Set the 'unregisted property |
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 1626d5347ee..64bcbeb0b2b 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -155,7 +155,6 @@ | |||
| 155 | "Git-specific version of `dir-state'." | 155 | "Git-specific version of `dir-state'." |
| 156 | ;; FIXME: This can't set 'ignored yet | 156 | ;; FIXME: This can't set 'ignored yet |
| 157 | (with-temp-buffer | 157 | (with-temp-buffer |
| 158 | (buffer-disable-undo) ;; Because these buffers can get huge | ||
| 159 | (vc-git-command (current-buffer) nil nil "ls-files" "-t" "-c" "-m" "-o") | 158 | (vc-git-command (current-buffer) nil nil "ls-files" "-t" "-c" "-m" "-o") |
| 160 | (goto-char (point-min)) | 159 | (goto-char (point-min)) |
| 161 | (let ((status-char nil) | 160 | (let ((status-char nil) |
| @@ -172,12 +171,16 @@ | |||
| 172 | ;; should not show up in vc-dired, so don't deal with them | 171 | ;; should not show up in vc-dired, so don't deal with them |
| 173 | ;; here. | 172 | ;; here. |
| 174 | ((eq status-char ?H) | 173 | ((eq status-char ?H) |
| 174 | (vc-file-setprop file 'vc-backend 'Git) | ||
| 175 | (vc-file-setprop file 'vc-state 'up-to-date)) | 175 | (vc-file-setprop file 'vc-state 'up-to-date)) |
| 176 | ((eq status-char ?R) | 176 | ((eq status-char ?R) |
| 177 | (vc-file-setprop file 'vc-backend 'Git) | ||
| 177 | (vc-file-setprop file 'vc-state 'removed)) | 178 | (vc-file-setprop file 'vc-state 'removed)) |
| 178 | ((eq status-char ?M) | 179 | ((eq status-char ?M) |
| 180 | (vc-file-setprop file 'vc-backend 'Git) | ||
| 179 | (vc-file-setprop file 'vc-state 'edited)) | 181 | (vc-file-setprop file 'vc-state 'edited)) |
| 180 | ((eq status-char ?C) | 182 | ((eq status-char ?C) |
| 183 | (vc-file-setprop file 'vc-backend 'Git) | ||
| 181 | (vc-file-setprop file 'vc-state 'edited)) | 184 | (vc-file-setprop file 'vc-state 'edited)) |
| 182 | ((eq status-char ??) | 185 | ((eq status-char ??) |
| 183 | (vc-file-setprop file 'vc-backend 'none) | 186 | (vc-file-setprop file 'vc-backend 'none) |