[MERGE] Fix #87179 by using the short status format when the short format is used for log.

[Robert Collins]

Robert Collins has voted tweak.
Status is now: Conditionally approved
Comment:
There is duplication in the tests; I suggest a helper that does what 
your comment is - checks for short, or checks for long, as that will be 
more robust when the short or long status are altered.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Cm2oczj7ypk.fsf%40free.fr%3E
Project: Bazaar