Andrew's git - gitweb.git/blob

342c78348ed66566be2afa61e748eef7d971aaa2
   1;;; git.el --- A user interface for git
   2
   3;; Copyright (C) 2005, 2006, 2007 Alexandre Julliard <julliard@winehq.org>
   4
   5;; Version: 1.0
   6
   7;; This program is free software; you can redistribute it and/or
   8;; modify it under the terms of the GNU General Public License as
   9;; published by the Free Software Foundation; either version 2 of
  10;; the License, or (at your option) any later version.
  11;;
  12;; This program is distributed in the hope that it will be
  13;; useful, but WITHOUT ANY WARRANTY; without even the implied
  14;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  15;; PURPOSE.  See the GNU General Public License for more details.
  16;;
  17;; You should have received a copy of the GNU General Public
  18;; License along with this program; if not, write to the Free
  19;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  20;; MA 02111-1307 USA
  21
  22;;; Commentary:
  23
  24;; This file contains an interface for the git version control
  25;; system. It provides easy access to the most frequently used git
  26;; commands. The user interface is as far as possible identical to
  27;; that of the PCL-CVS mode.
  28;;
  29;; To install: put this file on the load-path and place the following
  30;; in your .emacs file:
  31;;
  32;;    (require 'git)
  33;;
  34;; To start: `M-x git-status'
  35;;
  36;; TODO
  37;;  - portability to XEmacs
  38;;  - better handling of subprocess errors
  39;;  - diff against other branch
  40;;  - renaming files from the status buffer
  41;;  - creating tags
  42;;  - fetch/pull
  43;;  - switching branches
  44;;  - revlist browser
  45;;  - git-show-branch browser
  46;;  - menus
  47;;
  48
  49(eval-when-compile (require 'cl))
  50(require 'ewoc)
  51(require 'log-edit)
  52(require 'easymenu)
  53
  54
  55;;;; Customizations
  56;;;; ------------------------------------------------------------
  57
  58(defgroup git nil
  59  "A user interface for the git versioning system."
  60  :group 'tools)
  61
  62(defcustom git-committer-name nil
  63  "User name to use for commits.
  64The default is to fall back to the repository config,
  65then to `add-log-full-name' and then to `user-full-name'."
  66  :group 'git
  67  :type '(choice (const :tag "Default" nil)
  68                 (string :tag "Name")))
  69
  70(defcustom git-committer-email nil
  71  "Email address to use for commits.
  72The default is to fall back to the git repository config,
  73then to `add-log-mailing-address' and then to `user-mail-address'."
  74  :group 'git
  75  :type '(choice (const :tag "Default" nil)
  76                 (string :tag "Email")))
  77
  78(defcustom git-commits-coding-system nil
  79  "Default coding system for the log message of git commits."
  80  :group 'git
  81  :type '(choice (const :tag "From repository config" nil)
  82                 (coding-system)))
  83
  84(defcustom git-append-signed-off-by nil
  85  "Whether to append a Signed-off-by line to the commit message before editing."
  86  :group 'git
  87  :type 'boolean)
  88
  89(defcustom git-reuse-status-buffer t
  90  "Whether `git-status' should try to reuse an existing buffer
  91if there is already one that displays the same directory."
  92  :group 'git
  93  :type 'boolean)
  94
  95(defcustom git-per-dir-ignore-file ".gitignore"
  96  "Name of the per-directory ignore file."
  97  :group 'git
  98  :type 'string)
  99
 100(defcustom git-show-uptodate nil
 101  "Whether to display up-to-date files."
 102  :group 'git
 103  :type 'boolean)
 104
 105(defcustom git-show-ignored nil
 106  "Whether to display ignored files."
 107  :group 'git
 108  :type 'boolean)
 109
 110(defcustom git-show-unknown t
 111  "Whether to display unknown files."
 112  :group 'git
 113  :type 'boolean)
 114
 115
 116(defface git-status-face
 117  '((((class color) (background light)) (:foreground "purple"))
 118    (((class color) (background dark)) (:foreground "salmon")))
 119  "Git mode face used to highlight added and modified files."
 120  :group 'git)
 121
 122(defface git-unmerged-face
 123  '((((class color) (background light)) (:foreground "red" :bold t))
 124    (((class color) (background dark)) (:foreground "red" :bold t)))
 125  "Git mode face used to highlight unmerged files."
 126  :group 'git)
 127
 128(defface git-unknown-face
 129  '((((class color) (background light)) (:foreground "goldenrod" :bold t))
 130    (((class color) (background dark)) (:foreground "goldenrod" :bold t)))
 131  "Git mode face used to highlight unknown files."
 132  :group 'git)
 133
 134(defface git-uptodate-face
 135  '((((class color) (background light)) (:foreground "grey60"))
 136    (((class color) (background dark)) (:foreground "grey40")))
 137  "Git mode face used to highlight up-to-date files."
 138  :group 'git)
 139
 140(defface git-ignored-face
 141  '((((class color) (background light)) (:foreground "grey60"))
 142    (((class color) (background dark)) (:foreground "grey40")))
 143  "Git mode face used to highlight ignored files."
 144  :group 'git)
 145
 146(defface git-mark-face
 147  '((((class color) (background light)) (:foreground "red" :bold t))
 148    (((class color) (background dark)) (:foreground "tomato" :bold t)))
 149  "Git mode face used for the file marks."
 150  :group 'git)
 151
 152(defface git-header-face
 153  '((((class color) (background light)) (:foreground "blue"))
 154    (((class color) (background dark)) (:foreground "blue")))
 155  "Git mode face used for commit headers."
 156  :group 'git)
 157
 158(defface git-separator-face
 159  '((((class color) (background light)) (:foreground "brown"))
 160    (((class color) (background dark)) (:foreground "brown")))
 161  "Git mode face used for commit separator."
 162  :group 'git)
 163
 164(defface git-permission-face
 165  '((((class color) (background light)) (:foreground "green" :bold t))
 166    (((class color) (background dark)) (:foreground "green" :bold t)))
 167  "Git mode face used for permission changes."
 168  :group 'git)
 169
 170
 171;;;; Utilities
 172;;;; ------------------------------------------------------------
 173
 174(defconst git-log-msg-separator "--- log message follows this line ---")
 175
 176(defvar git-log-edit-font-lock-keywords
 177  `(("^\\(Author:\\|Date:\\|Parent:\\|Signed-off-by:\\)\\(.*\\)$"
 178     (1 font-lock-keyword-face)
 179     (2 font-lock-function-name-face))
 180    (,(concat "^\\(" (regexp-quote git-log-msg-separator) "\\)$")
 181     (1 font-lock-comment-face))))
 182
 183(defun git-get-env-strings (env)
 184  "Build a list of NAME=VALUE strings from a list of environment strings."
 185  (mapcar (lambda (entry) (concat (car entry) "=" (cdr entry))) env))
 186
 187(defun git-call-process-env (buffer env &rest args)
 188  "Wrapper for call-process that sets environment strings."
 189  (if env
 190      (apply #'call-process "env" nil buffer nil
 191             (append (git-get-env-strings env) (list "git") args))
 192    (apply #'call-process "git" nil buffer nil args)))
 193
 194(defun git-call-process-env-string (env &rest args)
 195  "Wrapper for call-process that sets environment strings,
 196and returns the process output as a string."
 197  (with-temp-buffer
 198    (and (eq 0 (apply #' git-call-process-env t env args))
 199         (buffer-string))))
 200
 201(defun git-run-process-region (buffer start end program args)
 202  "Run a git process with a buffer region as input."
 203  (let ((output-buffer (current-buffer))
 204        (dir default-directory))
 205    (with-current-buffer buffer
 206      (cd dir)
 207      (apply #'call-process-region start end program
 208             nil (list output-buffer nil) nil args))))
 209
 210(defun git-run-command-buffer (buffer-name &rest args)
 211  "Run a git command, sending the output to a buffer named BUFFER-NAME."
 212  (let ((dir default-directory)
 213        (buffer (get-buffer-create buffer-name)))
 214    (message "Running git %s..." (car args))
 215    (with-current-buffer buffer
 216      (let ((default-directory dir)
 217            (buffer-read-only nil))
 218        (erase-buffer)
 219        (apply #'git-call-process-env buffer nil args)))
 220    (message "Running git %s...done" (car args))
 221    buffer))
 222
 223(defun git-run-command-region (buffer start end env &rest args)
 224  "Run a git command with specified buffer region as input."
 225  (unless (eq 0 (if env
 226                    (git-run-process-region
 227                     buffer start end "env"
 228                     (append (git-get-env-strings env) (list "git") args))
 229                  (git-run-process-region
 230                   buffer start end "git" args)))
 231    (error "Failed to run \"git %s\":\n%s" (mapconcat (lambda (x) x) args " ") (buffer-string))))
 232
 233(defun git-run-hook (hook env &rest args)
 234  "Run a git hook and display its output if any."
 235  (let ((dir default-directory)
 236        (hook-name (expand-file-name (concat ".git/hooks/" hook))))
 237    (or (not (file-executable-p hook-name))
 238        (let (status (buffer (get-buffer-create "*Git Hook Output*")))
 239          (with-current-buffer buffer
 240            (erase-buffer)
 241            (cd dir)
 242            (setq status
 243                  (if env
 244                      (apply #'call-process "env" nil (list buffer t) nil
 245                             (append (git-get-env-strings env) (list hook-name) args))
 246                    (apply #'call-process hook-name nil (list buffer t) nil args))))
 247          (display-message-or-buffer buffer)
 248          (eq 0 status)))))
 249
 250(defun git-get-string-sha1 (string)
 251  "Read a SHA1 from the specified string."
 252  (and string
 253       (string-match "[0-9a-f]\\{40\\}" string)
 254       (match-string 0 string)))
 255
 256(defun git-get-committer-name ()
 257  "Return the name to use as GIT_COMMITTER_NAME."
 258  ; copied from log-edit
 259  (or git-committer-name
 260      (git-config "user.name")
 261      (and (boundp 'add-log-full-name) add-log-full-name)
 262      (and (fboundp 'user-full-name) (user-full-name))
 263      (and (boundp 'user-full-name) user-full-name)))
 264
 265(defun git-get-committer-email ()
 266  "Return the email address to use as GIT_COMMITTER_EMAIL."
 267  ; copied from log-edit
 268  (or git-committer-email
 269      (git-config "user.email")
 270      (and (boundp 'add-log-mailing-address) add-log-mailing-address)
 271      (and (fboundp 'user-mail-address) (user-mail-address))
 272      (and (boundp 'user-mail-address) user-mail-address)))
 273
 274(defun git-get-commits-coding-system ()
 275  "Return the coding system to use for commits."
 276  (let ((repo-config (git-config "i18n.commitencoding")))
 277    (or git-commits-coding-system
 278        (and repo-config
 279             (fboundp 'locale-charset-to-coding-system)
 280             (locale-charset-to-coding-system repo-config))
 281      'utf-8)))
 282
 283(defun git-get-logoutput-coding-system ()
 284  "Return the coding system used for git-log output."
 285  (let ((repo-config (or (git-config "i18n.logoutputencoding")
 286                         (git-config "i18n.commitencoding"))))
 287    (or git-commits-coding-system
 288        (and repo-config
 289             (fboundp 'locale-charset-to-coding-system)
 290             (locale-charset-to-coding-system repo-config))
 291      'utf-8)))
 292
 293(defun git-escape-file-name (name)
 294  "Escape a file name if necessary."
 295  (if (string-match "[\n\t\"\\]" name)
 296      (concat "\""
 297              (mapconcat (lambda (c)
 298                   (case c
 299                     (?\n "\\n")
 300                     (?\t "\\t")
 301                     (?\\ "\\\\")
 302                     (?\" "\\\"")
 303                     (t (char-to-string c))))
 304                 name "")
 305              "\"")
 306    name))
 307
 308(defun git-success-message (text files)
 309  "Print a success message after having handled FILES."
 310  (let ((n (length files)))
 311    (if (equal n 1)
 312        (message "%s %s" text (car files))
 313      (message "%s %d files" text n))))
 314
 315(defun git-get-top-dir (dir)
 316  "Retrieve the top-level directory of a git tree."
 317  (let ((cdup (with-output-to-string
 318                (with-current-buffer standard-output
 319                  (cd dir)
 320                  (unless (eq 0 (call-process "git" nil t nil "rev-parse" "--show-cdup"))
 321                    (error "cannot find top-level git tree for %s." dir))))))
 322    (expand-file-name (concat (file-name-as-directory dir)
 323                              (car (split-string cdup "\n"))))))
 324
 325;stolen from pcl-cvs
 326(defun git-append-to-ignore (file)
 327  "Add a file name to the ignore file in its directory."
 328  (let* ((fullname (expand-file-name file))
 329         (dir (file-name-directory fullname))
 330         (name (file-name-nondirectory fullname))
 331         (ignore-name (expand-file-name git-per-dir-ignore-file dir))
 332         (created (not (file-exists-p ignore-name))))
 333  (save-window-excursion
 334    (set-buffer (find-file-noselect ignore-name))
 335    (goto-char (point-max))
 336    (unless (zerop (current-column)) (insert "\n"))
 337    (insert "/" name "\n")
 338    (sort-lines nil (point-min) (point-max))
 339    (save-buffer))
 340  (when created
 341    (git-call-process-env nil nil "update-index" "--add" "--" (file-relative-name ignore-name)))
 342  (git-update-status-files (list (file-relative-name ignore-name)) 'unknown)))
 343
 344; propertize definition for XEmacs, stolen from erc-compat
 345(eval-when-compile
 346  (unless (fboundp 'propertize)
 347    (defun propertize (string &rest props)
 348      (let ((string (copy-sequence string)))
 349        (while props
 350          (put-text-property 0 (length string) (nth 0 props) (nth 1 props) string)
 351          (setq props (cddr props)))
 352        string))))
 353
 354;;;; Wrappers for basic git commands
 355;;;; ------------------------------------------------------------
 356
 357(defun git-rev-parse (rev)
 358  "Parse a revision name and return its SHA1."
 359  (git-get-string-sha1
 360   (git-call-process-env-string nil "rev-parse" rev)))
 361
 362(defun git-config (key)
 363  "Retrieve the value associated to KEY in the git repository config file."
 364  (let ((str (git-call-process-env-string nil "config" key)))
 365    (and str (car (split-string str "\n")))))
 366
 367(defun git-symbolic-ref (ref)
 368  "Wrapper for the git-symbolic-ref command."
 369  (let ((str (git-call-process-env-string nil "symbolic-ref" ref)))
 370    (and str (car (split-string str "\n")))))
 371
 372(defun git-update-ref (ref newval &optional oldval reason)
 373  "Update a reference by calling git-update-ref."
 374  (let ((args (and oldval (list oldval))))
 375    (push newval args)
 376    (push ref args)
 377    (when reason
 378     (push reason args)
 379     (push "-m" args))
 380    (eq 0 (apply #'git-call-process-env nil nil "update-ref" args))))
 381
 382(defun git-read-tree (tree &optional index-file)
 383  "Read a tree into the index file."
 384  (apply #'git-call-process-env nil
 385         (if index-file `(("GIT_INDEX_FILE" . ,index-file)) nil)
 386         "read-tree" (if tree (list tree))))
 387
 388(defun git-write-tree (&optional index-file)
 389  "Call git-write-tree and return the resulting tree SHA1 as a string."
 390  (git-get-string-sha1
 391   (git-call-process-env-string (and index-file `(("GIT_INDEX_FILE" . ,index-file))) "write-tree")))
 392
 393(defun git-commit-tree (buffer tree head)
 394  "Call git-commit-tree with buffer as input and return the resulting commit SHA1."
 395  (let ((author-name (git-get-committer-name))
 396        (author-email (git-get-committer-email))
 397        (subject "commit (initial): ")
 398        author-date log-start log-end args coding-system-for-write)
 399    (when head
 400      (setq subject "commit: ")
 401      (push "-p" args)
 402      (push head args))
 403    (with-current-buffer buffer
 404      (goto-char (point-min))
 405      (if
 406          (setq log-start (re-search-forward (concat "^" (regexp-quote git-log-msg-separator) "\n") nil t))
 407          (save-restriction
 408            (narrow-to-region (point-min) log-start)
 409            (goto-char (point-min))
 410            (when (re-search-forward "^Author: +\\(.*?\\) *<\\(.*\\)> *$" nil t)
 411              (setq author-name (match-string 1)
 412                    author-email (match-string 2)))
 413            (goto-char (point-min))
 414            (when (re-search-forward "^Date: +\\(.*\\)$" nil t)
 415              (setq author-date (match-string 1)))
 416            (goto-char (point-min))
 417            (while (re-search-forward "^Parent: +\\([0-9a-f]+\\)" nil t)
 418              (unless (string-equal head (match-string 1))
 419                (setq subject "commit (merge): ")
 420                (push "-p" args)
 421                (push (match-string 1) args))))
 422        (setq log-start (point-min)))
 423      (setq log-end (point-max))
 424      (goto-char log-start)
 425      (when (re-search-forward ".*$" nil t)
 426        (setq subject (concat subject (match-string 0))))
 427      (setq coding-system-for-write buffer-file-coding-system))
 428    (let ((commit
 429           (git-get-string-sha1
 430            (with-output-to-string
 431              (with-current-buffer standard-output
 432                (let ((env `(("GIT_AUTHOR_NAME" . ,author-name)
 433                             ("GIT_AUTHOR_EMAIL" . ,author-email)
 434                             ("GIT_COMMITTER_NAME" . ,(git-get-committer-name))
 435                             ("GIT_COMMITTER_EMAIL" . ,(git-get-committer-email)))))
 436                  (when author-date (push `("GIT_AUTHOR_DATE" . ,author-date) env))
 437                  (apply #'git-run-command-region
 438                         buffer log-start log-end env
 439                         "commit-tree" tree (nreverse args))))))))
 440      (and (git-update-ref "HEAD" commit head subject)
 441           commit))))
 442
 443(defun git-empty-db-p ()
 444  "Check if the git db is empty (no commit done yet)."
 445  (not (eq 0 (call-process "git" nil nil nil "rev-parse" "--verify" "HEAD"))))
 446
 447(defun git-get-merge-heads ()
 448  "Retrieve the merge heads from the MERGE_HEAD file if present."
 449  (let (heads)
 450    (when (file-readable-p ".git/MERGE_HEAD")
 451      (with-temp-buffer
 452        (insert-file-contents ".git/MERGE_HEAD" nil nil nil t)
 453        (goto-char (point-min))
 454        (while (re-search-forward "[0-9a-f]\\{40\\}" nil t)
 455          (push (match-string 0) heads))))
 456    (nreverse heads)))
 457
 458(defun git-get-commit-description (commit)
 459  "Get a one-line description of COMMIT."
 460  (let ((coding-system-for-read (git-get-logoutput-coding-system)))
 461    (let ((descr (git-call-process-env-string nil "log" "--max-count=1" "--pretty=oneline" commit)))
 462      (if (and descr (string-match "\\`\\([0-9a-f]\\{40\\}\\) *\\(.*\\)$" descr))
 463          (concat (substring (match-string 1 descr) 0 10) " - " (match-string 2 descr))
 464        descr))))
 465
 466;;;; File info structure
 467;;;; ------------------------------------------------------------
 468
 469; fileinfo structure stolen from pcl-cvs
 470(defstruct (git-fileinfo
 471            (:copier nil)
 472            (:constructor git-create-fileinfo (state name &optional old-perm new-perm rename-state orig-name marked))
 473            (:conc-name git-fileinfo->))
 474  marked              ;; t/nil
 475  state               ;; current state
 476  name                ;; file name
 477  old-perm new-perm   ;; permission flags
 478  rename-state        ;; rename or copy state
 479  orig-name           ;; original name for renames or copies
 480  needs-refresh)      ;; whether file needs to be refreshed
 481
 482(defvar git-status nil)
 483
 484(defun git-clear-status (status)
 485  "Remove everything from the status list."
 486  (ewoc-filter status (lambda (info) nil)))
 487
 488(defun git-set-fileinfo-state (info state)
 489  "Set the state of a file info."
 490  (unless (eq (git-fileinfo->state info) state)
 491    (setf (git-fileinfo->state info) state
 492          (git-fileinfo->new-perm info) (git-fileinfo->old-perm info)
 493          (git-fileinfo->rename-state info) nil
 494          (git-fileinfo->orig-name info) nil
 495          (git-fileinfo->needs-refresh info) t)))
 496
 497(defun git-status-filenames-map (status func files &rest args)
 498  "Apply FUNC to the status files names in the FILES list."
 499  (when files
 500    (setq files (sort files #'string-lessp))
 501    (let ((file (pop files))
 502          (node (ewoc-nth status 0)))
 503      (while (and file node)
 504        (let ((info (ewoc-data node)))
 505          (if (string-lessp (git-fileinfo->name info) file)
 506              (setq node (ewoc-next status node))
 507            (if (string-equal (git-fileinfo->name info) file)
 508                (apply func info args))
 509            (setq file (pop files))))))))
 510
 511(defun git-set-filenames-state (status files state)
 512  "Set the state of a list of named files."
 513  (when files
 514    (git-status-filenames-map status #'git-set-fileinfo-state files state)
 515    (unless state  ;; delete files whose state has been set to nil
 516      (ewoc-filter status (lambda (info) (git-fileinfo->state info))))))
 517
 518(defun git-state-code (code)
 519  "Convert from a string to a added/deleted/modified state."
 520  (case (string-to-char code)
 521    (?M 'modified)
 522    (?? 'unknown)
 523    (?A 'added)
 524    (?D 'deleted)
 525    (?U 'unmerged)
 526    (?T 'modified)
 527    (t nil)))
 528
 529(defun git-status-code-as-string (code)
 530  "Format a git status code as string."
 531  (case code
 532    ('modified (propertize "Modified" 'face 'git-status-face))
 533    ('unknown  (propertize "Unknown " 'face 'git-unknown-face))
 534    ('added    (propertize "Added   " 'face 'git-status-face))
 535    ('deleted  (propertize "Deleted " 'face 'git-status-face))
 536    ('unmerged (propertize "Unmerged" 'face 'git-unmerged-face))
 537    ('uptodate (propertize "Uptodate" 'face 'git-uptodate-face))
 538    ('ignored  (propertize "Ignored " 'face 'git-ignored-face))
 539    (t "?       ")))
 540
 541(defun git-file-type-as-string (info)
 542  "Return a string describing the file type of INFO."
 543  (let* ((old-type (lsh (or (git-fileinfo->old-perm info) 0) -9))
 544         (new-type (lsh (or (git-fileinfo->new-perm info) 0) -9))
 545         (str (case new-type
 546                (?\100  ;; file
 547                 (case old-type
 548                   (?\100 nil)
 549                   (?\120 "   (type change symlink -> file)")
 550                   (?\160 "   (type change subproject -> file)")))
 551                 (?\120  ;; symlink
 552                  (case old-type
 553                    (?\100 "   (type change file -> symlink)")
 554                    (?\160 "   (type change subproject -> symlink)")
 555                    (t "   (symlink)")))
 556                  (?\160  ;; subproject
 557                   (case old-type
 558                     (?\100 "   (type change file -> subproject)")
 559                     (?\120 "   (type change symlink -> subproject)")
 560                     (t "   (subproject)")))
 561                  (?\000  ;; deleted or unknown
 562                   (case old-type
 563                     (?\120 "   (symlink)")
 564                     (?\160 "   (subproject)")))
 565                  (t (format "   (unknown type %o)" new-type)))))
 566    (if str (propertize str 'face 'git-status-face) "")))
 567
 568(defun git-rename-as-string (info)
 569  "Return a string describing the copy or rename associated with INFO, or an empty string if none."
 570  (let ((state (git-fileinfo->rename-state info)))
 571    (if state
 572        (propertize
 573         (concat "   ("
 574                 (if (eq state 'copy) "copied from "
 575                   (if (eq (git-fileinfo->state info) 'added) "renamed from "
 576                     "renamed to "))
 577                 (git-escape-file-name (git-fileinfo->orig-name info))
 578                 ")") 'face 'git-status-face)
 579      "")))
 580
 581(defun git-permissions-as-string (old-perm new-perm)
 582  "Format a permission change as string."
 583  (propertize
 584   (if (or (not old-perm)
 585           (not new-perm)
 586           (eq 0 (logand ?\111 (logxor old-perm new-perm))))
 587       "  "
 588     (if (eq 0 (logand ?\111 old-perm)) "+x" "-x"))
 589  'face 'git-permission-face))
 590
 591(defun git-fileinfo-prettyprint (info)
 592  "Pretty-printer for the git-fileinfo structure."
 593  (insert (concat "   " (if (git-fileinfo->marked info) (propertize "*" 'face 'git-mark-face) " ")
 594                  " " (git-status-code-as-string (git-fileinfo->state info))
 595                  " " (git-permissions-as-string (git-fileinfo->old-perm info) (git-fileinfo->new-perm info))
 596                  "  " (git-escape-file-name (git-fileinfo->name info))
 597                  (git-file-type-as-string info)
 598                  (git-rename-as-string info))))
 599
 600(defun git-insert-info-list (status infolist)
 601  "Insert a list of file infos in the status buffer, replacing existing ones if any."
 602  (setq infolist (sort infolist
 603                       (lambda (info1 info2)
 604                         (string-lessp (git-fileinfo->name info1)
 605                                       (git-fileinfo->name info2)))))
 606  (let ((info (pop infolist))
 607        (node (ewoc-nth status 0)))
 608    (while info
 609      (setf (git-fileinfo->needs-refresh info) t)
 610      (cond ((not node)
 611             (setq node (ewoc-enter-last status info))
 612             (setq info (pop infolist)))
 613            ((string-lessp (git-fileinfo->name (ewoc-data node))
 614                           (git-fileinfo->name info))
 615             (setq node (ewoc-next status node)))
 616            ((string-equal (git-fileinfo->name (ewoc-data node))
 617                           (git-fileinfo->name info))
 618              ;; preserve the marked flag
 619              (setf (git-fileinfo->marked info) (git-fileinfo->marked (ewoc-data node)))
 620              (setf (ewoc-data node) info)
 621              (setq info (pop infolist)))
 622            (t
 623             (setq node (ewoc-enter-before status node info))
 624             (setq info (pop infolist)))))))
 625
 626(defun git-run-diff-index (status files)
 627  "Run git-diff-index on FILES and parse the results into STATUS.
 628Return the list of files that haven't been handled."
 629  (let ((remaining (copy-sequence files))
 630        infolist)
 631    (with-temp-buffer
 632      (apply #'git-call-process-env t nil "diff-index" "-z" "-M" "HEAD" "--" files)
 633      (goto-char (point-min))
 634      (while (re-search-forward
 635              ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMUT]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0"
 636              nil t 1)
 637        (let ((old-perm (string-to-number (match-string 1) 8))
 638              (new-perm (string-to-number (match-string 2) 8))
 639              (state (or (match-string 4) (match-string 6)))
 640              (name (or (match-string 5) (match-string 7)))
 641              (new-name (match-string 8)))
 642          (if new-name  ; copy or rename
 643              (if (eq ?C (string-to-char state))
 644                  (push (git-create-fileinfo 'added new-name old-perm new-perm 'copy name) infolist)
 645                (push (git-create-fileinfo 'deleted name 0 0 'rename new-name) infolist)
 646                (push (git-create-fileinfo 'added new-name old-perm new-perm 'rename name) infolist))
 647            (push (git-create-fileinfo (git-state-code state) name old-perm new-perm) infolist))
 648          (setq remaining (delete name remaining))
 649          (when new-name (setq remaining (delete new-name remaining))))))
 650    (git-insert-info-list status infolist)
 651    remaining))
 652
 653(defun git-find-status-file (status file)
 654  "Find a given file in the status ewoc and return its node."
 655  (let ((node (ewoc-nth status 0)))
 656    (while (and node (not (string= file (git-fileinfo->name (ewoc-data node)))))
 657      (setq node (ewoc-next status node)))
 658    node))
 659
 660(defun git-run-ls-files (status files default-state &rest options)
 661  "Run git-ls-files on FILES and parse the results into STATUS.
 662Return the list of files that haven't been handled."
 663  (let (infolist)
 664    (with-temp-buffer
 665      (apply #'git-call-process-env t nil "ls-files" "-z" (append options (list "--") files))
 666      (goto-char (point-min))
 667      (while (re-search-forward "\\([^\0]*\\)\0" nil t 1)
 668        (let ((name (match-string 1)))
 669          (push (git-create-fileinfo default-state name) infolist)
 670          (setq files (delete name files)))))
 671    (git-insert-info-list status infolist)
 672    files))
 673
 674(defun git-run-ls-files-cached (status files default-state)
 675  "Run git-ls-files -c on FILES and parse the results into STATUS.
 676Return the list of files that haven't been handled."
 677  (let ((remaining (copy-sequence files))
 678        infolist)
 679    (with-temp-buffer
 680      (apply #'git-call-process-env t nil "ls-files" "-z" "-s" "-c" "--" files)
 681      (goto-char (point-min))
 682      (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t)
 683        (let* ((new-perm (string-to-number (match-string 1) 8))
 684               (old-perm (if (eq default-state 'added) 0 new-perm))
 685               (name (match-string 2)))
 686          (push (git-create-fileinfo default-state name old-perm new-perm) infolist)
 687          (setq remaining (delete name remaining)))))
 688    (git-insert-info-list status infolist)
 689    remaining))
 690
 691(defun git-run-ls-unmerged (status files)
 692  "Run git-ls-files -u on FILES and parse the results into STATUS."
 693  (with-temp-buffer
 694    (apply #'git-call-process-env t nil "ls-files" "-z" "-u" "--" files)
 695    (goto-char (point-min))
 696    (let (unmerged-files)
 697      (while (re-search-forward "[0-7]\\{6\\} [0-9a-f]\\{40\\} [123]\t\\([^\0]+\\)\0" nil t)
 698        (push (match-string 1) unmerged-files))
 699      (git-set-filenames-state status unmerged-files 'unmerged))))
 700
 701(defun git-get-exclude-files ()
 702  "Get the list of exclude files to pass to git-ls-files."
 703  (let (files
 704        (config (git-config "core.excludesfile")))
 705    (when (file-readable-p ".git/info/exclude")
 706      (push ".git/info/exclude" files))
 707    (when (and config (file-readable-p config))
 708      (push config files))
 709    files))
 710
 711(defun git-run-ls-files-with-excludes (status files default-state &rest options)
 712  "Run git-ls-files on FILES with appropriate --exclude-from options."
 713  (let ((exclude-files (git-get-exclude-files)))
 714    (apply #'git-run-ls-files status files default-state
 715           (concat "--exclude-per-directory=" git-per-dir-ignore-file)
 716           (append options (mapcar (lambda (f) (concat "--exclude-from=" f)) exclude-files)))))
 717
 718(defun git-update-status-files (files &optional default-state)
 719  "Update the status of FILES from the index."
 720  (unless git-status (error "Not in git-status buffer."))
 721  (when (or git-show-uptodate files)
 722    (git-run-ls-files-cached git-status files 'uptodate))
 723  (let* ((remaining-files
 724          (if (git-empty-db-p) ; we need some special handling for an empty db
 725              (git-run-ls-files-cached git-status files 'added)
 726            (git-run-diff-index git-status files))))
 727    (git-run-ls-unmerged git-status files)
 728    (when (or remaining-files (and git-show-unknown (not files)))
 729      (setq remaining-files (git-run-ls-files-with-excludes git-status remaining-files 'unknown "-o")))
 730    (when (or remaining-files (and git-show-ignored (not files)))
 731      (setq remaining-files (git-run-ls-files-with-excludes git-status remaining-files 'ignored "-o" "-i")))
 732    (git-set-filenames-state git-status remaining-files default-state)
 733    (git-refresh-files)
 734    (git-refresh-ewoc-hf git-status)))
 735
 736(defun git-marked-files ()
 737  "Return a list of all marked files, or if none a list containing just the file at cursor position."
 738  (unless git-status (error "Not in git-status buffer."))
 739  (or (ewoc-collect git-status (lambda (info) (git-fileinfo->marked info)))
 740      (list (ewoc-data (ewoc-locate git-status)))))
 741
 742(defun git-marked-files-state (&rest states)
 743  "Return marked files that are in the specified states."
 744  (let ((files (git-marked-files))
 745        result)
 746    (dolist (info files)
 747      (when (memq (git-fileinfo->state info) states)
 748        (push info result)))
 749    result))
 750
 751(defun git-refresh-files ()
 752  "Refresh all files that need it and clear the needs-refresh flag."
 753  (unless git-status (error "Not in git-status buffer."))
 754  (ewoc-map
 755   (lambda (info)
 756     (let ((refresh (git-fileinfo->needs-refresh info)))
 757       (setf (git-fileinfo->needs-refresh info) nil)
 758       refresh))
 759   git-status)
 760  ; move back to goal column
 761  (when goal-column (move-to-column goal-column)))
 762
 763(defun git-refresh-ewoc-hf (status)
 764  "Refresh the ewoc header and footer."
 765  (let ((branch (git-symbolic-ref "HEAD"))
 766        (head (if (git-empty-db-p) "Nothing committed yet"
 767                (git-get-commit-description "HEAD")))
 768        (merge-heads (git-get-merge-heads)))
 769    (ewoc-set-hf status
 770                 (format "Directory:  %s\nBranch:     %s\nHead:       %s%s\n"
 771                         default-directory
 772                         (if branch
 773                             (if (string-match "^refs/heads/" branch)
 774                                 (substring branch (match-end 0))
 775                               branch)
 776                           "none (detached HEAD)")
 777                         head
 778                         (if merge-heads
 779                             (concat "\nMerging:    "
 780                                     (mapconcat (lambda (str) (git-get-commit-description str)) merge-heads "\n            "))
 781                           ""))
 782                 (if (ewoc-nth status 0) "" "    No changes."))))
 783
 784(defun git-get-filenames (files)
 785  (mapcar (lambda (info) (git-fileinfo->name info)) files))
 786
 787(defun git-update-index (index-file files)
 788  "Run git-update-index on a list of files."
 789  (let ((env (and index-file `(("GIT_INDEX_FILE" . ,index-file))))
 790        added deleted modified)
 791    (dolist (info files)
 792      (case (git-fileinfo->state info)
 793        ('added (push info added))
 794        ('deleted (push info deleted))
 795        ('modified (push info modified))))
 796    (when added
 797      (apply #'git-call-process-env nil env "update-index" "--add" "--" (git-get-filenames added)))
 798    (when deleted
 799      (apply #'git-call-process-env nil env "update-index" "--remove" "--" (git-get-filenames deleted)))
 800    (when modified
 801      (apply #'git-call-process-env nil env "update-index" "--" (git-get-filenames modified)))))
 802
 803(defun git-run-pre-commit-hook ()
 804  "Run the pre-commit hook if any."
 805  (unless git-status (error "Not in git-status buffer."))
 806  (let ((files (git-marked-files-state 'added 'deleted 'modified)))
 807    (or (not files)
 808        (not (file-executable-p ".git/hooks/pre-commit"))
 809        (let ((index-file (make-temp-file "gitidx")))
 810          (unwind-protect
 811            (let ((head-tree (unless (git-empty-db-p) (git-rev-parse "HEAD^{tree}"))))
 812              (git-read-tree head-tree index-file)
 813              (git-update-index index-file files)
 814              (git-run-hook "pre-commit" `(("GIT_INDEX_FILE" . ,index-file))))
 815          (delete-file index-file))))))
 816
 817(defun git-do-commit ()
 818  "Perform the actual commit using the current buffer as log message."
 819  (interactive)
 820  (let ((buffer (current-buffer))
 821        (index-file (make-temp-file "gitidx")))
 822    (with-current-buffer log-edit-parent-buffer
 823      (if (git-marked-files-state 'unmerged)
 824          (message "You cannot commit unmerged files, resolve them first.")
 825        (unwind-protect
 826            (let ((files (git-marked-files-state 'added 'deleted 'modified))
 827                  head head-tree)
 828              (unless (git-empty-db-p)
 829                (setq head (git-rev-parse "HEAD")
 830                      head-tree (git-rev-parse "HEAD^{tree}")))
 831              (if files
 832                  (progn
 833                    (message "Running git commit...")
 834                    (git-read-tree head-tree index-file)
 835                    (git-update-index nil files)         ;update both the default index
 836                    (git-update-index index-file files)  ;and the temporary one
 837                    (let ((tree (git-write-tree index-file)))
 838                      (if (or (not (string-equal tree head-tree))
 839                              (yes-or-no-p "The tree was not modified, do you really want to perform an empty commit? "))
 840                          (let ((commit (git-commit-tree buffer tree head)))
 841                            (condition-case nil (delete-file ".git/MERGE_HEAD") (error nil))
 842                            (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
 843                            (with-current-buffer buffer (erase-buffer))
 844                            (git-update-status-files (git-get-filenames files) 'uptodate)
 845                            (git-call-process-env nil nil "rerere")
 846                            (git-call-process-env nil nil "gc" "--auto")
 847                            (git-refresh-files)
 848                            (git-refresh-ewoc-hf git-status)
 849                            (message "Committed %s." commit)
 850                            (git-run-hook "post-commit" nil))
 851                        (message "Commit aborted."))))
 852                (message "No files to commit.")))
 853          (delete-file index-file))))))
 854
 855
 856;;;; Interactive functions
 857;;;; ------------------------------------------------------------
 858
 859(defun git-mark-file ()
 860  "Mark the file that the cursor is on and move to the next one."
 861  (interactive)
 862  (unless git-status (error "Not in git-status buffer."))
 863  (let* ((pos (ewoc-locate git-status))
 864         (info (ewoc-data pos)))
 865    (setf (git-fileinfo->marked info) t)
 866    (ewoc-invalidate git-status pos)
 867    (ewoc-goto-next git-status 1)))
 868
 869(defun git-unmark-file ()
 870  "Unmark the file that the cursor is on and move to the next one."
 871  (interactive)
 872  (unless git-status (error "Not in git-status buffer."))
 873  (let* ((pos (ewoc-locate git-status))
 874         (info (ewoc-data pos)))
 875    (setf (git-fileinfo->marked info) nil)
 876    (ewoc-invalidate git-status pos)
 877    (ewoc-goto-next git-status 1)))
 878
 879(defun git-unmark-file-up ()
 880  "Unmark the file that the cursor is on and move to the previous one."
 881  (interactive)
 882  (unless git-status (error "Not in git-status buffer."))
 883  (let* ((pos (ewoc-locate git-status))
 884         (info (ewoc-data pos)))
 885    (setf (git-fileinfo->marked info) nil)
 886    (ewoc-invalidate git-status pos)
 887    (ewoc-goto-prev git-status 1)))
 888
 889(defun git-mark-all ()
 890  "Mark all files."
 891  (interactive)
 892  (unless git-status (error "Not in git-status buffer."))
 893  (ewoc-map (lambda (info) (unless (git-fileinfo->marked info)
 894                             (setf (git-fileinfo->marked info) t))) git-status)
 895  ; move back to goal column after invalidate
 896  (when goal-column (move-to-column goal-column)))
 897
 898(defun git-unmark-all ()
 899  "Unmark all files."
 900  (interactive)
 901  (unless git-status (error "Not in git-status buffer."))
 902  (ewoc-map (lambda (info) (when (git-fileinfo->marked info)
 903                             (setf (git-fileinfo->marked info) nil)
 904                             t)) git-status)
 905  ; move back to goal column after invalidate
 906  (when goal-column (move-to-column goal-column)))
 907
 908(defun git-toggle-all-marks ()
 909  "Toggle all file marks."
 910  (interactive)
 911  (unless git-status (error "Not in git-status buffer."))
 912  (ewoc-map (lambda (info) (setf (git-fileinfo->marked info) (not (git-fileinfo->marked info))) t) git-status)
 913  ; move back to goal column after invalidate
 914  (when goal-column (move-to-column goal-column)))
 915
 916(defun git-next-file (&optional n)
 917  "Move the selection down N files."
 918  (interactive "p")
 919  (unless git-status (error "Not in git-status buffer."))
 920  (ewoc-goto-next git-status n))
 921
 922(defun git-prev-file (&optional n)
 923  "Move the selection up N files."
 924  (interactive "p")
 925  (unless git-status (error "Not in git-status buffer."))
 926  (ewoc-goto-prev git-status n))
 927
 928(defun git-next-unmerged-file (&optional n)
 929  "Move the selection down N unmerged files."
 930  (interactive "p")
 931  (unless git-status (error "Not in git-status buffer."))
 932  (let* ((last (ewoc-locate git-status))
 933         (node (ewoc-next git-status last)))
 934    (while (and node (> n 0))
 935      (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
 936        (setq n (1- n))
 937        (setq last node))
 938      (setq node (ewoc-next git-status node)))
 939    (ewoc-goto-node git-status last)))
 940
 941(defun git-prev-unmerged-file (&optional n)
 942  "Move the selection up N unmerged files."
 943  (interactive "p")
 944  (unless git-status (error "Not in git-status buffer."))
 945  (let* ((last (ewoc-locate git-status))
 946         (node (ewoc-prev git-status last)))
 947    (while (and node (> n 0))
 948      (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
 949        (setq n (1- n))
 950        (setq last node))
 951      (setq node (ewoc-prev git-status node)))
 952    (ewoc-goto-node git-status last)))
 953
 954(defun git-add-file ()
 955  "Add marked file(s) to the index cache."
 956  (interactive)
 957  (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored))))
 958    (unless files
 959      (push (file-relative-name (read-file-name "File to add: " nil nil t)) files))
 960    (apply #'git-call-process-env nil nil "update-index" "--add" "--" files)
 961    (git-update-status-files files 'uptodate)
 962    (git-success-message "Added" files)))
 963
 964(defun git-ignore-file ()
 965  "Add marked file(s) to the ignore list."
 966  (interactive)
 967  (let ((files (git-get-filenames (git-marked-files-state 'unknown))))
 968    (unless files
 969      (push (file-relative-name (read-file-name "File to ignore: " nil nil t)) files))
 970    (dolist (f files) (git-append-to-ignore f))
 971    (git-update-status-files files 'ignored)
 972    (git-success-message "Ignored" files)))
 973
 974(defun git-remove-file ()
 975  "Remove the marked file(s)."
 976  (interactive)
 977  (let ((files (git-get-filenames (git-marked-files-state 'added 'modified 'unknown 'uptodate 'ignored))))
 978    (unless files
 979      (push (file-relative-name (read-file-name "File to remove: " nil nil t)) files))
 980    (if (yes-or-no-p
 981         (format "Remove %d file%s? " (length files) (if (> (length files) 1) "s" "")))
 982        (progn
 983          (dolist (name files)
 984            (when (file-exists-p name) (delete-file name)))
 985          (apply #'git-call-process-env nil nil "update-index" "--remove" "--" files)
 986          (git-update-status-files files nil)
 987          (git-success-message "Removed" files))
 988      (message "Aborting"))))
 989
 990(defun git-revert-file ()
 991  "Revert changes to the marked file(s)."
 992  (interactive)
 993  (let ((files (git-marked-files))
 994        added modified)
 995    (when (and files
 996               (yes-or-no-p
 997                (format "Revert %d file%s? " (length files) (if (> (length files) 1) "s" ""))))
 998      (dolist (info files)
 999        (case (git-fileinfo->state info)
1000          ('added (push (git-fileinfo->name info) added))
1001          ('deleted (push (git-fileinfo->name info) modified))
1002          ('unmerged (push (git-fileinfo->name info) modified))
1003          ('modified (push (git-fileinfo->name info) modified))))
1004      (when added
1005        (apply #'git-call-process-env nil nil "update-index" "--force-remove" "--" added))
1006      (when modified
1007        (apply #'git-call-process-env nil nil "checkout" "HEAD" modified))
1008      (git-update-status-files (append added modified) 'uptodate)
1009      (git-success-message "Reverted" (git-get-filenames files)))))
1010
1011(defun git-resolve-file ()
1012  "Resolve conflicts in marked file(s)."
1013  (interactive)
1014  (let ((files (git-get-filenames (git-marked-files-state 'unmerged))))
1015    (when files
1016      (apply #'git-call-process-env nil nil "update-index" "--" files)
1017      (git-update-status-files files 'uptodate)
1018      (git-success-message "Resolved" files))))
1019
1020(defun git-remove-handled ()
1021  "Remove handled files from the status list."
1022  (interactive)
1023  (ewoc-filter git-status
1024               (lambda (info)
1025                 (case (git-fileinfo->state info)
1026                   ('ignored git-show-ignored)
1027                   ('uptodate git-show-uptodate)
1028                   ('unknown git-show-unknown)
1029                   (t t))))
1030  (unless (ewoc-nth git-status 0)  ; refresh header if list is empty
1031    (git-refresh-ewoc-hf git-status)))
1032
1033(defun git-toggle-show-uptodate ()
1034  "Toogle the option for showing up-to-date files."
1035  (interactive)
1036  (if (setq git-show-uptodate (not git-show-uptodate))
1037      (git-refresh-status)
1038    (git-remove-handled)))
1039
1040(defun git-toggle-show-ignored ()
1041  "Toogle the option for showing ignored files."
1042  (interactive)
1043  (if (setq git-show-ignored (not git-show-ignored))
1044      (progn
1045        (message "Inserting ignored files...")
1046        (git-run-ls-files-with-excludes git-status nil 'ignored "-o" "-i")
1047        (git-refresh-files)
1048        (git-refresh-ewoc-hf git-status)
1049        (message "Inserting ignored files...done"))
1050    (git-remove-handled)))
1051
1052(defun git-toggle-show-unknown ()
1053  "Toogle the option for showing unknown files."
1054  (interactive)
1055  (if (setq git-show-unknown (not git-show-unknown))
1056      (progn
1057        (message "Inserting unknown files...")
1058        (git-run-ls-files-with-excludes git-status nil 'unknown "-o")
1059        (git-refresh-files)
1060        (git-refresh-ewoc-hf git-status)
1061        (message "Inserting unknown files...done"))
1062    (git-remove-handled)))
1063
1064(defun git-setup-diff-buffer (buffer)
1065  "Setup a buffer for displaying a diff."
1066  (let ((dir default-directory))
1067    (with-current-buffer buffer
1068      (diff-mode)
1069      (goto-char (point-min))
1070      (setq default-directory dir)
1071      (setq buffer-read-only t)))
1072  (display-buffer buffer)
1073  ; shrink window only if it displays the status buffer
1074  (when (eq (window-buffer) (current-buffer))
1075    (shrink-window-if-larger-than-buffer)))
1076
1077(defun git-diff-file ()
1078  "Diff the marked file(s) against HEAD."
1079  (interactive)
1080  (let ((files (git-marked-files)))
1081    (git-setup-diff-buffer
1082     (apply #'git-run-command-buffer "*git-diff*" "diff-index" "-p" "-M" "HEAD" "--" (git-get-filenames files)))))
1083
1084(defun git-diff-file-merge-head (arg)
1085  "Diff the marked file(s) against the first merge head (or the nth one with a numeric prefix)."
1086  (interactive "p")
1087  (let ((files (git-marked-files))
1088        (merge-heads (git-get-merge-heads)))
1089    (unless merge-heads (error "No merge in progress"))
1090    (git-setup-diff-buffer
1091     (apply #'git-run-command-buffer "*git-diff*" "diff-index" "-p" "-M"
1092            (or (nth (1- arg) merge-heads) "HEAD") "--" (git-get-filenames files)))))
1093
1094(defun git-diff-unmerged-file (stage)
1095  "Diff the marked unmerged file(s) against the specified stage."
1096  (let ((files (git-marked-files)))
1097    (git-setup-diff-buffer
1098     (apply #'git-run-command-buffer "*git-diff*" "diff-files" "-p" stage "--" (git-get-filenames files)))))
1099
1100(defun git-diff-file-base ()
1101  "Diff the marked unmerged file(s) against the common base file."
1102  (interactive)
1103  (git-diff-unmerged-file "-1"))
1104
1105(defun git-diff-file-mine ()
1106  "Diff the marked unmerged file(s) against my pre-merge version."
1107  (interactive)
1108  (git-diff-unmerged-file "-2"))
1109
1110(defun git-diff-file-other ()
1111  "Diff the marked unmerged file(s) against the other's pre-merge version."
1112  (interactive)
1113  (git-diff-unmerged-file "-3"))
1114
1115(defun git-diff-file-combined ()
1116  "Do a combined diff of the marked unmerged file(s)."
1117  (interactive)
1118  (git-diff-unmerged-file "-c"))
1119
1120(defun git-diff-file-idiff ()
1121  "Perform an interactive diff on the current file."
1122  (interactive)
1123  (let ((files (git-marked-files-state 'added 'deleted 'modified)))
1124    (unless (eq 1 (length files))
1125      (error "Cannot perform an interactive diff on multiple files."))
1126    (let* ((filename (car (git-get-filenames files)))
1127           (buff1 (find-file-noselect filename))
1128           (buff2 (git-run-command-buffer (concat filename ".~HEAD~") "cat-file" "blob" (concat "HEAD:" filename))))
1129      (ediff-buffers buff1 buff2))))
1130
1131(defun git-log-file ()
1132  "Display a log of changes to the marked file(s)."
1133  (interactive)
1134  (let* ((files (git-marked-files))
1135         (coding-system-for-read git-commits-coding-system)
1136         (buffer (apply #'git-run-command-buffer "*git-log*" "rev-list" "--pretty" "HEAD" "--" (git-get-filenames files))))
1137    (with-current-buffer buffer
1138      ; (git-log-mode)  FIXME: implement log mode
1139      (goto-char (point-min))
1140      (setq buffer-read-only t))
1141    (display-buffer buffer)))
1142
1143(defun git-log-edit-files ()
1144  "Return a list of marked files for use in the log-edit buffer."
1145  (with-current-buffer log-edit-parent-buffer
1146    (git-get-filenames (git-marked-files-state 'added 'deleted 'modified))))
1147
1148(defun git-log-edit-diff ()
1149  "Run a diff of the current files being committed from a log-edit buffer."
1150  (with-current-buffer log-edit-parent-buffer
1151    (git-diff-file)))
1152
1153(defun git-append-sign-off (name email)
1154  "Append a Signed-off-by entry to the current buffer, avoiding duplicates."
1155  (let ((sign-off (format "Signed-off-by: %s <%s>" name email))
1156        (case-fold-search t))
1157    (goto-char (point-min))
1158    (unless (re-search-forward (concat "^" (regexp-quote sign-off)) nil t)
1159      (goto-char (point-min))
1160      (unless (re-search-forward "^Signed-off-by: " nil t)
1161        (setq sign-off (concat "\n" sign-off)))
1162      (goto-char (point-max))
1163      (insert sign-off "\n"))))
1164
1165(defun git-setup-log-buffer (buffer &optional author-name author-email subject date msg)
1166  "Setup the log buffer for a commit."
1167  (unless git-status (error "Not in git-status buffer."))
1168  (let ((merge-heads (git-get-merge-heads))
1169        (dir default-directory)
1170        (committer-name (git-get-committer-name))
1171        (committer-email (git-get-committer-email))
1172        (sign-off git-append-signed-off-by))
1173    (with-current-buffer buffer
1174      (cd dir)
1175      (erase-buffer)
1176      (insert
1177       (propertize
1178        (format "Author: %s <%s>\n%s%s"
1179                (or author-name committer-name)
1180                (or author-email committer-email)
1181                (if date (format "Date: %s\n" date) "")
1182                (if merge-heads
1183                    (format "Parent: %s\n%s\n"
1184                            (git-rev-parse "HEAD")
1185                            (mapconcat (lambda (str) (concat "Parent: " str)) merge-heads "\n"))
1186                  ""))
1187        'face 'git-header-face)
1188       (propertize git-log-msg-separator 'face 'git-separator-face)
1189       "\n")
1190      (when subject (insert subject "\n\n"))
1191      (cond (msg (insert msg "\n"))
1192            ((file-readable-p ".dotest/msg")
1193             (insert-file-contents ".dotest/msg"))
1194            ((file-readable-p ".git/MERGE_MSG")
1195             (insert-file-contents ".git/MERGE_MSG")))
1196      ; delete empty lines at end
1197      (goto-char (point-min))
1198      (when (re-search-forward "\n+\\'" nil t)
1199        (replace-match "\n" t t))
1200      (when sign-off (git-append-sign-off committer-name committer-email)))))
1201
1202(defun git-commit-file ()
1203  "Commit the marked file(s), asking for a commit message."
1204  (interactive)
1205  (unless git-status (error "Not in git-status buffer."))
1206  (when (git-run-pre-commit-hook)
1207    (let ((buffer (get-buffer-create "*git-commit*"))
1208          (coding-system (git-get-commits-coding-system))
1209          author-name author-email subject date)
1210      (when (eq 0 (buffer-size buffer))
1211        (when (file-readable-p ".dotest/info")
1212          (with-temp-buffer
1213            (insert-file-contents ".dotest/info")
1214            (goto-char (point-min))
1215            (when (re-search-forward "^Author: \\(.*\\)\nEmail: \\(.*\\)$" nil t)
1216              (setq author-name (match-string 1))
1217              (setq author-email (match-string 2)))
1218            (goto-char (point-min))
1219            (when (re-search-forward "^Subject: \\(.*\\)$" nil t)
1220              (setq subject (match-string 1)))
1221            (goto-char (point-min))
1222            (when (re-search-forward "^Date: \\(.*\\)$" nil t)
1223              (setq date (match-string 1)))))
1224        (git-setup-log-buffer buffer author-name author-email subject date))
1225      (if (boundp 'log-edit-diff-function)
1226          (log-edit 'git-do-commit nil '((log-edit-listfun . git-log-edit-files)
1227                                         (log-edit-diff-function . git-log-edit-diff)) buffer)
1228        (log-edit 'git-do-commit nil 'git-log-edit-files buffer))
1229      (setq font-lock-keywords (font-lock-compile-keywords git-log-edit-font-lock-keywords))
1230      (setq buffer-file-coding-system coding-system)
1231      (re-search-forward (regexp-quote (concat git-log-msg-separator "\n")) nil t))))
1232
1233(defun git-find-file ()
1234  "Visit the current file in its own buffer."
1235  (interactive)
1236  (unless git-status (error "Not in git-status buffer."))
1237  (let ((info (ewoc-data (ewoc-locate git-status))))
1238    (find-file (git-fileinfo->name info))
1239    (when (eq 'unmerged (git-fileinfo->state info))
1240      (smerge-mode 1))))
1241
1242(defun git-find-file-other-window ()
1243  "Visit the current file in its own buffer in another window."
1244  (interactive)
1245  (unless git-status (error "Not in git-status buffer."))
1246  (let ((info (ewoc-data (ewoc-locate git-status))))
1247    (find-file-other-window (git-fileinfo->name info))
1248    (when (eq 'unmerged (git-fileinfo->state info))
1249      (smerge-mode))))
1250
1251(defun git-find-file-imerge ()
1252  "Visit the current file in interactive merge mode."
1253  (interactive)
1254  (unless git-status (error "Not in git-status buffer."))
1255  (let ((info (ewoc-data (ewoc-locate git-status))))
1256    (find-file (git-fileinfo->name info))
1257    (smerge-ediff)))
1258
1259(defun git-view-file ()
1260  "View the current file in its own buffer."
1261  (interactive)
1262  (unless git-status (error "Not in git-status buffer."))
1263  (let ((info (ewoc-data (ewoc-locate git-status))))
1264    (view-file (git-fileinfo->name info))))
1265
1266(defun git-refresh-status ()
1267  "Refresh the git status buffer."
1268  (interactive)
1269  (let* ((status git-status)
1270         (pos (ewoc-locate status))
1271         (marked-files (git-get-filenames (ewoc-collect status (lambda (info) (git-fileinfo->marked info)))))
1272         (cur-name (and pos (git-fileinfo->name (ewoc-data pos)))))
1273    (unless status (error "Not in git-status buffer."))
1274    (message "Refreshing git status...")
1275    (git-call-process-env nil nil "update-index" "--refresh")
1276    (git-clear-status status)
1277    (git-update-status-files nil)
1278    ; restore file marks
1279    (when marked-files
1280      (git-status-filenames-map status
1281                                (lambda (info)
1282                                        (setf (git-fileinfo->marked info) t)
1283                                        (setf (git-fileinfo->needs-refresh info) t))
1284                                marked-files)
1285      (git-refresh-files))
1286    ; move point to the current file name if any
1287    (message "Refreshing git status...done")
1288    (let ((node (and cur-name (git-find-status-file status cur-name))))
1289      (when node (ewoc-goto-node status node)))))
1290
1291(defun git-status-quit ()
1292  "Quit git-status mode."
1293  (interactive)
1294  (bury-buffer))
1295
1296;;;; Major Mode
1297;;;; ------------------------------------------------------------
1298
1299(defvar git-status-mode-hook nil
1300  "Run after `git-status-mode' is setup.")
1301
1302(defvar git-status-mode-map nil
1303  "Keymap for git major mode.")
1304
1305(defvar git-status nil
1306  "List of all files managed by the git-status mode.")
1307
1308(unless git-status-mode-map
1309  (let ((map (make-keymap))
1310        (diff-map (make-sparse-keymap))
1311        (toggle-map (make-sparse-keymap)))
1312    (suppress-keymap map)
1313    (define-key map "?"   'git-help)
1314    (define-key map "h"   'git-help)
1315    (define-key map " "   'git-next-file)
1316    (define-key map "a"   'git-add-file)
1317    (define-key map "c"   'git-commit-file)
1318    (define-key map "d"    diff-map)
1319    (define-key map "="   'git-diff-file)
1320    (define-key map "f"   'git-find-file)
1321    (define-key map "\r"  'git-find-file)
1322    (define-key map "g"   'git-refresh-status)
1323    (define-key map "i"   'git-ignore-file)
1324    (define-key map "l"   'git-log-file)
1325    (define-key map "m"   'git-mark-file)
1326    (define-key map "M"   'git-mark-all)
1327    (define-key map "n"   'git-next-file)
1328    (define-key map "N"   'git-next-unmerged-file)
1329    (define-key map "o"   'git-find-file-other-window)
1330    (define-key map "p"   'git-prev-file)
1331    (define-key map "P"   'git-prev-unmerged-file)
1332    (define-key map "q"   'git-status-quit)
1333    (define-key map "r"   'git-remove-file)
1334    (define-key map "R"   'git-resolve-file)
1335    (define-key map "t"    toggle-map)
1336    (define-key map "T"   'git-toggle-all-marks)
1337    (define-key map "u"   'git-unmark-file)
1338    (define-key map "U"   'git-revert-file)
1339    (define-key map "v"   'git-view-file)
1340    (define-key map "x"   'git-remove-handled)
1341    (define-key map "\C-?" 'git-unmark-file-up)
1342    (define-key map "\M-\C-?" 'git-unmark-all)
1343    ; the diff submap
1344    (define-key diff-map "b" 'git-diff-file-base)
1345    (define-key diff-map "c" 'git-diff-file-combined)
1346    (define-key diff-map "=" 'git-diff-file)
1347    (define-key diff-map "e" 'git-diff-file-idiff)
1348    (define-key diff-map "E" 'git-find-file-imerge)
1349    (define-key diff-map "h" 'git-diff-file-merge-head)
1350    (define-key diff-map "m" 'git-diff-file-mine)
1351    (define-key diff-map "o" 'git-diff-file-other)
1352    ; the toggle submap
1353    (define-key toggle-map "u" 'git-toggle-show-uptodate)
1354    (define-key toggle-map "i" 'git-toggle-show-ignored)
1355    (define-key toggle-map "k" 'git-toggle-show-unknown)
1356    (define-key toggle-map "m" 'git-toggle-all-marks)
1357    (setq git-status-mode-map map))
1358  (easy-menu-define git-menu git-status-mode-map
1359    "Git Menu"
1360    `("Git"
1361      ["Refresh" git-refresh-status t]
1362      ["Commit" git-commit-file t]
1363      ("Merge"
1364        ["Next Unmerged File" git-next-unmerged-file t]
1365        ["Prev Unmerged File" git-prev-unmerged-file t]
1366        ["Mark as Resolved" git-resolve-file t]
1367        ["Interactive Merge File" git-find-file-imerge t]
1368        ["Diff Against Common Base File" git-diff-file-base t]
1369        ["Diff Combined" git-diff-file-combined t]
1370        ["Diff Against Merge Head" git-diff-file-merge-head t]
1371        ["Diff Against Mine" git-diff-file-mine t]
1372        ["Diff Against Other" git-diff-file-other t])
1373      "--------"
1374      ["Add File" git-add-file t]
1375      ["Revert File" git-revert-file t]
1376      ["Ignore File" git-ignore-file t]
1377      ["Remove File" git-remove-file t]
1378      "--------"
1379      ["Find File" git-find-file t]
1380      ["View File" git-view-file t]
1381      ["Diff File" git-diff-file t]
1382      ["Interactive Diff File" git-diff-file-idiff t]
1383      ["Log" git-log-file t]
1384      "--------"
1385      ["Mark" git-mark-file t]
1386      ["Mark All" git-mark-all t]
1387      ["Unmark" git-unmark-file t]
1388      ["Unmark All" git-unmark-all t]
1389      ["Toggle All Marks" git-toggle-all-marks t]
1390      ["Hide Handled Files" git-remove-handled t]
1391      "--------"
1392      ["Show Uptodate Files" git-toggle-show-uptodate :style toggle :selected git-show-uptodate]
1393      ["Show Ignored Files" git-toggle-show-ignored :style toggle :selected git-show-ignored]
1394      ["Show Unknown Files" git-toggle-show-unknown :style toggle :selected git-show-unknown]
1395      "--------"
1396      ["Quit" git-status-quit t])))
1397
1398
1399;; git mode should only run in the *git status* buffer
1400(put 'git-status-mode 'mode-class 'special)
1401
1402(defun git-status-mode ()
1403  "Major mode for interacting with Git.
1404Commands:
1405\\{git-status-mode-map}"
1406  (kill-all-local-variables)
1407  (buffer-disable-undo)
1408  (setq mode-name "git status"
1409        major-mode 'git-status-mode
1410        goal-column 17
1411        buffer-read-only t)
1412  (use-local-map git-status-mode-map)
1413  (let ((buffer-read-only nil))
1414    (erase-buffer)
1415  (let ((status (ewoc-create 'git-fileinfo-prettyprint "" "")))
1416    (set (make-local-variable 'git-status) status))
1417  (set (make-local-variable 'list-buffers-directory) default-directory)
1418  (make-local-variable 'git-show-uptodate)
1419  (make-local-variable 'git-show-ignored)
1420  (make-local-variable 'git-show-unknown)
1421  (run-hooks 'git-status-mode-hook)))
1422
1423(defun git-find-status-buffer (dir)
1424  "Find the git status buffer handling a specified directory."
1425  (let ((list (buffer-list))
1426        (fulldir (expand-file-name dir))
1427        found)
1428    (while (and list (not found))
1429      (let ((buffer (car list)))
1430        (with-current-buffer buffer
1431          (when (and list-buffers-directory
1432                     (string-equal fulldir (expand-file-name list-buffers-directory))
1433                     (string-match "\\*git-status\\*$" (buffer-name buffer)))
1434            (setq found buffer))))
1435      (setq list (cdr list)))
1436    found))
1437
1438(defun git-status (dir)
1439  "Entry point into git-status mode."
1440  (interactive "DSelect directory: ")
1441  (setq dir (git-get-top-dir dir))
1442  (if (file-directory-p (concat (file-name-as-directory dir) ".git"))
1443      (let ((buffer (or (and git-reuse-status-buffer (git-find-status-buffer dir))
1444                        (create-file-buffer (expand-file-name "*git-status*" dir)))))
1445        (switch-to-buffer buffer)
1446        (cd dir)
1447        (git-status-mode)
1448        (git-refresh-status)
1449        (goto-char (point-min))
1450        (add-hook 'after-save-hook 'git-update-saved-file))
1451    (message "%s is not a git working tree." dir)))
1452
1453(defun git-update-saved-file ()
1454  "Update the corresponding git-status buffer when a file is saved.
1455Meant to be used in `after-save-hook'."
1456  (let* ((file (expand-file-name buffer-file-name))
1457         (dir (condition-case nil (git-get-top-dir (file-name-directory file)) (error nil)))
1458         (buffer (and dir (git-find-status-buffer dir))))
1459    (when buffer
1460      (with-current-buffer buffer
1461        (let ((filename (file-relative-name file dir)))
1462          ; skip files located inside the .git directory
1463          (unless (string-match "^\\.git/" filename)
1464            (git-call-process-env nil nil "add" "--refresh" "--" filename)
1465            (git-update-status-files (list filename) 'uptodate)))))))
1466
1467(defun git-help ()
1468  "Display help for Git mode."
1469  (interactive)
1470  (describe-function 'git-status-mode))
1471
1472(provide 'git)
1473;;; git.el ends here