From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: bzr: just give me a context diff, will you? Date: Tue, 20 Apr 2010 18:00:03 +0000 Message-ID: <20100420180003.GA2785@muc.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1271786292 19661 80.91.229.12 (20 Apr 2010 17:58:12 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 17:58:12 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 20 19:58:11 2010 connect(): No such file or directory 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.69) (envelope-from ) id 1O4Hi6-0002ip-PU for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 19:58:11 +0200 Original-Received: from localhost ([127.0.0.1]:42950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4Hi5-0008AP-Se for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 13:58:09 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4Hhz-0008AA-NN for emacs-devel@gnu.org; Tue, 20 Apr 2010 13:58:03 -0400 Original-Received: from [140.186.70.92] (port=59836 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4Hhx-00089o-Jj for emacs-devel@gnu.org; Tue, 20 Apr 2010 13:58:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4Hhv-0006hq-Uj for emacs-devel@gnu.org; Tue, 20 Apr 2010 13:58:01 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:4875 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4Hhv-0006hB-LC for emacs-devel@gnu.org; Tue, 20 Apr 2010 13:57:59 -0400 Original-Received: (qmail 47646 invoked by uid 3782); 20 Apr 2010 17:51:16 -0000 Original-Received: from acm.muc.de (pD9E53304.dip.t-dialin.net [217.229.51.4]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Tue, 20 Apr 2010 19:51:15 +0200 Original-Received: (qmail 2910 invoked by uid 1000); 20 Apr 2010 18:00:03 -0000 Content-Disposition: inline User-Agent: Mutt/1.5.9i X-Delivery-Agent: TMDA/1.1.5 (Fettercairn) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 4.6-4.9 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:123929 Archived-At: Hi, Emacs! The project standard for diff output is a context diff, not a unified diff. By default, bzr unfortunately outputs unified. For anybody else who finds typing "--diff-options='-c'" intolerably long-winded, here is a quick hack in bzr to make context diffs the default. The file is ..../bzr-2.1.0/bzrlib/diff.py. *** diff.py~ 2010-02-16 17:00:21.000000000 +0000 --- diff.py 2010-04-20 17:42:45.059802592 +0000 *************** *** 868,873 **** --- 868,878 ---- extra_factories = [DiffFromTool.make_from_diff_tree(using)] else: extra_factories = [] + + # Added 2010-04-20 to make context diffs the default. + if not external_diff_options: + external_diff_options = '-c' + if external_diff_options: opts = external_diff_options.split() def diff_file(olab, olines, nlab, nlines, to_file): -- Alan Mackenzie (Nuremberg, Germany).