From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Santiago =?UTF-8?Q?Pay=C3=A0?= i Miralta Newsgroups: gmane.emacs.bugs Subject: bug#17515: * lisp/vc/vc-hg.el (vc-hg-root-log-format): New format supports graph, branches and bookmarks. Date: Sat, 17 May 2014 00:09:52 +0200 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=089e0160c2ba3ce1f104f98bac1a X-Trace: ger.gmane.org 1400278279 1469 80.91.229.3 (16 May 2014 22:11:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 16 May 2014 22:11:19 +0000 (UTC) To: 17515@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 17 00:11:12 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WlQLM-00078y-O6 for geb-bug-gnu-emacs@m.gmane.org; Sat, 17 May 2014 00:11:09 +0200 Original-Received: from localhost ([::1]:37989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlQLM-0002CG-AP for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 May 2014 18:11:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlQLI-0002Bh-Ds for bug-gnu-emacs@gnu.org; Fri, 16 May 2014 18:11:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WlQLH-00050l-0a for bug-gnu-emacs@gnu.org; Fri, 16 May 2014 18:11:04 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlQLG-00050g-So for bug-gnu-emacs@gnu.org; Fri, 16 May 2014 18:11:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WlQLG-0000z1-L0 for bug-gnu-emacs@gnu.org; Fri, 16 May 2014 18:11:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Santiago =?UTF-8?Q?Pay=C3=A0?= i Miralta Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 16 May 2014 22:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 17515 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.14002782083700 (code B ref -1); Fri, 16 May 2014 22:11:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 May 2014 22:10:08 +0000 Original-Received: from localhost ([127.0.0.1]:50899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WlQKN-0000xb-KV for submit@debbugs.gnu.org; Fri, 16 May 2014 18:10:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58037) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WlQKK-0000x3-EX for submit@debbugs.gnu.org; Fri, 16 May 2014 18:10:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WlQKE-0004JG-4q for submit@debbugs.gnu.org; Fri, 16 May 2014 18:09:59 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:58975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlQKE-0004JC-2R for submit@debbugs.gnu.org; Fri, 16 May 2014 18:09:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlQKC-0001wU-Ss for bug-gnu-emacs@gnu.org; Fri, 16 May 2014 18:09:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WlQKB-0004Io-Cs for bug-gnu-emacs@gnu.org; Fri, 16 May 2014 18:09:56 -0400 Original-Received: from mail-lb0-x234.google.com ([2a00:1450:4010:c04::234]:49003) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlQKA-0004Ic-NA for bug-gnu-emacs@gnu.org; Fri, 16 May 2014 18:09:55 -0400 Original-Received: by mail-lb0-f180.google.com with SMTP id p9so2399388lbv.11 for ; Fri, 16 May 2014 15:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=e3DgyxFQK66LvigdDYec1Pf7qivmVXE9PVgZ92XhBWE=; b=k9Nu5eAFLWs280zGvxfvLzJWvQuiVBbLw1DkhDlct+H27VG8P8rPIbf8+4PyKhdh96 SqGMDQL+Pk5OwI5J2XgVzKbtpD0xRaA3vPW5nd2UtjgqpS5QSL+f+mvesfteWD94l8La LRINhGh1LvKhK0mO269fgca/VNgzsDfsJRRERvUFpd5nl+t6Ti6Bq2LfsYCrY9ZBIeM4 8svB/vQONoBPSmFe4t8v5gOtv5gbN4Q8xPHR2bKU0/GJy7MuLMPuUFsRp+cYDjPZde6T oATafNkLGM2AjOqBB+Q1pxX+Rh+jzen5TprmVfTG1xEnY5QrqxFJuj0sONUk1r6UzXhi 0djg== X-Received: by 10.152.26.168 with SMTP id m8mr3404060lag.65.1400278192282; Fri, 16 May 2014 15:09:52 -0700 (PDT) Original-Received: by 10.112.170.105 with HTTP; Fri, 16 May 2014 15:09:52 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:89181 Archived-At: --089e0160c2ba3ce1f104f98bac1a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi emacs, I wish to improve the vc-change-log buffer in vc-hg with the graph view. My proposal is a change in default configuration. The vc-hg-root-log-format is compatible with or without the graph view. Also added branches and bookmarks. 2014-05-17 Santiago Pay=C3=A0 i Miralta * lisp/vc/vc-hg.el (vc-hg-root-log-format): New format supports graph, branches and bookmarks. >From a917e85f083907030daea6d1cf70ba524f5bbab9 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Santiago=3D20Pay=3DC3=3DA0=3D20i=3D20Miralta?=3D Date: Fri, 16 May 2014 23:58:57 +0200 Subject: [PATCH] * lisp/vc/vc-hg.el (vc-hg-root-log-format): New format supports graph, branches and bookmarks. Modern Mercurial log command supports --graph, also the graphlog extension is widely used in ancient Mercurial. So with adding this default configuration vc-hg users may see the graph DAG in the vc-change-log buffer. Users have the choice to define vc-hg-log-switches as nil again, the vc-hg-root-log-format is compatible with no graph switch. Also added branches and bookmarks to the log format, with some different but existing faces from add-log. --- lisp/vc/vc-hg.el | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 05b53a3..649c736 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -146,12 +146,14 @@ 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\\}\\)" - ((1 'log-view-message-face) - (2 'change-log-list) - (3 'change-log-name) - (4 'change-log-date))) + '("{rev}:{ifeq(branch, 'default','', '{branch}')}:{bookmarks}:{tags}: {author|person} {date|shortdate} {desc|firstline}\\n" + "^\\(?:[+@o x|-]*\\)\\([0-9]+\\):\\([^:]*\\):\\([^:]*\\):\\([^:]*\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)" +((1 'log-view-message-face) + (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, @@ -238,8 +240,9 @@ highlighting the Log View buffer." ;;; History functions -(defcustom vc-hg-log-switches nil - "String or list of strings specifying switches for hg log under VC." +(defcustom vc-hg-log-switches (list "--graph") + "String or list of strings specifying switches for hg log under VC. +Using --graph needs Mercurial 3.0+ or the graphlog extension." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) --=20 2.0.0.rc0 --089e0160c2ba3ce1f104f98bac1a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi emac= s,

