Mercurial > emacs
comparison lisp/vc.el @ 96886:3b7098612be6
(Todo): Update.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Tue, 22 Jul 2008 04:39:27 +0000 |
parents | 02d657f45045 |
children | 855f5155ed05 |
comparison
equal
deleted
inserted
replaced
96885:f669b344e719 | 96886:3b7098612be6 |
---|---|
79 ;; The vc code maintains some internal state in order to reduce expensive | 79 ;; The vc code maintains some internal state in order to reduce expensive |
80 ;; version-control operations to a minimum. Some names are only computed | 80 ;; version-control operations to a minimum. Some names are only computed |
81 ;; once. If you perform version control operations with the backend while | 81 ;; once. If you perform version control operations with the backend while |
82 ;; vc's back is turned, or move/rename master files while vc is running, | 82 ;; vc's back is turned, or move/rename master files while vc is running, |
83 ;; vc may get seriously confused. Don't do these things! | 83 ;; vc may get seriously confused. Don't do these things! |
84 ;; | |
85 ;; Developer's notes on some concurrency issues are included at the end of | |
86 ;; the file. | |
87 ;; | 84 ;; |
88 ;; ADDING SUPPORT FOR OTHER BACKENDS | 85 ;; ADDING SUPPORT FOR OTHER BACKENDS |
89 ;; | 86 ;; |
90 ;; VC can use arbitrary version control systems as a backend. To add | 87 ;; VC can use arbitrary version control systems as a backend. To add |
91 ;; support for a new backend named SYS, write a library vc-sys.el that | 88 ;; support for a new backend named SYS, write a library vc-sys.el that |
617 ;; were added, the list of files that were removed. If the diff is | 614 ;; were added, the list of files that were removed. If the diff is |
618 ;; available, maybe it could even call something like | 615 ;; available, maybe it could even call something like |
619 ;; `diff-add-change-log-entries-other-window' to create a detailed | 616 ;; `diff-add-change-log-entries-other-window' to create a detailed |
620 ;; skeleton for the log... | 617 ;; skeleton for the log... |
621 ;; | 618 ;; |
622 ;; - The *vc-dir* buffer needs to be updated properly after VC | |
623 ;; operations on directories that change the file VC state. | |
624 ;; | |
625 ;; - most vc-dir backends need more work. They might need to | 619 ;; - most vc-dir backends need more work. They might need to |
626 ;; provide custom headers, use the `extra' field and deal with all | 620 ;; provide custom headers, use the `extra' field and deal with all |
627 ;; possible VC states. | 621 ;; possible VC states. |
628 ;; | 622 ;; |
629 ;; - add a function that calls vc-dir to `find-directory-functions'. | 623 ;; - add a function that calls vc-dir to `find-directory-functions'. |
640 ;; - vc-dir-kill-dir-status-process should not be specific to dir-status, | 634 ;; - vc-dir-kill-dir-status-process should not be specific to dir-status, |
641 ;; it should work for other async commands done through vc-do-command | 635 ;; it should work for other async commands done through vc-do-command |
642 ;; as well, | 636 ;; as well, |
643 ;; | 637 ;; |
644 ;; - vc-dir toolbar needs more icons. | 638 ;; - vc-dir toolbar needs more icons. |
639 ;; | |
640 ;; - The backends should avoid using `vc-file-setprop' and `vc-file-getprop'. | |
645 ;; | 641 ;; |
646 ;;; Code: | 642 ;;; Code: |
647 | 643 |
648 (require 'vc-hooks) | 644 (require 'vc-hooks) |
649 (require 'vc-dispatcher) | 645 (require 'vc-dispatcher) |
1297 | 1293 |
1298 (defun vc-mark-resolved (backend files) | 1294 (defun vc-mark-resolved (backend files) |
1299 (with-vc-properties | 1295 (with-vc-properties |
1300 files | 1296 files |
1301 (vc-call-backend backend 'mark-resolved files) | 1297 (vc-call-backend backend 'mark-resolved files) |
1302 ;; XXX: Is this TRTD? Might not be. | 1298 ;; FIXME: Is this TRTD? Might not be. |
1303 `((vc-state . edited)))) | 1299 `((vc-state . edited)))) |
1304 | 1300 |
1305 (defun vc-steal-lock (file rev owner) | 1301 (defun vc-steal-lock (file rev owner) |
1306 "Steal the lock on FILE." | 1302 "Steal the lock on FILE." |
1307 (let (file-description) | 1303 (let (file-description) |