procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc-hg.el (vc-hg-log-graph): New var.

Browse source 
(vc-hg-print-log): Use it.
(vc-hg-root-log-format): Include branch name and bookmarks; ignore
graph output.

Fixes: debbugs:17515
This commit is contained in:
Santiago Payà i Miralta 2014-10-20 20:14:07 -04:00 • committed by Stefan Monnier
parent 4ede14b986
commit 739ba4636b
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2014-10-20 Santiago Payà i Miralta <santiagopim@gmail.com>
* 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 <juri@jurta.org>
* 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 <santiagopim@gmail.com> (tiny change)
2014-05-12 Santiago Payà i Miralta <santiagopim@gmail.com>
* vc/vc-hg.el (vc-hg-unregister): New function. (Bug#17454)

26
lisp/vc/vc-hg.el
View file

@ -146,12 +146,19 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
: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 "^\\(?:[+@o 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 @@ output, and KEYWORDS is a list of `font-lock-keywords' for
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 @@ highlighting the Log View buffer."
(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 @@ If LIMIT is non-nil, show no more than this many entries."
(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)