[MERGE] Show all merge revisions in 'commit -v' message template

[John Arbash Meinel]

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

Ian Clatworthy wrote:
> Colin D Bennett wrote:
>> I found it perplexing that when committing with pending merges, 
>> 'bzr commit' puts in the commit message template a suggestion that you
>> use -v to see all merge revisions (as 'bzr status' also displays), but
>> the -v option does nothing for the commit command.  For instance, a
>> commit message template may contain the following content, even when
>> '-v' is specified.
> 
> In the case of status, showing just the merge tips by default was done
> because the long list of revisions, after merging from trunk into a
> feature branch in particular, scrolled the interesting information
> (i.e. what files were changed) off the screen.

We also did it because it can take a long time to compute the
information, in what would otherwise be a very fast "bzr status" result.

> 
> I don't think the same problem exists for commit because the message
> template is loaded into an editor isn't it? In that case, I think the
> display of the merged revisions should always be the verbose form.
> 
>> [This is my first bzr patch, so please let me know if I can do
>> something better.]
> 
> At first glance, the code looks fine. I suspect a one line patch is
> all that we want here though, i.e. just setting verbose=True on the
> call to show_tree_status(). A test would be good as well to ensure
> this doesn't regress. (As the "bug" was only introduced in this
> development version, no NEWS entry is required.)
> 
> My 2c,
> Ian C.
> 
> 

I'm not as sure on that. I *personally* don't care, because I never use
an editor for my commit messages. (I just use bzr commit -m "" with a
multi-line message, as it works just fine in my shell.)

As the old form during commit was "--verbose", though, it seems that the
one-liner patch is certainly more backwards compatible, and a smaller
overall change.

John
=:->

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

iEYEARECAAYFAkmDI2QACgkQJdeBCYSNAAPK3QCfTZT3X5Ezb7d4WI7GtbV5Cp4o
1nEAoJaay7WPTZPfZgc/bPa4Irc2E/Vc
=6mqM
-----END PGP SIGNATURE-----