[MERGE] log --include-merges

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
> As requested by Jelmer and others, this patch makes
> --include-merges an alias for --levels 0 in log. The
> advice about using --levels 0 has been tweaked to refer
> to --include-merges instead.
> 
> Ian C.
> 

By the way, can we get it to not display the message if you supply "-n1"
(rather than not supplying anything.)

I default to "bzr log --short", and I realized that I don't have any way
to not display that message. (Now that you fixed it to display when it
should, I realized it bothers me seeing it all the time. I can adapt,
but it would be nice if I could just tweak my alias.)

         direction = (forward and 'forward') or 'reverse'
+        if include_merges and levels is None:
+            levels = 0

^- Shouldn't you have a check for "--levels 1 --include-merges" ? (in
several other places if you supply incompatible args we give warnings.)

This has some small problems with aliases, because:

 log = log -r X..Y
 bzr log -c 10

Fails because "-c" is not compatible with "-r" :(.

Regardless, though, if someone has an alias to "-n1" and then supplies
"--include-merges" I think they would like to be given a clear message
why the merges aren't being shown.

Otherwise:
  BB:tweak

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknSMO8ACgkQJdeBCYSNAAN5UACg2ClVhrBVdPSKABaDOPxub2FS
qJYAnj3SEh3BfTLLUHSI+KT9+dHbS6ES
=A2bg
-----END PGP SIGNATURE-----