stgit.el: Add "t i/u" for showing files ignored by or unknown to git

[stgit] / contrib / stgit.el

diff --git a/contrib/stgit.el b/contrib/stgit.el
index b66a1ca..f629593 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -10,6 +10,8 @@
 ;; To start: `M-x stgit'
 
 (require 'git nil t)
 ;; To start: `M-x stgit'
 
 (require 'git nil t)

+(require 'cl)
+(require 'ewoc)

 
 (defun stgit (dir)
   "Manage StGit patches for the tree in DIR."
 
 (defun stgit (dir)
   "Manage StGit patches for the tree in DIR."


@@ -25,7 +27,7 @@
                     (cd dir)
                     (unless (eq 0 (call-process "git" nil t nil
                                                 "rev-parse" "--show-cdup"))
                     (cd dir)
                     (unless (eq 0 (call-process "git" nil t nil
                                                 "rev-parse" "--show-cdup"))

-                      (error "cannot find top-level git tree for %s." dir))))))
+                      (error "Cannot find top-level git tree for %s" dir))))))

       (expand-file-name (concat (file-name-as-directory dir)
                                 (car (split-string cdup "\n")))))))
 
       (expand-file-name (concat (file-name-as-directory dir)
                                 (car (split-string cdup "\n")))))))
 


@@ -40,8 +42,8 @@ directory DIR or `default-directory'"
         (with-current-buffer git-status-buffer
           (git-refresh-status))))))
 
         (with-current-buffer git-status-buffer
           (git-refresh-status))))))
 

-(defun switch-to-stgit-buffer (dir)
-  "Switch to a (possibly new) buffer displaying StGit patches for DIR."
+(defun stgit-find-buffer (dir)
+  "Return the buffer displaying StGit patches for DIR, or nil if none."

   (setq dir (file-name-as-directory dir))
   (let ((buffers (buffer-list)))
     (while (and buffers
   (setq dir (file-name-as-directory dir))
   (let ((buffers (buffer-list)))
     (while (and buffers


@@ -49,9 +51,44 @@ directory DIR or `default-directory'"
                        (and (eq major-mode 'stgit-mode)
                             (string= default-directory dir)))))
       (setq buffers (cdr buffers)))
                        (and (eq major-mode 'stgit-mode)
                             (string= default-directory dir)))))
       (setq buffers (cdr buffers)))

