1996-01-20 05:32:51 +00:00
|
|
|
;;; ediff-vers.el --- version control interface to Ediff
|
|
|
|
|
|
2005-08-06 22:13:43 +00:00
|
|
|
;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
|
|
|
|
|
;; 2005 Free Software Foundation, Inc.
|
1996-01-20 05:32:51 +00:00
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
|
1996-01-20 05:32:51 +00:00
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 23:32:44 +00:00
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
1996-01-20 05:32:51 +00:00
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; Commentary:
|
1996-01-20 05:32:51 +00:00
|
|
|
|
|
|
|
|
;;; Code:
|
1996-06-22 01:54:34 +00:00
|
|
|
|
|
|
|
|
;; Compiler pacifier
|
|
|
|
|
(defvar rcs-default-co-switches)
|
|
|
|
|
(defvar sc-mode)
|
|
|
|
|
(defvar cvs-shell)
|
|
|
|
|
(defvar cvs-program)
|
|
|
|
|
(defvar cvs-cookie-handle)
|
1997-05-31 01:10:39 +00:00
|
|
|
(defvar ediff-temp-file-prefix)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(and noninteractive
|
|
|
|
|
(eval-when-compile
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
(let ((load-path (cons (expand-file-name ".") load-path)))
|
|
|
|
|
(load "pcl-cvs" 'noerror)
|
|
|
|
|
(load "rcs" 'noerror)
|
|
|
|
|
;; On 8+3 MS-DOS filesystems, generic-x.el is loaded
|
|
|
|
|
;; instead of (the missing) generic-sc.el. Since the
|
|
|
|
|
;; version of Emacs which supports MS-DOS doesn't have
|
|
|
|
|
;; generic-sc, we simply avoid loading it.
|
|
|
|
|
(or (and (fboundp 'msdos-long-file-names)
|
|
|
|
|
(not (msdos-long-file-names)))
|
|
|
|
|
(load "generic-sc" 'noerror))
|
|
|
|
|
;; (load "vc" 'noerror) ; this sometimes causes compiler error
|
|
|
|
|
(or (featurep 'ediff-init)
|
|
|
|
|
(load "ediff-init.el" nil nil 'nosuffix))
|
|
|
|
|
)))
|
1996-06-22 01:54:34 +00:00
|
|
|
;; end pacifier
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-01-20 05:32:51 +00:00
|
|
|
;; VC.el support
|
2003-01-25 08:09:16 +00:00
|
|
|
|
|
|
|
|
(defun ediff-vc-latest-version (file)
|
|
|
|
|
"Return the version level of the latest version of FILE in repository."
|
|
|
|
|
(if (fboundp 'vc-latest-version)
|
|
|
|
|
(vc-latest-version file)
|
|
|
|
|
(or (vc-file-getprop file 'vc-latest-version)
|
|
|
|
|
(cond ((vc-backend file)
|
|
|
|
|
(vc-call state file)
|
|
|
|
|
(vc-file-getprop file 'vc-latest-version))
|
|
|
|
|
(t (error "File %s is not under version control" file))))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-vc-internal (rev1 rev2 &optional startup-hooks)
|
2003-01-25 08:09:16 +00:00
|
|
|
;; Run Ediff on versions of the current buffer.
|
|
|
|
|
;; If REV1 is "", use the latest version of the current buffer's file.
|
|
|
|
|
;; If REV2 is "" then compare current buffer with REV1.
|
|
|
|
|
;; If the current buffer is named `F', the version is named `F.~REV~'.
|
|
|
|
|
;; If `F.~REV~' already exists, it is used instead of being re-created.
|
1996-01-20 05:32:51 +00:00
|
|
|
(let (file1 file2 rev1buf rev2buf)
|
2003-02-04 11:26:42 +00:00
|
|
|
(if (string= rev1 "")
|
2003-01-25 08:09:16 +00:00
|
|
|
(setq rev1 (ediff-vc-latest-version (buffer-file-name))))
|
2000-10-29 04:56:45 +00:00
|
|
|
(save-window-excursion
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vc-version-other-window rev1)
|
|
|
|
|
(setq rev1buf (current-buffer)
|
|
|
|
|
file1 (buffer-file-name)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(or (string= rev2 "") ; use current buffer
|
|
|
|
|
(vc-version-other-window rev2))
|
|
|
|
|
(setq rev2buf (current-buffer)
|
|
|
|
|
file2 (buffer-file-name)))
|
|
|
|
|
(setq startup-hooks
|
|
|
|
|
(cons `(lambda ()
|
|
|
|
|
(delete-file ,file1)
|
|
|
|
|
(or ,(string= rev2 "") (delete-file ,file2)))
|
|
|
|
|
startup-hooks)))
|
1996-01-20 05:32:51 +00:00
|
|
|
(ediff-buffers
|
|
|
|
|
rev1buf rev2buf
|
|
|
|
|
startup-hooks
|
|
|
|
|
'ediff-revision)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-01-20 05:32:51 +00:00
|
|
|
;; RCS.el support
|
|
|
|
|
(defun rcs-ediff-view-revision (&optional rev)
|
|
|
|
|
;; View previous RCS revision of current file.
|
|
|
|
|
;; With prefix argument, prompts for a revision name.
|
2003-02-04 11:26:42 +00:00
|
|
|
(interactive (list (if current-prefix-arg
|
1996-01-20 05:32:51 +00:00
|
|
|
(read-string "Revision: "))))
|
|
|
|
|
(let* ((filename (buffer-file-name (current-buffer)))
|
|
|
|
|
(switches (append '("-p")
|
|
|
|
|
(if rev (list (concat "-r" rev)) nil)))
|
|
|
|
|
(buff (concat (file-name-nondirectory filename) ".~" rev "~")))
|
|
|
|
|
(message "Working ...")
|
|
|
|
|
(setq filename (expand-file-name filename))
|
|
|
|
|
(with-output-to-temp-buffer buff
|
2000-11-10 22:34:55 +00:00
|
|
|
(ediff-with-current-buffer standard-output
|
|
|
|
|
(fundamental-mode))
|
1996-01-20 05:32:51 +00:00
|
|
|
(let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
|
|
|
|
|
(delete-windows-on output-buffer)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer output-buffer)
|
|
|
|
|
(apply 'call-process "co" nil t nil
|
|
|
|
|
;; -q: quiet (no diagnostics)
|
|
|
|
|
(append switches rcs-default-co-switches
|
2003-02-04 11:26:42 +00:00
|
|
|
(list "-q" filename)))))
|
1996-01-20 05:32:51 +00:00
|
|
|
(message "")
|
2003-02-04 11:26:42 +00:00
|
|
|
buff)))
|
|
|
|
|
|
1996-01-20 05:32:51 +00:00
|
|
|
(defun ediff-rcs-get-output-buffer (file name)
|
|
|
|
|
;; Get a buffer for RCS output for FILE, make it writable and clean it up.
|
|
|
|
|
;; Optional NAME is name to use instead of `*RCS-output*'.
|
1999-11-01 07:16:15 +00:00
|
|
|
;; This is a modified version from rcs.el v1.1. I use it here to make
|
1996-01-20 05:32:51 +00:00
|
|
|
;; Ediff immune to changes in rcs.el
|
|
|
|
|
(let* ((default-major-mode 'fundamental-mode) ; no frills!
|
|
|
|
|
(buf (get-buffer-create name)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(setq buffer-read-only nil
|
|
|
|
|
default-directory (file-name-directory (expand-file-name file)))
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
buf))
|
|
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-rcs-internal (rev1 rev2 &optional startup-hooks)
|
1996-01-20 05:32:51 +00:00
|
|
|
;; Run Ediff on versions of the current buffer.
|
|
|
|
|
;; If REV2 is "" then use current buffer.
|
2000-10-29 04:56:45 +00:00
|
|
|
(let (rev2buf rev1buf)
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(setq rev2buf (if (string= rev2 "")
|
|
|
|
|
(current-buffer)
|
|
|
|
|
(rcs-ediff-view-revision rev2))
|
|
|
|
|
rev1buf (rcs-ediff-view-revision rev1)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-01-20 05:32:51 +00:00
|
|
|
;; rcs.el doesn't create temp version files, so we don't have to delete
|
|
|
|
|
;; anything in startup hooks to ediff-buffers
|
|
|
|
|
(ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; GENERIC-SC.el support
|
|
|
|
|
|
|
|
|
|
(defun generic-sc-get-latest-rev ()
|
|
|
|
|
(cond ((eq sc-mode 'CCASE)
|
|
|
|
|
(eval "main/LATEST"))
|
|
|
|
|
(t (eval ""))))
|
|
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-generic-sc-internal (rev1 rev2 &optional startup-hooks)
|
1996-01-20 05:32:51 +00:00
|
|
|
;; Run Ediff on versions of the current buffer.
|
|
|
|
|
;; If REV2 is "" then compare current buffer with REV1.
|
|
|
|
|
;; If the current buffer is named `F', the version is named `F.~REV~'.
|
|
|
|
|
;; If `F.~REV~' already exists, it is used instead of being re-created.
|
|
|
|
|
(let (rev1buf rev2buf)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (or (not rev1) (string= rev1 ""))
|
|
|
|
|
(setq rev1 (generic-sc-get-latest-rev)))
|
|
|
|
|
(sc-visit-previous-revision rev1)
|
|
|
|
|
(setq rev1buf (current-buffer)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(or (string= rev2 "") ; use current buffer
|
|
|
|
|
(sc-visit-previous-revision rev2))
|
|
|
|
|
(setq rev2buf (current-buffer)))
|
|
|
|
|
(ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Merge with Version Control
|
|
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev
|
1997-11-01 01:46:51 +00:00
|
|
|
&optional startup-hooks merge-buffer-file)
|
1996-01-20 05:32:51 +00:00
|
|
|
;; If ANCESTOR-REV non-nil, merge with ancestor
|
|
|
|
|
(let (buf1 buf2 ancestor-buf)
|
2000-10-29 04:56:45 +00:00
|
|
|
(save-window-excursion
|
|
|
|
|
(save-excursion
|
|
|
|
|
(vc-version-other-window rev1)
|
|
|
|
|
(setq buf1 (current-buffer)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(or (string= rev2 "")
|
|
|
|
|
(vc-version-other-window rev2))
|
|
|
|
|
(setq buf2 (current-buffer)))
|
|
|
|
|
(if ancestor-rev
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (string= ancestor-rev "")
|
|
|
|
|
(setq ancestor-rev (vc-workfile-version buffer-file-name)))
|
|
|
|
|
(vc-version-other-window ancestor-rev)
|
|
|
|
|
(setq ancestor-buf (current-buffer))))
|
2003-02-04 11:26:42 +00:00
|
|
|
(setq startup-hooks
|
|
|
|
|
(cons
|
|
|
|
|
`(lambda ()
|
2000-10-29 04:56:45 +00:00
|
|
|
(delete-file ,(buffer-file-name buf1))
|
|
|
|
|
(or ,(string= rev2 "")
|
|
|
|
|
(delete-file ,(buffer-file-name buf2)))
|
|
|
|
|
(or ,(string= ancestor-rev "")
|
|
|
|
|
,(not ancestor-rev)
|
|
|
|
|
(delete-file ,(buffer-file-name ancestor-buf)))
|
|
|
|
|
)
|
|
|
|
|
startup-hooks)))
|
1996-01-20 05:32:51 +00:00
|
|
|
(if ancestor-rev
|
|
|
|
|
(ediff-merge-buffers-with-ancestor
|
|
|
|
|
buf1 buf2 ancestor-buf
|
1997-11-01 01:46:51 +00:00
|
|
|
startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
|
|
|
|
|
(ediff-merge-buffers
|
|
|
|
|
buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))
|
1996-01-20 05:32:51 +00:00
|
|
|
))
|
|
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-rcs-merge-internal (rev1 rev2 ancestor-rev
|
1997-11-01 01:46:51 +00:00
|
|
|
&optional
|
|
|
|
|
startup-hooks merge-buffer-file)
|
1996-01-20 05:32:51 +00:00
|
|
|
;; If ANCESTOR-REV non-nil, merge with ancestor
|
|
|
|
|
(let (buf1 buf2 ancestor-buf)
|
2000-10-29 04:56:45 +00:00
|
|
|
(save-window-excursion
|
|
|
|
|
(setq buf1 (rcs-ediff-view-revision rev1)
|
|
|
|
|
buf2 (if (string= rev2 "")
|
|
|
|
|
(current-buffer)
|
|
|
|
|
(rcs-ediff-view-revision rev2))
|
|
|
|
|
ancestor-buf (if ancestor-rev
|
|
|
|
|
(if (string= ancestor-rev "")
|
|
|
|
|
(current-buffer)
|
|
|
|
|
(rcs-ediff-view-revision ancestor-rev)))))
|
1996-01-20 05:32:51 +00:00
|
|
|
;; rcs.el doesn't create temp version files, so we don't have to delete
|
|
|
|
|
;; anything in startup hooks to ediff-buffers
|
|
|
|
|
(if ancestor-rev
|
|
|
|
|
(ediff-merge-buffers-with-ancestor
|
|
|
|
|
buf1 buf2 ancestor-buf
|
1997-11-01 01:46:51 +00:00
|
|
|
startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
|
|
|
|
|
(ediff-merge-buffers
|
|
|
|
|
buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
|
1996-01-20 05:32:51 +00:00
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-generic-sc-merge-internal (rev1 rev2 ancestor-rev
|
1997-11-01 01:46:51 +00:00
|
|
|
&optional
|
|
|
|
|
startup-hooks merge-buffer-file)
|
1996-01-20 05:32:51 +00:00
|
|
|
;; If ANCESTOR-REV non-nil, merge with ancestor
|
|
|
|
|
(let (buf1 buf2 ancestor-buf)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (string= rev1 "")
|
|
|
|
|
(setq rev1 (generic-sc-get-latest-rev)))
|
|
|
|
|
(sc-visit-previous-revision rev1)
|
|
|
|
|
(setq buf1 (current-buffer)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(or (string= rev2 "")
|
|
|
|
|
(sc-visit-previous-revision rev2))
|
|
|
|
|
(setq buf2 (current-buffer)))
|
|
|
|
|
(if ancestor-rev
|
|
|
|
|
(save-excursion
|
|
|
|
|
(or (string= ancestor-rev "")
|
|
|
|
|
(sc-visit-previous-revision ancestor-rev))
|
|
|
|
|
(setq ancestor-buf (current-buffer))))
|
|
|
|
|
(if ancestor-rev
|
|
|
|
|
(ediff-merge-buffers-with-ancestor
|
|
|
|
|
buf1 buf2 ancestor-buf
|
1997-11-01 01:46:51 +00:00
|
|
|
startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
|
|
|
|
|
(ediff-merge-buffers
|
|
|
|
|
buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
|
1996-01-20 05:32:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
;; PCL-CVS.el support
|
|
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs
|
1996-01-20 05:32:51 +00:00
|
|
|
(defun cvs-run-ediff-on-file-descriptor (tin)
|
|
|
|
|
;; This is a replacement for cvs-emerge-mode
|
1997-11-01 01:46:51 +00:00
|
|
|
;; Runs after cvs-update.
|
1996-01-20 05:32:51 +00:00
|
|
|
;; Ediff-merge appropriate revisions of the selected file.
|
|
|
|
|
(let* ((fileinfo (tin-cookie cvs-cookie-handle tin))
|
|
|
|
|
(type (cvs-fileinfo->type fileinfo))
|
|
|
|
|
(tmp-file
|
|
|
|
|
(cvs-retrieve-revision-to-tmpfile fileinfo))
|
1997-11-25 02:10:08 +00:00
|
|
|
(default-directory
|
1998-05-04 22:42:59 +00:00
|
|
|
(file-name-as-directory (cvs-fileinfo->dir fileinfo)))
|
1996-01-20 05:32:51 +00:00
|
|
|
ancestor-file)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-01-20 05:32:51 +00:00
|
|
|
(or (memq type '(MERGED CONFLICT MODIFIED))
|
|
|
|
|
(error
|
|
|
|
|
"Can only merge `Modified', `Merged' or `Conflict' files"))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-01-20 05:32:51 +00:00
|
|
|
(cond ((memq type '(MERGED CONFLICT))
|
|
|
|
|
(setq ancestor-file
|
|
|
|
|
(cvs-retrieve-revision-to-tmpfile
|
|
|
|
|
fileinfo
|
|
|
|
|
;; revision
|
|
|
|
|
(cvs-fileinfo->base-revision fileinfo)))
|
|
|
|
|
(ediff-merge-buffers-with-ancestor
|
|
|
|
|
(find-file-noselect tmp-file)
|
|
|
|
|
(find-file-noselect (cvs-fileinfo->backup-file fileinfo))
|
|
|
|
|
(find-file-noselect ancestor-file)
|
|
|
|
|
nil ; startup-hooks
|
|
|
|
|
'ediff-merge-revisions-with-ancestor))
|
|
|
|
|
((eq type 'MODIFIED)
|
1997-11-25 02:10:08 +00:00
|
|
|
(ediff-buffers
|
1996-01-20 05:32:51 +00:00
|
|
|
(find-file-noselect tmp-file)
|
|
|
|
|
(find-file-noselect (cvs-fileinfo->full-path fileinfo))
|
|
|
|
|
nil ; startup-hooks
|
1997-11-25 02:10:08 +00:00
|
|
|
'ediff-revisions)))
|
1996-01-20 05:32:51 +00:00
|
|
|
(if (stringp tmp-file) (delete-file tmp-file))
|
|
|
|
|
(if (stringp ancestor-file) (delete-file ancestor-file))))
|
|
|
|
|
|
2005-07-10 18:46:24 +00:00
|
|
|
|
|
|
|
|
(provide 'ediff-vers)
|
|
|
|
|
|
1996-01-20 05:32:51 +00:00
|
|
|
;;; Local Variables:
|
|
|
|
|
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
|
1997-07-31 04:04:23 +00:00
|
|
|
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
|
|
|
|
|
;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
|
1996-01-20 05:32:51 +00:00
|
|
|
;;; End:
|
|
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
;;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf
|
1996-01-20 05:32:51 +00:00
|
|
|
;;; ediff-vers.el ends here
|