code.delx.au - gnu-emacs/blob - lisp/ediff.el

   1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
   2
   3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
   4 ;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
   5
   6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
   7 ;; Created: February 2, 1994
   8 ;; Keywords: comparing, merging, patching, tools, unix
   9
  10 (defconst ediff-version "2.81.1" "The current version of Ediff")
  11 (defconst ediff-date "October 23, 2006" "Date of last update")
  12
  13
  14 ;; This file is part of GNU Emacs.
  15
  16 ;; GNU Emacs is free software; you can redistribute it and/or modify
  17 ;; it under the terms of the GNU General Public License as published by
  18 ;; the Free Software Foundation; either version 2, or (at your option)
  19 ;; any later version.
  20
  21 ;; GNU Emacs is distributed in the hope that it will be useful,
  22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
  23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  24 ;; GNU General Public License for more details.
  25
  26 ;; You should have received a copy of the GNU General Public License
  27 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
  28 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  29 ;; Boston, MA 02110-1301, USA.
  30
  31 ;;; Commentary:
  32
  33 ;; Never read that diff output again!
  34 ;; Apply patch interactively!
  35 ;; Merge with ease!
  36
  37 ;; This package provides a convenient way of simultaneous browsing through
  38 ;; the differences between a pair (or a triple) of files or buffers.  The
  39 ;; files being compared, file-A, file-B, and file-C (if applicable) are
  40 ;; shown in separate windows (side by side, one above the another, or in
  41 ;; separate frames), and the differences are highlighted as you step
  42 ;; through them.  You can also copy difference regions from one buffer to
  43 ;; another (and recover old differences if you change your mind).
  44
  45 ;; Ediff also supports merging operations on files and buffers, including
  46 ;; merging using ancestor versions.  Both comparison and merging operations can
  47 ;; be performed on directories, i.e., by pairwise comparison of files in those
  48 ;; directories.
  49
  50 ;; In addition, Ediff can apply a patch to a file and then let you step
  51 ;; though both files, the patched and the original one, simultaneously,
  52 ;; difference-by-difference.  You can even apply a patch right out of a
  53 ;; mail buffer, i.e., patches received by mail don't even have to be saved.
  54 ;; Since Ediff lets you copy differences between buffers, you can, in
  55 ;; effect, apply patches selectively (i.e., you can copy a difference
  56 ;; region from file_orig to file, thereby undoing any particular patch that
  57 ;; you don't like).
  58
  59 ;; Ediff is aware of version control, which lets the user compare
  60 ;; files with their older versions.  Ediff can also work with remote and
  61 ;; compressed files.  Details are given below.
  62
  63 ;; Finally, Ediff supports directory-level comparison, merging and patching.
  64 ;; See the on-line manual for details.
  65
  66 ;; This package builds upon the ideas borrowed from emerge.el and several
  67 ;; Ediff's functions are adaptations from emerge.el.  Much of the functionality
  68 ;; Ediff provides is also influenced by emerge.el.
  69
  70 ;; The present version of Ediff supersedes Emerge.  It provides a superior user
  71 ;; interface and has numerous major features not found in Emerge.  In
  72 ;; particular, it can do patching, and 2-way and 3-way file comparison,
  73 ;; merging, and directory operations.
  74
  75
  76
  77 ;;; Bugs:
  78
  79 ;;  1. The undo command doesn't restore deleted regions well.  That is, if
  80 ;;  you delete all characters in a difference region and then invoke
  81 ;;  `undo', the reinstated text will most likely be inserted outside of
  82 ;;  what Ediff thinks is the current difference region. (This problem
  83 ;;  doesn't seem to exist with XEmacs.)
  84 ;;
  85 ;;  If at any point you feel that difference regions are no longer correct,
  86 ;;  you can hit '!' to recompute the differences.
  87
  88 ;;  2. On a monochrome display, the repertoire of faces with which to
  89 ;;  highlight fine differences is limited.  By default, Ediff is using
  90 ;;  underlining.  However, if the region is already underlined by some other
  91 ;;  overlays, there is no simple way to temporarily remove that residual
  92 ;;  underlining.  This problem occurs when a buffer is highlighted with
  93 ;;  hilit19.el or font-lock.el packages.  If this residual highlighting gets
  94 ;;  in the way, you can do the following.  Both font-lock.el and hilit19.el
  95 ;;  provide commands for unhighlighting buffers.  You can either place these
  96 ;;  commands in `ediff-prepare-buffer-hook' (which will unhighlight every
  97 ;;  buffer used by Ediff) or you can execute them interactively, at any time
  98 ;;  and on any buffer.
  99
 100
 101 ;;; Acknowledgements:
 102
 103 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
 104 ;; Ediff would not have been possible without the help and encouragement of
 105 ;; its many users.  See Ediff on-line Info for the full list of those who
 106 ;; helped.  Improved defaults in Ediff file-name reading commands.
 107
 108 ;;; Code:
 109
 110
 111 ;; Compiler pacifier
 112 (defvar cvs-cookie-handle)
 113 (defvar ediff-last-dir-patch)
 114 (defvar ediff-patch-default-directory)
 115
 116 (and noninteractive
 117      (eval-when-compile
 118          (load-library "dired")
 119          (load-library "info")
 120          (load "pcl-cvs" 'noerror)))
 121 (eval-when-compile
 122   (let ((load-path (cons (expand-file-name ".") load-path)))
 123     (provide 'ediff) ; to break recursive load cycle
 124     (or (featurep 'ediff-init)
 125         (load "ediff-init.el" nil nil 'nosuffix))
 126     (or (featurep 'ediff-mult)
 127         (load "ediff-mult.el" nil nil 'nosuffix))
 128     (or (featurep 'ediff-ptch)
 129         (load "ediff-ptch.el" nil nil 'nosuffix))
 130     (or (featurep 'ediff-vers)
 131         (load "ediff-vers.el" nil nil 'nosuffix))
 132     ))
 133 ;; end pacifier
 134
 135 (require 'ediff-init)
 136 (require 'ediff-mult)  ; required because of the registry stuff
 137
 138 (defgroup ediff nil
 139   "A comprehensive visual interface to diff & patch."
 140   :tag "Ediff"
 141   :group 'tools)
 142
 143
 144 (defcustom ediff-use-last-dir nil
 145   "*If t, Ediff will use previous directory as default when reading file name."
 146   :type 'boolean
 147   :group 'ediff)
 148
 149 ;; Last directory used by an Ediff command for file-A.
 150 (defvar ediff-last-dir-A nil)
 151 ;; Last directory used by an Ediff command for file-B.
 152 (defvar ediff-last-dir-B nil)
 153 ;; Last directory used by an Ediff command for file-C.
 154 (defvar ediff-last-dir-C nil)
 155 ;; Last directory used by an Ediff command for the ancestor file.
 156 (defvar ediff-last-dir-ancestor nil)
 157 ;; Last directory used by an Ediff command as the output directory for merge.
 158 (defvar ediff-last-merge-autostore-dir nil)
 159
 160
 161 ;; Used as a startup hook to set `_orig' patch file read-only.
 162 (defun ediff-set-read-only-in-buf-A ()
 163   (ediff-with-current-buffer ediff-buffer-A
 164     (toggle-read-only 1)))
 165
 166 ;; Return a plausible default for ediff's first file:
 167 ;; In dired, return the file number FILENO (or 0) in the list
 168 ;; (all-selected-files, filename under the cursor), where directories are
 169 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
 170 ;; if the buffer is visiting a file, return that file name.
 171 (defun ediff-get-default-file-name (&optional default fileno)
 172   (cond ((eq major-mode 'dired-mode)
 173          (let ((current (dired-get-filename nil 'no-error))
 174                (marked (condition-case nil
 175                            (dired-get-marked-files 'no-dir)
 176                          (error nil)))
 177                aux-list choices result)
 178            (or (integerp fileno) (setq fileno 0))
 179            (if (stringp default)
 180                (setq aux-list (cons default aux-list)))
 181            (if (and (stringp current) (not (file-directory-p current)))
 182                (setq aux-list (cons current aux-list)))
 183            (setq choices (nconc  marked aux-list))
 184            (setq result (elt choices fileno))
 185            (or result
 186                default)))
 187         ((stringp default) default)
 188         ((buffer-file-name (current-buffer))
 189          (file-name-nondirectory (buffer-file-name (current-buffer))))
 190         ))
 191
 192 ;;; Compare files/buffers
 193
 194 ;;;###autoload
 195 (defun ediff-files (file-A file-B &optional startup-hooks)
 196   "Run Ediff on a pair of files, FILE-A and FILE-B."
 197   (interactive
 198    (let ((dir-A (if ediff-use-last-dir
 199                     ediff-last-dir-A
 200                   default-directory))
 201          dir-B f)
 202      (list (setq f (ediff-read-file-name
 203                     "File A to compare"
 204                     dir-A
 205                     (ediff-get-default-file-name)
 206                     'no-dirs))
 207            (ediff-read-file-name "File B to compare"
 208                                  (setq dir-B
 209                                        (if ediff-use-last-dir
 210                                            ediff-last-dir-B
 211                                          (file-name-directory f)))
 212                                  (progn
 213                                    (ediff-add-to-history
 214                                     'file-name-history
 215                                     (ediff-abbreviate-file-name
 216                                      (expand-file-name
 217                                       (file-name-nondirectory f)
 218                                       dir-B)))
 219                                    (ediff-get-default-file-name f 1)))
 220            )))
 221   (ediff-files-internal file-A
 222                         (if (file-directory-p file-B)
 223                             (expand-file-name
 224                              (file-name-nondirectory file-A) file-B)
 225                           file-B)
 226                         nil ; file-C
 227                         startup-hooks
 228                         'ediff-files))
 229
 230 ;;;###autoload
 231 (defun ediff-files3 (file-A file-B file-C &optional startup-hooks)
 232   "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
 233   (interactive
 234    (let ((dir-A (if ediff-use-last-dir
 235                     ediff-last-dir-A
 236                   default-directory))
 237          dir-B dir-C f ff)
 238      (list (setq f (ediff-read-file-name
 239                     "File A to compare"
 240                     dir-A
 241                     (ediff-get-default-file-name)
 242                     'no-dirs))
 243            (setq ff (ediff-read-file-name "File B to compare"
 244                                           (setq dir-B
 245                                                 (if ediff-use-last-dir
 246                                                     ediff-last-dir-B
 247                                                   (file-name-directory f)))
 248                                           (progn
 249                                             (ediff-add-to-history
 250                                              'file-name-history
 251                                              (ediff-abbreviate-file-name
 252                                               (expand-file-name
 253                                                (file-name-nondirectory f)
 254                                                dir-B)))
 255                                             (ediff-get-default-file-name f 1))))
 256            (ediff-read-file-name "File C to compare"
 257                                  (setq dir-C (if ediff-use-last-dir
 258                                                  ediff-last-dir-C
 259                                                (file-name-directory ff)))
 260                                  (progn
 261                                    (ediff-add-to-history
 262                                     'file-name-history
 263                                     (ediff-abbreviate-file-name
 264                                      (expand-file-name
 265                                       (file-name-nondirectory ff)
 266                                       dir-C)))
 267                                    (ediff-get-default-file-name ff 2)))
 268            )))
 269   (ediff-files-internal file-A
 270                         (if (file-directory-p file-B)
 271                             (expand-file-name
 272                              (file-name-nondirectory file-A) file-B)
 273                           file-B)
 274                         (if (file-directory-p file-C)
 275                             (expand-file-name
 276                              (file-name-nondirectory file-A) file-C)
 277                           file-C)
 278                         startup-hooks
 279                         'ediff-files3))
 280
 281 ;;;###autoload
 282 (defalias 'ediff3 'ediff-files3)
 283
 284
 285 ;; Visit FILE and arrange its buffer to Ediff's liking.
 286 ;; FILE is actually a variable symbol that must contain a true file name.
 287 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into
 288 ;; which FILE is read.
 289 ;; LAST-DIR is the directory variable symbol where FILE's
 290 ;; directory name should be returned.  HOOKS-VAR is a variable symbol that will
 291 ;; be assigned the hook to be executed after `ediff-startup' is finished.
 292 ;; `ediff-find-file' arranges that the temp files it might create will be
 293 ;; deleted.
 294 (defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var)
 295   (let* ((file (symbol-value file-var))
 296          (file-magic (ediff-filename-magic-p file))
 297          (temp-file-name-prefix (file-name-nondirectory file)))
 298     (cond ((not (file-readable-p file))
 299            (error "File `%s' does not exist or is not readable" file))
 300           ((file-directory-p file)
 301            (error "File `%s' is a directory" file)))
 302
 303     ;; some of the commands, below, require full file name
 304     (setq file (expand-file-name file))
 305
 306     ;; Record the directory of the file
 307     (if last-dir
 308         (set last-dir (expand-file-name (file-name-directory file))))
 309
 310     ;; Setup the buffer
 311     (set buffer-name (find-file-noselect file))
 312
 313     (ediff-with-current-buffer (symbol-value buffer-name)
 314       (widen) ; Make sure the entire file is seen
 315       (cond (file-magic  ;   file has a handler, such as jka-compr-handler or
 316                          ;;; ange-ftp-hook-function--arrange for temp file
 317              (ediff-verify-file-buffer 'magic)
 318              (setq file
 319                    (ediff-make-temp-file
 320                     (current-buffer) temp-file-name-prefix))
 321              (set hooks-var (cons `(lambda () (delete-file ,file))
 322                                   (symbol-value hooks-var))))
 323             ;; file processed via auto-mode-alist, a la uncompress.el
 324             ((not (equal (file-truename file)
 325                          (file-truename (buffer-file-name))))
 326              (setq file
 327                    (ediff-make-temp-file
 328                     (current-buffer) temp-file-name-prefix))
 329              (set hooks-var (cons `(lambda () (delete-file ,file))
 330                                   (symbol-value hooks-var))))
 331             (t ;; plain file---just check that the file matches the buffer
 332              (ediff-verify-file-buffer))))
 333     (set file-var file)))
 334
 335 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
 336 (defun ediff-files-internal (file-A file-B file-C startup-hooks job-name
 337                                     &optional merge-buffer-file)
 338   (let (buf-A buf-B buf-C)
 339     (if (string= file-A file-B)
 340         (error "Files A and B are the same"))
 341     (if (stringp file-C)
 342         (or (and (string= file-A file-C) (error "Files A and C are the same"))
 343             (and (string= file-B file-C) (error "Files B and C are the same"))))
 344     (message "Reading file %s ... " file-A)
 345     ;;(sit-for 0)
 346     (ediff-find-file 'file-A 'buf-A 'ediff-last-dir-A 'startup-hooks)
 347     (message "Reading file %s ... " file-B)
 348     ;;(sit-for 0)
 349     (ediff-find-file 'file-B 'buf-B 'ediff-last-dir-B 'startup-hooks)
 350     (if (stringp file-C)
 351         (progn
 352           (message "Reading file %s ... " file-C)
 353           ;;(sit-for 0)
 354           (ediff-find-file
 355            'file-C 'buf-C
 356            (if (eq job-name 'ediff-merge-files-with-ancestor)
 357                'ediff-last-dir-ancestor 'ediff-last-dir-C)
 358            'startup-hooks)))
 359     (ediff-setup buf-A file-A
 360                  buf-B file-B
 361                  buf-C file-C
 362                  startup-hooks
 363                  (list (cons 'ediff-job-name job-name))
 364                  merge-buffer-file)))
 365
 366
 367 ;;;###autoload
 368 (defalias 'ediff 'ediff-files)
 369
 370 ;;;###autoload
 371 (defun ediff-backup (file)
 372   "Run Ediff on FILE and its backup file.
 373 Uses the latest backup, if there are several numerical backups.
 374 If this file is a backup, `ediff' it with its original."
 375   (interactive (list (read-file-name "Ediff (file with backup): ")))
 376   ;; The code is taken from `diff-backup'.
 377   (require 'diff)
 378   (let (bak ori)
 379     (if (backup-file-name-p file)
 380         (setq bak file
 381               ori (file-name-sans-versions file))
 382       (setq bak (or (diff-latest-backup-file file)
 383                     (error "No backup found for %s" file))
 384             ori file))
 385     (ediff-files bak ori)))
 386
 387 ;;;###autoload
 388 (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name)
 389   "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
 390   (interactive
 391    (let (bf)
 392      (list (setq bf (read-buffer "Buffer A to compare: "
 393                                  (ediff-other-buffer "") t))
 394            (read-buffer "Buffer B to compare: "
 395                         (progn
 396                           ;; realign buffers so that two visible bufs will be
 397                           ;; at the top
 398                           (save-window-excursion (other-window 1))
 399                           (ediff-other-buffer bf))
 400                         t))))
 401   (or job-name (setq job-name 'ediff-buffers))
 402   (ediff-buffers-internal buffer-A buffer-B nil startup-hooks job-name))
 403
 404 ;;;###autoload
 405 (defalias 'ebuffers 'ediff-buffers)
 406
 407
 408 ;;;###autoload
 409 (defun ediff-buffers3 (buffer-A buffer-B buffer-C
 410                                  &optional startup-hooks job-name)
 411   "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
 412   (interactive
 413    (let (bf bff)
 414      (list (setq bf (read-buffer "Buffer A to compare: "
 415                                  (ediff-other-buffer "") t))
 416            (setq bff (read-buffer "Buffer B to compare: "
 417                                   (progn
 418                                     ;; realign buffers so that two visible
 419                                     ;; bufs will be at the top
 420                                     (save-window-excursion (other-window 1))
 421                                     (ediff-other-buffer bf))
 422                                   t))
 423            (read-buffer "Buffer C to compare: "
 424                                   (progn
 425                                     ;; realign buffers so that three visible
 426                                     ;; bufs will be at the top
 427                                     (save-window-excursion (other-window 1))
 428                                     (ediff-other-buffer (list bf bff)))
 429                                   t)
 430            )))
 431   (or job-name (setq job-name 'ediff-buffers3))
 432   (ediff-buffers-internal buffer-A buffer-B buffer-C startup-hooks job-name))
 433
 434 ;;;###autoload
 435 (defalias 'ebuffers3 'ediff-buffers3)
 436
 437
 438
 439 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
 440 (defun ediff-buffers-internal (buf-A buf-B buf-C startup-hooks job-name
 441                                      &optional merge-buffer-file)
 442   (let* ((buf-A-file-name (buffer-file-name (get-buffer buf-A)))
 443          (buf-B-file-name (buffer-file-name (get-buffer buf-B)))
 444          (buf-C-is-alive (ediff-buffer-live-p buf-C))
 445          (buf-C-file-name (if buf-C-is-alive
 446                               (buffer-file-name (get-buffer buf-B))))
 447          file-A file-B file-C)
 448     (if (not (ediff-buffer-live-p buf-A))
 449         (error "Buffer %S doesn't exist" buf-A))
 450     (if (not (ediff-buffer-live-p buf-B))
 451         (error "Buffer %S doesn't exist" buf-B))
 452     (let ((ediff-job-name job-name))
 453       (if (and ediff-3way-comparison-job
 454                (not buf-C-is-alive))
 455           (error "Buffer %S doesn't exist" buf-C)))
 456     (if (stringp buf-A-file-name)
 457         (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
 458     (if (stringp buf-B-file-name)
 459         (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
 460     (if (stringp buf-C-file-name)
 461         (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
 462
 463     (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
 464           file-B (ediff-make-temp-file buf-B buf-B-file-name))
 465     (if buf-C-is-alive
 466         (setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
 467
 468     (ediff-setup (get-buffer buf-A) file-A
 469                  (get-buffer buf-B) file-B
 470                  (if buf-C-is-alive (get-buffer buf-C))
 471                  file-C
 472                  (cons `(lambda ()
 473                           (delete-file ,file-A)
 474                           (delete-file ,file-B)
 475                           (if (stringp ,file-C) (delete-file ,file-C)))
 476                        startup-hooks)
 477                  (list (cons 'ediff-job-name job-name))
 478                  merge-buffer-file)))
 479
 480
 481 ;;; Directory and file group operations
 482
 483 ;; Get appropriate default name for directory:
 484 ;; If ediff-use-last-dir, use ediff-last-dir-A.
 485 ;; In dired mode, use the directory that is under the point (if any);
 486 ;; otherwise, use default-directory
 487 (defun ediff-get-default-directory-name ()
 488   (cond (ediff-use-last-dir ediff-last-dir-A)
 489         ((eq major-mode 'dired-mode)
 490          (let ((f (dired-get-filename nil 'noerror)))
 491            (if (and (stringp f) (file-directory-p f))
 492                f
 493              default-directory)))
 494         (t default-directory)))
 495
 496
 497 ;;;###autoload
 498 (defun ediff-directories (dir1 dir2 regexp)
 499   "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
 500 the same name in both.  The third argument, REGEXP, is nil or a regular
 501 expression; only file names that match the regexp are considered."
 502   (interactive
 503    (let ((dir-A (ediff-get-default-directory-name))
 504          (default-regexp (eval ediff-default-filtering-regexp))
 505          f)
 506      (list (setq f (read-directory-name
 507                     "Directory A to compare:" dir-A nil 'must-match))
 508            (read-directory-name "Directory B to compare:"
 509                            (if ediff-use-last-dir
 510                                ediff-last-dir-B
 511                              (ediff-strip-last-dir f))
 512                            nil 'must-match)
 513            (read-string
 514             (if (stringp default-regexp)
 515                 (format "Filter through regular expression (default %s): "
 516                          default-regexp)
 517               "Filter through regular expression: ")
 518             nil
 519             'ediff-filtering-regexp-history
 520             (eval ediff-default-filtering-regexp))
 521            )))
 522   (ediff-directories-internal
 523    dir1 dir2 nil regexp 'ediff-files 'ediff-directories
 524    ))
 525
 526 ;;;###autoload
 527 (defalias 'edirs 'ediff-directories)
 528
 529
 530 ;;;###autoload
 531 (defun ediff-directory-revisions (dir1 regexp)
 532   "Run Ediff on a directory, DIR1, comparing its files with their revisions.
 533 The second argument, REGEXP, is a regular expression that filters the file
 534 names.  Only the files that are under revision control are taken into account."
 535   (interactive
 536    (let ((dir-A (ediff-get-default-directory-name))
 537          (default-regexp (eval ediff-default-filtering-regexp))
 538          )
 539      (list (read-directory-name
 540             "Directory to compare with revision:" dir-A nil 'must-match)
 541            (read-string
 542             (if (stringp default-regexp)
 543                 (format "Filter through regular expression (default %s): "
 544                          default-regexp)
 545               "Filter through regular expression: ")
 546             nil
 547             'ediff-filtering-regexp-history
 548             (eval ediff-default-filtering-regexp))
 549            )))
 550   (ediff-directory-revisions-internal
 551    dir1 regexp 'ediff-revision 'ediff-directory-revisions
 552    ))
 553
 554 ;;;###autoload
 555 (defalias 'edir-revisions 'ediff-directory-revisions)
 556
 557
 558 ;;;###autoload
 559 (defun ediff-directories3 (dir1 dir2 dir3 regexp)
 560   "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
 561 have the same name in all three.  The last argument, REGEXP, is nil or a
 562 regular expression; only file names that match the regexp are considered."
 563
 564   (interactive
 565    (let ((dir-A (ediff-get-default-directory-name))
 566          (default-regexp (eval ediff-default-filtering-regexp))
 567          f)
 568      (list (setq f (read-directory-name "Directory A to compare:" dir-A nil))
 569            (setq f (read-directory-name "Directory B to compare:"
 570                                    (if ediff-use-last-dir
 571                                        ediff-last-dir-B
 572                                      (ediff-strip-last-dir f))
 573                                    nil 'must-match))
 574            (read-directory-name "Directory C to compare:"
 575                            (if ediff-use-last-dir
 576                                ediff-last-dir-C
 577                              (ediff-strip-last-dir f))
 578                            nil 'must-match)
 579            (read-string
 580             (if (stringp default-regexp)
 581                 (format "Filter through regular expression (default %s): "
 582                          default-regexp)
 583               "Filter through regular expression: ")
 584             nil
 585             'ediff-filtering-regexp-history
 586             (eval ediff-default-filtering-regexp))
 587            )))
 588   (ediff-directories-internal
 589    dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3
 590    ))
 591
 592 ;;;###autoload
 593 (defalias 'edirs3 'ediff-directories3)
 594
 595 ;;;###autoload
 596 (defun ediff-merge-directories (dir1 dir2 regexp &optional merge-autostore-dir)
 597   "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
 598 the same name in both.  The third argument, REGEXP, is nil or a regular
 599 expression; only file names that match the regexp are considered."
 600   (interactive
 601    (let ((dir-A (ediff-get-default-directory-name))
 602          (default-regexp (eval ediff-default-filtering-regexp))
 603          f)
 604      (list (setq f (read-directory-name "Directory A to merge:"
 605                                         dir-A nil 'must-match))
 606            (read-directory-name "Directory B to merge:"
 607                            (if ediff-use-last-dir
 608                                ediff-last-dir-B
 609                              (ediff-strip-last-dir f))
 610                            nil 'must-match)
 611            (read-string
 612             (if (stringp default-regexp)
 613                 (format "Filter through regular expression (default %s): "
 614                          default-regexp)
 615               "Filter through regular expression: ")
 616             nil
 617             'ediff-filtering-regexp-history
 618             (eval ediff-default-filtering-regexp))
 619            )))
 620   (ediff-directories-internal
 621    dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories
 622    nil merge-autostore-dir
 623    ))
 624
 625 ;;;###autoload
 626 (defalias 'edirs-merge 'ediff-merge-directories)
 627
 628 ;;;###autoload
 629 (defun ediff-merge-directories-with-ancestor (dir1 dir2 ancestor-dir regexp
 630                                                    &optional
 631                                                    merge-autostore-dir)
 632   "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
 633 Ediff merges files that have identical names in DIR1, DIR2.  If a pair of files
 634 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
 635 without ancestor.  The fourth argument, REGEXP, is nil or a regular expression;
 636 only file names that match the regexp are considered."
 637   (interactive
 638    (let ((dir-A (ediff-get-default-directory-name))
 639          (default-regexp (eval ediff-default-filtering-regexp))
 640          f)
 641      (list (setq f (read-directory-name "Directory A to merge:" dir-A nil))
 642            (setq f (read-directory-name "Directory B to merge:"
 643                                  (if ediff-use-last-dir
 644                                      ediff-last-dir-B
 645                                    (ediff-strip-last-dir f))
 646                                  nil 'must-match))
 647            (read-directory-name "Ancestor directory:"
 648                                  (if ediff-use-last-dir
 649                                      ediff-last-dir-C
 650                                    (ediff-strip-last-dir f))
 651                                  nil 'must-match)
 652            (read-string
 653             (if (stringp default-regexp)
 654                 (format "Filter through regular expression (default %s): "
 655                          default-regexp)
 656               "Filter through regular expression: ")
 657             nil
 658             'ediff-filtering-regexp-history
 659             (eval ediff-default-filtering-regexp))
 660            )))
 661   (ediff-directories-internal
 662    dir1 dir2 ancestor-dir regexp
 663    'ediff-merge-files-with-ancestor 'ediff-merge-directories-with-ancestor
 664    nil merge-autostore-dir
 665    ))
 666
 667 ;;;###autoload
 668 (defun ediff-merge-directory-revisions (dir1 regexp
 669                                              &optional merge-autostore-dir)
 670   "Run Ediff on a directory, DIR1, merging its files with their revisions.
 671 The second argument, REGEXP, is a regular expression that filters the file
 672 names.  Only the files that are under revision control are taken into account."
 673   (interactive
 674    (let ((dir-A (ediff-get-default-directory-name))
 675          (default-regexp (eval ediff-default-filtering-regexp))
 676          )
 677      (list (read-directory-name
 678             "Directory to merge with revisions:" dir-A nil 'must-match)
 679            (read-string
 680             (if (stringp default-regexp)
 681                 (format "Filter through regular expression (default %s): "
 682                          default-regexp)
 683               "Filter through regular expression: ")
 684             nil
 685             'ediff-filtering-regexp-history
 686             (eval ediff-default-filtering-regexp))
 687            )))
 688   (ediff-directory-revisions-internal
 689    dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions
 690    nil merge-autostore-dir
 691    ))
 692
 693 ;;;###autoload
 694 (defalias 'edir-merge-revisions 'ediff-merge-directory-revisions)
 695
 696 ;;;###autoload
 697 (defun ediff-merge-directory-revisions-with-ancestor (dir1 regexp
 698                                                            &optional
 699                                                            merge-autostore-dir)
 700   "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
 701 The second argument, REGEXP, is a regular expression that filters the file
 702 names.  Only the files that are under revision control are taken into account."
 703   (interactive
 704    (let ((dir-A (ediff-get-default-directory-name))
 705          (default-regexp (eval ediff-default-filtering-regexp))
 706          )
 707      (list (read-directory-name
 708             "Directory to merge with revisions and ancestors:"
 709             dir-A nil 'must-match)
 710            (read-string
 711             (if (stringp default-regexp)
 712                 (format "Filter through regular expression (default %s): "
 713                          default-regexp)
 714               "Filter through regular expression: ")
 715             nil
 716             'ediff-filtering-regexp-history
 717             (eval ediff-default-filtering-regexp))
 718            )))
 719   (ediff-directory-revisions-internal
 720    dir1 regexp 'ediff-merge-revisions-with-ancestor
 721    'ediff-merge-directory-revisions-with-ancestor
 722    nil merge-autostore-dir
 723    ))
 724
 725 ;;;###autoload
 726 (defalias
 727   'edir-merge-revisions-with-ancestor
 728   'ediff-merge-directory-revisions-with-ancestor)
 729
 730 ;;;###autoload
 731 (defalias 'edirs-merge-with-ancestor 'ediff-merge-directories-with-ancestor)
 732
 733 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
 734 ;; on a pair of directories (three directories, in case of ancestor).
 735 ;; The third argument, REGEXP, is nil or a regular expression;
 736 ;; only file names that match the regexp are considered.
 737 ;; JOBNAME is the symbol indicating the meta-job to be performed.
 738 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
 739 (defun ediff-directories-internal (dir1 dir2 dir3 regexp action jobname
 740                                         &optional startup-hooks
 741                                         merge-autostore-dir)
 742   (if (stringp dir3)
 743       (setq dir3 (if (file-directory-p dir3) dir3 (file-name-directory dir3))))
 744
 745   (cond ((string= dir1 dir2)
 746          (error "Directories A and B are the same: %s" dir1))
 747         ((and (eq jobname 'ediff-directories3)
 748               (string= dir1 dir3))
 749          (error "Directories A and C are the same: %s" dir1))
 750         ((and (eq jobname 'ediff-directories3)
 751               (string= dir2 dir3))
 752          (error "Directories B and C are the same: %s" dir1)))
 753
 754   (if merge-autostore-dir
 755       (or (stringp merge-autostore-dir)
 756           (error "%s: Directory for storing merged files must be a string"
 757                  jobname)))
 758   (let (;; dir-diff-struct is of the form (common-list diff-list)
 759         ;; It is a structure where ediff-intersect-directories returns
 760         ;; commonalities and differences among directories
 761         dir-diff-struct
 762         meta-buf)
 763     (if (and ediff-autostore-merges
 764              (ediff-merge-metajob jobname)
 765              (not merge-autostore-dir))
 766         (setq merge-autostore-dir
 767               (read-directory-name "Save merged files in directory: "
 768                               (if ediff-use-last-dir
 769                                         ediff-last-merge-autostore-dir
 770                                       (ediff-strip-last-dir dir1))
 771                               nil
 772                               'must-match)))
 773     ;; verify we are not merging into an orig directory
 774     (if merge-autostore-dir
 775         (cond ((and (stringp dir1) (string= merge-autostore-dir dir1))
 776                (or (y-or-n-p
 777                     "Directory for saving merged files = Directory A.  Sure? ")
 778                    (error "Directory merge aborted")))
 779               ((and (stringp dir2) (string= merge-autostore-dir dir2))
 780                (or (y-or-n-p
 781                     "Directory for saving merged files = Directory B.  Sure? ")
 782                    (error "Directory merge aborted")))
 783               ((and (stringp dir3) (string= merge-autostore-dir dir3))
 784                (or (y-or-n-p
 785                     "Directory for saving merged files = Ancestor Directory.  Sure? ")
 786                    (error "Directory merge aborted")))))
 787
 788     (setq dir-diff-struct (ediff-intersect-directories
 789                            jobname
 790                            regexp dir1 dir2 dir3 merge-autostore-dir))
 791     (setq startup-hooks
 792           ;; this sets various vars in the meta buffer inside
 793           ;; ediff-prepare-meta-buffer
 794           (cons `(lambda ()
 795                    ;; tell what to do if the user clicks on a session record
 796                    (setq ediff-session-action-function (quote ,action))
 797                    ;; set ediff-dir-difference-list
 798                    (setq ediff-dir-difference-list
 799                          (cdr (quote ,dir-diff-struct))))
 800                 startup-hooks))
 801     (setq meta-buf (ediff-prepare-meta-buffer
 802                     'ediff-filegroup-action
 803                     (car dir-diff-struct)
 804                     "*Ediff Session Group Panel"
 805                     'ediff-redraw-directory-group-buffer
 806                     jobname
 807                     startup-hooks))
 808     (ediff-show-meta-buffer meta-buf)
 809     ))
 810
 811 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
 812 ;; files
 813 (defun ediff-directory-revisions-internal (dir1 regexp action jobname
 814                                                 &optional startup-hooks
 815                                                 merge-autostore-dir)
 816   (setq dir1 (if (file-directory-p dir1) dir1 (file-name-directory dir1)))
 817
 818   (if merge-autostore-dir
 819       (or (stringp merge-autostore-dir)
 820           (error "%S: Directory for storing merged files must be a string"
 821                  jobname)))
 822   (let (file-list meta-buf)
 823     (if (and ediff-autostore-merges
 824              (ediff-merge-metajob jobname)
 825              (not merge-autostore-dir))
 826         (setq merge-autostore-dir
 827               (read-directory-name "Save merged files in directory: "
 828                               (if ediff-use-last-dir
 829                                   ediff-last-merge-autostore-dir
 830                                 (ediff-strip-last-dir dir1))
 831                               nil
 832                               'must-match)))
 833     ;; verify merge-autostore-dir != dir1
 834     (if (and merge-autostore-dir
 835              (stringp dir1)
 836              (string= merge-autostore-dir dir1))
 837         (or (y-or-n-p
 838              "Directory for saving merged file = directory A.  Sure? ")
 839             (error "Merge of directory revisions aborted")))
 840
 841     (setq file-list
 842           (ediff-get-directory-files-under-revision
 843            jobname regexp dir1 merge-autostore-dir))
 844     (setq startup-hooks
 845           ;; this sets various vars in the meta buffer inside
 846           ;; ediff-prepare-meta-buffer
 847           (cons `(lambda ()
 848                    ;; tell what to do if the user clicks on a session record
 849                    (setq ediff-session-action-function (quote ,action)))
 850                 startup-hooks))
 851     (setq meta-buf (ediff-prepare-meta-buffer
 852                     'ediff-filegroup-action
 853                     file-list
 854                     "*Ediff Session Group Panel"
 855                     'ediff-redraw-directory-group-buffer
 856                     jobname
 857                     startup-hooks))
 858     (ediff-show-meta-buffer meta-buf)
 859     ))
 860
 861
 862 ;;; Compare regions and windows
 863
 864 ;;;###autoload
 865 (defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks)
 866   "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
 867 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
 868 follows:
 869 If WIND-A is nil, use selected window.
 870 If WIND-B is nil, use window next to WIND-A."
 871   (interactive "P")
 872   (ediff-windows dumb-mode wind-A wind-B
 873                  startup-hooks 'ediff-windows-wordwise 'word-mode))
 874
 875 ;;;###autoload
 876 (defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks)
 877   "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
 878 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
 879 follows:
 880 If WIND-A is nil, use selected window.
 881 If WIND-B is nil, use window next to WIND-A."
 882   (interactive "P")
 883   (ediff-windows dumb-mode wind-A wind-B
 884                  startup-hooks 'ediff-windows-linewise nil))
 885
 886 ;; Compare WIND-A and WIND-B, which are selected by clicking.
 887 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
 888 ;; works as follows:
 889 ;; If WIND-A is nil, use selected window.
 890 ;; If WIND-B is nil, use window next to WIND-A.
 891 (defun ediff-windows (dumb-mode wind-A wind-B startup-hooks job-name word-mode)
 892   (if (or dumb-mode (not (ediff-window-display-p)))
 893       (setq wind-A (ediff-get-next-window wind-A nil)
 894             wind-B (ediff-get-next-window wind-B wind-A))
 895     (setq wind-A (ediff-get-window-by-clicking wind-A nil 1)
 896           wind-B (ediff-get-window-by-clicking wind-B wind-A 2)))
 897
 898   (let ((buffer-A (window-buffer wind-A))
 899         (buffer-B (window-buffer wind-B))
 900         beg-A end-A beg-B end-B)
 901
 902     (save-excursion
 903       (save-window-excursion
 904         (sit-for 0) ; sync before using window-start/end -- a precaution
 905         (select-window wind-A)
 906         (setq beg-A (window-start)
 907               end-A (window-end))
 908         (select-window wind-B)
 909         (setq beg-B (window-start)
 910               end-B (window-end))))
 911     (setq buffer-A
 912           (ediff-clone-buffer-for-window-comparison
 913            buffer-A wind-A "-Window.A-")
 914           buffer-B
 915           (ediff-clone-buffer-for-window-comparison
 916            buffer-B wind-B "-Window.B-"))
 917     (ediff-regions-internal
 918      buffer-A beg-A end-A buffer-B beg-B end-B
 919      startup-hooks job-name word-mode nil)))
 920
 921
 922 ;;;###autoload
 923 (defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks)
 924   "Run Ediff on a pair of regions in specified buffers.
 925 Regions \(i.e., point and mark\) are assumed to be set in advance except
 926 for the second region in the case both regions are from the same buffer.
 927 In such a case the user is asked to interactively establish the second
 928 region.
 929 This function is effective only for relatively small regions, up to 200
 930 lines.  For large regions, use `ediff-regions-linewise'."
 931   (interactive
 932    (let (bf)
 933      (list (setq bf (read-buffer "Region's A buffer: "
 934                                  (ediff-other-buffer "") t))
 935            (read-buffer "Region's B buffer: "
 936                         (progn
 937                           ;; realign buffers so that two visible bufs will be
 938                           ;; at the top
 939                           (save-window-excursion (other-window 1))
 940                           (ediff-other-buffer bf))
 941                         t))))
 942   (if (not (ediff-buffer-live-p buffer-A))
 943       (error "Buffer %S doesn't exist" buffer-A))
 944   (if (not (ediff-buffer-live-p buffer-B))
 945       (error "Buffer %S doesn't exist" buffer-B))
 946
 947
 948   (let ((buffer-A
 949          (ediff-clone-buffer-for-region-comparison buffer-A "-Region.A-"))
 950         (buffer-B
 951          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
 952         reg-A-beg reg-A-end reg-B-beg reg-B-end)
 953     (save-excursion
 954       (set-buffer buffer-A)
 955       (setq reg-A-beg (region-beginning)
 956             reg-A-end (region-end))
 957       (set-buffer buffer-B)
 958       (setq reg-B-beg (region-beginning)
 959             reg-B-end (region-end)))
 960
 961     (ediff-regions-internal
 962      (get-buffer buffer-A) reg-A-beg reg-A-end
 963      (get-buffer buffer-B) reg-B-beg reg-B-end
 964      startup-hooks 'ediff-regions-wordwise 'word-mode nil)))
 965
 966 ;;;###autoload
 967 (defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks)
 968   "Run Ediff on a pair of regions in specified buffers.
 969 Regions \(i.e., point and mark\) are assumed to be set in advance except
 970 for the second region in the case both regions are from the same buffer.
 971 In such a case the user is asked to interactively establish the second
 972 region.
 973 Each region is enlarged to contain full lines.
 974 This function is effective for large regions, over 100-200
 975 lines.  For small regions, use `ediff-regions-wordwise'."
 976   (interactive
 977    (let (bf)
 978      (list (setq bf (read-buffer "Region A's buffer: "
 979                                  (ediff-other-buffer "") t))
 980            (read-buffer "Region B's buffer: "
 981                         (progn
 982                           ;; realign buffers so that two visible bufs will be
 983                           ;; at the top
 984                           (save-window-excursion (other-window 1))
 985                           (ediff-other-buffer bf))
 986                         t))))
 987   (if (not (ediff-buffer-live-p buffer-A))
 988       (error "Buffer %S doesn't exist" buffer-A))
 989   (if (not (ediff-buffer-live-p buffer-B))
 990       (error "Buffer %S doesn't exist" buffer-B))
 991
 992   (let ((buffer-A
 993          (ediff-clone-buffer-for-region-comparison buffer-A "-Region.A-"))
 994         (buffer-B
 995          (ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
 996         reg-A-beg reg-A-end reg-B-beg reg-B-end)
 997     (save-excursion
 998       (set-buffer buffer-A)
 999       (setq reg-A-beg (region-beginning)
1000             reg-A-end (region-end))
1001       ;; enlarge the region to hold full lines
1002       (goto-char reg-A-beg)
1003       (beginning-of-line)
1004       (setq reg-A-beg (point))
1005       (goto-char reg-A-end)
1006       (end-of-line)
1007       (or (eobp) (forward-char)) ; include the newline char
1008       (setq reg-A-end (point))
1009
1010       (set-buffer buffer-B)
1011       (setq reg-B-beg (region-beginning)
1012             reg-B-end (region-end))
1013       ;; enlarge the region to hold full lines
1014       (goto-char reg-B-beg)
1015       (beginning-of-line)
1016       (setq reg-B-beg (point))
1017       (goto-char reg-B-end)
1018       (end-of-line)
1019       (or (eobp) (forward-char)) ; include the newline char
1020       (setq reg-B-end (point))
1021       ) ; save excursion
1022
1023     (ediff-regions-internal
1024      (get-buffer buffer-A) reg-A-beg reg-A-end
1025      (get-buffer buffer-B) reg-B-beg reg-B-end
1026      startup-hooks 'ediff-regions-linewise nil nil))) ; no word mode
1027
1028 ;; compare region beg-A to end-A of buffer-A
1029 ;; to regions beg-B -- end-B in buffer-B.
1030 (defun ediff-regions-internal (buffer-A beg-A end-A buffer-B beg-B end-B
1031                                         startup-hooks job-name word-mode
1032                                         setup-parameters)
1033   (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
1034         overl-A overl-B
1035         file-A file-B)
1036
1037     ;; in case beg/end-A/B aren't markers--make them into markers
1038     (ediff-with-current-buffer buffer-A
1039       (setq beg-A (move-marker (make-marker) beg-A)
1040             end-A (move-marker (make-marker) end-A)))
1041     (ediff-with-current-buffer buffer-B
1042       (setq beg-B (move-marker (make-marker) beg-B)
1043             end-B (move-marker (make-marker) end-B)))
1044
1045     ;; make file-A
1046     (if word-mode
1047         (ediff-wordify beg-A end-A buffer-A tmp-buffer)
1048       (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
1049     (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
1050
1051     ;; make file-B
1052     (if word-mode
1053         (ediff-wordify beg-B end-B buffer-B tmp-buffer)
1054       (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
1055     (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
1056
1057     (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
1058     (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
1059     (ediff-setup buffer-A file-A
1060                  buffer-B file-B
1061                  nil nil            ; buffer & file C
1062                  (cons `(lambda ()
1063                             (delete-file ,file-A)
1064                             (delete-file ,file-B))
1065                        startup-hooks)
1066                  (append
1067                   (list (cons 'ediff-word-mode  word-mode)
1068                         (cons 'ediff-narrow-bounds (list overl-A overl-B))
1069                         (cons 'ediff-job-name job-name))
1070                   setup-parameters))
1071     ))
1072
1073
1074 ;;; Merge files and buffers
1075
1076 ;;;###autoload
1077 (defalias 'ediff-merge 'ediff-merge-files)
1078
1079 (defsubst ediff-merge-on-startup ()
1080   (ediff-do-merge 0)
1081   ;; Can't remember why this is here, but it may cause the automatically merged
1082   ;; buffer to be lost. So, keep the buffer modified.
1083   ;;(ediff-with-current-buffer ediff-buffer-C
1084   ;;  (set-buffer-modified-p nil))
1085   )
1086
1087 ;;;###autoload
1088 (defun ediff-merge-files (file-A file-B
1089                                  ;; MERGE-BUFFER-FILE is the file to be
1090                                  ;; associated with the merge buffer
1091                                  &optional startup-hooks merge-buffer-file)
1092   "Merge two files without ancestor."
1093   (interactive
1094    (let ((dir-A (if ediff-use-last-dir
1095                     ediff-last-dir-A
1096                   default-directory))
1097          dir-B f)
1098      (list (setq f (ediff-read-file-name
1099                     "File A to merge"
1100                     dir-A
1101                     (ediff-get-default-file-name)
1102                     'no-dirs))
1103            (ediff-read-file-name "File B to merge"
1104                                  (setq dir-B
1105                                        (if ediff-use-last-dir
1106                                            ediff-last-dir-B
1107                                          (file-name-directory f)))
1108                                  (progn
1109                                    (ediff-add-to-history
1110                                     'file-name-history
1111                                     (ediff-abbreviate-file-name
1112                                      (expand-file-name
1113                                       (file-name-nondirectory f)
1114                                       dir-B)))
1115                                    (ediff-get-default-file-name f 1)))
1116            )))
1117   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
1118   (ediff-files-internal file-A
1119                         (if (file-directory-p file-B)
1120                             (expand-file-name
1121                              (file-name-nondirectory file-A) file-B)
1122                           file-B)
1123                           nil ; file-C
1124                           startup-hooks
1125                           'ediff-merge-files
1126                           merge-buffer-file))
1127
1128 ;;;###autoload
1129 (defun ediff-merge-files-with-ancestor (file-A file-B file-ancestor
1130                                                &optional
1131                                                startup-hooks
1132                                                ;; MERGE-BUFFER-FILE is the file
1133                                                ;; to be associated with the
1134                                                ;; merge buffer
1135                                                merge-buffer-file)
1136   "Merge two files with ancestor."
1137   (interactive
1138    (let ((dir-A (if ediff-use-last-dir
1139                     ediff-last-dir-A
1140                   default-directory))
1141          dir-B dir-ancestor f ff)
1142      (list (setq f (ediff-read-file-name
1143                     "File A to merge"
1144                     dir-A
1145                     (ediff-get-default-file-name)
1146                     'no-dirs))
1147            (setq ff (ediff-read-file-name "File B to merge"
1148                                           (setq dir-B
1149                                                 (if ediff-use-last-dir
1150                                                     ediff-last-dir-B
1151                                                   (file-name-directory f)))
1152                                           (progn
1153                                             (ediff-add-to-history
1154                                              'file-name-history
1155                                              (ediff-abbreviate-file-name
1156                                               (expand-file-name
1157                                                (file-name-nondirectory f)
1158                                                dir-B)))
1159                                             (ediff-get-default-file-name f 1))))
1160            (ediff-read-file-name "Ancestor file"
1161                                  (setq dir-ancestor
1162                                        (if ediff-use-last-dir
1163                                            ediff-last-dir-ancestor
1164                                          (file-name-directory ff)))
1165                                  (progn
1166                                    (ediff-add-to-history
1167                                     'file-name-history
1168                                     (ediff-abbreviate-file-name
1169                                      (expand-file-name
1170                                       (file-name-nondirectory ff)
1171                                       dir-ancestor)))
1172                                    (ediff-get-default-file-name ff 2)))
1173            )))
1174   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
1175   (ediff-files-internal file-A
1176                         (if (file-directory-p file-B)
1177                             (expand-file-name
1178                              (file-name-nondirectory file-A) file-B)
1179                           file-B)
1180                           file-ancestor
1181                           startup-hooks
1182                           'ediff-merge-files-with-ancestor
1183                           merge-buffer-file))
1184
1185 ;;;###autoload
1186 (defalias 'ediff-merge-with-ancestor 'ediff-merge-files-with-ancestor)
1187
1188 ;;;###autoload
1189 (defun ediff-merge-buffers (buffer-A buffer-B
1190                                      &optional
1191                                      ;; MERGE-BUFFER-FILE is the file to be
1192                                      ;; associated with the merge buffer
1193                                      startup-hooks job-name merge-buffer-file)
1194   "Merge buffers without ancestor."
1195   (interactive
1196    (let (bf)
1197      (list (setq bf (read-buffer "Buffer A to merge: "
1198                                  (ediff-other-buffer "") t))
1199            (read-buffer "Buffer B to merge: "
1200                         (progn
1201                           ;; realign buffers so that two visible bufs will be
1202                           ;; at the top
1203                           (save-window-excursion (other-window 1))
1204                           (ediff-other-buffer bf))
1205                         t))))
1206
1207   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
1208   (or job-name (setq job-name 'ediff-merge-buffers))
1209   (ediff-buffers-internal
1210    buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1211
1212 ;;;###autoload
1213 (defun ediff-merge-buffers-with-ancestor (buffer-A buffer-B buffer-ancestor
1214                                                    &optional
1215                                                    startup-hooks
1216                                                    job-name
1217                                                    ;; MERGE-BUFFER-FILE is the
1218                                                    ;; file to be associated
1219                                                    ;; with the merge buffer
1220                                                    merge-buffer-file)
1221   "Merge buffers with ancestor."
1222   (interactive
1223    (let (bf bff)
1224      (list (setq bf (read-buffer "Buffer A to merge: "
1225                                  (ediff-other-buffer "") t))
1226            (setq bff (read-buffer "Buffer B to merge: "
1227                                   (progn
1228                                     ;; realign buffers so that two visible
1229                                     ;; bufs will be at the top
1230                                     (save-window-excursion (other-window 1))
1231                                     (ediff-other-buffer bf))
1232                                   t))
1233            (read-buffer "Ancestor buffer: "
1234                                   (progn
1235                                     ;; realign buffers so that three visible
1236                                     ;; bufs will be at the top
1237                                     (save-window-excursion (other-window 1))
1238                                     (ediff-other-buffer (list bf bff)))
1239                                   t)
1240            )))
1241
1242   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
1243   (or job-name (setq job-name 'ediff-merge-buffers-with-ancestor))
1244   (ediff-buffers-internal
1245    buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1246
1247
1248 ;;;###autoload
1249 (defun ediff-merge-revisions (&optional file startup-hooks merge-buffer-file)
1250   ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1251   "Run Ediff by merging two revisions of a file.
1252 The file is the optional FILE argument or the file visited by the current
1253 buffer."
1254   (interactive)
1255   (if (stringp file) (find-file file))
1256   (let (rev1 rev2)
1257     (setq rev1
1258           (read-string
1259            (format
1260             "Version 1 to merge (default %s's working version): "
1261             (if (stringp file)
1262                 (file-name-nondirectory file) "current buffer")))
1263           rev2
1264           (read-string
1265            (format
1266             "Version 2 to merge (default %s): "
1267             (if (stringp file)
1268                 (file-name-nondirectory file) "current buffer"))))
1269     (ediff-load-version-control)
1270     ;; ancestor-revision=nil
1271     (funcall
1272      (intern (format "ediff-%S-merge-internal" ediff-version-control-package))
1273      rev1 rev2 nil startup-hooks merge-buffer-file)))
1274
1275
1276 ;;;###autoload
1277 (defun ediff-merge-revisions-with-ancestor (&optional
1278                                             file startup-hooks
1279                                             ;; MERGE-BUFFER-FILE is the file to
1280                                             ;; be associated with the merge
1281                                             ;; buffer
1282                                             merge-buffer-file)
1283   "Run Ediff by merging two revisions of a file with a common ancestor.
1284 The file is the optional FILE argument or the file visited by the current
1285 buffer."
1286   (interactive)
1287   (if (stringp file) (find-file file))
1288   (let (rev1 rev2 ancestor-rev)
1289     (setq rev1
1290           (read-string
1291            (format
1292             "Version 1 to merge (default %s's working version): "
1293             (if (stringp file)
1294                 (file-name-nondirectory file) "current buffer")))
1295           rev2
1296           (read-string
1297            (format
1298             "Version 2 to merge (default %s): "
1299             (if (stringp file)
1300                 (file-name-nondirectory file) "current buffer")))
1301           ancestor-rev
1302           (read-string
1303            (format
1304             "Ancestor version (default %s's base revision): "
1305             (if (stringp file)
1306                 (file-name-nondirectory file) "current buffer"))))
1307     (ediff-load-version-control)
1308     (funcall
1309      (intern (format "ediff-%S-merge-internal" ediff-version-control-package))
1310      rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1311
1312 ;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs
1313 ;;;###autoload
1314 (defun run-ediff-from-cvs-buffer (pos)
1315   "Run Ediff-merge on appropriate revisions of the selected file.
1316 First run after `M-x cvs-update'.  Then place the cursor on a line describing a
1317 file and then run `run-ediff-from-cvs-buffer'."
1318   (interactive "d")
1319   (ediff-load-version-control)
1320   (let ((tin (tin-locate cvs-cookie-handle pos)))
1321     (if tin
1322         (cvs-run-ediff-on-file-descriptor tin)
1323       (error "There is no file to merge"))))
1324
1325
1326 ;;; Apply patch
1327
1328 ;;;###autoload
1329 (defun ediff-patch-file (&optional arg patch-buf)
1330   "Run Ediff by patching SOURCE-FILENAME.
1331 If optional PATCH-BUF is given, use the patch in that buffer
1332 and don't ask the user.
1333 If prefix argument, then: if even argument, assume that the patch is in a
1334 buffer. If odd -- assume it is in a file."
1335   (interactive "P")
1336   (let (source-dir source-file)
1337     (require 'ediff-ptch)
1338     (setq patch-buf
1339           (ediff-get-patch-buffer
1340            (if arg (prefix-numeric-value arg)) patch-buf))
1341     (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch)
1342                            ((and (not ediff-patch-default-directory)
1343                                  (buffer-file-name patch-buf))
1344                             (file-name-directory
1345                              (expand-file-name
1346                               (buffer-file-name patch-buf))))
1347                            (t default-directory)))
1348     (setq source-file
1349           (read-file-name
1350            "File to patch (directory, if multifile patch): "
1351            ;; use an explicit initial file
1352            source-dir nil nil (ediff-get-default-file-name)))
1353     (ediff-dispatch-file-patching-job patch-buf source-file)))
1354
1355 ;;;###autoload
1356 (defun ediff-patch-buffer (&optional arg patch-buf)
1357   "Run Ediff by patching the buffer specified at prompt.
1358 Without the optional prefix ARG, asks if the patch is in some buffer and
1359 prompts for the buffer or a file, depending on the answer.
1360 With ARG=1, assumes the patch is in a file and prompts for the file.
1361 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1362 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1363 patch. If not given, the user is prompted according to the prefix argument."
1364   (interactive "P")
1365   (require 'ediff-ptch)
1366   (setq patch-buf
1367         (ediff-get-patch-buffer
1368          (if arg (prefix-numeric-value arg)) patch-buf))
1369   (ediff-patch-buffer-internal
1370    patch-buf
1371    (read-buffer
1372     "Which buffer to patch? "
1373     (ediff-other-buffer patch-buf))))
1374
1375
1376 ;;;###autoload
1377 (defalias 'epatch 'ediff-patch-file)
1378 ;;;###autoload
1379 (defalias 'epatch-buffer 'ediff-patch-buffer)
1380
1381
1382
1383 \f
1384 ;;; Versions Control functions
1385
1386 ;;;###autoload
1387 (defun ediff-revision (&optional file startup-hooks)
1388   "Run Ediff by comparing versions of a file.
1389 The file is an optional FILE argument or the file entered at the prompt.
1390 Default: the file visited by the current buffer.
1391 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1392   ;; if buffer is non-nil, use that buffer instead of the current buffer
1393   (interactive "P")
1394   (if (not (stringp file))
1395     (setq file
1396           (ediff-read-file-name "Compare revisions for file"
1397                                 (if ediff-use-last-dir
1398                                     ediff-last-dir-A
1399                                   default-directory)
1400                                 (ediff-get-default-file-name)
1401                                 'no-dirs)))
1402   (find-file file)
1403   (if (and (buffer-modified-p)
1404            (y-or-n-p (message "Buffer %s is modified. Save buffer? "
1405                               (buffer-name))))
1406       (save-buffer (current-buffer)))
1407   (let (rev1 rev2)
1408     (setq rev1
1409           (read-string
1410            (format "Revision 1 to compare (default %s's latest revision): "
1411                    (file-name-nondirectory file)))
1412           rev2
1413           (read-string
1414            (format "Revision 2 to compare (default %s's current state): "
1415                    (file-name-nondirectory file))))
1416     (ediff-load-version-control)
1417     (funcall
1418      (intern (format "ediff-%S-internal" ediff-version-control-package))
1419      rev1 rev2 startup-hooks)
1420     ))
1421
1422
1423 ;;;###autoload
1424 (defalias 'erevision 'ediff-revision)
1425
1426
1427 ;; Test if version control package is loaded and load if not
1428 ;; Is SILENT is non-nil, don't report error if package is not found.
1429 (defun ediff-load-version-control (&optional silent)
1430   (require 'ediff-vers)
1431   (or (featurep ediff-version-control-package)
1432       (if (locate-library (symbol-name ediff-version-control-package))
1433           (progn
1434             (message "") ; kill the message from `locate-library'
1435             (require ediff-version-control-package))
1436         (or silent
1437             (error "Version control package %S.el not found.  Use vc.el instead"
1438                    ediff-version-control-package)))))
1439
1440
1441 ;;;###autoload
1442 (defun ediff-version ()
1443   "Return string describing the version of Ediff.
1444 When called interactively, displays the version."
1445   (interactive)
1446   (if (interactive-p)
1447       (message (ediff-version))
1448     (format "Ediff %s of %s" ediff-version ediff-date)))
1449
1450
1451 ;;;###autoload
1452 (defun ediff-documentation (&optional node)
1453   "Display Ediff's manual.
1454 With optional NODE, goes to that node."
1455   (interactive)
1456   (let ((ctl-window ediff-control-window)
1457         (ctl-buf ediff-control-buffer))
1458
1459     (ediff-skip-unsuitable-frames)
1460     (condition-case nil
1461         (progn
1462           (pop-to-buffer (get-buffer-create "*info*"))
1463           (info (if ediff-xemacs-p "ediff.info" "ediff"))
1464           (if node
1465               (Info-goto-node node)
1466             (message "Type `i' to search for a specific topic"))
1467           (raise-frame (selected-frame)))
1468       (error (beep 1)
1469              (with-output-to-temp-buffer ediff-msg-buffer
1470                (ediff-with-current-buffer standard-output
1471                  (fundamental-mode))
1472                (princ ediff-BAD-INFO))
1473              (if (window-live-p ctl-window)
1474                  (progn
1475                    (select-window ctl-window)
1476                    (set-window-buffer ctl-window ctl-buf)))))))
1477
1478
1479 (dolist (mess '("^Errors in diff output. Diff output is in "
1480                 "^Hmm... I don't see an Ediff command around here...$"
1481                 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1482                 ": This command runs in Ediff Control Buffer only!$"
1483                 ": Invalid op in ediff-check-version$"
1484                 "^ediff-shrink-window-C can be used only for merging jobs$"
1485                 "^Lost difference info on these directories$"
1486                 "^This command is inapplicable in the present context$"
1487                 "^This session group has no parent$"
1488                 "^Can't hide active session, $"
1489                 "^Ediff: something wrong--no multiple diffs buffer$"
1490                 "^Can't make context diff for Session $"
1491                 "^The patch buffer wasn't found$"
1492                 "^Aborted$"
1493                 "^This Ediff session is not part of a session group$"
1494                 "^No active Ediff sessions or corrupted session registry$"
1495                 "^No session info in this line$"
1496                 "^`.*' is not an ordinary file$"
1497                 "^Patch appears to have failed$"
1498                 "^Recomputation of differences cancelled$"
1499                 "^No fine differences in this mode$"
1500                 "^Lost connection to ancestor buffer...sorry$"
1501                 "^Not merging with ancestor$"
1502                 "^Don't know how to toggle read-only in buffer "
1503                 "Emacs is not running as a window application$"
1504                 "^This command makes sense only when merging with an ancestor$"
1505                 "^At end of the difference list$"
1506                 "^At beginning of the difference list$"
1507                 "^Nothing saved for diff .* in buffer "
1508                 "^Buffer is out of sync for file "
1509                 "^Buffer out of sync for file "
1510                 "^Output from `diff' not found$"
1511                 "^You forgot to specify a region in buffer "
1512                 "^All right. Make up your mind and come back...$"
1513                 "^Current buffer is not visiting any file$"
1514                 "^Failed to retrieve revision: $"
1515                 "^Can't determine display width.$"
1516                 "^File `.*' does not exist or is not readable$"
1517                 "^File `.*' is a directory$"
1518                 "^Buffer .* doesn't exist$"
1519                 "^Directories . and . are the same: "
1520                 "^Directory merge aborted$"
1521                 "^Merge of directory revisions aborted$"
1522                 "^Buffer .* doesn't exist$"
1523                 "^There is no file to merge$"
1524                 "^Version control package .*.el not found. Use vc.el instead$"))
1525   (add-to-list 'debug-ignored-errors mess))
1526
1527
1528 (require 'ediff-util)
1529
1530 (run-hooks 'ediff-load-hook)
1531
1532 (provide 'ediff)
1533
1534
1535 ;;; Local Variables:
1536 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1537 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1538 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1539 ;;; End:
1540
1541 ;;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1542 ;;; ediff.el ends here