From 02432300e15868a716b0900ee5ade4011f7dcb65 Mon Sep 17 00:00:00 2001
From: Phil Jackson <phil@shellarchive.co.uk>
Date: Sun, 8 Nov 2009 14:54:53 +0000
Subject: [PATCH] Highlight refs according to their origin.

---
 magit.el | 71 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 20 deletions(-)

diff --git a/magit.el b/magit.el
index 6df6ba17..feb1d927 100644
--- a/magit.el
+++ b/magit.el
@@ -220,14 +220,37 @@ Many Magit faces inherit from this one by default."
   "Face for git tag labels shown in log buffer."
   :group 'magit)
 
-(defface magit-log-head-label
+(defface magit-log-head-label-remote
   '((((class color) (background light))
-     :background "spring green")
+     :background "Grey11"
+     :foreground "OliveDrab4")
     (((class color) (background dark))
-     :background "DarkGreen"))
-  "Face for branch head labels shown in log buffer."
+     :background "Grey11"
+     :foreground "DarkSeaGreen2"))
+  "Face for remote branch head labels shown in log buffer."
   :group 'magit)
 
+(defface magit-log-head-label-tags
+  '((((class color) (background light))
+     :background "Grey13"
+     :foreground "khaki4")
+    (((class color) (background dark))
+     :background "Grey13"
+     :foreground "khaki1"))
+  "Face for tag labels shown in log buffer."
+  :group 'magit)
+
+(defface magit-log-head-label-local
+  '((((class color) (background light))
+     :background "Grey13"
+     :foreground "LightSkyBlue4")
+    (((class color) (background dark))
+     :background "Grey13"
+     :foreground "LightSkyBlue1"))
+  "Face for local branch head labels shown in log buffer."
+  :group 'magit)
+
+
 ;;; Macros
 
 (defmacro magit-with-refresh (&rest body)
@@ -1844,28 +1867,34 @@ string which will represent the log line.")
 
 (defun magit-present-log-line (graph sha1 refs message)
   "The default log line generator."
-  (let* ((ref-re "\\(?:tag: \\)?refs/\\(?:tags\\|remotes\\|heads\\)/\\(.+\\)")
+  (let* ((ref-re "\\(?:tag: \\)?refs/\\(tags\\|remotes\\|heads\\)/\\(.+\\)")
 	 (string-refs
 	  (when refs
 	    (concat (mapconcat
 		     (lambda (r)
 		       (propertize
 			(if (string-match ref-re r)
-			    (match-string 1 r)
+			    (match-string 2 r)
 			  r)
-			'face 'magit-log-head-label))
-		     refs
-		     " ")
-		    " "))))
-    (concat
-     (if sha1
-         (propertize (substring sha1 0 8) 'face 'magit-log-sha1)
-       (insert-char ? 8))
-     " "
-     (propertize graph 'face 'magit-log-graph)
-     string-refs
-     (when message
-       (propertize message 'face 'magit-log-message)))))
+			'face (cond
+			       ((string= (match-string 1 r) "remotes")
+				'magit-log-head-label-remote)
+			       ((string= (match-string 1 r) "tags")
+				'magit-log-head-label-tags)
+				((string= (match-string 1 r) "heads")
+				 'magit-log-head-label-local))))
+		       refs
+		       " ")
+		     " "))))
+	 (concat
+	  (if sha1
+	      (propertize (substring sha1 0 8) 'face 'magit-log-sha1)
+	    (insert-char ? 8))
+	  " "
+	  (propertize graph 'face 'magit-log-graph)
+	  string-refs
+	  (when message
+	    (propertize message 'face 'magit-log-message)))))
 
 (defun magit-wash-log-line ()
   (beginning-of-line)
@@ -1876,7 +1905,9 @@ string which will represent the log line.")
 	    (sha1 (match-string 2))
 	    (msg (match-string 4))
 	    (refs (when (match-string 3)
-		    (split-string (match-string 3) "[(), ]" t))))
+		    (remove-if (lambda (s)
+				 (string= s "tag:"))
+			       (split-string (match-string 3) "[(), ]" t)))))
 	(delete-region (point-at-bol) (point-at-eol))
 	(insert (magit-present-log-line chart sha1 refs msg))
 	(goto-char (point-at-bol))