1999-10-09 23:52:39 +00:00
|
|
|
;;; diff-mode.el --- A mode for viewing/editing context diffs
|
|
|
|
|
|
2000-08-29 14:38:49 +00:00
|
|
|
;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
|
|
|
|
;; Keywords: patch diff
|
2000-08-29 14:38:49 +00:00
|
|
|
;; Revision: $Id: diff-mode.el,v 1.9 2000/08/16 19:56:10 monnier Exp $
|
1999-10-09 23:52:39 +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
|
|
|
|
|
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
;; Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; Provides support for font-lock patterns, outline-regexps, navigation
|
|
|
|
|
;; commands, editing and various conversions as well as jumping
|
|
|
|
|
;; to the corresponding source file.
|
|
|
|
|
|
|
|
|
|
;; inspired by Pavel Machek's patch-mode.el (<pavel@atrey.karlin.mff.cuni.cz>)
|
|
|
|
|
;; some efforts were spent to have it somewhat compatible with XEmacs'
|
|
|
|
|
;; diff-mode as well as with compilation-minor-mode
|
|
|
|
|
|
|
|
|
|
;; to use it, simply add to your .emacs the following lines:
|
|
|
|
|
;;
|
|
|
|
|
;; (autoload 'diff-mode "diff-mode" "Diff major mode" t)
|
|
|
|
|
;; (add-to-list 'auto-mode-alist '("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode))
|
|
|
|
|
|
|
|
|
|
;; Bugs:
|
|
|
|
|
|
2000-08-16 19:56:10 +00:00
|
|
|
;; - Reverse doesn't work with normal diffs.
|
|
|
|
|
;; - (nitpick) The mark is not always quite right in diff-goto-source.
|
|
|
|
|
;; - diff-apply-hunk only works on unified diffs.
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
;; Todo:
|
|
|
|
|
|
2000-08-16 19:56:10 +00:00
|
|
|
;; - Add change-log support.
|
|
|
|
|
;; - Spice up the minor-mode with font-lock support.
|
|
|
|
|
;; - Improve narrowed-view support.
|
|
|
|
|
;; - Improve the `compile' support (?).
|
|
|
|
|
;; - Recognize pcl-cvs' special string for `cvs-execute-single'.
|
|
|
|
|
;; - Support for # comments in context->unified.
|
|
|
|
|
;; - Do a fuzzy search in diff-goto-source.
|
|
|
|
|
;; - Allow diff.el to use diff-mode.
|
|
|
|
|
;; This mostly means ability to jump from half-hunk to half-hunk
|
|
|
|
|
;; in context (and normal) diffs and to jump to the corresponding
|
|
|
|
|
;; (i.e. new or old) file.
|
|
|
|
|
;; - Handle `diff -b' output in context->unified.
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defgroup diff-mode ()
|
|
|
|
|
"Major-mode for viewing/editing diffs"
|
2000-08-29 14:38:49 +00:00
|
|
|
:version "21.1"
|
1999-10-09 23:52:39 +00:00
|
|
|
:group 'tools
|
|
|
|
|
:group 'diff)
|
|
|
|
|
|
|
|
|
|
(defcustom diff-jump-to-old-file-flag nil
|
|
|
|
|
"*Non-nil means `diff-goto-source' jumps to the old file.
|
|
|
|
|
Else, it jumps to the new file."
|
|
|
|
|
:group 'diff-mode
|
|
|
|
|
:type '(boolean))
|
|
|
|
|
|
|
|
|
|
(defcustom diff-update-on-the-fly-flag t
|
|
|
|
|
"*Non-nil means hunk headers are kept up-to-date on-the-fly.
|
|
|
|
|
When editing a diff file, the line numbers in the hunk headers
|
|
|
|
|
need to be kept consistent with the actual diff. This can
|
|
|
|
|
either be done on the fly (but this sometimes interacts poorly with the
|
|
|
|
|
undo mechanism) or whenever the file is written (can be slow
|
|
|
|
|
when editing big diffs)."
|
|
|
|
|
:group 'diff-mode
|
|
|
|
|
:type '(boolean))
|
|
|
|
|
|
|
|
|
|
(defvar diff-mode-hook nil
|
|
|
|
|
"Run after setting up the `diff-mode' major mode.")
|
|
|
|
|
|
|
|
|
|
(defvar diff-outline-regexp
|
|
|
|
|
"\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
|
|
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
|
;;;; keymap, menu, ...
|
|
|
|
|
;;;;
|
|
|
|
|
|
2000-03-21 16:59:17 +00:00
|
|
|
(easy-mmode-defmap diff-mode-shared-map
|
2000-08-16 19:56:10 +00:00
|
|
|
'(;; From Pavel Machek's patch-mode.
|
2000-03-21 16:59:17 +00:00
|
|
|
("n" . diff-hunk-next)
|
|
|
|
|
("N" . diff-file-next)
|
|
|
|
|
("p" . diff-hunk-prev)
|
|
|
|
|
("P" . diff-file-prev)
|
|
|
|
|
("k" . diff-hunk-kill)
|
|
|
|
|
("K" . diff-file-kill)
|
2000-08-16 19:56:10 +00:00
|
|
|
;; From compilation-minor-mode.
|
2000-03-21 16:59:17 +00:00
|
|
|
("}" . diff-file-next)
|
|
|
|
|
("{" . diff-file-prev)
|
1999-10-09 23:52:39 +00:00
|
|
|
("\C-m" . diff-goto-source)
|
2000-08-29 14:38:49 +00:00
|
|
|
([mouse-2] . diff-mouse-goto-source)
|
2000-08-16 19:56:10 +00:00
|
|
|
;; From XEmacs' diff-mode.
|
1999-10-09 23:52:39 +00:00
|
|
|
("W" . widen)
|
|
|
|
|
;;("." . diff-goto-source) ;display-buffer
|
|
|
|
|
;;("f" . diff-goto-source) ;find-file
|
|
|
|
|
("o" . diff-goto-source) ;other-window
|
|
|
|
|
;;("w" . diff-goto-source) ;other-frame
|
|
|
|
|
;;("N" . diff-narrow)
|
|
|
|
|
;;("h" . diff-show-header)
|
|
|
|
|
;;("j" . diff-show-difference) ;jump to Nth diff
|
|
|
|
|
;;("q" . diff-quit)
|
|
|
|
|
(" " . scroll-up)
|
|
|
|
|
("\177" . scroll-down)
|
2000-08-16 19:56:10 +00:00
|
|
|
;; Our very own bindings.
|
1999-10-09 23:52:39 +00:00
|
|
|
("A" . diff-ediff-patch)
|
|
|
|
|
("r" . diff-restrict-view)
|
|
|
|
|
("R" . diff-reverse-direction)
|
|
|
|
|
("U" . diff-context->unified)
|
|
|
|
|
("C" . diff-unified->context))
|
1999-12-07 07:04:03 +00:00
|
|
|
"Basic keymap for `diff-mode', bound to various prefix keys.")
|
1999-10-09 23:52:39 +00:00
|
|
|
|
2000-03-21 16:59:17 +00:00
|
|
|
(easy-mmode-defmap diff-mode-map
|
1999-10-09 23:52:39 +00:00
|
|
|
`(("\e" . ,diff-mode-shared-map)
|
2000-08-16 19:56:10 +00:00
|
|
|
;; From compilation-minor-mode.
|
|
|
|
|
("\C-c\C-c" . diff-goto-source)
|
|
|
|
|
;; Misc operations.
|
|
|
|
|
("\C-cda" . diff-apply-hunk))
|
1999-10-09 23:52:39 +00:00
|
|
|
"Keymap for `diff-mode'. See also `diff-mode-shared-map'.")
|
|
|
|
|
|
|
|
|
|
(easy-menu-define diff-mode-menu diff-mode-map
|
|
|
|
|
"Menu for `diff-mode'."
|
|
|
|
|
'("Diff"
|
|
|
|
|
["Jump to Source" diff-goto-source t]
|
|
|
|
|
["Apply with Ediff" diff-ediff-patch t]
|
|
|
|
|
["-----" nil nil]
|
|
|
|
|
["Reverse direction" diff-reverse-direction t]
|
|
|
|
|
["Context -> Unified" diff-context->unified t]
|
|
|
|
|
["Unified -> Context" diff-unified->context t]
|
|
|
|
|
;;["Fixup Headers" diff-fixup-modifs (not buffer-read-only)]
|
|
|
|
|
))
|
|
|
|
|
|
1999-12-07 07:04:03 +00:00
|
|
|
(defcustom diff-minor-mode-prefix "\C-cd"
|
|
|
|
|
"Prefix key for `diff-minor-mode' commands."
|
|
|
|
|
:group 'diff-mode
|
|
|
|
|
:type '(choice (string "\e") (string "C-cd") string))
|
|
|
|
|
|
2000-03-21 16:59:17 +00:00
|
|
|
(easy-mmode-defmap diff-minor-mode-map
|
|
|
|
|
`((,diff-minor-mode-prefix . ,diff-mode-shared-map))
|
1999-12-07 07:04:03 +00:00
|
|
|
"Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.")
|
|
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
|
;;;; font-lock support
|
|
|
|
|
;;;;
|
|
|
|
|
|
|
|
|
|
(defface diff-file-header-face
|
|
|
|
|
'((((class color) (background light))
|
|
|
|
|
(:background "grey70" :bold t))
|
|
|
|
|
(t (:bold t)))
|
|
|
|
|
"diff-mode face used to highlight file header lines."
|
|
|
|
|
:group 'diff-mode)
|
|
|
|
|
(defvar diff-file-header-face 'diff-file-header-face)
|
|
|
|
|
|
|
|
|
|
(defface diff-index-face
|
|
|
|
|
'((((class color) (background light))
|
|
|
|
|
(:background "grey70" :bold t))
|
|
|
|
|
(t (:bold t)))
|
|
|
|
|
"diff-mode face used to highlight index header lines."
|
|
|
|
|
:group 'diff-mode)
|
|
|
|
|
(defvar diff-index-face 'diff-index-face)
|
|
|
|
|
|
|
|
|
|
(defface diff-hunk-header-face
|
|
|
|
|
'((((class color) (background light))
|
|
|
|
|
(:background "grey85"))
|
|
|
|
|
(t (:bold t)))
|
|
|
|
|
"diff-mode face used to highlight hunk header lines."
|
|
|
|
|
:group 'diff-mode)
|
|
|
|
|
(defvar diff-hunk-header-face 'diff-hunk-header-face)
|
|
|
|
|
|
|
|
|
|
(defface diff-removed-face
|
|
|
|
|
'((t ()))
|
|
|
|
|
"diff-mode face used to highlight removed lines."
|
|
|
|
|
:group 'diff-mode)
|
|
|
|
|
(defvar diff-removed-face 'diff-removed-face)
|
|
|
|
|
|
|
|
|
|
(defface diff-added-face
|
|
|
|
|
'((t ()))
|
|
|
|
|
"diff-mode face used to highlight added lines."
|
|
|
|
|
:group 'diff-mode)
|
|
|
|
|
(defvar diff-added-face 'diff-added-face)
|
|
|
|
|
|
|
|
|
|
(defface diff-changed-face
|
|
|
|
|
'((t ()))
|
|
|
|
|
"diff-mode face used to highlight changed lines."
|
|
|
|
|
:group 'diff-mode)
|
|
|
|
|
(defvar diff-changed-face 'diff-changed-face)
|
|
|
|
|
|
|
|
|
|
(defvar diff-font-lock-keywords
|
2000-09-07 20:16:22 +00:00
|
|
|
'(("^@@ \\(-[0-9,]+ \\+[0-9,]+\\) @@\\(.*\\)$" ;unified
|
|
|
|
|
(1 diff-hunk-header-face)
|
|
|
|
|
(2 font-lock-comment-face))
|
|
|
|
|
("^--- \\(.+\\) ----$" ;context
|
|
|
|
|
(1 diff-hunk-header-face))
|
|
|
|
|
("\\(\\*\\{15\\}\\)\\(.*\\)\n" ;context
|
|
|
|
|
(1 diff-hunk-header-face)
|
|
|
|
|
(2 font-lock-comment-face))
|
|
|
|
|
("^\\*\\*\\* \\(.+\\) \\*\\*\\*" ;context
|
|
|
|
|
(1 diff-hunk-header-face))
|
|
|
|
|
("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\(\\S-+\\)" (2 diff-file-header-face))
|
1999-10-09 23:52:39 +00:00
|
|
|
("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face)
|
|
|
|
|
("^!.*\n" . diff-changed-face) ;context
|
|
|
|
|
("^[+>].*\n" . diff-added-face)
|
|
|
|
|
("^[-<].*\n" . diff-removed-face)
|
2000-09-07 20:16:22 +00:00
|
|
|
("^Index: \\(.+\\)$" (1 diff-index-face))
|
2000-05-10 22:12:46 +00:00
|
|
|
("^#.*" . font-lock-string-face)
|
1999-10-09 23:52:39 +00:00
|
|
|
("^[^-=+*!<>].*\n" . font-lock-comment-face)))
|
|
|
|
|
|
|
|
|
|
(defconst diff-font-lock-defaults
|
2000-05-10 22:12:46 +00:00
|
|
|
'(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil)))
|
1999-10-09 23:52:39 +00:00
|
|
|
|
2000-08-29 14:38:49 +00:00
|
|
|
(defvar diff-imenu-generic-expression
|
|
|
|
|
;; Prefer second name as first is most likely to be a backup or
|
|
|
|
|
;; version-control name.
|
|
|
|
|
'((nil "\\+\\+\\+\\ \\([^\t\n]+\\)\t" 1) ; unidiffs
|
|
|
|
|
(nil "^--- \\([^\t\n]+\\)\t.*\n\\*" 1))) ; context diffs
|
|
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
;;;;
|
|
|
|
|
;;;; Compile support
|
|
|
|
|
;;;;
|
|
|
|
|
|
|
|
|
|
(defvar diff-file-regexp-alist
|
|
|
|
|
'(("Index: \\(.+\\)" 1)))
|
|
|
|
|
|
|
|
|
|
(defvar diff-error-regexp-alist
|
|
|
|
|
'(("@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@" nil 2)
|
|
|
|
|
("--- \\([0-9]+\\),[0-9]+ ----" nil 1)
|
|
|
|
|
("\\([0-9]+\\)\\(,[0-9]+\\)?[adc]\\([0-9]+\\)" nil 3)))
|
|
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
|
;;;; Movement
|
|
|
|
|
;;;;
|
|
|
|
|
|
2000-06-05 07:30:09 +00:00
|
|
|
(defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
|
1999-10-09 23:52:39 +00:00
|
|
|
(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+\\|\\*\\*\\* .+\n---\\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
|
|
|
|
|
(defvar diff-narrowed-to nil)
|
|
|
|
|
|
|
|
|
|
(defun diff-end-of-hunk (&optional style)
|
|
|
|
|
(if (looking-at diff-hunk-header-re) (goto-char (match-end 0)))
|
2000-05-10 22:12:46 +00:00
|
|
|
(let ((end (and (re-search-forward (case style
|
|
|
|
|
(unified "^[^-+# \\]")
|
|
|
|
|
(context "^[^-+#! \\]")
|
|
|
|
|
(normal "^[^<>#\\]")
|
|
|
|
|
(t "^[^-+#!<> \\]"))
|
|
|
|
|
nil t)
|
|
|
|
|
(match-beginning 0))))
|
|
|
|
|
;; The return value is used by easy-mmode-define-navigation.
|
|
|
|
|
(goto-char (or end (point-max)))))
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
(defun diff-beginning-of-hunk ()
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(unless (looking-at diff-hunk-header-re)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(condition-case ()
|
|
|
|
|
(re-search-backward diff-hunk-header-re)
|
|
|
|
|
(error (error "Can't find the beginning of the hunk")))))
|
|
|
|
|
|
|
|
|
|
(defun diff-beginning-of-file ()
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(unless (looking-at diff-file-header-re)
|
|
|
|
|
(forward-line 2)
|
|
|
|
|
(condition-case ()
|
|
|
|
|
(re-search-backward diff-file-header-re)
|
|
|
|
|
(error (error "Can't find the beginning of the file")))))
|
|
|
|
|
|
|
|
|
|
(defun diff-end-of-file ()
|
2000-05-10 22:12:46 +00:00
|
|
|
(re-search-forward "^[-+#!<>0-9@* \\]" nil t)
|
|
|
|
|
(re-search-forward "^[^-+#!<>0-9@* \\]" nil 'move)
|
1999-10-09 23:52:39 +00:00
|
|
|
(beginning-of-line))
|
|
|
|
|
|
2000-03-21 16:59:17 +00:00
|
|
|
;; Define diff-{hunk,file}-{prev,next}
|
|
|
|
|
(easy-mmode-define-navigation
|
|
|
|
|
diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk)
|
|
|
|
|
(easy-mmode-define-navigation
|
|
|
|
|
diff-file diff-file-header-re "file" diff-end-of-hunk)
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
(defun diff-restrict-view (&optional arg)
|
|
|
|
|
"Restrict the view to the current hunk.
|
|
|
|
|
If the prefix ARG is given, restrict the view to the current file instead."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if arg (diff-beginning-of-file) (diff-beginning-of-hunk))
|
|
|
|
|
(narrow-to-region (point)
|
|
|
|
|
(progn (if arg (diff-end-of-file) (diff-end-of-hunk))
|
|
|
|
|
(point)))
|
|
|
|
|
(set (make-local-variable 'diff-narrowed-to) (if arg 'file 'hunk))))
|
|
|
|
|
|
|
|
|
|
|
2000-03-21 16:59:17 +00:00
|
|
|
(defun diff-hunk-kill ()
|
1999-10-09 23:52:39 +00:00
|
|
|
"Kill current hunk."
|
|
|
|
|
(interactive)
|
|
|
|
|
(diff-beginning-of-hunk)
|
|
|
|
|
(let ((start (point))
|
|
|
|
|
(firsthunk (save-excursion
|
|
|
|
|
(ignore-errors
|
2000-03-21 16:59:17 +00:00
|
|
|
(diff-beginning-of-file) (diff-hunk-next) (point))))
|
1999-10-09 23:52:39 +00:00
|
|
|
(nexthunk (save-excursion
|
|
|
|
|
(ignore-errors
|
2000-03-21 16:59:17 +00:00
|
|
|
(diff-hunk-next) (point))))
|
1999-10-09 23:52:39 +00:00
|
|
|
(nextfile (save-excursion
|
|
|
|
|
(ignore-errors
|
2000-03-21 16:59:17 +00:00
|
|
|
(diff-file-next) (point)))))
|
1999-10-09 23:52:39 +00:00
|
|
|
(if (and firsthunk (= firsthunk start)
|
|
|
|
|
(or (null nexthunk)
|
|
|
|
|
(and nextfile (> nexthunk nextfile))))
|
|
|
|
|
;; we're the only hunk for this file, so kill the file
|
2000-03-21 16:59:17 +00:00
|
|
|
(diff-file-kill)
|
1999-10-09 23:52:39 +00:00
|
|
|
(diff-end-of-hunk)
|
|
|
|
|
(kill-region start (point)))))
|
|
|
|
|
|
2000-03-21 16:59:17 +00:00
|
|
|
(defun diff-file-kill ()
|
1999-10-09 23:52:39 +00:00
|
|
|
"Kill current file's hunks."
|
|
|
|
|
(interactive)
|
|
|
|
|
(diff-beginning-of-file)
|
|
|
|
|
(let* ((start (point))
|
|
|
|
|
(prevhunk (save-excursion
|
|
|
|
|
(ignore-errors
|
2000-03-21 16:59:17 +00:00
|
|
|
(diff-hunk-prev) (point))))
|
1999-10-09 23:52:39 +00:00
|
|
|
(index (save-excursion
|
|
|
|
|
(re-search-backward "^Index: " prevhunk t))))
|
|
|
|
|
(when index (setq start index))
|
|
|
|
|
(diff-end-of-file)
|
|
|
|
|
(kill-region start (point))))
|
|
|
|
|
|
2000-02-07 02:01:07 +00:00
|
|
|
(defun diff-kill-junk ()
|
|
|
|
|
"Kill spurious empty diffs."
|
|
|
|
|
(interactive)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward (concat "^\\(Index: .*\n\\)"
|
|
|
|
|
"\\([^-+!* <>].*\n\\)*?"
|
|
|
|
|
"\\(\\(Index:\\) \\|"
|
|
|
|
|
diff-file-header-re "\\)")
|
|
|
|
|
nil t)
|
|
|
|
|
(delete-region (if (match-end 4) (match-beginning 0) (match-end 1))
|
|
|
|
|
(match-beginning 3))
|
|
|
|
|
(beginning-of-line)))))
|
|
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
;;;;
|
|
|
|
|
;;;; jump to other buffers
|
|
|
|
|
;;;;
|
|
|
|
|
|
1999-12-07 07:04:03 +00:00
|
|
|
(defvar diff-remembered-files-alist nil)
|
|
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
(defun diff-filename-drop-dir (file)
|
|
|
|
|
(when (string-match "/" file) (substring file (match-end 0))))
|
|
|
|
|
|
1999-12-07 07:04:03 +00:00
|
|
|
(defun diff-merge-strings (ancestor from to)
|
|
|
|
|
"Merge the diff between ANCESTOR and FROM into TO.
|
|
|
|
|
Returns the merged string if successful or nil otherwise.
|
2000-03-21 16:59:17 +00:00
|
|
|
The strings are assumed not to contain any \"\\n\" (i.e. end of line).
|
1999-12-07 07:04:03 +00:00
|
|
|
If ANCESTOR = FROM, returns TO.
|
|
|
|
|
If ANCESTOR = TO, returns FROM.
|
|
|
|
|
The heuristic is simplistic and only really works for cases
|
|
|
|
|
like \(diff-merge-strings \"b/foo\" \"b/bar\" \"/a/c/foo\")."
|
|
|
|
|
;; Ideally, we want:
|
|
|
|
|
;; AMB ANB CMD -> CND
|
|
|
|
|
;; but that's ambiguous if `foo' or `bar' is empty:
|
|
|
|
|
;; a/foo a/foo1 b/foo.c -> b/foo1.c but not 1b/foo.c or b/foo.c1
|
2000-03-21 16:59:17 +00:00
|
|
|
(let ((str (concat ancestor "\n" from "\n" to)))
|
1999-12-07 07:04:03 +00:00
|
|
|
(when (and (string-match (concat
|
2000-03-21 16:59:17 +00:00
|
|
|
"\\`\\(.*?\\)\\(.*\\)\\(.*\\)\n"
|
|
|
|
|
"\\1\\(.*\\)\\3\n"
|
1999-12-07 07:04:03 +00:00
|
|
|
"\\(.*\\(\\2\\).*\\)\\'") str)
|
|
|
|
|
(equal to (match-string 5 str)))
|
|
|
|
|
(concat (substring str (match-beginning 5) (match-beginning 6))
|
|
|
|
|
(match-string 4 str)
|
|
|
|
|
(substring str (match-end 6) (match-end 5))))))
|
|
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
(defun diff-find-file-name (&optional old)
|
|
|
|
|
"Return the file corresponding to the current patch.
|
|
|
|
|
Non-nil OLD means that we want the old file."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(unless (looking-at diff-file-header-re)
|
|
|
|
|
(or (ignore-errors (diff-beginning-of-file))
|
|
|
|
|
(re-search-forward diff-file-header-re nil t)))
|
|
|
|
|
(let* ((limit (save-excursion
|
|
|
|
|
(condition-case ()
|
2000-03-21 16:59:17 +00:00
|
|
|
(progn (diff-hunk-prev) (point))
|
1999-10-09 23:52:39 +00:00
|
|
|
(error (point-min)))))
|
1999-10-13 22:26:45 +00:00
|
|
|
(header-files
|
|
|
|
|
(if (looking-at "[-*][-*][-*] \\(\\S-+\\)\\s-.*\n[-+][-+][-+] \\(\\S-+\\)\\s-.*$")
|
|
|
|
|
(list (if old (match-string 1) (match-string 2))
|
|
|
|
|
(if old (match-string 2) (match-string 1)))
|
|
|
|
|
(forward-line 1) nil))
|
1999-10-09 23:52:39 +00:00
|
|
|
(fs (append
|
|
|
|
|
(when (save-excursion
|
|
|
|
|
(re-search-backward "^Index: \\(.+\\)" limit t))
|
|
|
|
|
(list (match-string 1)))
|
1999-10-13 22:26:45 +00:00
|
|
|
header-files
|
1999-10-09 23:52:39 +00:00
|
|
|
(when (re-search-backward "^diff \\(-\\S-+ +\\)*\\(\\S-+\\)\\( +\\(\\S-+\\)\\)?" nil t)
|
|
|
|
|
(list (if old (match-string 2) (match-string 4))
|
|
|
|
|
(if old (match-string 4) (match-string 2))))))
|
1999-12-07 07:04:03 +00:00
|
|
|
(fs (delq nil fs)))
|
1999-10-09 23:52:39 +00:00
|
|
|
(or
|
1999-12-07 07:04:03 +00:00
|
|
|
;; use any previously used preference
|
|
|
|
|
(cdr (assoc fs diff-remembered-files-alist))
|
|
|
|
|
;; try to be clever and use previous choices as an inspiration
|
|
|
|
|
(dolist (rf diff-remembered-files-alist)
|
|
|
|
|
(let ((newfile (diff-merge-strings (caar rf) (car fs) (cdr rf))))
|
|
|
|
|
(if (and newfile (file-exists-p newfile)) (return newfile))))
|
|
|
|
|
;; look for each file in turn. If none found, try again but
|
|
|
|
|
;; ignoring the first level of directory, ...
|
|
|
|
|
(do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files)))
|
|
|
|
|
(file nil nil))
|
|
|
|
|
((or (null files)
|
|
|
|
|
(setq file (do* ((files files (cdr files))
|
|
|
|
|
(file (car files) (car files)))
|
|
|
|
|
((or (null file) (file-exists-p file))
|
|
|
|
|
file))))
|
|
|
|
|
file))
|
|
|
|
|
;; <foo>.rej patches implicitly apply to <foo>
|
1999-10-09 23:52:39 +00:00
|
|
|
(and (string-match "\\.rej\\'" (or buffer-file-name ""))
|
|
|
|
|
(let ((file (substring buffer-file-name 0 (match-beginning 0))))
|
|
|
|
|
(when (file-exists-p file) file)))
|
1999-12-07 07:04:03 +00:00
|
|
|
;; if all else fails, ask the user
|
|
|
|
|
(let ((file (read-file-name (format "Use file %s: " (or (first fs) ""))
|
|
|
|
|
nil (first fs) t (first fs))))
|
|
|
|
|
(set (make-local-variable 'diff-remembered-files-alist)
|
|
|
|
|
(cons (cons fs file) diff-remembered-files-alist))
|
1999-10-09 23:52:39 +00:00
|
|
|
file)))))
|
|
|
|
|
|
2000-08-16 19:56:10 +00:00
|
|
|
(defun diff-find-source-location (&optional other-file)
|
|
|
|
|
"Find out (FILE LINE SPAN)."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(diff-beginning-of-hunk)
|
|
|
|
|
(let* ((old (if (not other-file) diff-jump-to-old-file-flag
|
|
|
|
|
(not diff-jump-to-old-file-flag)))
|
|
|
|
|
;; Find the location specification.
|
|
|
|
|
(loc (if (not (looking-at "\\(?:\\*\\{15\\}.*\n\\)?[-@* ]*\\([0-9,]+\\)\\([ acd+]+\\([0-9,]+\\)\\)?"))
|
|
|
|
|
(error "Can't find the hunk header")
|
|
|
|
|
(if old (match-string 1)
|
|
|
|
|
(if (match-end 3) (match-string 3)
|
|
|
|
|
(unless (re-search-forward "^--- \\([0-9,]+\\)" nil t)
|
|
|
|
|
(error "Can't find the hunk separator"))
|
|
|
|
|
(match-string 1)))))
|
|
|
|
|
;; Extract the actual line number.
|
|
|
|
|
(lines (if (string-match "^\\([0-9]*\\),\\([0-9]*\\)" loc)
|
|
|
|
|
(cons (string-to-number (match-string 1 loc))
|
|
|
|
|
(string-to-number (match-string 2 loc)))
|
|
|
|
|
(cons (string-to-number loc) nil)))
|
|
|
|
|
(file (diff-find-file-name old))
|
|
|
|
|
(line (car lines))
|
|
|
|
|
(span (if (or (null (cdr lines)) (< (cdr lines) 0)) 0
|
|
|
|
|
;; Bad hack.
|
|
|
|
|
(if (< (cdr lines) line) (cdr lines)
|
|
|
|
|
(- (cdr lines) line)))))
|
|
|
|
|
;; Update the user preference if he so wished.
|
|
|
|
|
(when (> (prefix-numeric-value other-file) 8)
|
|
|
|
|
(setq diff-jump-to-old-file-flag old))
|
|
|
|
|
(if (null file) (error "Can't find the file")
|
|
|
|
|
(list file line span)))))
|
|
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
(defun diff-goto-source (&optional other-file)
|
|
|
|
|
"Jump to the corresponding source line.
|
|
|
|
|
`diff-jump-to-old-file-flag' (or its opposite if the OTHER-FILE prefix arg
|
|
|
|
|
is give) determines whether to jump to the old or the new file.
|
|
|
|
|
If the prefix arg is bigger than 8 (for example with \\[universal-argument] \\[universal-argument])
|
2000-08-16 19:56:10 +00:00
|
|
|
then `diff-jump-to-old-file-flag' is also set, for the next invocations."
|
1999-10-09 23:52:39 +00:00
|
|
|
(interactive "P")
|
|
|
|
|
(save-excursion
|
2000-08-16 19:56:10 +00:00
|
|
|
(let ((loc (diff-find-source-location other-file)))
|
|
|
|
|
(pop-to-buffer (find-file-noselect (car loc)))
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(goto-line (+ (cadr loc) (caddr loc)))
|
|
|
|
|
(push-mark (point) t t)
|
|
|
|
|
(goto-line (cadr loc))))))
|
1999-10-09 23:52:39 +00:00
|
|
|
|
2000-09-07 20:16:22 +00:00
|
|
|
(defun diff-mouse-goto-source (event)
|
|
|
|
|
"Run `diff-goto-source' for the diff at a mouse click."
|
|
|
|
|
(interactive "e")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(mouse-set-point event)
|
|
|
|
|
(diff-goto-source)))
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
(defun diff-ediff-patch ()
|
|
|
|
|
"Call `ediff-patch-file' on the current buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(condition-case err
|
2000-05-10 22:12:46 +00:00
|
|
|
(ediff-patch-file nil (current-buffer))
|
1999-10-09 23:52:39 +00:00
|
|
|
(wrong-number-of-arguments (ediff-patch-file))))
|
|
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
|
;;;; Conversion functions
|
|
|
|
|
;;;;
|
|
|
|
|
|
|
|
|
|
;;(defvar diff-inhibit-after-change nil
|
|
|
|
|
;; "Non-nil means inhibit `diff-mode's after-change functions.")
|
|
|
|
|
|
|
|
|
|
(defun diff-unified->context (start end)
|
|
|
|
|
"Convert unified diffs to context diffs.
|
|
|
|
|
START and END are either taken from the region (if a prefix arg is given) or
|
|
|
|
|
else cover the whole bufer."
|
|
|
|
|
(interactive (if current-prefix-arg
|
|
|
|
|
(list (mark) (point))
|
|
|
|
|
(list (point-min) (point-max))))
|
|
|
|
|
(unless (markerp end) (setq end (copy-marker end)))
|
|
|
|
|
(let (;;(diff-inhibit-after-change t)
|
|
|
|
|
(inhibit-read-only t))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char start)
|
2000-06-05 07:30:09 +00:00
|
|
|
(while (and (re-search-forward "^\\(\\(---\\) .+\n\\(\\+\\+\\+\\) .+\\|@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@.*\\)$" nil t)
|
1999-10-09 23:52:39 +00:00
|
|
|
(< (point) end))
|
|
|
|
|
(combine-after-change-calls
|
|
|
|
|
(if (match-beginning 2)
|
2000-05-10 22:12:46 +00:00
|
|
|
;; we matched a file header
|
1999-10-09 23:52:39 +00:00
|
|
|
(progn
|
|
|
|
|
;; use reverse order to make sure the indices are kept valid
|
|
|
|
|
(replace-match "---" t t nil 3)
|
|
|
|
|
(replace-match "***" t t nil 2))
|
|
|
|
|
;; we matched a hunk header
|
|
|
|
|
(let ((line1 (match-string 4))
|
|
|
|
|
(lines1 (match-string 5))
|
|
|
|
|
(line2 (match-string 6))
|
|
|
|
|
(lines2 (match-string 7)))
|
|
|
|
|
(replace-match
|
|
|
|
|
(concat "***************\n*** " line1 ","
|
|
|
|
|
(number-to-string (+ (string-to-number line1)
|
|
|
|
|
(string-to-number lines1)
|
|
|
|
|
-1)) " ****"))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region (point)
|
|
|
|
|
(progn (diff-end-of-hunk 'unified) (point)))
|
|
|
|
|
(let ((hunk (buffer-string)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (not (save-excursion (re-search-forward "^-" nil t)))
|
|
|
|
|
(delete-region (point) (point-max))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(let ((modif nil) last-pt)
|
|
|
|
|
(while (progn (setq last-pt (point))
|
|
|
|
|
(= (forward-line -1) 0))
|
|
|
|
|
(case (char-after)
|
|
|
|
|
(? (insert " ") (setq modif nil) (backward-char 1))
|
|
|
|
|
(?+ (delete-region (point) last-pt) (setq modif t))
|
|
|
|
|
(?- (if (not modif)
|
|
|
|
|
(progn (forward-char 1)
|
|
|
|
|
(insert " "))
|
|
|
|
|
(delete-char 1)
|
|
|
|
|
(insert "! "))
|
|
|
|
|
(backward-char 2))
|
|
|
|
|
(?\\ (when (save-excursion (forward-line -1)
|
|
|
|
|
(= (char-after) ?+))
|
|
|
|
|
(delete-region (point) last-pt) (setq modif t)))
|
|
|
|
|
(t (setq modif nil))))))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(insert "--- " line2 ","
|
|
|
|
|
(number-to-string (+ (string-to-number line2)
|
|
|
|
|
(string-to-number lines2)
|
|
|
|
|
-1)) " ----\n" hunk))
|
|
|
|
|
;;(goto-char (point-min))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(if (not (save-excursion (re-search-forward "^+" nil t)))
|
|
|
|
|
(delete-region (point) (point-max))
|
|
|
|
|
(let ((modif nil) (delete nil))
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(case (char-after)
|
|
|
|
|
(? (insert " ") (setq modif nil) (backward-char 1))
|
|
|
|
|
(?- (setq delete t) (setq modif t))
|
|
|
|
|
(?+ (if (not modif)
|
|
|
|
|
(progn (forward-char 1)
|
|
|
|
|
(insert " "))
|
|
|
|
|
(delete-char 1)
|
|
|
|
|
(insert "! "))
|
|
|
|
|
(backward-char 2))
|
|
|
|
|
(?\\ (when (save-excursion (forward-line 1)
|
|
|
|
|
(not (eobp)))
|
|
|
|
|
(setq delete t) (setq modif t)))
|
|
|
|
|
(t (setq modif nil)))
|
|
|
|
|
(let ((last-pt (point)))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(when delete
|
|
|
|
|
(delete-region last-pt (point))
|
|
|
|
|
(setq delete nil)))))))))))))))
|
|
|
|
|
|
|
|
|
|
(defun diff-context->unified (start end)
|
|
|
|
|
"Convert context diffs to unified diffs.
|
|
|
|
|
START and END are either taken from the region (if a prefix arg is given) or
|
|
|
|
|
else cover the whole bufer."
|
|
|
|
|
(interactive (if current-prefix-arg
|
|
|
|
|
(list (mark) (point))
|
|
|
|
|
(list (point-min) (point-max))))
|
|
|
|
|
(unless (markerp end) (setq end (copy-marker end)))
|
|
|
|
|
(let (;;(diff-inhibit-after-change t)
|
|
|
|
|
(inhibit-read-only t))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char start)
|
2000-06-05 07:30:09 +00:00
|
|
|
(while (and (re-search-forward "^\\(\\(\\*\\*\\*\\) .+\n\\(---\\) .+\\|\\*\\{15\\}.*\n\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]+\\) \\*\\*\\*\\*\\)$" nil t)
|
1999-10-09 23:52:39 +00:00
|
|
|
(< (point) end))
|
|
|
|
|
(combine-after-change-calls
|
|
|
|
|
(if (match-beginning 2)
|
|
|
|
|
;; we matched a file header
|
|
|
|
|
(progn
|
|
|
|
|
;; use reverse order to make sure the indices are kept valid
|
|
|
|
|
(replace-match "+++" t t nil 3)
|
|
|
|
|
(replace-match "---" t t nil 2))
|
|
|
|
|
;; we matched a hunk header
|
|
|
|
|
(let ((line1s (match-string 4))
|
|
|
|
|
(line1e (match-string 5))
|
|
|
|
|
(pt1 (match-beginning 0)))
|
|
|
|
|
(replace-match "")
|
|
|
|
|
(unless (re-search-forward
|
|
|
|
|
"^--- \\([0-9]+\\),\\(-?[0-9]+\\) ----$" nil t)
|
|
|
|
|
(error "Can't find matching `--- n1,n2 ----' line"))
|
|
|
|
|
(let ((line2s (match-string 1))
|
|
|
|
|
(line2e (match-string 2))
|
|
|
|
|
(pt2 (progn
|
|
|
|
|
(delete-region (progn (beginning-of-line) (point))
|
|
|
|
|
(progn (forward-line 1) (point)))
|
|
|
|
|
(point-marker))))
|
|
|
|
|
(goto-char pt1)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(while (< (point) pt2)
|
|
|
|
|
(case (char-after)
|
|
|
|
|
((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
|
|
|
|
|
(?\ ;merge with the other half of the chunk
|
|
|
|
|
(let* ((endline2
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char pt2) (forward-line 1) (point)))
|
|
|
|
|
(c (char-after pt2)))
|
|
|
|
|
(case c
|
|
|
|
|
((?! ?+)
|
|
|
|
|
(insert "+"
|
|
|
|
|
(prog1 (buffer-substring (+ pt2 2) endline2)
|
|
|
|
|
(delete-region pt2 endline2))))
|
|
|
|
|
(?\ ;FIXME: check consistency
|
|
|
|
|
(delete-region pt2 endline2)
|
|
|
|
|
(delete-char 1)
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
(?\\ (forward-line 1))
|
|
|
|
|
(t (delete-char 1) (forward-line 1)))))
|
|
|
|
|
(t (forward-line 1))))
|
|
|
|
|
(while (looking-at "[+! ] ")
|
|
|
|
|
(if (/= (char-after) ?!) (forward-char 1)
|
|
|
|
|
(delete-char 1) (insert "+"))
|
|
|
|
|
(delete-char 1) (forward-line 1))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char pt1)
|
|
|
|
|
(insert "@@ -" line1s ","
|
|
|
|
|
(number-to-string (- (string-to-number line1e)
|
|
|
|
|
(string-to-number line1s)
|
|
|
|
|
-1))
|
|
|
|
|
" +" line2s ","
|
|
|
|
|
(number-to-string (- (string-to-number line2e)
|
|
|
|
|
(string-to-number line2s)
|
|
|
|
|
-1)) " @@"))))))))))
|
|
|
|
|
|
|
|
|
|
(defun diff-reverse-direction (start end)
|
|
|
|
|
"Reverse the direction of the diffs.
|
|
|
|
|
START and END are either taken from the region (if a prefix arg is given) or
|
|
|
|
|
else cover the whole bufer."
|
|
|
|
|
(interactive (if current-prefix-arg
|
|
|
|
|
(list (mark) (point))
|
|
|
|
|
(list (point-min) (point-max))))
|
|
|
|
|
(unless (markerp end) (setq end (copy-marker end)))
|
|
|
|
|
(let (;;(diff-inhibit-after-change t)
|
|
|
|
|
(inhibit-read-only t))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char start)
|
2000-06-05 07:30:09 +00:00
|
|
|
(while (and (re-search-forward "^\\(\\([-*][-*][-*] \\)\\(.+\\)\n\\([-+][-+][-+] \\)\\(.+\\)\\|\\*\\{15\\}.*\n\\*\\*\\* \\(.+\\) \\*\\*\\*\\*\\|@@ -\\([0-9,]+\\) \\+\\([0-9,]+\\) @@.*\\)$" nil t)
|
1999-10-09 23:52:39 +00:00
|
|
|
(< (point) end))
|
|
|
|
|
(combine-after-change-calls
|
|
|
|
|
(cond
|
|
|
|
|
;; a file header
|
|
|
|
|
((match-beginning 2) (replace-match "\\2\\5\n\\4\\3" nil))
|
|
|
|
|
;; a context-diff hunk header
|
|
|
|
|
((match-beginning 6)
|
|
|
|
|
(let ((pt-lines1 (match-beginning 6))
|
|
|
|
|
(lines1 (match-string 6)))
|
|
|
|
|
(replace-match "" nil nil nil 6)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(let ((half1s (point)))
|
2000-05-10 22:12:46 +00:00
|
|
|
(while (looking-at "[-! \\][ \t]\\|#")
|
1999-10-09 23:52:39 +00:00
|
|
|
(when (= (char-after) ?-) (delete-char 1) (insert "+"))
|
|
|
|
|
(forward-line 1))
|
2000-02-07 02:01:07 +00:00
|
|
|
(let ((half1 (delete-and-extract-region half1s (point))))
|
1999-10-09 23:52:39 +00:00
|
|
|
(unless (looking-at "^--- \\([0-9]+,-?[0-9]+\\) ----$")
|
|
|
|
|
(insert half1)
|
|
|
|
|
(error "Can't find matching `--- n1,n2 ----' line"))
|
|
|
|
|
(let ((str1 (match-string 1)))
|
|
|
|
|
(replace-match lines1 nil nil nil 1)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(let ((half2s (point)))
|
2000-05-10 22:12:46 +00:00
|
|
|
(while (looking-at "[!+ \\][ \t]\\|#")
|
1999-10-09 23:52:39 +00:00
|
|
|
(when (= (char-after) ?+) (delete-char 1) (insert "-"))
|
|
|
|
|
(forward-line 1))
|
2000-02-07 02:01:07 +00:00
|
|
|
(let ((half2 (delete-and-extract-region half2s (point))))
|
2000-05-10 22:12:46 +00:00
|
|
|
(insert (or half1 ""))
|
1999-10-09 23:52:39 +00:00
|
|
|
(goto-char half1s)
|
2000-05-10 22:12:46 +00:00
|
|
|
(insert (or half2 ""))))
|
1999-10-09 23:52:39 +00:00
|
|
|
(goto-char pt-lines1)
|
|
|
|
|
(insert str1))))))
|
|
|
|
|
;; a unified-diff hunk header
|
|
|
|
|
((match-beginning 7)
|
|
|
|
|
(replace-match "@@ -\\8 +\\7 @@" nil)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(let ((c (char-after)) first last)
|
|
|
|
|
(while (case (setq c (char-after))
|
|
|
|
|
(?- (setq first (or first (point)))
|
|
|
|
|
(delete-char 1) (insert "+") t)
|
|
|
|
|
(?+ (setq last (or last (point)))
|
|
|
|
|
(delete-char 1) (insert "-") t)
|
2000-05-10 22:12:46 +00:00
|
|
|
((?\\ ?#) t)
|
1999-10-09 23:52:39 +00:00
|
|
|
(t (when (and first last (< first last))
|
2000-02-07 02:01:07 +00:00
|
|
|
(let ((str
|
|
|
|
|
(save-excursion
|
|
|
|
|
(delete-and-extract-region first last))))
|
1999-10-09 23:52:39 +00:00
|
|
|
(insert str)))
|
|
|
|
|
(setq first nil last nil)
|
|
|
|
|
(equal ?\ c)))
|
|
|
|
|
(forward-line 1))))))))))
|
|
|
|
|
|
|
|
|
|
(defun diff-fixup-modifs (start end)
|
|
|
|
|
"Fixup the hunk headers (in case the buffer was modified).
|
|
|
|
|
START and END are either taken from the region (if a prefix arg is given) or
|
|
|
|
|
else cover the whole bufer."
|
|
|
|
|
(interactive (if current-prefix-arg
|
|
|
|
|
(list (mark) (point))
|
|
|
|
|
(list (point-min) (point-max))))
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char end) (diff-end-of-hunk)
|
|
|
|
|
(let ((plus 0) (minus 0) (space 0) (bang 0))
|
|
|
|
|
(while (and (= (forward-line -1) 0) (<= start (point)))
|
2000-06-05 07:30:09 +00:00
|
|
|
(if (not (looking-at "\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|[-*][-*][-*] .+ [-*][-*][-*][-*]\\)$"))
|
1999-10-09 23:52:39 +00:00
|
|
|
(case (char-after)
|
|
|
|
|
(?\ (incf space))
|
|
|
|
|
(?+ (incf plus))
|
|
|
|
|
(?- (incf minus))
|
|
|
|
|
(?! (incf bang))
|
2000-05-10 22:12:46 +00:00
|
|
|
((?\\ ?#) nil)
|
1999-10-09 23:52:39 +00:00
|
|
|
(t (setq space 0 plus 0 minus 0 bang 0)))
|
|
|
|
|
(cond
|
2000-06-05 07:30:09 +00:00
|
|
|
((looking-at "@@ -[0-9]+,\\([0-9]*\\) \\+[0-9]+,\\([0-9]*\\) @@.*$")
|
1999-10-09 23:52:39 +00:00
|
|
|
(let* ((old1 (match-string 1))
|
|
|
|
|
(old2 (match-string 2))
|
|
|
|
|
(new1 (number-to-string (+ space minus)))
|
|
|
|
|
(new2 (number-to-string (+ space plus))))
|
|
|
|
|
(unless (string= new2 old2) (replace-match new2 t t nil 2))
|
|
|
|
|
(unless (string= new1 old1) (replace-match new1 t t nil 1))))
|
|
|
|
|
((looking-at "--- \\([0-9]+\\),\\([0-9]*\\) ----$")
|
|
|
|
|
(when (> (+ space bang plus) 0)
|
|
|
|
|
(let* ((old1 (match-string 1))
|
|
|
|
|
(old2 (match-string 2))
|
|
|
|
|
(new (number-to-string
|
|
|
|
|
(+ space bang plus -1 (string-to-number old1)))))
|
|
|
|
|
(unless (string= new old2) (replace-match new t t nil 2)))))
|
|
|
|
|
((looking-at "\\*\\*\\* \\([0-9]+\\),\\(-?[0-9]*\\) \\*\\*\\*\\*$")
|
|
|
|
|
(when (> (+ space bang minus) 0)
|
|
|
|
|
(let* ((old (match-string 1))
|
|
|
|
|
(new (format
|
|
|
|
|
(concat "%0" (number-to-string (length old)) "d")
|
|
|
|
|
(+ space bang minus -1 (string-to-number old)))))
|
|
|
|
|
(unless (string= new old) (replace-match new t t nil 2))))))
|
|
|
|
|
(setq space 0 plus 0 minus 0 bang 0)))))))
|
|
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
|
;;;; Hooks
|
|
|
|
|
;;;;
|
|
|
|
|
|
|
|
|
|
(defun diff-write-contents-hooks ()
|
|
|
|
|
"Fixup hunk headers if necessary."
|
|
|
|
|
(if (buffer-modified-p) (diff-fixup-modifs (point-min) (point-max)))
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
;; It turns out that making changes in the buffer from within an
|
|
|
|
|
;; *-change-function is asking for trouble, whereas making them
|
|
|
|
|
;; from a post-command-hook doesn't pose much problems
|
|
|
|
|
(defvar diff-unhandled-changes nil)
|
|
|
|
|
(defun diff-after-change-function (beg end len)
|
|
|
|
|
"Remember to fixup the hunk header.
|
|
|
|
|
See `after-change-functions' for the meaning of BEG, END and LEN."
|
2000-06-05 07:30:09 +00:00
|
|
|
;; Ignoring changes when inhibit-read-only is set is strictly speaking
|
|
|
|
|
;; incorrect, but it turns out that inhibit-read-only is normally not set
|
|
|
|
|
;; inside editing commands, while it tends to be set when the buffer gets
|
|
|
|
|
;; updated by an async process or by a conversion function, both of which
|
|
|
|
|
;; would rather not be uselessly slowed down by this hook.
|
1999-10-09 23:52:39 +00:00
|
|
|
(when (and (not undo-in-progress) (not inhibit-read-only))
|
|
|
|
|
(if diff-unhandled-changes
|
|
|
|
|
(setq diff-unhandled-changes
|
|
|
|
|
(cons (min beg (car diff-unhandled-changes))
|
|
|
|
|
(max beg (cdr diff-unhandled-changes))))
|
|
|
|
|
(setq diff-unhandled-changes (cons beg end)))))
|
|
|
|
|
|
|
|
|
|
(defun diff-post-command-hook ()
|
|
|
|
|
"Fixup hunk headers if necessary."
|
|
|
|
|
(when (consp diff-unhandled-changes)
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(save-excursion
|
2000-02-07 02:01:07 +00:00
|
|
|
(goto-char (car diff-unhandled-changes))
|
|
|
|
|
(unless (ignore-errors
|
|
|
|
|
(diff-beginning-of-hunk)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(diff-end-of-hunk)
|
|
|
|
|
(> (point) (car diff-unhandled-changes))))
|
|
|
|
|
(goto-char (car diff-unhandled-changes))
|
|
|
|
|
(re-search-forward diff-hunk-header-re (cdr diff-unhandled-changes))
|
|
|
|
|
(diff-beginning-of-hunk))
|
1999-10-09 23:52:39 +00:00
|
|
|
(diff-fixup-modifs (point) (cdr diff-unhandled-changes))))
|
|
|
|
|
(setq diff-unhandled-changes nil)))
|
|
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
|
;;;; The main function
|
|
|
|
|
;;;;
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2000-03-21 16:59:17 +00:00
|
|
|
(define-derived-mode diff-mode fundamental-mode "Diff"
|
1999-12-07 07:04:03 +00:00
|
|
|
"Major mode for viewing/editing context diffs.
|
1999-10-09 23:52:39 +00:00
|
|
|
Supports unified and context diffs as well as (to a lesser extent) normal diffs.
|
|
|
|
|
When the buffer is read-only, the ESC prefix is not necessary.
|
|
|
|
|
This mode runs `diff-mode-hook'.
|
|
|
|
|
\\{diff-mode-map}"
|
|
|
|
|
(set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
|
|
|
|
|
(set (make-local-variable 'outline-regexp) diff-outline-regexp)
|
2000-08-29 14:38:49 +00:00
|
|
|
(set (make-local-variable 'imenu-generic-expression)
|
|
|
|
|
diff-imenu-generic-expression)
|
2000-09-07 20:16:22 +00:00
|
|
|
;; These are not perfect. They would be better done separately for
|
|
|
|
|
;; context diffs and unidiffs.
|
|
|
|
|
;; (set (make-local-variable 'paragraph-start)
|
|
|
|
|
;; (concat "@@ " ; unidiff hunk
|
|
|
|
|
;; "\\|\\*\\*\\* " ; context diff hunk or file start
|
|
|
|
|
;; "\\|--- [^\t]+\t")) ; context or unidiff file
|
|
|
|
|
;; ; start (first or second line)
|
|
|
|
|
;; (set (make-local-variable 'paragraph-separate) paragraph-start)
|
|
|
|
|
;; (set (make-local-variable 'page-delimiter) "--- [^\t]+\t")
|
|
|
|
|
;; compile support
|
1999-10-09 23:52:39 +00:00
|
|
|
(set (make-local-variable 'compilation-file-regexp-alist)
|
|
|
|
|
diff-file-regexp-alist)
|
|
|
|
|
(set (make-local-variable 'compilation-error-regexp-alist)
|
|
|
|
|
diff-error-regexp-alist)
|
|
|
|
|
(when (string-match "\\.rej\\'" (or buffer-file-name ""))
|
|
|
|
|
(set (make-local-variable 'compilation-current-file)
|
|
|
|
|
(substring buffer-file-name 0 (match-beginning 0))))
|
|
|
|
|
(compilation-shell-minor-mode 1)
|
2000-02-07 02:01:07 +00:00
|
|
|
;; setup change hooks
|
|
|
|
|
(toggle-read-only t)
|
1999-10-09 23:52:39 +00:00
|
|
|
(if (not diff-update-on-the-fly-flag)
|
|
|
|
|
(add-hook 'write-contents-hooks 'diff-write-contents-hooks)
|
|
|
|
|
(make-local-variable 'diff-unhandled-changes)
|
1999-12-07 07:04:03 +00:00
|
|
|
(add-hook (make-local-hook 'after-change-functions)
|
|
|
|
|
'diff-after-change-function nil t)
|
|
|
|
|
(add-hook (make-local-hook 'post-command-hook)
|
|
|
|
|
'diff-post-command-hook nil t))
|
1999-10-09 23:52:39 +00:00
|
|
|
;; Neat trick from Dave Love to add more bindings in read-only mode:
|
2000-02-07 02:01:07 +00:00
|
|
|
(add-to-list (make-local-variable 'minor-mode-overriding-map-alist)
|
2000-03-21 16:59:17 +00:00
|
|
|
(cons 'buffer-read-only diff-mode-shared-map)))
|
1999-10-09 23:52:39 +00:00
|
|
|
|
|
|
|
|
;;;###autoload
|
1999-12-07 07:04:03 +00:00
|
|
|
(define-minor-mode diff-minor-mode
|
|
|
|
|
"Minor mode for viewing/editing context diffs.
|
|
|
|
|
\\{diff-minor-mode-map}"
|
|
|
|
|
nil " Diff" nil
|
|
|
|
|
;; FIXME: setup font-lock
|
2000-02-07 02:01:07 +00:00
|
|
|
;; setup change hooks
|
|
|
|
|
(if (not diff-update-on-the-fly-flag)
|
|
|
|
|
(add-hook 'write-contents-hooks 'diff-write-contents-hooks)
|
|
|
|
|
(make-local-variable 'diff-unhandled-changes)
|
|
|
|
|
(add-hook (make-local-hook 'after-change-functions)
|
|
|
|
|
'diff-after-change-function nil t)
|
|
|
|
|
(add-hook (make-local-hook 'post-command-hook)
|
|
|
|
|
'diff-post-command-hook nil t)))
|
1999-12-07 07:04:03 +00:00
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
|
2000-08-16 19:56:10 +00:00
|
|
|
;;;
|
|
|
|
|
;;; Misc operations that have proved useful at some point.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(defun diff-next-complex-hunk ()
|
|
|
|
|
"Jump to the next \"complex\" hunk.
|
|
|
|
|
\"Complex\" is approximated by \"the hunk changes the number of lines\".
|
|
|
|
|
Only works for unified diffs."
|
|
|
|
|
(interactive)
|
|
|
|
|
(while
|
|
|
|
|
(and (re-search-forward "^@@ [-0-9]+,\\([0-9]+\\) [+0-9]+,\\([0-9]+\\) @@"
|
|
|
|
|
nil t)
|
|
|
|
|
(equal (match-string 1) (match-string 2)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun diff-filter-lines (char)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(if (eq (char-after) char)
|
|
|
|
|
(delete-region (point) (progn (forward-line 1) (point)))
|
|
|
|
|
(delete-char 1)
|
|
|
|
|
(forward-line 1))))
|
|
|
|
|
|
|
|
|
|
(defun diff-apply-hunk (&optional reverse)
|
|
|
|
|
"Apply the current hunk.
|
|
|
|
|
With a prefix argument, REVERSE the hunk.
|
|
|
|
|
FIXME: Only works for unified diffs."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((loc (diff-find-source-location nil)))
|
|
|
|
|
(diff-beginning-of-hunk)
|
|
|
|
|
(unless (looking-at diff-hunk-header-re) (error "Help! Mom!"))
|
|
|
|
|
(goto-char (1+ (match-end 0)))
|
|
|
|
|
;; Extract the SRC and DEST strings.
|
|
|
|
|
(let ((text (buffer-substring (point) (progn (diff-end-of-hunk) (point))))
|
|
|
|
|
src dest)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert text)
|
|
|
|
|
(diff-filter-lines ?+)
|
|
|
|
|
(setq src (buffer-string))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert text)
|
|
|
|
|
(diff-filter-lines ?-)
|
|
|
|
|
(setq dest (buffer-string)))
|
|
|
|
|
;; Exchange the two strings if we're reversing the patch.
|
|
|
|
|
(if reverse (let ((tmp src)) (setq src dest) (setq dest tmp)))
|
|
|
|
|
;; Look for SRC in the file.
|
|
|
|
|
(pop-to-buffer (find-file-noselect (car loc)))
|
|
|
|
|
(goto-line (cadr loc))
|
|
|
|
|
(let* ((pos (point))
|
|
|
|
|
(forw (and (search-forward src nil t)
|
|
|
|
|
(match-beginning 0)))
|
|
|
|
|
(back (and (goto-char (+ pos (length src)))
|
|
|
|
|
(search-backward src nil t)
|
|
|
|
|
(match-beginning 0))))
|
|
|
|
|
;; Choose the closest match.
|
|
|
|
|
(setq pos (if (and forw back)
|
|
|
|
|
(if (> (- forw pos) (- pos back)) back forw)
|
|
|
|
|
(or back forw)))
|
|
|
|
|
(unless pos (error "Can't find the text to patch"))
|
|
|
|
|
;; Do it!
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(delete-char (length src))
|
|
|
|
|
(insert dest))))))
|
|
|
|
|
|
|
|
|
|
|
1999-10-09 23:52:39 +00:00
|
|
|
;; provide the package
|
|
|
|
|
(provide 'diff-mode)
|
|
|
|
|
|
2000-08-16 19:56:10 +00:00
|
|
|
;;; Old Change Log from when diff-mode wasn't part of Emacs:
|
1999-10-09 23:52:39 +00:00
|
|
|
;; Revision 1.11 1999/10/09 23:38:29 monnier
|
|
|
|
|
;; (diff-mode-load-hook): dropped.
|
|
|
|
|
;; (auto-mode-alist): also catch *.diffs.
|
|
|
|
|
;; (diff-find-file-name, diff-mode): add smarts to find the right file
|
|
|
|
|
;; for *.rej files (that lack any file name indication).
|
|
|
|
|
;;
|
|
|
|
|
;; Revision 1.10 1999/09/30 15:32:11 monnier
|
|
|
|
|
;; added support for "\ No newline at end of file".
|
|
|
|
|
;;
|
|
|
|
|
;; Revision 1.9 1999/09/15 00:01:13 monnier
|
|
|
|
|
;; - added basic `compile' support.
|
|
|
|
|
;; - have diff-kill-hunk call diff-kill-file if it's the only hunk.
|
|
|
|
|
;; - diff-kill-file now tries to kill the leading garbage as well.
|
|
|
|
|
;;
|
|
|
|
|
;; Revision 1.8 1999/09/13 21:10:09 monnier
|
|
|
|
|
;; - don't use CL in the autoloaded code
|
|
|
|
|
;; - accept diffs using -T
|
|
|
|
|
;;
|
|
|
|
|
;; Revision 1.7 1999/09/05 20:53:03 monnier
|
|
|
|
|
;; interface to ediff-patch
|
|
|
|
|
;;
|
|
|
|
|
;; Revision 1.6 1999/09/01 20:55:13 monnier
|
|
|
|
|
;; (ediff=patch-file): add bindings to call ediff-patch.
|
|
|
|
|
;; (diff-find-file-name): taken out of diff-goto-source.
|
|
|
|
|
;; (diff-unified->context, diff-context->unified, diff-reverse-direction,
|
|
|
|
|
;; diff-fixup-modifs): only use the region if a prefix arg is given.
|
|
|
|
|
;;
|
|
|
|
|
;; Revision 1.5 1999/08/31 19:18:52 monnier
|
|
|
|
|
;; (diff-beginning-of-file, diff-prev-file): fixed wrong parenthesis.
|
|
|
|
|
;;
|
|
|
|
|
;; Revision 1.4 1999/08/31 13:01:44 monnier
|
|
|
|
|
;; use `combine-after-change-calls' to minimize the slowdown of font-lock.
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
;;; diff-mode.el ends here
|