I wish to improve the vc-change-log buffer in = vc-hg with the graph view. My proposal is a change in default configuration= . The vc-hg-root-log-format is compatible with or without the graph view. A= lso added branches and bookmarks.

2014-05-17 Santiago Pay=C3= =A0 i Miralta <santiagopim@gmai= l.com>

=C2=A0 =C2=A0 =C2=A0 =C2= =A0=C2=A0* lisp/vc/vc-hg.el (vc-hg-root-log-format): New format<= /span>
=C2=A0supports graph, branches and bookmarks.

From a917e85f083907030d= aea6d1cf70ba524f5bbab9 Mon Sep 17 00:00:00 2001
From: =3D?UTF-8?q?S= antiago=3D20Pay=3DC3=3DA0=3D20i=3D20Miralta?=3D <santiagopim@gmail.com>
Date: Fri, 16 May 2= 014 23:58:57 +0200
Subject: [PATCH] * lisp/vc/v= c-hg.el (vc-hg-root-log-format): New format
=C2=A0supports graph, branches and bookmarks.
<= div class=3D"gmail_default" style>
Modern Mercurial log command supports --graph,= also the graphlog extension is widely used in ancient Mercurial. So with a= dding this default configuration vc-hg users may see the graph DAG in the v= c-change-log buffer. Users have the choice to define vc-hg-log-switches as = nil again, the vc-hg-root-log-format is compatible with no graph switch.

Also added branches and bo= okmarks to the log format, with some different but existing faces from add-= log.
---
=C2=A0lisp/vc/vc-hg.el | 19= +++++++++++--------
=C2=A01 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.= el
index 05b53a3..649c736 100644
--- a/lisp/vc/vc-hg.el
+++ b/li= sp/vc/vc-hg.el
@@ -146,12 +146,14 @@ If nil, use the value of `vc-diff-swi= tches'. =C2=A0If t, use no switches."
=C2=A0 =C2=A0:group= 'vc-hg)
=C2=A0
=C2=A0(defcustom vc-hg-root-log-format
- =C2=A0'("{rev}:{tags}: {author|person} {date|sho= rtdate} {desc|firstline}\\n"
- =C2=A0 =C2= =A0"^\\([0-9]+\\):\\([^:]*\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{= 2\\}-[0-9]\\{2\\}\\)"
- =C2=A0 =C2=A0((1 'log-view-message-face)
=
- =C2=A0 =C2=A0 (2 'change-log-list)
- =C2=A0 =C2=A0 (3 'change-log-name)
- =C2=A0 =C2=A0 (4 'change-log-date)))
+ =C2=A0'("{rev}:{ifeq(branch, 'default',&= #39;', '{branch}')}:{bookmarks}:{tags}: {author|person} {date|s= hortdate} {desc|firstline}\\n"
+ =C2=A0 =C2=A0"^\\(?:[+@o x|-]*\\)\\([0-9]+\\):\\([^:= ]*\\):\\([^:]*\\):\\([^:]*\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-= [0-9]\\{2\\}\\)"
+((1 'log-view-message-face)
+ =C2=A0 =C2=A0 (3 'change-log-list)
+ =C2=A0 =C2=A0 (4 'change-log-conditionals)
+ =C2=A0 =C2=A0 (5 'change-log-name)
+ =C2=A0 =C2=A0 (6 'change-log-date)))
=C2=A0 =C2=A0"Mercurial log template for `vc-hg-print-= log' short format.
=C2=A0This should be a l= ist (TEMPLATE REGEXP KEYWORDS), where TEMPLATE
=C2=A0is the \"--template\" argument string to pa= ss to Mercurial,
@@ -238,8 +240,9 @@ highlighti= ng the Log View buffer."
=C2=A0
=C2=A0;;; History functi= ons
=C2=A0
=
-(defcustom vc-hg-log-switches nil
- =C2=A0"Strin= g or list of strings specifying switches for hg log under VC."<= /div>
+(defcustom vc-hg-log-switches (list "--graph&quo= t;)
+ =C2=A0"String or list of strings specifying switches= for hg log under VC.
+Using --graph needs Merc= urial 3.0+ or the graphlog extension."
=C2=A0 =C2=A0:type '(choice (const :tag "None"= ; nil)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (string :tag "Argument String")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (repeat :tag "Argument List" :value ("") string))
--=C2=A0
2.0.0.rc0

--089e0160c2ba3ce1f104f98bac1a--