From: Dan Nicolaescu <dann@ics.uci.edu>
To: emacs-devel@gnu.org
Subject: show merge info for git vc-log
Date: Tue, 7 Jul 2009 11:33:14 -0700 (PDT) [thread overview]
Message-ID: <200907071833.n67IXEEQ019584@godzilla.ics.uci.edu> (raw)
git log can show a graph of the merges, it looks like this:
* commit blah
|\ Merge: blah blah
| | Author: blah
| | Date: blah
| |
| | Merge branch 'master'
| |
| * commit blah
| |\ Merge: blah blah
| | | Author: blah
| | | Date: blah
| | |
| | | Merge branch foo.
| | |
| | * commit blah
| | | Author: blah
| | | Date: blah
| | |
| | | Fix some stuff.
| | |
| | * commit blah
| | | Author: blah
| | | Date: blah
| | |
| | | Fix more stuff.
| | |
| | |
* | | commit blah
|/ / Author: blah
| | Date: blah
| |
| | blah
Should we vc-log do this by default for git?
Lightly tested patch:
--- vc-git.el.~1.82.~ Fri Jun 26 18:46:22 2009
+++ vc-git.el Tue Jul 7 11:27:52 2009
@@ -459,4 +459,4 @@
(with-current-buffer
buffer
(vc-git-command buffer 'async files
- "rev-list" "--pretty" "HEAD" "--")))))
+ "rev-list" "--graph" "--pretty" "HEAD" "--")))))
@@ -472,17 +497,17 @@
(set (make-local-variable 'log-view-file-re) "\\`a\\`")
(set (make-local-variable 'log-view-per-file-logs) nil)
(set (make-local-variable 'log-view-message-re)
- "^commit *\\([0-9a-z]+\\)")
+ "^[ */\\|]+commit *\\([0-9a-z]+\\)")
(set (make-local-variable 'log-view-font-lock-keywords)
(append
`((,log-view-message-re (1 'change-log-acknowledgement)))
;; Handle the case:
;; user: foo@bar
- '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
+ '((" Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
(1 'change-log-email))
;; Handle the case:
;; user: FirstName LastName <foo@bar>
- ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
+ (" Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
(1 'change-log-name)
(2 'change-log-email))
("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
@@ -490,11 +515,11 @@
("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
(1 'change-log-name)
(2 'change-log-email))
- ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
+ (" Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
(1 'change-log-acknowledgement)
(2 'change-log-acknowledgement))
- ("^Date: \\(.+\\)" (1 'change-log-date))
- ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
+ (" Date: \\(.+\\)" (1 'change-log-date))
+ (" summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
(defun vc-git-show-log-entry (revision)
"Move to the log entry for REVISION.
next reply other threads:[~2009-07-07 18:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-07 18:33 Dan Nicolaescu [this message]
2009-07-07 19:16 ` show merge info for git vc-log Leo
2009-07-07 23:09 ` Dmitry Dzhus
2009-07-08 20:44 ` Dan Nicolaescu
2009-07-08 21:35 ` Thierry Volpiatto
2009-07-08 22:08 ` Dan Nicolaescu
2009-07-09 2:11 ` Kevin Rodgers
2009-07-09 3:24 ` Dan Nicolaescu
2009-07-09 5:01 ` Thierry Volpiatto
2009-07-09 5:51 ` Dan Nicolaescu
2009-07-09 19:09 ` Dmitry Dzhus
2009-07-11 19:40 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200907071833.n67IXEEQ019584@godzilla.ics.uci.edu \
--to=dann@ics.uci.edu \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.