Mercurial > emacs
comparison lisp/vc-arch.el @ 82502:2a2056106d16
(vc-arch-extra-menu-map): New var and fun.
(vc-arch-find-file-not-found-hook): Remove, it's now the default.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 21 Aug 2007 15:18:06 +0000 |
| parents | b98604865ea0 |
| children | 1224dec49333 b83d0dadb2a7 |
comparison
equal
deleted
inserted
replaced
| 82501:5c15d3c510b1 | 82502:2a2056106d16 |
|---|---|
| 363 'vc-arch-delete-rej-if-obsolete nil t) | 363 'vc-arch-delete-rej-if-obsolete nil t) |
| 364 (message "There are unresolved conflicts in this file"))) | 364 (message "There are unresolved conflicts in this file"))) |
| 365 (message "There are unresolved conflicts in %s" | 365 (message "There are unresolved conflicts in %s" |
| 366 (file-name-nondirectory rej)))))) | 366 (file-name-nondirectory rej)))))) |
| 367 | 367 |
| 368 (defun vc-arch-find-file-not-found-hook () | |
| 369 ;; Do nothing. We are not sure whether the file is `source' or not, | |
| 370 ;; so we shouldn't ask the user whether she wants to check it out. | |
| 371 ) | |
| 372 | |
| 373 (defun vc-arch-checkout-model (file) 'implicit) | 368 (defun vc-arch-checkout-model (file) 'implicit) |
| 374 | 369 |
| 375 (defun vc-arch-checkin (files rev comment) | 370 (defun vc-arch-checkin (files rev comment) |
| 376 (if rev (error "Committing to a specific revision is unsupported")) | 371 (if rev (error "Committing to a specific revision is unsupported")) |
| 377 ;; FIXME: This implementation probably only works for singleton filesets | 372 ;; FIXME: This implementation probably only works for singleton filesets |
| 550 (when (file-directory-p dir) | 545 (when (file-directory-p dir) |
| 551 (directory-files dir 'full "--.*--"))) | 546 (directory-files dir 'full "--.*--"))) |
| 552 branches)))) | 547 branches)))) |
| 553 (mapc 'vc-arch-trim-one-revlib versions)) | 548 (mapc 'vc-arch-trim-one-revlib versions)) |
| 554 )) | 549 )) |
| 555 | 550 |
| 551 (defvar vc-arch-extra-menu-map | |
| 552 (let ((map (make-sparse-keymap))) | |
| 553 (define-key map [add-tagline] | |
| 554 '(menu-item "Add tagline" vc-arch-add-tagline)) | |
| 555 map)) | |
| 556 | |
| 557 (defun vc-arch-extra-menu () vc-arch-extra-menu-map) | |
| 558 | |
| 559 | |
| 556 ;;; Less obvious implementations. | 560 ;;; Less obvious implementations. |
| 557 | 561 |
| 558 (defun vc-arch-find-version (file rev buffer) | 562 (defun vc-arch-find-version (file rev buffer) |
| 559 (let ((out (make-temp-file "vc-out"))) | 563 (let ((out (make-temp-file "vc-out"))) |
| 560 (unwind-protect | 564 (unwind-protect |