[Emacs-diffs] trunk r115150: * vc/vc-git.el (vc-git-dir-extra-headers): Add headers

[Dan Nicolaescu]

------------------------------------------------------------
revno: 115150
revision-id: address@hidden
parent: address@hidden
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-19 15:23:53 -0500
message:
  * vc/vc-git.el (vc-git-dir-extra-headers): Add headers
  when rebase or bisect are in progress.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-git.el              vcgit.el-20091113204419-o5vbwnq5f7feedwu-5070

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-19 09:47:02 +0000
+++ b/lisp/ChangeLog    2013-11-19 20:23:53 +0000
@@ -1,3 +1,8 @@
+2013-11-19  Dan Nicolaescu  <address@hidden>
+
+       * vc/vc-git.el (vc-git-dir-extra-headers): Add headers
+       when rebase or bisect are in progress.
+
 2013-11-19  Xue Fuqiao  <address@hidden>
 
        * filenotify.el (file-notify-add-watch): Doc fix.

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2013-10-01 15:34:14 +0000
+++ b/lisp/vc/vc-git.el 2013-11-19 20:23:53 +0000
@@ -559,6 +559,11 @@
        (propertize remote-url
                    'face 'font-lock-variable-name-face)))
      "\n"
+     ;; For now just a heading, key bindings can be added later for various 
bisect actions
+     (when (file-exists-p (expand-file-name ".git/BISECT_START" (vc-git-root 
_dir)))
+       (propertize  "Bisect     : in progress\n" 'face 
'font-lock-warning-face))
+     (when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root 
_dir)))
+       (propertize  "Rebase     : in progress\n" 'face 
'font-lock-warning-face))
      (if stash
        (concat
        (propertize "Stash      :\n" 'face 'font-lock-type-face