[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117612: * lisp/vc/vc-hg.el (vc-hg-log-graph): Ne
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r117612: * lisp/vc/vc-hg.el (vc-hg-log-graph): New var. |
Date: |
Tue, 21 Oct 2014 00:14:13 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117612
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17515
author: Santiago Payà i Miralta <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-10-20 20:14:07 -0400
message:
* lisp/vc/vc-hg.el (vc-hg-log-graph): New var.
(vc-hg-print-log): Use it.
(vc-hg-root-log-format): Include branch name and bookmarks; ignore
graph output.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/vc-hg.el vchg.el-20091113204419-o5vbwnq5f7feedwu-5062
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-21 00:11:58 +0000
+++ b/lisp/ChangeLog 2014-10-21 00:14:07 +0000
@@ -1,3 +1,10 @@
+2014-10-20 Santiago Payà i Miralta <address@hidden>
+
+ * vc/vc-hg.el (vc-hg-log-graph): New var.
+ (vc-hg-print-log): Use it.
+ (vc-hg-root-log-format): Include branch name and bookmarks; ignore
+ graph output (bug#17515).
+
2014-10-20 Juri Linkov <address@hidden>
* vc/diff-mode.el (diff-refine-changed): Rename from
@@ -1182,7 +1189,7 @@
* emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled
into autoloading just because of a silly indirection.
-2014-05-11 Santiago Payà i Miralta <address@hidden> (tiny change)
+2014-05-12 Santiago Payà i Miralta <address@hidden>
* vc/vc-hg.el (vc-hg-unregister): New function. (Bug#17454)
=== modified file 'lisp/vc/vc-hg.el'
--- a/lisp/vc/vc-hg.el 2014-06-06 16:29:55 +0000
+++ b/lisp/vc/vc-hg.el 2014-10-21 00:14:07 +0000
@@ -146,12 +146,19 @@
:group 'vc-hg)
(defcustom vc-hg-root-log-format
- '("{rev}:{tags}: {author|person} {date|shortdate} {desc|firstline}\\n"
- "^\\([0-9]+\\):\\([^:]*\\): \\(.*?\\)[
\t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)"
+ `(,(concat "{rev}:{ifeq(branch, 'default','', '{branch}')}"
+ ":{bookmarks}:{tags}:{author|person}"
+ " {date|shortdate} {desc|firstline}\\n")
+ ,(concat "^\\(?:address@hidden x|-]*\\)" ;Graph data.
+ "\\([0-9]+\\):\\([^:]*\\)"
+ ":\\([^:]*\\):\\([^:]*\\):\\(.*?\\)"
+ "[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)")
((1 'log-view-message-face)
- (2 'change-log-list)
- (3 'change-log-name)
- (4 'change-log-date)))
+ (2 'change-log-file)
+ (3 'change-log-list)
+ (4 'change-log-conditionals)
+ (5 'change-log-name)
+ (6 'change-log-date)))
"Mercurial log template for `vc-hg-print-log' short format.
This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE
is the \"--template\" argument string to pass to Mercurial,
@@ -160,7 +167,7 @@
highlighting the Log View buffer."
:type '(list string string (repeat sexp))
:group 'vc-hg
- :version "24.1")
+ :version "24.5")
;;; Properties of the backend
@@ -244,6 +251,9 @@
(autoload 'vc-setup-buffer "vc-dispatcher")
+(defvar vc-hg-log-graph nil
+ "If non-nil, use `--graph' in the short log output.")
+
(defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
"Print commit log associated with FILES into specified BUFFER.
If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'.
@@ -261,7 +271,9 @@
(nconc
(when start-revision (list (format "-r%s:0" start-revision)))
(when limit (list "-l" (format "%s" limit)))
- (when shortlog (list "--template" (car vc-hg-root-log-format)))
+ (when shortlog `(,@(if vc-hg-log-graph '("--graph"))
+ "--template"
+ ,(car vc-hg-root-log-format)))
vc-hg-log-switches)))))
(defvar log-view-message-re)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117612: * lisp/vc/vc-hg.el (vc-hg-log-graph): New var.,
Stefan Monnier <=