From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: show merge info for git vc-log Date: Wed, 8 Jul 2009 20:24:20 -0700 (PDT) Message-ID: <200907090324.n693OKNm028308@godzilla.ics.uci.edu> References: <200907071833.n67IXEEQ019584@godzilla.ics.uci.edu> <87tz1of5u2.fsf@sphinx.net.ru> <200907082044.n68KiJYN022678@godzilla.ics.uci.edu> <87hbxmj1tk.fsf@tux.homenetwork> <200907082208.n68M8Ixc024022@godzilla.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1247109980 27073 80.91.229.12 (9 Jul 2009 03:26:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 9 Jul 2009 03:26:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: Kevin Rodgers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 09 05:26:13 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MOkGz-00079V-6U for ged-emacs-devel@m.gmane.org; Thu, 09 Jul 2009 05:26:13 +0200 Original-Received: from localhost ([127.0.0.1]:41362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MOkGy-0002lx-Dm for ged-emacs-devel@m.gmane.org; Wed, 08 Jul 2009 23:26:12 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MOkGt-0002lJ-FS for emacs-devel@gnu.org; Wed, 08 Jul 2009 23:26:07 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MOkGq-0002kf-02 for emacs-devel@gnu.org; Wed, 08 Jul 2009 23:26:07 -0400 Original-Received: from [199.232.76.173] (port=46892 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MOkGp-0002kb-No for emacs-devel@gnu.org; Wed, 08 Jul 2009 23:26:03 -0400 Original-Received: from sallyv2.ics.uci.edu ([128.195.1.120]:43590) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1MOkGo-0001q6-VC for emacs-devel@gnu.org; Wed, 08 Jul 2009 23:26:03 -0400 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n693OLoB028006; Wed, 8 Jul 2009 20:24:21 -0700 (PDT) Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n693OKNm028308; Wed, 8 Jul 2009 20:24:20 -0700 (PDT) In-Reply-To: (Kevin Rodgers's message of "Wed, 08 Jul 2009 20:11:50 -0600") Original-Lines: 28 X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n693OLoB028006 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:112221 Archived-At: Kevin Rodgers writes: > Dan Nicolaescu wrote: > > Thierry Volpiatto writes: > > > > > Dan Nicolaescu writes: > > > > > Dmitry Dzhus writes: > > > > > > > > > Mercurial can do the same with graphlog extension enabled (it's included > > > > > in Mercurial distribution now) if we add `-G` flag in > > > > > `vc-hg-log-switches`. > > > > > > > > Is there a way to force that flag to work? > > > > > > $ hg log -G > > > > hg log: option -G not recognized > > > > hg log [OPTION]... [FILE] > > > > Add this to your .hgrc > > > > That's not good. To enable this by default, we need to be able to force > > this flag to work from the command line. > > True, but you can enable it conditionally, depending on the exit > status of "grep '^hgext.graphlog *=' $HOME/.hgrc" The regexps that do syntax highlighting need to change depending if graphlog is used or not. Adding two versions, or making the regexps cope with too formats just adds complexity. When hg is fixed to do this thing is a less painful way we can update vc-hg.el to use it.