Mercurial > emacs
comparison lisp/vc.el @ 98336:26ff192a882a
(vc-mark-resolved): Move message here from vc-default-mark-resolved.
(vc-default-mark-resolved): Change to an alias for ignore.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 25 Sep 2008 01:44:23 +0000 |
| parents | c5442f509109 |
| children | 34fed5300274 |
comparison
equal
deleted
inserted
replaced
| 98335:c82c45a5263a | 98336:26ff192a882a |
|---|---|
| 1287 | 1287 |
| 1288 (defun vc-mark-resolved (backend files) | 1288 (defun vc-mark-resolved (backend files) |
| 1289 (with-vc-properties | 1289 (with-vc-properties |
| 1290 files | 1290 files |
| 1291 (vc-call-backend backend 'mark-resolved files) | 1291 (vc-call-backend backend 'mark-resolved files) |
| 1292 (message | |
| 1293 (substitute-command-keys | |
| 1294 "Conflicts have been resolved in %s. \ | |
| 1295 Type \\[vc-next-action] to check in changes.") | |
| 1296 (if (> (length files) 1) | |
| 1297 (format "%d files" (length files)) | |
| 1298 "this file")) | |
| 1292 ;; FIXME: Is this TRTD? Might not be. | 1299 ;; FIXME: Is this TRTD? Might not be. |
| 1293 `((vc-state . edited)))) | 1300 `((vc-state . edited)))) |
| 1294 | 1301 |
| 1295 (defun vc-steal-lock (file rev owner) | 1302 (defun vc-steal-lock (file rev owner) |
| 1296 "Steal the lock on FILE." | 1303 "Steal the lock on FILE." |
| 2450 (rename-file backup-name file 'ok-if-already-exists) | 2457 (rename-file backup-name file 'ok-if-already-exists) |
| 2451 (and (not vc-make-backup-files) (delete-file backup-name)))))) | 2458 (and (not vc-make-backup-files) (delete-file backup-name)))))) |
| 2452 (message "Checking out %s...done" file)))) | 2459 (message "Checking out %s...done" file)))) |
| 2453 | 2460 |
| 2454 (defalias 'vc-default-revision-completion-table 'ignore) | 2461 (defalias 'vc-default-revision-completion-table 'ignore) |
| 2462 (defalias 'vc-default-mark-resolved 'ignore) | |
| 2455 | 2463 |
| 2456 (defun vc-default-dir-status-files (backend dir files default-state update-function) | 2464 (defun vc-default-dir-status-files (backend dir files default-state update-function) |
| 2457 (funcall update-function | 2465 (funcall update-function |
| 2458 (mapcar (lambda (file) (list file default-state)) files))) | 2466 (mapcar (lambda (file) (list file default-state)) files))) |
| 2459 | |
| 2460 (defun vc-default-mark-resolved (backend files) | |
| 2461 (message | |
| 2462 (substitute-command-keys | |
| 2463 "Conflicts have been resolved in %s. \ | |
| 2464 Type \\[vc-next-action] to check in changes.") | |
| 2465 (if (> (length files) 1) | |
| 2466 (format "%d files" (length files)) | |
| 2467 "this file"))) | |
| 2468 | 2467 |
| 2469 (defun vc-check-headers () | 2468 (defun vc-check-headers () |
| 2470 "Check if the current file has any headers in it." | 2469 "Check if the current file has any headers in it." |
| 2471 (interactive) | 2470 (interactive) |
| 2472 (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) | 2471 (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) |