-    (switch-to-buffer (if buffers
-                          (car buffers)
-                        (create-stgit-buffer dir)))))
+    (and buffers (car buffers))))
+
+(defun switch-to-stgit-buffer (dir)
+  "Switch to a (possibly new) buffer displaying StGit patches for DIR."
+  (setq dir (file-name-as-directory dir))
+  (let ((buffer (stgit-find-buffer dir)))
+    (switch-to-buffer (or buffer
+                         (create-stgit-buffer dir)))))
+
+(defstruct (stgit-patch)
+  status name desc empty files-ewoc)
+
+(defun stgit-patch-pp (patch)
+  (let* ((status (stgit-patch-status patch))
+         (start (point))
+         (name (stgit-patch-name patch))
+         (face (cdr (assq status stgit-patch-status-face-alist))))
+    (insert (case status
+              ('applied "+")
+              ('top ">")
+              ('unapplied "-")
+              (t " "))
+            (if (memq name stgit-marked-patches)
+                "*" " "))
+    (if (memq status '(index work))
+        (insert (propertize (if (eq status 'index) "Index" "Work tree")
+                            'face face))
+      (insert (format "%-30s"
+                      (propertize (symbol-name name) 'face face))
+              "  "
+              (if (stgit-patch-empty patch) "(empty) " "")
+              (propertize (or (stgit-patch-desc patch) "")
+                          'face 'stgit-description-face)))
+    (insert "\n")
+    (put-text-property start (point) 'entry-type 'patch)
+    (when (memq name stgit-expanded-patches)
+      (stgit-insert-patch-files patch))
+    (put-text-property start (point) 'patch-data patch)))

 
 (defun create-stgit-buffer (dir)
   "Create a buffer for showing StGit patches.
 
 (defun create-stgit-buffer (dir)
   "Create a buffer for showing StGit patches.


@@ -61,11 +98,17 @@ Argument DIR is the repository path."
     (with-current-buffer buf
       (setq default-directory dir)
       (stgit-mode)
     (with-current-buffer buf
       (setq default-directory dir)
       (stgit-mode)

+      (set (make-local-variable 'stgit-ewoc)
+           (ewoc-create #'stgit-patch-pp "Branch:\n\n" "--\n" t))

       (setq buffer-read-only t))
     buf))
 
 (defmacro stgit-capture-output (name &rest body)
       (setq buffer-read-only t))
     buf))
 
 (defmacro stgit-capture-output (name &rest body)

-  "Capture StGit output and show it in a window at the end."
+  "Capture StGit output and, if there was any output, show it in a window
+at the end.
+Returns nil if there was no output."
+  (declare (debug ([&or stringp null] body))
+           (indent 1))

   `(let ((output-buf (get-buffer-create ,(or name "*StGit output*")))
          (stgit-dir default-directory)
          (inhibit-read-only t))
   `(let ((output-buf (get-buffer-create ,(or name "*StGit output*")))
          (stgit-dir default-directory)
          (inhibit-read-only t))


@@ -80,37 +123,142 @@ Argument DIR is the repository path."
        (setq buffer-read-only t)
        (if (< (point-min) (point-max))
            (display-buffer output-buf t)))))
        (setq buffer-read-only t)
        (if (< (point-min) (point-max))
            (display-buffer output-buf t)))))

-(put 'stgit-capture-output 'lisp-indent-function 1)
+
+(defun stgit-make-run-args (args)
+  "Return a copy of ARGS with its elements converted to strings."
+  (mapcar (lambda (x)
+            ;; don't use (format "%s" ...) to limit type errors
+            (cond ((stringp x) x)
+                  ((integerp x) (number-to-string x))
+                  ((symbolp x) (symbol-name x))
+                  (t
+                   (error "Bad element in stgit-make-run-args args: %S" x))))
+          args))

 
 (defun stgit-run-silent (&rest args)
 
 (defun stgit-run-silent (&rest args)

+  (setq args (stgit-make-run-args args))

   (apply 'call-process "stg" nil standard-output nil args))
 
 (defun stgit-run (&rest args)
   (apply 'call-process "stg" nil standard-output nil args))
 
 (defun stgit-run (&rest args)

+  (setq args (stgit-make-run-args args))

   (let ((msgcmd (mapconcat #'identity args " ")))
     (message "Running stg %s..." msgcmd)
     (apply 'call-process "stg" nil standard-output nil args)
     (message "Running stg %s...done" msgcmd)))
 
 (defun stgit-run-git (&rest args)
   (let ((msgcmd (mapconcat #'identity args " ")))
     (message "Running stg %s..." msgcmd)
     (apply 'call-process "stg" nil standard-output nil args)
     (message "Running stg %s...done" msgcmd)))
 
 (defun stgit-run-git (&rest args)

+  (setq args (stgit-make-run-args args))

   (let ((msgcmd (mapconcat #'identity args " ")))
     (message "Running git %s..." msgcmd)
     (apply 'call-process "git" nil standard-output nil args)
     (message "Running git %s...done" msgcmd)))
 
 (defun stgit-run-git-silent (&rest args)
   (let ((msgcmd (mapconcat #'identity args " ")))
     (message "Running git %s..." msgcmd)
     (apply 'call-process "git" nil standard-output nil args)
     (message "Running git %s...done" msgcmd)))
 
 (defun stgit-run-git-silent (&rest args)

+  (setq args (stgit-make-run-args args))

   (apply 'call-process "git" nil standard-output nil args))
 
   (apply 'call-process "git" nil standard-output nil args))
 

+(defun stgit-index-empty-p ()
+  "Returns non-nil if the index contains no changes from HEAD."
+  (zerop (stgit-run-git-silent "diff-index" "--cached" "--quiet" "HEAD")))
+
+(defvar stgit-index-node)
+(defvar stgit-worktree-node)
+
+(defun stgit-refresh-index ()
+  (when stgit-index-node
+    (ewoc-invalidate (car stgit-index-node) (cdr stgit-index-node))))
+
+(defun stgit-refresh-worktree ()
+  (when stgit-worktree-node
+    (ewoc-invalidate (car stgit-worktree-node) (cdr stgit-worktree-node))))
+
+(defun stgit-run-series-insert-index (ewoc)
+  (setq index-node    (cons ewoc (ewoc-enter-last ewoc
+                                                  (make-stgit-patch
+                                                   :status 'index
+                                                   :name :index
+                                                   :desc nil
+                                                   :empty nil)))
+        worktree-node (cons ewoc (ewoc-enter-last ewoc
+                                                  (make-stgit-patch
+                                                   :status 'work
+                                                   :name :work
+                                                   :desc nil
+                                                   :empty nil)))))
+
+(defun stgit-run-series (ewoc)
+  (setq stgit-index-node nil
+        stgit-worktree-node nil)
+  (let ((inserted-index (not stgit-show-worktree))
+        index-node
+        worktree-node
+        all-patchsyms)
+    (with-temp-buffer
+      (let ((exit-status (stgit-run-silent "series" "--description" "--empty")))
+        (goto-char (point-min))
+        (if (not (zerop exit-status))
+            (cond ((looking-at "stg series: \\(.*\\)")
+                   (setq inserted-index t)
+                   (ewoc-set-hf ewoc (car (ewoc-get-hf ewoc))
+                                (substitute-command-keys
+                                 "-- not initialized; run \\[stgit-init]")))
+                  ((looking-at ".*")
+                   (error "Error running stg: %s"
+                          (match-string 0))))
+          (while (not (eobp))
+            (unless (looking-at
+                     "\\([0 ]\\)\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)")
+              (error "Syntax error in output from stg series"))
+            (let* ((state-str (match-string 2))
+                   (state (cond ((string= state-str ">") 'top)
+                                ((string= state-str "+") 'applied)
+                                ((string= state-str "-") 'unapplied)))
+                   (name (intern (match-string 4)))
+                   (desc (match-string 5))
+                   (empty (string= (match-string 1) "0")))
+              (unless inserted-index
+                (when (or (eq stgit-show-worktree-mode 'top)
+                          (and (eq stgit-show-worktree-mode 'center)
+                               (eq state 'unapplied)))
+                  (setq inserted-index t)
+                  (stgit-run-series-insert-index ewoc)))
+              (setq all-patchsyms (cons name all-patchsyms))
+              (ewoc-enter-last ewoc
+                               (make-stgit-patch
+                                :status state
+                                :name   name
+                                :desc   desc
+                                :empty  empty)))
+            (forward-line 1))))
+      (unless inserted-index
+        (stgit-run-series-insert-index ewoc)))
+    (setq stgit-index-node    index-node
+          stgit-worktree-node worktree-node
+          stgit-marked-patches (intersection stgit-marked-patches
+                                             all-patchsyms))))
+

 (defun stgit-reload ()
   "Update the contents of the StGit buffer."
   (interactive)
   (let ((inhibit-read-only t)
         (curline (line-number-at-pos))
 (defun stgit-reload ()
   "Update the contents of the StGit buffer."
   (interactive)
   (let ((inhibit-read-only t)
         (curline (line-number-at-pos))

-        (curpatch (stgit-patch-at-point)))
-    (erase-buffer)
-    (insert "Branch: ")
-    (stgit-run-silent "branch")
-    (stgit-run-silent "series" "--description")
-    (stgit-rescan)
+        (curpatch (stgit-patch-name-at-point)))
+    (ewoc-filter stgit-ewoc #'(lambda (x) nil))
+    (ewoc-set-hf stgit-ewoc
+                 (concat "Branch: "
+                         (propertize
+                          (with-temp-buffer
+                            (stgit-run-silent "branch")
+                            (buffer-substring (point-min) (1- (point-max))))
+                          'face 'stgit-branch-name-face)
+                         "\n\n")
+                 (if stgit-show-worktree
+                     "--"
+                   (propertize
+                    (substitute-command-keys "--\n\"\\[stgit-toggle-worktree]\"\
+ shows the working tree\n")
+                   'face 'stgit-description-face)))
+    (stgit-run-series stgit-ewoc)

     (if curpatch
         (stgit-goto-patch curpatch)
       (goto-line curline)))
     (if curpatch
         (stgit-goto-patch curpatch)
       (goto-line curline)))


@@ -126,6 +274,11 @@ Argument DIR is the repository path."
   "The face used for StGit descriptions"
   :group 'stgit)
 
   "The face used for StGit descriptions"
   :group 'stgit)
 

+(defface stgit-branch-name-face
+  '((t :inherit bold))
+  "The face used for the StGit branch name"
+  :group 'stgit)
+

 (defface stgit-top-patch-face
   '((((background dark)) (:weight bold :foreground "yellow"))
     (((background light)) (:weight bold :foreground "purple"))
 (defface stgit-top-patch-face
   '((((background dark)) (:weight bold :foreground "yellow"))
     (((background light)) (:weight bold :foreground "purple"))


@@ -165,12 +318,24 @@ Argument DIR is the repository path."
   "StGit mode face used for unknown file status"
   :group 'stgit)
 
   "StGit mode face used for unknown file status"
   :group 'stgit)
 

+(defface stgit-ignored-file-face
+  '((((class color) (background light)) (:foreground "grey60"))
+    (((class color) (background dark)) (:foreground "grey40")))
+  "StGit mode face used for ignored files")
+

 (defface stgit-file-permission-face
   '((((class color) (background light)) (:foreground "green" :bold t))
     (((class color) (background dark)) (:foreground "green" :bold t)))
   "StGit mode face used for permission changes."
   :group 'stgit)
 
 (defface stgit-file-permission-face
   '((((class color) (background light)) (:foreground "green" :bold t))
     (((class color) (background dark)) (:foreground "green" :bold t)))
   "StGit mode face used for permission changes."
   :group 'stgit)
 

+(defface stgit-index-work-tree-title-face
+  '((((supports :slant italic)) :slant italic)
+    (t :inherit bold))
+  "StGit mode face used for the \"Index\" and \"Work tree\" titles"
+  :group 'stgit)
+
+

 (defcustom stgit-expand-find-copies-harder
   nil
   "Try harder to find copied files when listing patches.
 (defcustom stgit-expand-find-copies-harder
   nil
   "Try harder to find copied files when listing patches.


@@ -191,26 +356,37 @@ flag, which reduces performance."
             (rename      "Renamed"     stgit-modified-file-face)
             (mode-change "Mode change" stgit-modified-file-face)
             (unmerged    "Unmerged"    stgit-unmerged-file-face)
             (rename      "Renamed"     stgit-modified-file-face)
             (mode-change "Mode change" stgit-modified-file-face)
             (unmerged    "Unmerged"    stgit-unmerged-file-face)

-            (unknown     "Unknown"     stgit-unknown-file-face)))
+            (unknown     "Unknown"     stgit-unknown-file-face)
+            (ignore      "Ignored"     stgit-ignored-file-face)))

   "Alist of code symbols to description strings")
 
   "Alist of code symbols to description strings")
 

-(defun stgit-file-status-code-as-string (code)
-  "Return stgit status code as string"
-  (let ((str (assq (if (consp code) (car code) code)
-                   stgit-file-status-code-strings)))
-    (when str
+(defconst stgit-patch-status-face-alist
+  '((applied   . stgit-applied-patch-face)
+    (top       . stgit-top-patch-face)
+    (unapplied . stgit-unapplied-patch-face)
+    (index     . stgit-index-work-tree-title-face)
+    (work      . stgit-index-work-tree-title-face))
+  "Alist of face to use for a given patch status")
+
+(defun stgit-file-status-code-as-string (file)
+  "Return stgit status code for FILE as a string"
+  (let* ((code (assq (stgit-file-status file)
+                     stgit-file-status-code-strings))
+         (score (stgit-file-cr-score file)))
+    (when code

       (format "%-11s  "
       (format "%-11s  "

-              (if (and str (consp code) (/= (cdr code) 100))
-                  (format "%s %s" (cdr str)
-                          (propertize (format "%d%%" (cdr code))
+              (if (and score (/= score 100))
+                  (format "%s %s" (cdr code)
+                          (propertize (format "%d%%" score)

                                       'face 'stgit-description-face))
                                       'face 'stgit-description-face))

-                (cdr str))))))
+                (cdr code))))))

 
 (defun stgit-file-status-code (str &optional score)
   "Return stgit status code from git status string"
   (let ((code (assoc str '(("A" . add)
                            ("C" . copy)
                            ("D" . delete)
 
 (defun stgit-file-status-code (str &optional score)
   "Return stgit status code from git status string"
   (let ((code (assoc str '(("A" . add)
                            ("C" . copy)
                            ("D" . delete)

+                           ("I" . ignore)

                            ("M" . modify)
                            ("R" . rename)
                            ("T" . mode-change)
                            ("M" . modify)
                            ("R" . rename)
                            ("T" . mode-change)


@@ -276,115 +452,150 @@ Cf. `stgit-file-type-change-string'."
                        (propertize (format "%o" new-perm)
                                    'face 'stgit-file-permission-face)))))))
 
                        (propertize (format "%o" new-perm)
                                    'face 'stgit-file-permission-face)))))))
 

-(defun stgit-expand-patch (patchsym)
-  "Expand (show modification of) the patch with name PATCHSYM (a
-symbol) at point.
-`stgit-expand-find-copies-harder' controls how hard to try to
-find copied files."
-  (save-excursion
-    (forward-line)
-    (let* ((start (point))
-           (result (with-output-to-string
-                     (stgit-run-git "diff-tree" "-r" "-z"
-                                    (if stgit-expand-find-copies-harder
-                                        "--find-copies-harder"
-                                      "-C")
-                                    (stgit-id (symbol-name patchsym))))))
-      (let (mstart)
-        (while (string-match "\0:\\([0-7]+\\) \\([0-7]+\\) [0-9A-Fa-f]\\{40\\} [0-9A-Fa-f]\\{40\\} \\(\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\\|\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\\)"
-                             result mstart)
-          (let ((copy-or-rename (match-string 4 result))
-                (old-perm       (read (format "#o%s" (match-string 1 result))))
-                (new-perm       (read (format "#o%s" (match-string 2 result))))
-                (line-start (point))
-                status
-                change
-                properties)
-            (insert "    ")
-            (if copy-or-rename
-                (let ((cr-score       (match-string 5 result))
-                      (cr-from-file   (match-string 6 result))
-                      (cr-to-file     (match-string 7 result)))
-                  (setq status (stgit-file-status-code copy-or-rename
-                                                       cr-score)
-                        properties (list 'stgit-old-file cr-from-file
-                                         'stgit-new-file cr-to-file)
-                        change (concat
-                                cr-from-file
-                                (propertize " -> "
-                                            'face 'stgit-description-face)
-                                cr-to-file)))
-              (setq status (stgit-file-status-code (match-string 8 result))
-                    properties (list 'stgit-file (match-string 9 result))
-                    change (match-string 9 result)))
-
-            (let ((mode-change (stgit-file-mode-change-string old-perm
-                                                              new-perm)))
-              (insert (format "%-12s" (stgit-file-status-code-as-string
-                                       status))
-                      mode-change
-                      (if (> (length mode-change) 0) " " "")
-                      change
-                      (propertize (stgit-file-type-change-string old-perm
-                                                                 new-perm)
-                                  'face 'stgit-description-face)
-                      ?\n))
-            (add-text-properties line-start (point) properties))
-          (setq mstart (match-end 0))))
-      (when (= start (point))
-        (insert "    <no files>\n"))
-      (put-text-property start (point) 'stgit-patchsym patchsym))))
-
-(defun stgit-rescan ()
-  "Rescan the status buffer."
-  (save-excursion
-    (let ((marked ()))
+(defstruct (stgit-file)
+  old-perm new-perm copy-or-rename cr-score cr-from cr-to status file)
+
+(defun stgit-file-pp (file)
+  (let ((status (stgit-file-status file))
+        (name (if (stgit-file-copy-or-rename file)
+                  (concat (stgit-file-cr-from file)
+                          (propertize " -> "
+                                      'face 'stgit-description-face)
+                          (stgit-file-cr-to file))
+                (stgit-file-file file)))
+        (mode-change (stgit-file-mode-change-string
+                      (stgit-file-old-perm file)
+                      (stgit-file-new-perm file)))
+        (start (point)))
+    (insert (format "    %-12s%1s%s%s\n"
+                    (stgit-file-status-code-as-string file)
+                    mode-change
+                    name
+                    (propertize (stgit-file-type-change-string
+                                 (stgit-file-old-perm file)
+                                 (stgit-file-new-perm file))
+                                'face 'stgit-description-face)))
+    (add-text-properties start (point)
+                         (list 'entry-type 'file
+                               'file-data file))))
+
+(defun stgit-find-copies-harder-diff-arg ()
+  "Return the flag to use with `git-diff' depending on the
+`stgit-expand-find-copies-harder' flag."
+  (if stgit-expand-find-copies-harder
+      "--find-copies-harder"
+    "-C"))
+
+(defun stgit-insert-ls-files (args file-flag)
+  (let ((start (point)))
+    (apply 'stgit-run-git
+           (append '("ls-files" "--exclude-standard" "-z") args))
+    (goto-char start)
+    (while (looking-at "\\([^\0]*\\)\0")
+      (let ((name-len (- (match-end 0) (match-beginning 0))))
+        (insert ":0 0 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 " file-flag "\0")
+        (forward-char name-len)))))
+
+(defun stgit-insert-patch-files (patch)
+  "Expand (show modification of) the patch PATCH after the line
+at point."
+  (let* ((patchsym (stgit-patch-name patch))
+         (end      (point-marker))
+         (args     (list "-z" (stgit-find-copies-harder-diff-arg)))
+         (ewoc     (ewoc-create #'stgit-file-pp nil nil t)))
+    (set-marker-insertion-type end t)
+    (setf (stgit-patch-files-ewoc patch) ewoc)
+    (with-temp-buffer
+      (apply 'stgit-run-git
+             (cond ((eq patchsym :work)
+                    `("diff-files" ,@args))
+                   ((eq patchsym :index)
+                    `("diff-index" ,@args "--cached" "HEAD"))
+                   (t
+                    `("diff-tree" ,@args "-r" ,(stgit-id patchsym)))))
+
+      (when (and (eq patchsym :work))
+        (when stgit-show-ignored
+          (stgit-insert-ls-files '("--ignored" "--others") "I"))
+        (when stgit-show-unknown
+          (stgit-insert-ls-files '("--others") "X"))
+        (sort-regexp-fields nil ":[^\0]*\0\\([^\0]*\\)\0" "\\1"
+                            (point-min) (point-max)))
+

       (goto-char (point-min))
       (goto-char (point-min))

-      (while (not (eobp))
-        (cond ((looking-at "Branch: \\(.*\\)")
-               (put-text-property (match-beginning 1) (match-end 1)
-                                  'face 'bold))
-              ((looking-at "\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)")
-               (let ((state (match-string 1))
-                     (patchsym (intern (match-string 3))))
-                 (put-text-property
-                  (match-beginning 3) (match-end 3) 'face
-                  (cond ((string= state ">") 'stgit-top-patch-face)
-                        ((string= state "+") 'stgit-applied-patch-face)
-                        ((string= state "-") 'stgit-unapplied-patch-face)))
-                 (put-text-property (match-beginning 4) (match-end 4)
-                                    'face 'stgit-description-face)
-                 (when (memq patchsym stgit-marked-patches)
-                   (replace-match "*" nil nil nil 2)
-                   (setq marked (cons patchsym marked)))
-                 (when (memq patchsym stgit-expanded-patches)
-                   (stgit-expand-patch patchsym))
-                 ))
-              ((or (looking-at "stg series: Branch \".*\" not initialised")
-                   (looking-at "stg series: .*: branch not initialized"))
-               (forward-line 1)
-               (insert "Run M-x stgit-init to initialise")))
-        (forward-line 1))
-      (setq stgit-marked-patches (nreverse marked)))))
+      (unless (or (eobp) (memq patchsym '(:work :index)))
+        (forward-char 41))
+      (while (looking-at ":\\([0-7]+\\) \\([0-7]+\\) [0-9A-Fa-f]\\{40\\} [0-9A-Fa-f]\\{40\\} ")
+        (let ((old-perm (string-to-number (match-string 1) 8))
+              (new-perm (string-to-number (match-string 2) 8)))
+          (goto-char (match-end 0))
+          (let ((file
+                 (cond ((looking-at
+                         "\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\0")
+                        (let* ((patch-status (stgit-patch-status patch))
+                               (file-subexp  (if (eq patch-status 'unapplied)
+                                                 3
+                                               4))
+                               (file         (match-string file-subexp)))
+                          (make-stgit-file
+                           :old-perm       old-perm
+                           :new-perm       new-perm
+                           :copy-or-rename t
+                           :cr-score       (string-to-number (match-string 2))
+                           :cr-from        (match-string 3)
+                           :cr-to          (match-string 4)
+                           :status         (stgit-file-status-code
+                                            (match-string 1))
+                           :file           file)))
+                       ((looking-at "\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\0")
+                        (make-stgit-file
+                         :old-perm       old-perm
+                         :new-perm       new-perm
+                         :copy-or-rename nil
+                         :cr-score       nil
+                         :cr-from        nil
+                         :cr-to          nil
+                         :status         (stgit-file-status-code
+                                          (match-string 1))
+                         :file           (match-string 2))))))
+            (ewoc-enter-last ewoc file))
+          (goto-char (match-end 0))))
+      (unless (ewoc-nth ewoc 0)
+        (ewoc-set-hf ewoc ""
+                     (concat "    "
+                             (propertize "<no files>"
+                                         'face 'stgit-description-face)
+                             "\n"))))
+    (goto-char end)))
+
+(defun stgit-select-file ()
+  (let ((filename (expand-file-name
+                   (stgit-file-file (stgit-patched-file-at-point)))))
+    (unless (file-exists-p filename)
+      (error "File does not exist"))
+    (find-file filename)))
+
+(defun stgit-select-patch ()
+  (let ((patchname (stgit-patch-name-at-point)))
+    (if (memq patchname stgit-expanded-patches)
+        (setq stgit-expanded-patches (delq patchname stgit-expanded-patches))
+      (setq stgit-expanded-patches (cons patchname stgit-expanded-patches)))
+    (ewoc-invalidate stgit-ewoc (ewoc-locate stgit-ewoc)))
+  (move-to-column (stgit-goal-column)))

 
 (defun stgit-select ()
 
 (defun stgit-select ()

-  "Expand or collapse the current entry"
+  "With point on a patch, toggle showing files in the patch.
+
+With point on a file, open the associated file. Opens the target
+file for (applied) copies and renames."

   (interactive)
   (interactive)

-  (let ((curpatch (stgit-patch-at-point)))
-    (if (not curpatch)
-        (let ((patched-file (stgit-patched-file-at-point)))
-          (unless patched-file
-            (error "No patch or file on the current line"))
-          (let ((filename (expand-file-name (cdr patched-file))))
-            (unless (file-exists-p filename)
-              (error "File does not exist"))
-            (find-file filename)))
-      (setq curpatch (intern curpatch))
-      (setq stgit-expanded-patches
-            (if (memq curpatch stgit-expanded-patches)
-                (delq curpatch stgit-expanded-patches)
-              (cons curpatch stgit-expanded-patches)))
-      (stgit-reload))))
+  (case (get-text-property (point) 'entry-type)
+    ('patch
+     (stgit-select-patch))
+    ('file
+     (stgit-select-file))
+    (t
+     (error "No patch or file on line"))))

 
 (defun stgit-find-file-other-window ()
   "Open file at point in other window"
 
 (defun stgit-find-file-other-window ()
   "Open file at point in other window"


@@ -392,7 +603,7 @@ find copied files."
   (let ((patched-file (stgit-patched-file-at-point)))
     (unless patched-file
       (error "No file on the current line"))
   (let ((patched-file (stgit-patched-file-at-point)))
     (unless patched-file
       (error "No file on the current line"))

-    (let ((filename (expand-file-name (cdr patched-file))))
+    (let ((filename (expand-file-name (stgit-file-file patched-file))))

       (unless (file-exists-p filename)
         (error "File does not exist"))
       (find-file-other-window filename))))
       (unless (file-exists-p filename)
         (error "File does not exist"))
       (find-file-other-window filename))))


@@ -406,49 +617,42 @@ find copied files."
   "Show status using `git-status'."
   (interactive)
   (unless (fboundp 'git-status)
   "Show status using `git-status'."
   (interactive)
   (unless (fboundp 'git-status)

-    (error "stgit-git-status requires git-status"))
+    (error "The stgit-git-status command requires git-status"))

   (let ((dir default-directory))
     (save-selected-window
       (pop-to-buffer nil)
       (git-status dir))))
 
   (let ((dir default-directory))
     (save-selected-window
       (pop-to-buffer nil)
       (git-status dir))))
 

-(defun stgit-next-line (&optional arg try-vscroll)
+(defun stgit-goal-column ()
+  "Return goal column for the current line"
+  (case (get-text-property (point) 'entry-type)
+    ('patch 2)
+    ('file 4)
+    (t 0)))
+
+(defun stgit-next-line (&optional arg)

   "Move cursor vertically down ARG lines"
   "Move cursor vertically down ARG lines"

-  (interactive "p\np")
-  (next-line arg try-vscroll)
-  (when (looking-at "  \\S-")
-    (forward-char 2)))
+  (interactive "p")
+  (next-line arg)
+  (move-to-column (stgit-goal-column)))

 
 

-(defun stgit-previous-line (&optional arg try-vscroll)
+(defun stgit-previous-line (&optional arg)

   "Move cursor vertically up ARG lines"
   "Move cursor vertically up ARG lines"

-  (interactive "p\np")
-  (previous-line arg try-vscroll)
-  (when (looking-at "  \\S-")
-    (forward-char 2)))
+  (interactive "p")
+  (previous-line arg)
+  (move-to-column (stgit-goal-column)))

 
 (defun stgit-next-patch (&optional arg)
 
 (defun stgit-next-patch (&optional arg)

-  "Move cursor down ARG patches"
+  "Move cursor down ARG patches."

   (interactive "p")
   (interactive "p")

-  (unless arg
-    (setq arg 1))
-  (if (< arg 0)
-      (stgit-previous-patch (- arg))
-    (while (not (zerop arg))
-      (setq arg (1- arg))
-      (while (progn (stgit-next-line)
-                    (not (stgit-patch-at-point)))))))
+  (ewoc-goto-next stgit-ewoc (or arg 1))
+  (move-to-column goal-column))

 
 (defun stgit-previous-patch (&optional arg)
 
 (defun stgit-previous-patch (&optional arg)

-  "Move cursor up ARG patches"
+  "Move cursor up ARG patches."

   (interactive "p")
   (interactive "p")

-  (unless arg
-    (setq arg 1))
-  (if (< arg 0)
-      (stgit-next-patch (- arg))
-    (while (not (zerop arg))
-      (setq arg (1- arg))
-      (while (progn (stgit-previous-line)
-                    (not (stgit-patch-at-point)))))))
+  (ewoc-goto-prev stgit-ewoc (or arg 1))
+  (move-to-column goal-column))

 
 (defvar stgit-mode-hook nil
   "Run after `stgit-mode' is setup.")
 
 (defvar stgit-mode-hook nil
   "Run after `stgit-mode' is setup.")


@@ -457,42 +661,55 @@ find copied files."
   "Keymap for StGit major mode.")
 
 (unless stgit-mode-map
   "Keymap for StGit major mode.")
 
 (unless stgit-mode-map

-  (setq stgit-mode-map (make-keymap))
-  (suppress-keymap stgit-mode-map)
-  (mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg)))
-        '((" " .        stgit-mark)
-          ("m" .        stgit-mark)
-          ("\d" .       stgit-unmark-up)
-          ("u" .        stgit-unmark-down)
-          ("?" .        stgit-help)
-          ("h" .        stgit-help)
-          ("p" .        stgit-previous-line)
-          ("n" .        stgit-next-line)
-          ("\C-p" .     stgit-previous-patch)
-          ("\C-n" .     stgit-next-patch)
-          ("\M-{" .     stgit-previous-patch)
-          ("\M-}" .     stgit-next-patch)
-          ("s" .        stgit-git-status)
-          ("g" .        stgit-reload)
-          ("r" .        stgit-refresh)
-          ("\C-c\C-r" . stgit-rename)
-          ("e" .        stgit-edit)
-          ("c" .        stgit-coalesce)
-          ("N" .        stgit-new)
-          ("R" .        stgit-repair)
-          ("C" .        stgit-commit)
-          ("U" .        stgit-uncommit)
-          ("\r" .       stgit-select)
-          ("o" .        stgit-find-file-other-window)
-          (">" .        stgit-push-next)
-          ("<" .        stgit-pop-next)
-          ("P" .        stgit-push-or-pop)
-          ("G" .        stgit-goto)
-          ("=" .        stgit-show)
-          ("D" .        stgit-delete)
-          ([(control ?/)] . stgit-undo)
-          ("\C-_" .     stgit-undo)
-          ("q" . stgit-quit))))
+  (let ((toggle-map (make-keymap)))
+    (suppress-keymap toggle-map)
+    (mapc (lambda (arg) (define-key toggle-map (car arg) (cdr arg)))
+          '(("t" .        stgit-toggle-worktree)
+            ("i" .        stgit-toggle-ignored)
+            ("u" .        stgit-toggle-unknown)))
+    (setq stgit-mode-map (make-keymap))
+    (suppress-keymap stgit-mode-map)
+    (mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg)))
+          `((" " .        stgit-mark)
+            ("m" .        stgit-mark)
+            ("\d" .       stgit-unmark-up)
+            ("u" .        stgit-unmark-down)
+            ("?" .        stgit-help)
+            ("h" .        stgit-help)
+            ("\C-p" .     stgit-previous-line)
+            ("\C-n" .     stgit-next-line)
+            ([up] .       stgit-previous-line)
+            ([down] .     stgit-next-line)
+            ("p" .        stgit-previous-patch)
+            ("n" .        stgit-next-patch)
+            ("\M-{" .     stgit-previous-patch)
+            ("\M-}" .     stgit-next-patch)
+            ("s" .        stgit-git-status)
+            ("g" .        stgit-reload-or-repair)
+            ("r" .        stgit-refresh)
+            ("\C-c\C-r" . stgit-rename)
+            ("e" .        stgit-edit)
+            ("M" .        stgit-move-patches)
+            ("S" .        stgit-squash)
+            ("N" .        stgit-new)
+            ("\C-c\C-c" . stgit-commit)
+            ("\C-c\C-u" . stgit-uncommit)
+            ("U" .        stgit-revert-file)
+            ("R" .        stgit-resolve-file)
+            ("\r" .       stgit-select)
+            ("o" .        stgit-find-file-other-window)
+            ("i" .        stgit-file-toggle-index)
+            (">" .        stgit-push-next)
+            ("<" .        stgit-pop-next)
+            ("P" .        stgit-push-or-pop)
+            ("G" .        stgit-goto)
+            ("=" .        stgit-show)
+            ("D" .        stgit-delete)
+            ([(control ?/)] . stgit-undo)
+            ("\C-_" .     stgit-undo)
+            ("B" .        stgit-branch)
+            ("t" .        ,toggle-map)
+            ("q" .        stgit-quit)))))

 
 (defun stgit-mode ()
   "Major mode for interacting with StGit.
 
 (defun stgit-mode ()
   "Major mode for interacting with StGit.


@@ -506,87 +723,76 @@ Commands:
   (use-local-map stgit-mode-map)
   (set (make-local-variable 'list-buffers-directory) default-directory)
   (set (make-local-variable 'stgit-marked-patches) nil)
   (use-local-map stgit-mode-map)
   (set (make-local-variable 'list-buffers-directory) default-directory)
   (set (make-local-variable 'stgit-marked-patches) nil)

-  (set (make-local-variable 'stgit-expanded-patches) nil)
+  (set (make-local-variable 'stgit-expanded-patches) (list :work :index))
+  (set (make-local-variable 'stgit-show-worktree) stgit-default-show-worktree)
+  (set (make-local-variable 'stgit-index-node) nil)
+  (set (make-local-variable 'stgit-worktree-node) nil)

   (set-variable 'truncate-lines 't)
   (set-variable 'truncate-lines 't)

+  (add-hook 'after-save-hook 'stgit-update-saved-file)

   (run-hooks 'stgit-mode-hook))
 
   (run-hooks 'stgit-mode-hook))
 

-(defun stgit-add-mark (patch)
-  "Mark the patch named PATCH."
-  (let ((patchsym (intern patch)))
-    (setq stgit-marked-patches (cons patchsym stgit-marked-patches))))
+(defun stgit-update-saved-file ()
+  (let* ((file (expand-file-name buffer-file-name))
+         (dir (file-name-directory file))
+         (gitdir (condition-case nil (git-get-top-dir dir)
+                   (error nil)))
+        (buffer (and gitdir (stgit-find-buffer gitdir))))
+    (when buffer
+      (with-current-buffer buffer
+        (stgit-refresh-worktree)))))
+
+(defun stgit-add-mark (patchsym)
+  "Mark the patch PATCHSYM."
+  (setq stgit-marked-patches (cons patchsym stgit-marked-patches)))

 
 

-(defun stgit-remove-mark (patch)
-  "Unmark the patch named PATCH."
-  (let ((patchsym (intern patch)))
-    (setq stgit-marked-patches (delq patchsym stgit-marked-patches))))
+(defun stgit-remove-mark (patchsym)
+  "Unmark the patch PATCHSYM."
+  (setq stgit-marked-patches (delq patchsym stgit-marked-patches)))

 
 (defun stgit-clear-marks ()
   "Unmark all patches."
   (setq stgit-marked-patches '()))
 
 
 (defun stgit-clear-marks ()
   "Unmark all patches."
   (setq stgit-marked-patches '()))
 

-(defun stgit-marked-patches ()
-  "Return the names of the marked patches."
-  (mapcar 'symbol-name stgit-marked-patches))
+(defun stgit-patch-at-point (&optional cause-error)
+  (get-text-property (point) 'patch-data))

 
 

-(defun stgit-patch-at-point (&optional cause-error allow-file)
-  "Return the patch name on the current line.
+(defun stgit-patch-name-at-point (&optional cause-error only-patches)
+  "Return the patch name on the current line as a symbol.

 If CAUSE-ERROR is not nil, signal an error if none found.
 If CAUSE-ERROR is not nil, signal an error if none found.

-If ALLOW-FILE is not nil, also handle when point is on a file of
-a patch."
-  (or (and allow-file
-           (let ((patchsym (get-text-property (point) 'stgit-patchsym)))
-             (and patchsym
-                  (symbol-name patchsym))))
-      (save-excursion
-        (beginning-of-line)
-        (and (looking-at "[>+-][ *]\\([^ ]*\\)")
-             (match-string-no-properties 1)))
-      (and cause-error
-           (error "No patch on this line"))))
-
-(defun stgit-patched-file-at-point (&optional both-files)
-  "Returns a cons of the patchsym and file name at point. For
-copies and renames, return the new file if the patch is either
-applied. If BOTH-FILES is non-nil, return a cons of the old and
-the new file names instead of just one name."
-  (let ((patchsym (get-text-property (point) 'stgit-patchsym))
-        (file     (get-text-property (point) 'stgit-file)))
-    (cond ((not patchsym) nil)
-          (file (cons patchsym file))
-          (both-files
-           (cons patchsym (cons (get-text-property (point) 'stgit-old-file)
-                                (get-text-property (point) 'stgit-new-file))))
-          (t
-           (let ((file-sym (save-excursion
-                             (stgit-previous-patch)
-                             (unless (equal (stgit-patch-at-point)
-                                            (symbol-name patchsym))
-                               (error "Cannot find the %s patch" patchsym))
-                             (beginning-of-line)
-                             (if (= (char-after) ?-)
-                                 'stgit-old-file 
-                               'stgit-new-file))))
-             (cons patchsym (get-text-property (point) file-sym)))))))
+If ONLY-PATCHES is not nil, only allow real patches, and not
+index or work tree."
+  (let ((patch (stgit-patch-at-point)))
+    (and patch
+         only-patches
+         (memq (stgit-patch-status patch) '(work index))
+         (setq patch nil))
+    (cond (patch
+           (stgit-patch-name patch))
+          (cause-error
+           (error "No patch on this line")))))
+
+(defun stgit-patched-file-at-point ()
+  (get-text-property (point) 'file-data))

 
 (defun stgit-patches-marked-or-at-point ()
 
 (defun stgit-patches-marked-or-at-point ()

-  "Return the names of the marked patches, or the patch on the current line."
+  "Return the symbols of the marked patches, or the patch on the current line."

   (if stgit-marked-patches
   (if stgit-marked-patches

-      (stgit-marked-patches)
-    (let ((patch (stgit-patch-at-point)))
+      stgit-marked-patches
+    (let ((patch (stgit-patch-name-at-point)))

       (if patch
           (list patch)
         '()))))
 
       (if patch
           (list patch)
         '()))))
 

-(defun stgit-goto-patch (patch)
-  "Move point to the line containing PATCH."
-  (let ((p (point)))
-    (goto-char (point-min))
-    (if (re-search-forward (concat "^[>+-][ *]" (regexp-quote patch) " ")
-                           nil t)
-        (progn (move-to-column goal-column)
-               t)
-      (goto-char p)
-      nil)))
+(defun stgit-goto-patch (patchsym)
+  "Move point to the line containing patch PATCHSYM.
+If that patch cannot be found, do nothing."
+  (let ((node (ewoc-nth stgit-ewoc 0)))
+    (while (and node (not (eq (stgit-patch-name (ewoc-data node))
+                              patchsym)))
+      (setq node (ewoc-next stgit-ewoc node)))
+    (when node
+      (ewoc-goto-node stgit-ewoc node)
+      (move-to-column goal-column))))

 
 (defun stgit-init ()
   "Run stg init."
 
 (defun stgit-init ()
   "Run stg init."


@@ -598,41 +804,63 @@ the new file names instead of just one name."
 (defun stgit-mark ()
   "Mark the patch under point."
   (interactive)
 (defun stgit-mark ()
   "Mark the patch under point."
   (interactive)

-  (let ((patch (stgit-patch-at-point t)))
-    (stgit-add-mark patch)
-    (stgit-reload))
+  (let* ((node (ewoc-locate stgit-ewoc))
+         (patch (ewoc-data node))
+         (name (stgit-patch-name patch)))
+    (when (eq name :work)
+      (error "Cannot mark the work tree"))
+    (when (eq name :index)
+      (error "Cannot mark the index"))
+    (stgit-add-mark (stgit-patch-name patch))
+    (ewoc-invalidate stgit-ewoc node))

   (stgit-next-patch))
 
 (defun stgit-unmark-up ()
   "Remove mark from the patch on the previous line."
   (interactive)
   (stgit-previous-patch)
   (stgit-next-patch))
 
 (defun stgit-unmark-up ()
   "Remove mark from the patch on the previous line."
   (interactive)
   (stgit-previous-patch)

-  (stgit-remove-mark (stgit-patch-at-point t))
-  (stgit-reload))
+  (let* ((node (ewoc-locate stgit-ewoc))
+         (patch (ewoc-data node)))
+    (stgit-remove-mark (stgit-patch-name patch))
+    (ewoc-invalidate stgit-ewoc node))
+  (move-to-column (stgit-goal-column)))

 
 (defun stgit-unmark-down ()
   "Remove mark from the patch on the current line."
   (interactive)
 
 (defun stgit-unmark-down ()
   "Remove mark from the patch on the current line."
   (interactive)

-  (stgit-remove-mark (stgit-patch-at-point t))
-  (stgit-reload)
+  (let* ((node (ewoc-locate stgit-ewoc))
+         (patch (ewoc-data node)))
+    (stgit-remove-mark (stgit-patch-name patch))
+    (ewoc-invalidate stgit-ewoc node))

   (stgit-next-patch))
 
 (defun stgit-rename (name)
   "Rename the patch under point to NAME."
   (stgit-next-patch))
 
 (defun stgit-rename (name)
   "Rename the patch under point to NAME."

-  (interactive (list (read-string "Patch name: " (stgit-patch-at-point t))))
-  (let ((old-name (stgit-patch-at-point t)))
+  (interactive (list
+                (read-string "Patch name: "
+                             (symbol-name (stgit-patch-name-at-point t t)))))
+  (let ((old-patchsym (stgit-patch-name-at-point t t)))

     (stgit-capture-output nil
     (stgit-capture-output nil

-      (stgit-run "rename" old-name name))
-    (let ((old-name-sym (intern old-name))
-          (name-sym (intern name)))
-      (when (memq old-name-sym stgit-expanded-patches)
+      (stgit-run "rename" old-patchsym name))
+    (let ((name-sym (intern name)))
+      (when (memq old-patchsym stgit-expanded-patches)

         (setq stgit-expanded-patches
         (setq stgit-expanded-patches

-            (cons name-sym (delq old-name-sym stgit-expanded-patches))))
-      (when (memq old-name-sym stgit-marked-patches)
+            (cons name-sym (delq old-patchsym stgit-expanded-patches))))
+      (when (memq old-patchsym stgit-marked-patches)

         (setq stgit-marked-patches
         (setq stgit-marked-patches

-            (cons name-sym (delq old-name-sym stgit-marked-patches)))))
-    (stgit-reload)
-    (stgit-goto-patch name)))
+            (cons name-sym (delq old-patchsym stgit-marked-patches))))
+      (stgit-reload)
+      (stgit-goto-patch name-sym))))
+
+(defun stgit-reload-or-repair (repair)
+  "Update the contents of the StGit buffer (`stgit-reload').
+
+With a prefix argument, repair the StGit metadata if the branch
+was modified with git commands (`stgit-repair')."
+  (interactive "P")
+  (if repair
+      (stgit-repair)
+    (stgit-reload)))

 
 (defun stgit-repair ()
   "Run stg repair."
 
 (defun stgit-repair ()
   "Run stg repair."


@@ -641,24 +869,99 @@ the new file names instead of just one name."
     (stgit-run "repair"))
   (stgit-reload))
 
     (stgit-run "repair"))
   (stgit-reload))
 

-(defun stgit-commit ()
-  "Run stg commit."
-  (interactive)
-  (stgit-capture-output nil (stgit-run "commit"))
+(defun stgit-available-branches ()
+  "Returns a list of the available stg branches"
+  (let ((output (with-output-to-string
+                  (stgit-run "branch" "--list")))
+        (start 0)
+        result)
+    (while (string-match "^>?\\s-+s\\s-+\\(\\S-+\\)" output start)
+      (setq result (cons (match-string 1 output) result))
+      (setq start (match-end 0)))
+    result))
+
+(defun stgit-branch (branch)
+  "Switch to branch BRANCH."
+  (interactive (list (completing-read "Switch to branch: "
+                                      (stgit-available-branches))))
+  (stgit-capture-output nil (stgit-run "branch" "--" branch))

   (stgit-reload))
 
   (stgit-reload))
 

-(defun stgit-uncommit (arg)
-  "Run stg uncommit. Numeric arg determines number of patches to uncommit."
+(defun stgit-commit (count)
+  "Run stg commit on COUNT commits.
+Interactively, the prefix argument is used as COUNT."

   (interactive "p")
   (interactive "p")

-  (stgit-capture-output nil (stgit-run "uncommit" "-n" (number-to-string arg)))
+  (stgit-capture-output nil (stgit-run "commit" "-n" count))
+  (stgit-reload))
+
+(defun stgit-revert-file ()
+  "Revert the file at point, which must be in the index or the
+working tree."
+  (interactive)
+  (let* ((patched-file (or (stgit-patched-file-at-point)
+                           (error "No file on the current line")))
+         (patch-name   (stgit-patch-name-at-point))
+         (file-status  (stgit-file-status patched-file))
+         (rm-file      (cond ((stgit-file-copy-or-rename patched-file)
+                              (stgit-file-cr-to patched-file))
+                             ((eq file-status 'add)
+                              (stgit-file-file patched-file))))
+         (co-file      (cond ((eq file-status 'rename)
+                              (stgit-file-cr-from patched-file))
+                             ((not (memq file-status '(copy add)))
+                              (stgit-file-file patched-file)))))
+
+    (unless (memq patch-name '(:work :index))
+      (error "No index or working tree file on this line"))
+
+    (when (eq file-status 'ignore)
+      (error "Cannot revert ignored files"))
+
+    (when (eq file-status 'unknown)
+      (error "Cannot revert unknown files"))
+
+    (let ((nfiles (+ (if rm-file 1 0) (if co-file 1 0))))
+      (when (yes-or-no-p (format "Revert %d file%s? "
+                                 nfiles
+                                 (if (= nfiles 1) "" "s")))
+        (stgit-capture-output nil
+          (when rm-file
+            (stgit-run-git "rm" "-f" "-q" "--" rm-file))
+          (when co-file
+            (stgit-run-git "checkout" "HEAD" co-file)))
+        (stgit-reload)))))
+
+(defun stgit-resolve-file ()
+  "Resolve conflict in the file at point."
+  (interactive)
+  (let* ((patched-file (stgit-patched-file-at-point))
+         (patch        (stgit-patch-at-point))
+         (patch-name   (and patch (stgit-patch-name patch)))
+         (status       (and patched-file (stgit-file-status patched-file))))
+
+    (unless (memq patch-name '(:work :index))
+      (error "No index or working tree file on this line"))
+
+    (unless (eq status 'unmerged)
+      (error "No conflict to resolve at the current line"))
+
+    (stgit-capture-output nil
+      (stgit-move-change-to-index (stgit-file-file patched-file)))
+
+    (stgit-reload)))
+
+(defun stgit-uncommit (count)
+  "Run stg uncommit on COUNT commits.
+Interactively, the prefix argument is used as COUNT."
+  (interactive "p")
+  (stgit-capture-output nil (stgit-run "uncommit" "-n" count))

   (stgit-reload))
 
 (defun stgit-push-next (npatches)
   "Push the first unapplied patch.
 With numeric prefix argument, push that many patches."
   (interactive "p")
   (stgit-reload))
 
 (defun stgit-push-next (npatches)
   "Push the first unapplied patch.
 With numeric prefix argument, push that many patches."
   (interactive "p")

-  (stgit-capture-output nil (stgit-run "push" "-n"
-                                       (number-to-string npatches)))
+  (stgit-capture-output nil (stgit-run "push" "-n" npatches))

   (stgit-reload)
   (stgit-refresh-git-status))
 
   (stgit-reload)
   (stgit-refresh-git-status))
 


@@ -666,7 +969,7 @@ With numeric prefix argument, push that many patches."
   "Pop the topmost applied patch.
 With numeric prefix argument, pop that many patches."
   (interactive "p")
   "Pop the topmost applied patch.
 With numeric prefix argument, pop that many patches."
   (interactive "p")

-  (stgit-capture-output nil (stgit-run "pop" "-n" (number-to-string npatches)))
+  (stgit-capture-output nil (stgit-run "pop" "-n" npatches))

   (stgit-reload)
   (stgit-refresh-git-status))
 
   (stgit-reload)
   (stgit-refresh-git-status))
 


@@ -679,71 +982,120 @@ With numeric prefix argument, pop that many patches."
 (defun stgit-push-or-pop ()
   "Push or pop the patch on the current line."
   (interactive)
 (defun stgit-push-or-pop ()
   "Push or pop the patch on the current line."
   (interactive)

-  (let ((patch (stgit-patch-at-point t))
+  (let ((patchsym (stgit-patch-name-at-point t))

         (applied (stgit-applied-at-point)))
     (stgit-capture-output nil
         (applied (stgit-applied-at-point)))
     (stgit-capture-output nil

-      (stgit-run (if applied "pop" "push") patch))
+      (stgit-run (if applied "pop" "push") patchsym))

     (stgit-reload)))
 
 (defun stgit-goto ()
   "Go to the patch on the current line."
   (interactive)
     (stgit-reload)))
 
 (defun stgit-goto ()
   "Go to the patch on the current line."
   (interactive)

-  (let ((patch (stgit-patch-at-point t)))
+  (let ((patchsym (stgit-patch-name-at-point t)))

     (stgit-capture-output nil
     (stgit-capture-output nil

-      (stgit-run "goto" patch))
+      (stgit-run "goto" patchsym))

     (stgit-reload)))
 
     (stgit-reload)))
 

-(defun stgit-id (patch)
-  "Return the git commit id for PATCH"
-  (let ((result (with-output-to-string
-                  (stgit-run-silent "id" patch))))
-    (unless (string-match "^\\([0-9A-Fa-f]\\{40\\}\\)$" result)
-      (error "Cannot find commit id for %s" patch))
-    (match-string 1 result)))
+(defun stgit-id (patchsym)
+  "Return the git commit id for PATCHSYM.
+If PATCHSYM is a keyword, returns PATCHSYM unmodified."
+  (if (keywordp patchsym)
+      patchsym
+    (let ((result (with-output-to-string
+                   (stgit-run-silent "id" patchsym))))
+      (unless (string-match "^\\([0-9A-Fa-f]\\{40\\}\\)$" result)
+       (error "Cannot find commit id for %s" patchsym))
+      (match-string 1 result))))

 
 (defun stgit-show ()
   "Show the patch on the current line."
   (interactive)
   (stgit-capture-output "*StGit patch*"
 
 (defun stgit-show ()
   "Show the patch on the current line."
   (interactive)
   (stgit-capture-output "*StGit patch*"

-    (let ((patch (stgit-patch-at-point)))
-      (if (not patch)
-          (let ((patched-file (stgit-patched-file-at-point t)))
-            (unless patched-file
-              (error "No patch or file at point"))
-            (let ((id (stgit-id (symbol-name (car patched-file)))))
-              (with-output-to-temp-buffer "*StGit diff*"
-                (if (consp (cdr patched-file))
-                    ;; two files (copy or rename)
-                    (stgit-run-git "diff" "-C" "-C" (concat id "^") id "--"
-                                   (cadr patched-file) (cddr patched-file))
-                  ;; just one file
-                  (stgit-run-git "diff" (concat id "^") id "--"
-                                 (cdr patched-file)))
-                (with-current-buffer standard-output
-                  (diff-mode)))))
-        (stgit-run "show" (stgit-patch-at-point))
-        (with-current-buffer standard-output
-          (goto-char (point-min))
-          (diff-mode))))))
+    (case (get-text-property (point) 'entry-type)
+      ('file
+       (let* ((patched-file (stgit-patched-file-at-point))
+              (patch-name (stgit-patch-name-at-point))
+              (patch-id (stgit-id patch-name))
+              (args (append (and (stgit-file-cr-from patched-file)
+                                 (list (stgit-find-copies-harder-diff-arg)))
+                            (cond ((eq patch-id :index)
+                                   '("--cached"))
+                                  ((eq patch-id :work)
+                                   nil)
+                                  (t
+                                   (list (concat patch-id "^") patch-id)))
+                            '("--")
+                              (if (stgit-file-copy-or-rename patched-file)
+                                  (list (stgit-file-cr-from patched-file)
+                                        (stgit-file-cr-to patched-file))
+                                (list (stgit-file-file patched-file))))))
+         (apply 'stgit-run-git "diff" args)))
+      ('patch
+       (let* ((patch-name (stgit-patch-name-at-point))
+              (patch-id (stgit-id patch-name)))
+         (if (or (eq patch-id :index) (eq patch-id :work))
+             (apply 'stgit-run-git "diff"
+                    (stgit-find-copies-harder-diff-arg)
+                    (and (eq patch-id :index)
+                         '("--cached")))
+           (stgit-run "show" "-O" "--patch-with-stat" "-O" "-M"
+                      (stgit-patch-name-at-point)))))
+      (t
+       (error "No patch or file at point")))
+    (with-current-buffer standard-output
+      (goto-char (point-min))
+      (diff-mode))))
+
+(defun stgit-move-change-to-index (file)
+  "Copies the workspace state of FILE to index, using git add or git rm"
+  (let ((op (if (or (file-exists-p file) (file-symlink-p file))
+                '("add") '("rm" "-q"))))
+    (stgit-capture-output "*git output*"
+      (apply 'stgit-run-git (append op '("--") (list file))))))
+
+(defun stgit-remove-change-from-index (file)
+  "Unstages the change in FILE from the index"
+  (stgit-capture-output "*git output*"
+    (stgit-run-git "reset" "-q" "--" file)))
+
+(defun stgit-file-toggle-index ()
+  "Move modified file in or out of the index."
+  (interactive)
+  (let ((patched-file (stgit-patched-file-at-point)))
+    (unless patched-file
+      (error "No file on the current line"))
+    (when (eq (stgit-file-status patched-file) 'unmerged)
+      (error (substitute-command-keys "Use \\[stgit-resolve-file] to move an unmerged file to the index")))
+    (when (eq (stgit-file-status patched-file) 'ignore)
+      (error "You cannot add ignored files to the index"))
+    (let ((patch-name (stgit-patch-name-at-point)))
+      (cond ((eq patch-name :work)
+             (stgit-move-change-to-index (stgit-file-file patched-file)))
+            ((eq patch-name :index)
+             (stgit-remove-change-from-index (stgit-file-file patched-file)))
+            (t
+             (error "Can only move files in the working tree to index")))))
+  (stgit-refresh-worktree)
+  (stgit-refresh-index))

 
 (defun stgit-edit ()
   "Edit the patch on the current line."
   (interactive)
 
 (defun stgit-edit ()
   "Edit the patch on the current line."
   (interactive)

-  (let ((patch (stgit-patch-at-point t))
+  (let ((patchsym (stgit-patch-name-at-point t t))

         (edit-buf (get-buffer-create "*StGit edit*"))
         (dir default-directory))
     (log-edit 'stgit-confirm-edit t nil edit-buf)
         (edit-buf (get-buffer-create "*StGit edit*"))
         (dir default-directory))
     (log-edit 'stgit-confirm-edit t nil edit-buf)

-    (set (make-local-variable 'stgit-edit-patch) patch)
+    (set (make-local-variable 'stgit-edit-patchsym) patchsym)

     (setq default-directory dir)
     (let ((standard-output edit-buf))
     (setq default-directory dir)
     (let ((standard-output edit-buf))

-      (stgit-run-silent "edit" "--save-template=-" patch))))
+      (stgit-run-silent "edit" "--save-template=-" patchsym))))

 
 (defun stgit-confirm-edit ()
   (interactive)
   (let ((file (make-temp-file "stgit-edit-")))
     (write-region (point-min) (point-max) file)
     (stgit-capture-output nil
 
 (defun stgit-confirm-edit ()
   (interactive)
   (let ((file (make-temp-file "stgit-edit-")))
     (write-region (point-min) (point-max) file)
     (stgit-capture-output nil

-      (stgit-run "edit" "-f" file stgit-edit-patch))
+      (stgit-run "edit" "-f" file stgit-edit-patchsym))

     (with-current-buffer log-edit-parent-buffer
       (stgit-reload))))
 
     (with-current-buffer log-edit-parent-buffer
       (stgit-reload))))
 


@@ -789,34 +1141,137 @@ end of the patch."
            (substring patch 0 20))
           (t patch))))
 
            (substring patch 0 20))
           (t patch))))
 

-(defun stgit-delete (patch-names)
-  "Delete the named patches."
-  (interactive (list (stgit-patches-marked-or-at-point)))
-  (if (zerop (length patch-names))
-      (error "No patches to delete")
-    (when (yes-or-no-p (format "Really delete %d patches? "
-                               (length patch-names)))
+(defun stgit-delete (patchsyms &optional spill-p)
+  "Delete the patches in PATCHSYMS.
+Interactively, delete the marked patches, or the patch at point.
+
+With a prefix argument, or SPILL-P, spill the patch contents to
+the work tree and index."
+  (interactive (list (stgit-patches-marked-or-at-point)
+                     current-prefix-arg))
+  (unless patchsyms
+    (error "No patches to delete"))
+  (when (memq :index patchsyms)
+    (error "Cannot delete the index"))
+  (when (memq :work  patchsyms)
+    (error "Cannot delete the work tree"))
+
+  (let ((npatches (length patchsyms)))
+    (when (yes-or-no-p (format "Really delete %d patch%s%s? "
+                              npatches
+                              (if (= 1 npatches) "" "es")
+                               (if spill-p
+                                   " (spilling contents to index)"
+                                 "")))
+      (let ((args (if spill-p 
+                      (cons "--spill" patchsyms)
+                    patchsyms)))
+        (stgit-capture-output nil
+          (apply 'stgit-run "delete" args))
+        (stgit-reload)))))
+
+(defun stgit-move-patches-target ()
+  "Return the patchsym indicating a target patch for
+`stgit-move-patches'.
+
+This is either the patch at point, or one of :top and :bottom, if
+the point is after or before the applied patches."
+
+  (let ((patchsym (stgit-patch-name-at-point)))
+    (cond (patchsym patchsym)
+         ((save-excursion (re-search-backward "^>" nil t)) :top)
+         (t :bottom))))
+
+(defun stgit-sort-patches (patchsyms)
+  "Returns the list of patches in PATCHSYMS sorted according to
+their position in the patch series, bottommost first.
+
+PATCHSYMS may not contain duplicate entries."
+  (let (sorted-patchsyms
+        (series (with-output-to-string
+                  (with-current-buffer standard-output
+                    (stgit-run-silent "series" "--noprefix"))))
+        start)
+    (while (string-match "^\\(.+\\)" series start)
+      (let ((patchsym (intern (match-string 1 series))))
+        (when (memq patchsym patchsyms)
+          (setq sorted-patchsyms (cons patchsym sorted-patchsyms))))
+      (setq start (match-end 0)))
+    (setq sorted-patchsyms (nreverse sorted-patchsyms))
+
+    (unless (= (length patchsyms) (length sorted-patchsyms))
+      (error "Internal error"))
+
+    sorted-patchsyms))
+
+(defun stgit-move-patches (patchsyms target-patch)
+  "Move the patches in PATCHSYMS to below TARGET-PATCH.
+If TARGET-PATCH is :bottom or :top, move the patches to the
+bottom or top of the stack, respectively.
+
+Interactively, move the marked patches to where the point is."
+  (interactive (list stgit-marked-patches
+                     (stgit-move-patches-target)))
+  (unless patchsyms
+    (error "Need at least one patch to move"))
+
+  (unless target-patch
+    (error "Point not at a patch"))
+
+  (if (eq target-patch :top)

       (stgit-capture-output nil
       (stgit-capture-output nil

-        (apply 'stgit-run "delete" patch-names))
-      (stgit-reload))))
+        (apply 'stgit-run "float" patchsyms))
+
+    ;; need to have patchsyms sorted by position in the stack
+    (let ((sorted-patchsyms (stgit-sort-patches patchsyms)))
+      (while sorted-patchsyms
+        (setq sorted-patchsyms
+              (and (stgit-capture-output nil
+                     (if (eq target-patch :bottom)
+                         (stgit-run "sink" "--" (car sorted-patchsyms))
+                       (stgit-run "sink" "--to" target-patch "--"
+                                  (car sorted-patchsyms))))
+                   (cdr sorted-patchsyms))))))
+  (stgit-reload))

 
 

-(defun stgit-coalesce (patch-names)
-  "Run stg coalesce on the named patches."
-  (interactive (list (stgit-marked-patches)))
-  (let ((edit-buf (get-buffer-create "*StGit edit*"))
-        (dir default-directory))
-    (log-edit 'stgit-confirm-coalesce t nil edit-buf)
-    (set (make-local-variable 'stgit-patches) patch-names)
+(defun stgit-squash (patchsyms)
+  "Squash the patches in PATCHSYMS.
+Interactively, squash the marked patches.
+
+Unless there are any conflicts, the patches will be merged into
+one patch, which will occupy the same spot in the series as the
+deepest patch had before the squash."
+  (interactive (list stgit-marked-patches))
+  (when (< (length patchsyms) 2)
+    (error "Need at least two patches to squash"))
+  (let ((stgit-buffer (current-buffer))
+        (edit-buf (get-buffer-create "*StGit edit*"))
+        (dir default-directory)
+        (sorted-patchsyms (stgit-sort-patches patchsyms)))
+    (log-edit 'stgit-confirm-squash t nil edit-buf)
+    (set (make-local-variable 'stgit-patchsyms) sorted-patchsyms)

     (setq default-directory dir)
     (setq default-directory dir)

-    (let ((standard-output edit-buf))
-      (apply 'stgit-run-silent "coalesce" "--save-template=-" patch-names))))
-
-(defun stgit-confirm-coalesce ()
+    (let ((result (let ((standard-output edit-buf))
+                    (apply 'stgit-run-silent "squash"
+                           "--save-template=-" sorted-patchsyms))))
+
+      ;; stg squash may have reordered the patches or caused conflicts
+      (with-current-buffer stgit-buffer
+        (stgit-reload))
+
+      (unless (eq 0 result)
+        (fundamental-mode)
+        (rename-buffer "*StGit error*")
+        (resize-temp-buffer-window)
+        (switch-to-buffer-other-window stgit-buffer)
+        (error "stg squash failed")))))
+
+(defun stgit-confirm-squash ()

   (interactive)
   (let ((file (make-temp-file "stgit-edit-")))
     (write-region (point-min) (point-max) file)
     (stgit-capture-output nil
   (interactive)
   (let ((file (make-temp-file "stgit-edit-")))
     (write-region (point-min) (point-max) file)
     (stgit-capture-output nil

-      (apply 'stgit-run "coalesce" "-f" file stgit-patches))
+      (apply 'stgit-run "squash" "-f" file stgit-patchsyms))

     (with-current-buffer log-edit-parent-buffer
       (stgit-clear-marks)
       ;; Go to first marked patch and stay there
     (with-current-buffer log-edit-parent-buffer
       (stgit-clear-marks)
       ;; Go to first marked patch and stay there


@@ -844,20 +1299,96 @@ With prefix argument, run it with the --hard flag."
 
 (defun stgit-refresh (&optional arg)
   "Run stg refresh.
 
 (defun stgit-refresh (&optional arg)
   "Run stg refresh.

+If the index contains any changes, only refresh from index.
+

 With prefix argument, refresh the marked patch or the patch under point."
   (interactive "P")
   (let ((patchargs (if arg
                        (let ((patches (stgit-patches-marked-or-at-point)))
                          (cond ((null patches)
 With prefix argument, refresh the marked patch or the patch under point."
   (interactive "P")
   (let ((patchargs (if arg
                        (let ((patches (stgit-patches-marked-or-at-point)))
                          (cond ((null patches)

-                                (error "no patch to update"))
+                                (error "No patch to update"))

                                ((> (length patches) 1)
                                ((> (length patches) 1)

-                                (error "too many patches selected"))
+                                (error "Too many patches selected"))

                                (t
                                 (cons "-p" patches))))
                      nil)))
                                (t
                                 (cons "-p" patches))))
                      nil)))

+    (unless (stgit-index-empty-p)
+      (setq patchargs (cons "--index" patchargs)))

     (stgit-capture-output nil
       (apply 'stgit-run "refresh" patchargs))
     (stgit-refresh-git-status))
   (stgit-reload))
 
     (stgit-capture-output nil
       (apply 'stgit-run "refresh" patchargs))
     (stgit-refresh-git-status))
   (stgit-reload))
 

+(defcustom stgit-show-worktree-mode 'center
+  "This variable controls where the \"Index\" and \"Work tree\"
+will be shown on in the buffer.
+
+It can be set to 'top (above all patches), 'center (show between
+applied and unapplied patches), and 'bottom (below all patches).
+
+See also `stgit-show-worktree'."
+  :type '(radio (const :tag "above all patches (top)" top)
+                (const :tag "between applied and unapplied patches (center)"
+                       center)
+                (const :tag "below all patches (bottom)" bottom))
+  :group 'stgit)
+
+(defcustom stgit-default-show-worktree
+  nil
+  "Set to non-nil to by default show the working tree in a new stgit buffer.
+
+This value is used as the default value for `stgit-show-worktree'."
+  :type 'boolean
+  :group 'stgit)
+
+(defvar stgit-show-worktree nil
+  "If nil, inhibit showing work tree and index in the stgit buffer.
+
+See also `stgit-show-worktree-mode'.")
+
+(defvar stgit-show-ignored nil
+  "If nil, inhibit showing files ignored by git.")
+
+(defvar stgit-show-unknown nil
+  "If nil, inhibit showing files not registered with git.")
+
+(defun stgit-toggle-worktree (&optional arg)
+  "Toggle the visibility of the work tree.
+With arg, show the work tree if arg is positive.
+
+Its initial setting is controlled by `stgit-default-show-worktree'.
+
+`stgit-show-worktree-mode' controls where on screen the index and
+work tree will show up."
+  (interactive)
+  (setq stgit-show-worktree
+        (if (numberp arg)
+            (> arg 0)
+          (not stgit-show-worktree)))
+  (stgit-reload))
+
+(defun stgit-toggle-ignored (&optional arg)
+  "Toggle the visibility of files ignored by git in the work
+tree. With ARG, show these files if ARG is positive.
+
+Use \\[stgit-toggle-worktree] to show the work tree."
+  (interactive)
+  (setq stgit-show-ignored
+        (if (numberp arg)
+            (> arg 0)
+          (not stgit-show-ignored)))
+  (stgit-reload))
+
+(defun stgit-toggle-unknown (&optional arg)
+  "Toggle the visibility of files not registered with git in the
+work tree. With ARG, show these files if ARG is positive.
+
+Use \\[stgit-toggle-worktree] to show the work tree."
+  (interactive)
+  (setq stgit-show-unknown
+        (if (numberp arg)
+            (> arg 0)
+          (not stgit-show-unknown)))
+  (stgit-reload))
+

 (provide 'stgit)
 (provide 'stgit)