bzr: just give me a context diff, will you?

bzr: just give me a context diff, will you?

[Alan Mackenzie]

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).

Re: bzr: just give me a context diff, will you?

[Stefan Monnier]

> 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,

You can set up such default options in your ~/.bazaar/bazaar.conf file.
E.g. the two lines below should do it.

	[ALIASES]
	diff=diff --diff-options=-c


-- Stefan "who prefers unified diffs"

Re: bzr: just give me a context diff, will you?

[Eli Zaretskii]

> Date: Tue, 20 Apr 2010 18:00:03 +0000
> From: Alan Mackenzie <acm@muc.de>
> 
> 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.

You don't need to hack Bazaar to get this.  Just edit your
~/.bazaar/bazaar.conf file and add this:

[ALIASES]
diff=diff --diff-options -c

(If you already have the ALIASES section, you only need the second
line.)

Re: bzr: just give me a context diff, will you?

[Andreas Schwab]

Eli Zaretskii <eliz@gnu.org> writes:

>> Date: Tue, 20 Apr 2010 18:00:03 +0000
>> From: Alan Mackenzie <acm@muc.de>
>> 
>> 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.
>
> You don't need to hack Bazaar to get this.  Just edit your
> ~/.bazaar/bazaar.conf file and add this:
>
> [ALIASES]
> diff=diff --diff-options -c

$ bzr alias diff="diff --diff-options -c"

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: bzr: just give me a context diff, will you?

[Alan Mackenzie]

Hi, Eli and everybody else,

On Tue, Apr 20, 2010 at 09:45:01PM +0300, Eli Zaretskii wrote:
> > Date: Tue, 20 Apr 2010 18:00:03 +0000
> > From: Alan Mackenzie <acm@muc.de>

> > 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.

> You don't need to hack Bazaar to get this.  Just edit your
> ~/.bazaar/bazaar.conf file and add this:

> [ALIASES]
> diff=diff --diff-options -c

> (If you already have the ALIASES section, you only need the second
> line.)

Thanks for this!  _Maybe_ R'ingTFM would have been faster than hacking
the source.

-- 
Alan Mackenzie (Nuremberg, Germany).