# HG changeset patch # User Dan Nicolaescu # Date 1252973511 0 # Node ID bfda253c8f66c8532044fe2cfb371df497ac8402 # Parent 8604318df7f961841175b6e1b1547e35b1790d7a (vc-git-dir-extra-headers): Show the remote location. diff -r 8604318df7f9 -r bfda253c8f66 lisp/ChangeLog --- a/lisp/ChangeLog Mon Sep 14 23:28:40 2009 +0000 +++ b/lisp/ChangeLog Tue Sep 15 00:11:51 2009 +0000 @@ -1,3 +1,7 @@ +2009-09-15 Dan Nicolaescu + + * vc-git.el (vc-git-dir-extra-headers): Show the remote location. + 2009-09-14 Dan Nicolaescu * bindings.el (mode-line-mode-menu): Add purecopy calls for :help. diff -r 8604318df7f9 -r bfda253c8f66 lisp/vc-git.el --- a/lisp/vc-git.el Mon Sep 14 23:28:40 2009 +0000 +++ b/lisp/vc-git.el Tue Sep 15 00:11:51 2009 +0000 @@ -403,16 +403,38 @@ (let ((str (with-output-to-string (with-current-buffer standard-output (vc-git--out-ok "symbolic-ref" "HEAD")))) - (stash (vc-git-stash-list))) + (stash (vc-git-stash-list)) + branch remote remote-url) + (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) + (progn + (setq branch (match-string 2 str)) + (message "branch (%s)" branch) + (setq remote + (with-output-to-string + (with-current-buffer standard-output + (vc-git--out-ok "config" (concat "branch." branch ".remote"))))) + (when (string-match "\\([^\n]+\\)" remote) + (setq remote (match-string 1 remote))) + (when remote + (setq remote-url + (with-output-to-string + (with-current-buffer standard-output + (vc-git--out-ok "config" (concat "remote." remote ".url")))))) + (when (string-match "\\([^\n]+\\)" remote-url) + (setq remote-url (match-string 1 remote-url)))) + "not (detached HEAD)") ;; FIXME: maybe use a different face when nothing is stashed. (when (string= stash "") (setq stash "Nothing stashed")) (concat (propertize "Branch : " 'face 'font-lock-type-face) - (propertize - (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) - (match-string 2 str) - "not (detached HEAD)") - 'face 'font-lock-variable-name-face) + (propertize branch + 'face 'font-lock-variable-name-face) + (when remote + (concat + "\n" + (propertize "Remote : " 'face 'font-lock-type-face) + (propertize remote-url + 'face 'font-lock-variable-name-face))) "\n" (propertize "Stash : " 'face 'font-lock-type-face) (propertize