contrib/emacs/git.el

   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 ;;  - hook into file save (after-save-hook)
  40 ;;  - diff against other branch
  41 ;;  - renaming files from the status buffer
  42 ;;  - creating tags
  43 ;;  - fetch/pull
  44 ;;  - switching branches
  45 ;;  - revlist browser
  46 ;;  - git-show-branch browser
  47 ;;  - menus
  48 ;;
  49
  50 (eval-when-compile (require 'cl))
  51 (require 'ewoc)
  52 (require 'log-edit)
  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.
  64 The default is to fall back to the repository config,
  65 then 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.
  72 The default is to fall back to the git repository config,
  73 then 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
  91 if 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
 101 (defface git-status-face
 102   '((((class color) (background light)) (:foreground "purple")))
 103   "Git mode face used to highlight added and modified files."
 104   :group 'git)
 105
 106 (defface git-unmerged-face
 107   '((((class color) (background light)) (:foreground "red" :bold t)))
 108   "Git mode face used to highlight unmerged files."
 109   :group 'git)
 110
 111 (defface git-unknown-face
 112   '((((class color) (background light)) (:foreground "goldenrod" :bold t)))
 113   "Git mode face used to highlight unknown files."
 114   :group 'git)
 115
 116 (defface git-uptodate-face
 117   '((((class color) (background light)) (:foreground "grey60")))
 118   "Git mode face used to highlight up-to-date files."
 119   :group 'git)
 120
 121 (defface git-ignored-face
 122   '((((class color) (background light)) (:foreground "grey60")))
 123   "Git mode face used to highlight ignored files."
 124   :group 'git)
 125
 126 (defface git-mark-face
 127   '((((class color) (background light)) (:foreground "red" :bold t)))
 128   "Git mode face used for the file marks."
 129   :group 'git)
 130
 131 (defface git-header-face
 132   '((((class color) (background light)) (:foreground "blue")))
 133   "Git mode face used for commit headers."
 134   :group 'git)
 135
 136 (defface git-separator-face
 137   '((((class color) (background light)) (:foreground "brown")))
 138   "Git mode face used for commit separator."
 139   :group 'git)
 140
 141 (defface git-permission-face
 142   '((((class color) (background light)) (:foreground "green" :bold t)))
 143   "Git mode face used for permission changes."
 144   :group 'git)
 145
 146
 147 ;;;; Utilities
 148 ;;;; ------------------------------------------------------------
 149
 150 (defconst git-log-msg-separator "--- log message follows this line ---")
 151
 152 (defvar git-log-edit-font-lock-keywords
 153   `(("^\\(Author:\\|Date:\\|Parent:\\|Signed-off-by:\\)\\(.*\\)$"
 154      (1 font-lock-keyword-face)
 155      (2 font-lock-function-name-face))
 156     (,(concat "^\\(" (regexp-quote git-log-msg-separator) "\\)$")
 157      (1 font-lock-comment-face))))
 158
 159 (defun git-get-env-strings (env)
 160   "Build a list of NAME=VALUE strings from a list of environment strings."
 161   (mapcar (lambda (entry) (concat (car entry) "=" (cdr entry))) env))
 162
 163 (defun git-call-process-env (buffer env &rest args)
 164   "Wrapper for call-process that sets environment strings."
 165   (if env
 166       (apply #'call-process "env" nil buffer nil
 167              (append (git-get-env-strings env) (list "git") args))
 168     (apply #'call-process "git" nil buffer nil args)))
 169
 170 (defun git-call-process-env-string (env &rest args)
 171   "Wrapper for call-process that sets environment strings,
 172 and returns the process output as a string."
 173   (with-temp-buffer
 174     (and (eq 0 (apply #' git-call-process-env t env args))
 175          (buffer-string))))
 176
 177 (defun git-run-process-region (buffer start end program args)
 178   "Run a git process with a buffer region as input."
 179   (let ((output-buffer (current-buffer))
 180         (dir default-directory))
 181     (with-current-buffer buffer
 182       (cd dir)
 183       (apply #'call-process-region start end program
 184              nil (list output-buffer nil) nil args))))
 185
 186 (defun git-run-command-buffer (buffer-name &rest args)
 187   "Run a git command, sending the output to a buffer named BUFFER-NAME."
 188   (let ((dir default-directory)
 189         (buffer (get-buffer-create buffer-name)))
 190     (message "Running git %s..." (car args))
 191     (with-current-buffer buffer
 192       (let ((default-directory dir)
 193             (buffer-read-only nil))
 194         (erase-buffer)
 195         (apply #'git-call-process-env buffer nil args)))
 196     (message "Running git %s...done" (car args))
 197     buffer))
 198
 199 (defun git-run-command (buffer env &rest args)
 200   (message "Running git %s..." (car args))
 201   (apply #'git-call-process-env buffer env args)
 202   (message "Running git %s...done" (car args)))
 203
 204 (defun git-run-command-region (buffer start end env &rest args)
 205   "Run a git command with specified buffer region as input."
 206   (message "Running git %s..." (car args))
 207   (unless (eq 0 (if env
 208                     (git-run-process-region
 209                      buffer start end "env"
 210                      (append (git-get-env-strings env) (list "git") args))
 211                   (git-run-process-region
 212                    buffer start end "git" args)))
 213     (error "Failed to run \"git %s\":\n%s" (mapconcat (lambda (x) x) args " ") (buffer-string)))
 214   (message "Running git %s...done" (car args)))
 215
 216 (defun git-run-hook (hook env &rest args)
 217   "Run a git hook and display its output if any."
 218   (let ((dir default-directory)
 219         (hook-name (expand-file-name (concat ".git/hooks/" hook))))
 220     (or (not (file-executable-p hook-name))
 221         (let (status (buffer (get-buffer-create "*Git Hook Output*")))
 222           (with-current-buffer buffer
 223             (erase-buffer)
 224             (cd dir)
 225             (setq status
 226                   (if env
 227                       (apply #'call-process "env" nil (list buffer t) nil
 228                              (append (git-get-env-strings env) (list hook-name) args))
 229                     (apply #'call-process hook-name nil (list buffer t) nil args))))
 230           (display-message-or-buffer buffer)
 231           (eq 0 status)))))
 232
 233 (defun git-get-string-sha1 (string)
 234   "Read a SHA1 from the specified string."
 235   (and string
 236        (string-match "[0-9a-f]\\{40\\}" string)
 237        (match-string 0 string)))
 238
 239 (defun git-get-committer-name ()
 240   "Return the name to use as GIT_COMMITTER_NAME."
 241   ; copied from log-edit
 242   (or git-committer-name
 243       (git-config "user.name")
 244       (and (boundp 'add-log-full-name) add-log-full-name)
 245       (and (fboundp 'user-full-name) (user-full-name))
 246       (and (boundp 'user-full-name) user-full-name)))
 247
 248 (defun git-get-committer-email ()
 249   "Return the email address to use as GIT_COMMITTER_EMAIL."
 250   ; copied from log-edit
 251   (or git-committer-email
 252       (git-config "user.email")
 253       (and (boundp 'add-log-mailing-address) add-log-mailing-address)
 254       (and (fboundp 'user-mail-address) (user-mail-address))
 255       (and (boundp 'user-mail-address) user-mail-address)))
 256
 257 (defun git-get-commits-coding-system ()
 258   "Return the coding system to use for commits."
 259   (let ((repo-config (git-config "i18n.commitencoding")))
 260     (or git-commits-coding-system
 261         (and repo-config
 262              (fboundp 'locale-charset-to-coding-system)
 263              (locale-charset-to-coding-system repo-config))
 264       'utf-8)))
 265
 266 (defun git-get-logoutput-coding-system ()
 267   "Return the coding system used for git-log output."
 268   (let ((repo-config (or (git-config "i18n.logoutputencoding")
 269                          (git-config "i18n.commitencoding"))))
 270     (or git-commits-coding-system
 271         (and repo-config
 272              (fboundp 'locale-charset-to-coding-system)
 273              (locale-charset-to-coding-system repo-config))
 274       'utf-8)))
 275
 276 (defun git-escape-file-name (name)
 277   "Escape a file name if necessary."
 278   (if (string-match "[\n\t\"\\]" name)
 279       (concat "\""
 280               (mapconcat (lambda (c)
 281                    (case c
 282                      (?\n "\\n")
 283                      (?\t "\\t")
 284                      (?\\ "\\\\")
 285                      (?\" "\\\"")
 286                      (t (char-to-string c))))
 287                  name "")
 288               "\"")
 289     name))
 290
 291 (defun git-get-top-dir (dir)
 292   "Retrieve the top-level directory of a git tree."
 293   (let ((cdup (with-output-to-string
 294                 (with-current-buffer standard-output
 295                   (cd dir)
 296                   (unless (eq 0 (call-process "git" nil t nil "rev-parse" "--show-cdup"))
 297                     (error "cannot find top-level git tree for %s." dir))))))
 298     (expand-file-name (concat (file-name-as-directory dir)
 299                               (car (split-string cdup "\n"))))))
 300
 301 ;stolen from pcl-cvs
 302 (defun git-append-to-ignore (file)
 303   "Add a file name to the ignore file in its directory."
 304   (let* ((fullname (expand-file-name file))
 305          (dir (file-name-directory fullname))
 306          (name (file-name-nondirectory fullname))
 307          (ignore-name (expand-file-name git-per-dir-ignore-file dir))
 308          (created (not (file-exists-p ignore-name))))
 309   (save-window-excursion
 310     (set-buffer (find-file-noselect ignore-name))
 311     (goto-char (point-max))
 312     (unless (zerop (current-column)) (insert "\n"))
 313     (insert "/" name "\n")
 314     (sort-lines nil (point-min) (point-max))
 315     (save-buffer))
 316   (when created
 317     (git-run-command nil nil "update-index" "--add" "--" (file-relative-name ignore-name)))
 318   (git-update-status-files (list (file-relative-name ignore-name)) 'unknown)))
 319
 320 ; propertize definition for XEmacs, stolen from erc-compat
 321 (eval-when-compile
 322   (unless (fboundp 'propertize)
 323     (defun propertize (string &rest props)
 324       (let ((string (copy-sequence string)))
 325         (while props
 326           (put-text-property 0 (length string) (nth 0 props) (nth 1 props) string)
 327           (setq props (cddr props)))
 328         string))))
 329
 330 ;;;; Wrappers for basic git commands
 331 ;;;; ------------------------------------------------------------
 332
 333 (defun git-rev-parse (rev)
 334   "Parse a revision name and return its SHA1."
 335   (git-get-string-sha1
 336    (git-call-process-env-string nil "rev-parse" rev)))
 337
 338 (defun git-config (key)
 339   "Retrieve the value associated to KEY in the git repository config file."
 340   (let ((str (git-call-process-env-string nil "config" key)))
 341     (and str (car (split-string str "\n")))))
 342
 343 (defun git-symbolic-ref (ref)
 344   "Wrapper for the git-symbolic-ref command."
 345   (let ((str (git-call-process-env-string nil "symbolic-ref" ref)))
 346     (and str (car (split-string str "\n")))))
 347
 348 (defun git-update-ref (ref newval &optional oldval reason)
 349   "Update a reference by calling git-update-ref."
 350   (let ((args (and oldval (list oldval))))
 351     (push newval args)
 352     (push ref args)
 353     (when reason
 354      (push reason args)
 355      (push "-m" args))
 356     (eq 0 (apply #'git-call-process-env nil nil "update-ref" args))))
 357
 358 (defun git-read-tree (tree &optional index-file)
 359   "Read a tree into the index file."
 360   (apply #'git-call-process-env nil
 361          (if index-file `(("GIT_INDEX_FILE" . ,index-file)) nil)
 362          "read-tree" (if tree (list tree))))
 363
 364 (defun git-write-tree (&optional index-file)
 365   "Call git-write-tree and return the resulting tree SHA1 as a string."
 366   (git-get-string-sha1
 367    (git-call-process-env-string (and index-file `(("GIT_INDEX_FILE" . ,index-file))) "write-tree")))
 368
 369 (defun git-commit-tree (buffer tree head)
 370   "Call git-commit-tree with buffer as input and return the resulting commit SHA1."
 371   (let ((author-name (git-get-committer-name))
 372         (author-email (git-get-committer-email))
 373         (subject "commit (initial): ")
 374         author-date log-start log-end args coding-system-for-write)
 375     (when head
 376       (setq subject "commit: ")
 377       (push "-p" args)
 378       (push head args))
 379     (with-current-buffer buffer
 380       (goto-char (point-min))
 381       (if
 382           (setq log-start (re-search-forward (concat "^" (regexp-quote git-log-msg-separator) "\n") nil t))
 383           (save-restriction
 384             (narrow-to-region (point-min) log-start)
 385             (goto-char (point-min))
 386             (when (re-search-forward "^Author: +\\(.*?\\) *<\\(.*\\)> *$" nil t)
 387               (setq author-name (match-string 1)
 388                     author-email (match-string 2)))
 389             (goto-char (point-min))
 390             (when (re-search-forward "^Date: +\\(.*\\)$" nil t)
 391               (setq author-date (match-string 1)))
 392             (goto-char (point-min))
 393             (while (re-search-forward "^Parent: +\\([0-9a-f]+\\)" nil t)
 394               (unless (string-equal head (match-string 1))
 395                 (setq subject "commit (merge): ")
 396                 (push "-p" args)
 397                 (push (match-string 1) args))))
 398         (setq log-start (point-min)))
 399       (setq log-end (point-max))
 400       (goto-char log-start)
 401       (when (re-search-forward ".*$" nil t)
 402         (setq subject (concat subject (match-string 0))))
 403       (setq coding-system-for-write buffer-file-coding-system))
 404     (let ((commit
 405            (git-get-string-sha1
 406             (with-output-to-string
 407               (with-current-buffer standard-output
 408                 (let ((env `(("GIT_AUTHOR_NAME" . ,author-name)
 409                              ("GIT_AUTHOR_EMAIL" . ,author-email)
 410                              ("GIT_COMMITTER_NAME" . ,(git-get-committer-name))
 411                              ("GIT_COMMITTER_EMAIL" . ,(git-get-committer-email)))))
 412                   (when author-date (push `("GIT_AUTHOR_DATE" . ,author-date) env))
 413                   (apply #'git-run-command-region
 414                          buffer log-start log-end env
 415                          "commit-tree" tree (nreverse args))))))))
 416       (and (git-update-ref "HEAD" commit head subject)
 417            commit))))
 418
 419 (defun git-empty-db-p ()
 420   "Check if the git db is empty (no commit done yet)."
 421   (not (eq 0 (call-process "git" nil nil nil "rev-parse" "--verify" "HEAD"))))
 422
 423 (defun git-get-merge-heads ()
 424   "Retrieve the merge heads from the MERGE_HEAD file if present."
 425   (let (heads)
 426     (when (file-readable-p ".git/MERGE_HEAD")
 427       (with-temp-buffer
 428         (insert-file-contents ".git/MERGE_HEAD" nil nil nil t)
 429         (goto-char (point-min))
 430         (while (re-search-forward "[0-9a-f]\\{40\\}" nil t)
 431           (push (match-string 0) heads))))
 432     (nreverse heads)))
 433
 434 (defun git-get-commit-description (commit)
 435   "Get a one-line description of COMMIT."
 436   (let ((coding-system-for-read (git-get-logoutput-coding-system)))
 437     (let ((descr (git-call-process-env-string nil "log" "--max-count=1" "--pretty=oneline" commit)))
 438       (if (and descr (string-match "\\`\\([0-9a-f]\\{40\\}\\) *\\(.*\\)$" descr))
 439           (concat (substring (match-string 1 descr) 0 10) " - " (match-string 2 descr))
 440         descr))))
 441
 442 ;;;; File info structure
 443 ;;;; ------------------------------------------------------------
 444
 445 ; fileinfo structure stolen from pcl-cvs
 446 (defstruct (git-fileinfo
 447             (:copier nil)
 448             (:constructor git-create-fileinfo (state name &optional old-perm new-perm rename-state orig-name marked))
 449             (:conc-name git-fileinfo->))
 450   marked              ;; t/nil
 451   state               ;; current state
 452   name                ;; file name
 453   old-perm new-perm   ;; permission flags
 454   rename-state        ;; rename or copy state
 455   orig-name           ;; original name for renames or copies
 456   needs-refresh)      ;; whether file needs to be refreshed
 457
 458 (defvar git-status nil)
 459
 460 (defun git-clear-status (status)
 461   "Remove everything from the status list."
 462   (ewoc-filter status (lambda (info) nil)))
 463
 464 (defun git-set-files-state (files state)
 465   "Set the state of a list of files."
 466   (dolist (info files)
 467     (unless (eq (git-fileinfo->state info) state)
 468       (setf (git-fileinfo->state info) state)
 469       (setf (git-fileinfo->rename-state info) nil)
 470       (setf (git-fileinfo->orig-name info) nil)
 471       (setf (git-fileinfo->needs-refresh info) t))))
 472
 473 (defun git-state-code (code)
 474   "Convert from a string to a added/deleted/modified state."
 475   (case (string-to-char code)
 476     (?M 'modified)
 477     (?? 'unknown)
 478     (?A 'added)
 479     (?D 'deleted)
 480     (?U 'unmerged)
 481     (t nil)))
 482
 483 (defun git-status-code-as-string (code)
 484   "Format a git status code as string."
 485   (case code
 486     ('modified (propertize "Modified" 'face 'git-status-face))
 487     ('unknown  (propertize "Unknown " 'face 'git-unknown-face))
 488     ('added    (propertize "Added   " 'face 'git-status-face))
 489     ('deleted  (propertize "Deleted " 'face 'git-status-face))
 490     ('unmerged (propertize "Unmerged" 'face 'git-unmerged-face))
 491     ('uptodate (propertize "Uptodate" 'face 'git-uptodate-face))
 492     ('ignored  (propertize "Ignored " 'face 'git-ignored-face))
 493     (t "?       ")))
 494
 495 (defun git-rename-as-string (info)
 496   "Return a string describing the copy or rename associated with INFO, or an empty string if none."
 497   (let ((state (git-fileinfo->rename-state info)))
 498     (if state
 499         (propertize
 500          (concat "   ("
 501                  (if (eq state 'copy) "copied from "
 502                    (if (eq (git-fileinfo->state info) 'added) "renamed from "
 503                      "renamed to "))
 504                  (git-escape-file-name (git-fileinfo->orig-name info))
 505                  ")") 'face 'git-status-face)
 506       "")))
 507
 508 (defun git-permissions-as-string (old-perm new-perm)
 509   "Format a permission change as string."
 510   (propertize
 511    (if (or (not old-perm)
 512            (not new-perm)
 513            (eq 0 (logand ?\111 (logxor old-perm new-perm))))
 514        "  "
 515      (if (eq 0 (logand ?\111 old-perm)) "+x" "-x"))
 516   'face 'git-permission-face))
 517
 518 (defun git-fileinfo-prettyprint (info)
 519   "Pretty-printer for the git-fileinfo structure."
 520   (insert (concat "   " (if (git-fileinfo->marked info) (propertize "*" 'face 'git-mark-face) " ")
 521                   " " (git-status-code-as-string (git-fileinfo->state info))
 522                   " " (git-permissions-as-string (git-fileinfo->old-perm info) (git-fileinfo->new-perm info))
 523                   "  " (git-escape-file-name (git-fileinfo->name info))
 524                   (git-rename-as-string info))))
 525
 526 (defun git-insert-fileinfo (status info &optional refresh)
 527   "Insert INFO in the status buffer, optionally refreshing an existing one."
 528   (let ((node (and refresh
 529                    (git-find-status-file status (git-fileinfo->name info)))))
 530     (setf (git-fileinfo->needs-refresh info) t)
 531     (when node   ;preserve the marked flag
 532       (setf (git-fileinfo->marked info) (git-fileinfo->marked (ewoc-data node))))
 533     (if node (setf (ewoc-data node) info) (ewoc-enter-last status info))))
 534
 535 (defun git-run-diff-index (status files)
 536   "Run git-diff-index on FILES and parse the results into STATUS.
 537 Return the list of files that haven't been handled."
 538   (let ((refresh files))
 539     (with-temp-buffer
 540       (apply #'git-run-command t nil "diff-index" "-z" "-M" "HEAD" "--" files)
 541       (goto-char (point-min))
 542       (while (re-search-forward
 543               ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMU]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0"
 544               nil t 1)
 545         (let ((old-perm (string-to-number (match-string 1) 8))
 546               (new-perm (string-to-number (match-string 2) 8))
 547               (state (or (match-string 4) (match-string 6)))
 548               (name (or (match-string 5) (match-string 7)))
 549               (new-name (match-string 8)))
 550           (if new-name  ; copy or rename
 551               (if (eq ?C (string-to-char state))
 552                   (git-insert-fileinfo status (git-create-fileinfo 'added new-name old-perm new-perm 'copy name) refresh)
 553                 (git-insert-fileinfo status (git-create-fileinfo 'deleted name 0 0 'rename new-name) refresh)
 554                 (git-insert-fileinfo status (git-create-fileinfo 'added new-name old-perm new-perm 'rename name)) refresh)
 555             (git-insert-fileinfo status (git-create-fileinfo (git-state-code state) name old-perm new-perm) refresh))
 556           (setq files (delete name files))
 557           (when new-name (setq files (delete new-name files)))))))
 558   files)
 559
 560 (defun git-find-status-file (status file)
 561   "Find a given file in the status ewoc and return its node."
 562   (let ((node (ewoc-nth status 0)))
 563     (while (and node (not (string= file (git-fileinfo->name (ewoc-data node)))))
 564       (setq node (ewoc-next status node)))
 565     node))
 566
 567 (defun git-run-ls-files (status files default-state &rest options)
 568   "Run git-ls-files on FILES and parse the results into STATUS.
 569 Return the list of files that haven't been handled."
 570   (let ((refresh files))
 571     (with-temp-buffer
 572       (apply #'git-run-command t nil "ls-files" "-z" "-t" (append options (list "--") files))
 573       (goto-char (point-min))
 574       (while (re-search-forward "\\([HMRCK?]\\) \\([^\0]*\\)\0" nil t 1)
 575         (let ((state (match-string 1))
 576               (name (match-string 2)))
 577           (git-insert-fileinfo status (git-create-fileinfo (or (git-state-code state) default-state) name) refresh)
 578           (setq files (delete name files))))))
 579   files)
 580
 581 (defun git-run-ls-unmerged (status files)
 582   "Run git-ls-files -u on FILES and parse the results into STATUS."
 583   (with-temp-buffer
 584     (apply #'git-run-command t nil "ls-files" "-z" "-u" "--" files)
 585     (goto-char (point-min))
 586     (let (unmerged-files)
 587       (while (re-search-forward "[0-7]\\{6\\} [0-9a-f]\\{40\\} [123]\t\\([^\0]+\\)\0" nil t)
 588         (let ((node (git-find-status-file status (match-string 1))))
 589           (when node (push (ewoc-data node) unmerged-files))))
 590       (git-set-files-state unmerged-files 'unmerged))))
 591
 592 (defun git-get-exclude-files ()
 593   "Get the list of exclude files to pass to git-ls-files."
 594   (let (files
 595         (config (git-config "core.excludesfile")))
 596     (when (file-readable-p ".git/info/exclude")
 597       (push ".git/info/exclude" files))
 598     (when (and config (file-readable-p config))
 599       (push config files))
 600     files))
 601
 602 (defun git-update-status-files (files &optional default-state)
 603   "Update the status of FILES from the index."
 604   (unless git-status (error "Not in git-status buffer."))
 605   (let* ((status git-status)
 606          (remaining-files
 607           (if (git-empty-db-p) ; we need some special handling for an empty db
 608               (git-run-ls-files status files 'added "-c")
 609             (git-run-diff-index status files))))
 610     (git-run-ls-unmerged status files)
 611     (when (or (not files) remaining-files)
 612       (let ((exclude-files (git-get-exclude-files)))
 613         (setq remaining-files (apply #'git-run-ls-files status remaining-files 'unknown "-o"
 614                                      (concat "--exclude-per-directory=" git-per-dir-ignore-file)
 615                                      (mapcar (lambda (f) (concat "--exclude-from=" f)) exclude-files)))))
 616     ; mark remaining files with the default state (or remove them if nil)
 617     (when remaining-files
 618       (if default-state
 619           (ewoc-map (lambda (info)
 620                       (when (member (git-fileinfo->name info) remaining-files)
 621                         (git-set-files-state (list info) default-state))
 622                       nil)
 623                     status)
 624         (ewoc-filter status
 625                      (lambda (info files)
 626                        (not (member (git-fileinfo->name info) files)))
 627                      remaining-files)))
 628     (git-refresh-files)
 629     (git-refresh-ewoc-hf status)))
 630
 631 (defun git-marked-files ()
 632   "Return a list of all marked files, or if none a list containing just the file at cursor position."
 633   (unless git-status (error "Not in git-status buffer."))
 634   (or (ewoc-collect git-status (lambda (info) (git-fileinfo->marked info)))
 635       (list (ewoc-data (ewoc-locate git-status)))))
 636
 637 (defun git-marked-files-state (&rest states)
 638   "Return marked files that are in the specified states."
 639   (let ((files (git-marked-files))
 640         result)
 641     (dolist (info files)
 642       (when (memq (git-fileinfo->state info) states)
 643         (push info result)))
 644     result))
 645
 646 (defun git-refresh-files ()
 647   "Refresh all files that need it and clear the needs-refresh flag."
 648   (unless git-status (error "Not in git-status buffer."))
 649   (ewoc-map
 650    (lambda (info)
 651      (let ((refresh (git-fileinfo->needs-refresh info)))
 652        (setf (git-fileinfo->needs-refresh info) nil)
 653        refresh))
 654    git-status)
 655   ; move back to goal column
 656   (when goal-column (move-to-column goal-column)))
 657
 658 (defun git-refresh-ewoc-hf (status)
 659   "Refresh the ewoc header and footer."
 660   (let ((branch (git-symbolic-ref "HEAD"))
 661         (head (if (git-empty-db-p) "Nothing committed yet"
 662                 (git-get-commit-description "HEAD")))
 663         (merge-heads (git-get-merge-heads)))
 664     (ewoc-set-hf status
 665                  (format "Directory:  %s\nBranch:     %s\nHead:       %s%s\n"
 666                          default-directory
 667                          (if (string-match "^refs/heads/" branch)
 668                              (substring branch (match-end 0))
 669                            branch)
 670                          head
 671                          (if merge-heads
 672                              (concat "\nMerging:    "
 673                                      (mapconcat (lambda (str) (git-get-commit-description str)) merge-heads "\n            "))
 674                            ""))
 675                  (if (ewoc-nth status 0) "" "    No changes."))))
 676
 677 (defun git-get-filenames (files)
 678   (mapcar (lambda (info) (git-fileinfo->name info)) files))
 679
 680 (defun git-update-index (index-file files)
 681   "Run git-update-index on a list of files."
 682   (let ((env (and index-file `(("GIT_INDEX_FILE" . ,index-file))))
 683         added deleted modified)
 684     (dolist (info files)
 685       (case (git-fileinfo->state info)
 686         ('added (push info added))
 687         ('deleted (push info deleted))
 688         ('modified (push info modified))))
 689     (when added
 690       (apply #'git-run-command nil env "update-index" "--add" "--" (git-get-filenames added)))
 691     (when deleted
 692       (apply #'git-run-command nil env "update-index" "--remove" "--" (git-get-filenames deleted)))
 693     (when modified
 694       (apply #'git-run-command nil env "update-index" "--" (git-get-filenames modified)))))
 695
 696 (defun git-run-pre-commit-hook ()
 697   "Run the pre-commit hook if any."
 698   (unless git-status (error "Not in git-status buffer."))
 699   (let ((files (git-marked-files-state 'added 'deleted 'modified)))
 700     (or (not files)
 701         (not (file-executable-p ".git/hooks/pre-commit"))
 702         (let ((index-file (make-temp-file "gitidx")))
 703           (unwind-protect
 704             (let ((head-tree (unless (git-empty-db-p) (git-rev-parse "HEAD^{tree}"))))
 705               (git-read-tree head-tree index-file)
 706               (git-update-index index-file files)
 707               (git-run-hook "pre-commit" `(("GIT_INDEX_FILE" . ,index-file))))
 708           (delete-file index-file))))))
 709
 710 (defun git-do-commit ()
 711   "Perform the actual commit using the current buffer as log message."
 712   (interactive)
 713   (let ((buffer (current-buffer))
 714         (index-file (make-temp-file "gitidx")))
 715     (with-current-buffer log-edit-parent-buffer
 716       (if (git-marked-files-state 'unmerged)
 717           (message "You cannot commit unmerged files, resolve them first.")
 718         (unwind-protect
 719             (let ((files (git-marked-files-state 'added 'deleted 'modified))
 720                   head head-tree)
 721               (unless (git-empty-db-p)
 722                 (setq head (git-rev-parse "HEAD")
 723                       head-tree (git-rev-parse "HEAD^{tree}")))
 724               (if files
 725                   (progn
 726                     (git-read-tree head-tree index-file)
 727                     (git-update-index nil files)         ;update both the default index
 728                     (git-update-index index-file files)  ;and the temporary one
 729                     (let ((tree (git-write-tree index-file)))
 730                       (if (or (not (string-equal tree head-tree))
 731                               (yes-or-no-p "The tree was not modified, do you really want to perform an empty commit? "))
 732                           (let ((commit (git-commit-tree buffer tree head)))
 733                             (condition-case nil (delete-file ".git/MERGE_HEAD") (error nil))
 734                             (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
 735                             (with-current-buffer buffer (erase-buffer))
 736                             (git-set-files-state files 'uptodate)
 737                             (git-run-command nil nil "rerere")
 738                             (git-refresh-files)
 739                             (git-refresh-ewoc-hf git-status)
 740                             (message "Committed %s." commit)
 741                             (git-run-hook "post-commit" nil))
 742                         (message "Commit aborted."))))
 743                 (message "No files to commit.")))
 744           (delete-file index-file))))))
 745
 746
 747 ;;;; Interactive functions
 748 ;;;; ------------------------------------------------------------
 749
 750 (defun git-mark-file ()
 751   "Mark the file that the cursor is on and move to the next one."
 752   (interactive)
 753   (unless git-status (error "Not in git-status buffer."))
 754   (let* ((pos (ewoc-locate git-status))
 755          (info (ewoc-data pos)))
 756     (setf (git-fileinfo->marked info) t)
 757     (ewoc-invalidate git-status pos)
 758     (ewoc-goto-next git-status 1)))
 759
 760 (defun git-unmark-file ()
 761   "Unmark the file that the cursor is on and move to the next one."
 762   (interactive)
 763   (unless git-status (error "Not in git-status buffer."))
 764   (let* ((pos (ewoc-locate git-status))
 765          (info (ewoc-data pos)))
 766     (setf (git-fileinfo->marked info) nil)
 767     (ewoc-invalidate git-status pos)
 768     (ewoc-goto-next git-status 1)))
 769
 770 (defun git-unmark-file-up ()
 771   "Unmark the file that the cursor is on and move to the previous one."
 772   (interactive)
 773   (unless git-status (error "Not in git-status buffer."))
 774   (let* ((pos (ewoc-locate git-status))
 775          (info (ewoc-data pos)))
 776     (setf (git-fileinfo->marked info) nil)
 777     (ewoc-invalidate git-status pos)
 778     (ewoc-goto-prev git-status 1)))
 779
 780 (defun git-mark-all ()
 781   "Mark all files."
 782   (interactive)
 783   (unless git-status (error "Not in git-status buffer."))
 784   (ewoc-map (lambda (info) (setf (git-fileinfo->marked info) t) t) git-status)
 785   ; move back to goal column after invalidate
 786   (when goal-column (move-to-column goal-column)))
 787
 788 (defun git-unmark-all ()
 789   "Unmark all files."
 790   (interactive)
 791   (unless git-status (error "Not in git-status buffer."))
 792   (ewoc-map (lambda (info) (setf (git-fileinfo->marked info) nil) t) git-status)
 793   ; move back to goal column after invalidate
 794   (when goal-column (move-to-column goal-column)))
 795
 796 (defun git-toggle-all-marks ()
 797   "Toggle all file marks."
 798   (interactive)
 799   (unless git-status (error "Not in git-status buffer."))
 800   (ewoc-map (lambda (info) (setf (git-fileinfo->marked info) (not (git-fileinfo->marked info))) t) git-status)
 801   ; move back to goal column after invalidate
 802   (when goal-column (move-to-column goal-column)))
 803
 804 (defun git-next-file (&optional n)
 805   "Move the selection down N files."
 806   (interactive "p")
 807   (unless git-status (error "Not in git-status buffer."))
 808   (ewoc-goto-next git-status n))
 809
 810 (defun git-prev-file (&optional n)
 811   "Move the selection up N files."
 812   (interactive "p")
 813   (unless git-status (error "Not in git-status buffer."))
 814   (ewoc-goto-prev git-status n))
 815
 816 (defun git-next-unmerged-file (&optional n)
 817   "Move the selection down N unmerged files."
 818   (interactive "p")
 819   (unless git-status (error "Not in git-status buffer."))
 820   (let* ((last (ewoc-locate git-status))
 821          (node (ewoc-next git-status last)))
 822     (while (and node (> n 0))
 823       (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
 824         (setq n (1- n))
 825         (setq last node))
 826       (setq node (ewoc-next git-status node)))
 827     (ewoc-goto-node git-status last)))
 828
 829 (defun git-prev-unmerged-file (&optional n)
 830   "Move the selection up N unmerged files."
 831   (interactive "p")
 832   (unless git-status (error "Not in git-status buffer."))
 833   (let* ((last (ewoc-locate git-status))
 834          (node (ewoc-prev git-status last)))
 835     (while (and node (> n 0))
 836       (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
 837         (setq n (1- n))
 838         (setq last node))
 839       (setq node (ewoc-prev git-status node)))
 840     (ewoc-goto-node git-status last)))
 841
 842 (defun git-add-file ()
 843   "Add marked file(s) to the index cache."
 844   (interactive)
 845   (let ((files (git-get-filenames (git-marked-files-state 'unknown))))
 846     (unless files
 847       (push (file-relative-name (read-file-name "File to add: " nil nil t)) files))
 848     (apply #'git-run-command nil nil "update-index" "--add" "--" files)
 849     (git-update-status-files files 'uptodate)))
 850
 851 (defun git-ignore-file ()
 852   "Add marked file(s) to the ignore list."
 853   (interactive)
 854   (let ((files (git-get-filenames (git-marked-files-state 'unknown))))
 855     (unless files
 856       (push (file-relative-name (read-file-name "File to ignore: " nil nil t)) files))
 857     (dolist (f files) (git-append-to-ignore f))
 858     (git-update-status-files files 'ignored)))
 859
 860 (defun git-remove-file ()
 861   "Remove the marked file(s)."
 862   (interactive)
 863   (let ((files (git-get-filenames (git-marked-files-state 'added 'modified 'unknown 'uptodate))))
 864     (unless files
 865       (push (file-relative-name (read-file-name "File to remove: " nil nil t)) files))
 866     (if (yes-or-no-p
 867          (format "Remove %d file%s? " (length files) (if (> (length files) 1) "s" "")))
 868         (progn
 869           (dolist (name files)
 870             (when (file-exists-p name) (delete-file name)))
 871           (apply #'git-run-command nil nil "update-index" "--remove" "--" files)
 872           (git-update-status-files files nil))
 873       (message "Aborting"))))
 874
 875 (defun git-revert-file ()
 876   "Revert changes to the marked file(s)."
 877   (interactive)
 878   (let ((files (git-marked-files))
 879         added modified)
 880     (when (and files
 881                (yes-or-no-p
 882                 (format "Revert %d file%s? " (length files) (if (> (length files) 1) "s" ""))))
 883       (dolist (info files)
 884         (case (git-fileinfo->state info)
 885           ('added (push (git-fileinfo->name info) added))
 886           ('deleted (push (git-fileinfo->name info) modified))
 887           ('unmerged (push (git-fileinfo->name info) modified))
 888           ('modified (push (git-fileinfo->name info) modified))))
 889       (when added
 890         (apply #'git-run-command nil nil "update-index" "--force-remove" "--" added))
 891       (when modified
 892         (apply #'git-run-command nil nil "checkout" "HEAD" modified))
 893       (git-update-status-files (append added modified) 'uptodate))))
 894
 895 (defun git-resolve-file ()
 896   "Resolve conflicts in marked file(s)."
 897   (interactive)
 898   (let ((files (git-get-filenames (git-marked-files-state 'unmerged))))
 899     (when files
 900       (apply #'git-run-command nil nil "update-index" "--" files)
 901       (git-update-status-files files 'uptodate))))
 902
 903 (defun git-remove-handled ()
 904   "Remove handled files from the status list."
 905   (interactive)
 906   (ewoc-filter git-status
 907                (lambda (info)
 908                  (not (or (eq (git-fileinfo->state info) 'ignored)
 909                           (eq (git-fileinfo->state info) 'uptodate)))))
 910   (unless (ewoc-nth git-status 0)  ; refresh header if list is empty
 911     (git-refresh-ewoc-hf git-status)))
 912
 913 (defun git-setup-diff-buffer (buffer)
 914   "Setup a buffer for displaying a diff."
 915   (let ((dir default-directory))
 916     (with-current-buffer buffer
 917       (diff-mode)
 918       (goto-char (point-min))
 919       (setq default-directory dir)
 920       (setq buffer-read-only t)))
 921   (display-buffer buffer)
 922   (shrink-window-if-larger-than-buffer))
 923
 924 (defun git-diff-file ()
 925   "Diff the marked file(s) against HEAD."
 926   (interactive)
 927   (let ((files (git-marked-files)))
 928     (git-setup-diff-buffer
 929      (apply #'git-run-command-buffer "*git-diff*" "diff-index" "-p" "-M" "HEAD" "--" (git-get-filenames files)))))
 930
 931 (defun git-diff-file-merge-head (arg)
 932   "Diff the marked file(s) against the first merge head (or the nth one with a numeric prefix)."
 933   (interactive "p")
 934   (let ((files (git-marked-files))
 935         (merge-heads (git-get-merge-heads)))
 936     (unless merge-heads (error "No merge in progress"))
 937     (git-setup-diff-buffer
 938      (apply #'git-run-command-buffer "*git-diff*" "diff-index" "-p" "-M"
 939             (or (nth (1- arg) merge-heads) "HEAD") "--" (git-get-filenames files)))))
 940
 941 (defun git-diff-unmerged-file (stage)
 942   "Diff the marked unmerged file(s) against the specified stage."
 943   (let ((files (git-marked-files)))
 944     (git-setup-diff-buffer
 945      (apply #'git-run-command-buffer "*git-diff*" "diff-files" "-p" stage "--" (git-get-filenames files)))))
 946
 947 (defun git-diff-file-base ()
 948   "Diff the marked unmerged file(s) against the common base file."
 949   (interactive)
 950   (git-diff-unmerged-file "-1"))
 951
 952 (defun git-diff-file-mine ()
 953   "Diff the marked unmerged file(s) against my pre-merge version."
 954   (interactive)
 955   (git-diff-unmerged-file "-2"))
 956
 957 (defun git-diff-file-other ()
 958   "Diff the marked unmerged file(s) against the other's pre-merge version."
 959   (interactive)
 960   (git-diff-unmerged-file "-3"))
 961
 962 (defun git-diff-file-combined ()
 963   "Do a combined diff of the marked unmerged file(s)."
 964   (interactive)
 965   (git-diff-unmerged-file "-c"))
 966
 967 (defun git-diff-file-idiff ()
 968   "Perform an interactive diff on the current file."
 969   (interactive)
 970   (let ((files (git-marked-files-state 'added 'deleted 'modified)))
 971     (unless (eq 1 (length files))
 972       (error "Cannot perform an interactive diff on multiple files."))
 973     (let* ((filename (car (git-get-filenames files)))
 974            (buff1 (find-file-noselect filename))
 975            (buff2 (git-run-command-buffer (concat filename ".~HEAD~") "cat-file" "blob" (concat "HEAD:" filename))))
 976       (ediff-buffers buff1 buff2))))
 977
 978 (defun git-log-file ()
 979   "Display a log of changes to the marked file(s)."
 980   (interactive)
 981   (let* ((files (git-marked-files))
 982          (coding-system-for-read git-commits-coding-system)
 983          (buffer (apply #'git-run-command-buffer "*git-log*" "rev-list" "--pretty" "HEAD" "--" (git-get-filenames files))))
 984     (with-current-buffer buffer
 985       ; (git-log-mode)  FIXME: implement log mode
 986       (goto-char (point-min))
 987       (setq buffer-read-only t))
 988     (display-buffer buffer)))
 989
 990 (defun git-log-edit-files ()
 991   "Return a list of marked files for use in the log-edit buffer."
 992   (with-current-buffer log-edit-parent-buffer
 993     (git-get-filenames (git-marked-files-state 'added 'deleted 'modified))))
 994
 995 (defun git-append-sign-off (name email)
 996   "Append a Signed-off-by entry to the current buffer, avoiding duplicates."
 997   (let ((sign-off (format "Signed-off-by: %s <%s>" name email))
 998         (case-fold-search t))
 999     (goto-char (point-min))
1000     (unless (re-search-forward (concat "^" (regexp-quote sign-off)) nil t)
1001       (goto-char (point-min))
1002       (unless (re-search-forward "^Signed-off-by: " nil t)
1003         (setq sign-off (concat "\n" sign-off)))
1004       (goto-char (point-max))
1005       (insert sign-off "\n"))))
1006
1007 (defun git-setup-log-buffer (buffer &optional author-name author-email subject date msg)
1008   "Setup the log buffer for a commit."
1009   (unless git-status (error "Not in git-status buffer."))
1010   (let ((merge-heads (git-get-merge-heads))
1011         (dir default-directory)
1012         (committer-name (git-get-committer-name))
1013         (committer-email (git-get-committer-email))
1014         (sign-off git-append-signed-off-by))
1015     (with-current-buffer buffer
1016       (cd dir)
1017       (erase-buffer)
1018       (insert
1019        (propertize
1020         (format "Author: %s <%s>\n%s%s"
1021                 (or author-name committer-name)
1022                 (or author-email committer-email)
1023                 (if date (format "Date: %s\n" date) "")
1024                 (if merge-heads
1025                     (format "Parent: %s\n%s\n"
1026                             (git-rev-parse "HEAD")
1027                             (mapconcat (lambda (str) (concat "Parent: " str)) merge-heads "\n"))
1028                   ""))
1029         'face 'git-header-face)
1030        (propertize git-log-msg-separator 'face 'git-separator-face)
1031        "\n")
1032       (when subject (insert subject "\n\n"))
1033       (cond (msg (insert msg "\n"))
1034             ((file-readable-p ".dotest/msg")
1035              (insert-file-contents ".dotest/msg"))
1036             ((file-readable-p ".git/MERGE_MSG")
1037              (insert-file-contents ".git/MERGE_MSG")))
1038       ; delete empty lines at end
1039       (goto-char (point-min))
1040       (when (re-search-forward "\n+\\'" nil t)
1041         (replace-match "\n" t t))
1042       (when sign-off (git-append-sign-off committer-name committer-email)))))
1043
1044 (defun git-commit-file ()
1045   "Commit the marked file(s), asking for a commit message."
1046   (interactive)
1047   (unless git-status (error "Not in git-status buffer."))
1048   (when (git-run-pre-commit-hook)
1049     (let ((buffer (get-buffer-create "*git-commit*"))
1050           (coding-system (git-get-commits-coding-system))
1051           author-name author-email subject date)
1052       (when (eq 0 (buffer-size buffer))
1053         (when (file-readable-p ".dotest/info")
1054           (with-temp-buffer
1055             (insert-file-contents ".dotest/info")
1056             (goto-char (point-min))
1057             (when (re-search-forward "^Author: \\(.*\\)\nEmail: \\(.*\\)$" nil t)
1058               (setq author-name (match-string 1))
1059               (setq author-email (match-string 2)))
1060             (goto-char (point-min))
1061             (when (re-search-forward "^Subject: \\(.*\\)$" nil t)
1062               (setq subject (match-string 1)))
1063             (goto-char (point-min))
1064             (when (re-search-forward "^Date: \\(.*\\)$" nil t)
1065               (setq date (match-string 1)))))
1066         (git-setup-log-buffer buffer author-name author-email subject date))
1067       (log-edit #'git-do-commit nil #'git-log-edit-files buffer)
1068       (setq font-lock-keywords (font-lock-compile-keywords git-log-edit-font-lock-keywords))
1069       (setq buffer-file-coding-system coding-system)
1070       (re-search-forward (regexp-quote (concat git-log-msg-separator "\n")) nil t))))
1071
1072 (defun git-find-file ()
1073   "Visit the current file in its own buffer."
1074   (interactive)
1075   (unless git-status (error "Not in git-status buffer."))
1076   (let ((info (ewoc-data (ewoc-locate git-status))))
1077     (find-file (git-fileinfo->name info))
1078     (when (eq 'unmerged (git-fileinfo->state info))
1079       (smerge-mode 1))))
1080
1081 (defun git-find-file-other-window ()
1082   "Visit the current file in its own buffer in another window."
1083   (interactive)
1084   (unless git-status (error "Not in git-status buffer."))
1085   (let ((info (ewoc-data (ewoc-locate git-status))))
1086     (find-file-other-window (git-fileinfo->name info))
1087     (when (eq 'unmerged (git-fileinfo->state info))
1088       (smerge-mode))))
1089
1090 (defun git-find-file-imerge ()
1091   "Visit the current file in interactive merge mode."
1092   (interactive)
1093   (unless git-status (error "Not in git-status buffer."))
1094   (let ((info (ewoc-data (ewoc-locate git-status))))
1095     (find-file (git-fileinfo->name info))
1096     (smerge-ediff)))
1097
1098 (defun git-view-file ()
1099   "View the current file in its own buffer."
1100   (interactive)
1101   (unless git-status (error "Not in git-status buffer."))
1102   (let ((info (ewoc-data (ewoc-locate git-status))))
1103     (view-file (git-fileinfo->name info))))
1104
1105 (defun git-refresh-status ()
1106   "Refresh the git status buffer."
1107   (interactive)
1108   (let* ((status git-status)
1109          (pos (ewoc-locate status))
1110          (cur-name (and pos (git-fileinfo->name (ewoc-data pos)))))
1111     (unless status (error "Not in git-status buffer."))
1112     (git-run-command nil nil "update-index" "--refresh")
1113     (git-clear-status status)
1114     (git-update-status-files nil)
1115     ; move point to the current file name if any
1116     (let ((node (and cur-name (git-find-status-file status cur-name))))
1117       (when node (ewoc-goto-node status node)))))
1118
1119 (defun git-status-quit ()
1120   "Quit git-status mode."
1121   (interactive)
1122   (bury-buffer))
1123
1124 ;;;; Major Mode
1125 ;;;; ------------------------------------------------------------
1126
1127 (defvar git-status-mode-hook nil
1128   "Run after `git-status-mode' is setup.")
1129
1130 (defvar git-status-mode-map nil
1131   "Keymap for git major mode.")
1132
1133 (defvar git-status nil
1134   "List of all files managed by the git-status mode.")
1135
1136 (unless git-status-mode-map
1137   (let ((map (make-keymap))
1138         (diff-map (make-sparse-keymap)))
1139     (suppress-keymap map)
1140     (define-key map "?"   'git-help)
1141     (define-key map "h"   'git-help)
1142     (define-key map " "   'git-next-file)
1143     (define-key map "a"   'git-add-file)
1144     (define-key map "c"   'git-commit-file)
1145     (define-key map "d"    diff-map)
1146     (define-key map "="   'git-diff-file)
1147     (define-key map "f"   'git-find-file)
1148     (define-key map "\r"  'git-find-file)
1149     (define-key map "g"   'git-refresh-status)
1150     (define-key map "i"   'git-ignore-file)
1151     (define-key map "l"   'git-log-file)
1152     (define-key map "m"   'git-mark-file)
1153     (define-key map "M"   'git-mark-all)
1154     (define-key map "n"   'git-next-file)
1155     (define-key map "N"   'git-next-unmerged-file)
1156     (define-key map "o"   'git-find-file-other-window)
1157     (define-key map "p"   'git-prev-file)
1158     (define-key map "P"   'git-prev-unmerged-file)
1159     (define-key map "q"   'git-status-quit)
1160     (define-key map "r"   'git-remove-file)
1161     (define-key map "R"   'git-resolve-file)
1162     (define-key map "T"   'git-toggle-all-marks)
1163     (define-key map "u"   'git-unmark-file)
1164     (define-key map "U"   'git-revert-file)
1165     (define-key map "v"   'git-view-file)
1166     (define-key map "x"   'git-remove-handled)
1167     (define-key map "\C-?" 'git-unmark-file-up)
1168     (define-key map "\M-\C-?" 'git-unmark-all)
1169     ; the diff submap
1170     (define-key diff-map "b" 'git-diff-file-base)
1171     (define-key diff-map "c" 'git-diff-file-combined)
1172     (define-key diff-map "=" 'git-diff-file)
1173     (define-key diff-map "e" 'git-diff-file-idiff)
1174     (define-key diff-map "E" 'git-find-file-imerge)
1175     (define-key diff-map "h" 'git-diff-file-merge-head)
1176     (define-key diff-map "m" 'git-diff-file-mine)
1177     (define-key diff-map "o" 'git-diff-file-other)
1178     (setq git-status-mode-map map)))
1179
1180 ;; git mode should only run in the *git status* buffer
1181 (put 'git-status-mode 'mode-class 'special)
1182
1183 (defun git-status-mode ()
1184   "Major mode for interacting with Git.
1185 Commands:
1186 \\{git-status-mode-map}"
1187   (kill-all-local-variables)
1188   (buffer-disable-undo)
1189   (setq mode-name "git status"
1190         major-mode 'git-status-mode
1191         goal-column 17
1192         buffer-read-only t)
1193   (use-local-map git-status-mode-map)
1194   (let ((buffer-read-only nil))
1195     (erase-buffer)
1196   (let ((status (ewoc-create 'git-fileinfo-prettyprint "" "")))
1197     (set (make-local-variable 'git-status) status))
1198   (set (make-local-variable 'list-buffers-directory) default-directory)
1199   (run-hooks 'git-status-mode-hook)))
1200
1201 (defun git-find-status-buffer (dir)
1202   "Find the git status buffer handling a specified directory."
1203   (let ((list (buffer-list))
1204         (fulldir (expand-file-name dir))
1205         found)
1206     (while (and list (not found))
1207       (let ((buffer (car list)))
1208         (with-current-buffer buffer
1209           (when (and list-buffers-directory
1210                      (string-equal fulldir (expand-file-name list-buffers-directory))
1211                      (string-match "\\*git-status\\*$" (buffer-name buffer)))
1212             (setq found buffer))))
1213       (setq list (cdr list)))
1214     found))
1215
1216 (defun git-status (dir)
1217   "Entry point into git-status mode."
1218   (interactive "DSelect directory: ")
1219   (setq dir (git-get-top-dir dir))
1220   (if (file-directory-p (concat (file-name-as-directory dir) ".git"))
1221       (let ((buffer (or (and git-reuse-status-buffer (git-find-status-buffer dir))
1222                         (create-file-buffer (expand-file-name "*git-status*" dir)))))
1223         (switch-to-buffer buffer)
1224         (cd dir)
1225         (git-status-mode)
1226         (git-refresh-status)
1227         (goto-char (point-min)))
1228     (message "%s is not a git working tree." dir)))
1229
1230 (defun git-help ()
1231   "Display help for Git mode."
1232   (interactive)
1233   (describe-function 'git-status-mode))
1234
1235 (provide 'git)
1236 ;;; git.el ends here