[MERGE] fix #306394 (status handle non-existent files too)

Ian Clatworthy ian.clatworthy at internode.on.net
Tue Feb 10 00:05:48 GMT 2009


Karl Fogel wrote:
> Ian Clatworthy <ian.clatworthy at canonical.com> writes:

>> The UI looks good. You still need to:
>>
>> * turn your shell script into tests inside
>> bzrlib/tests/blackbox/test_status.py
>>
>> * update the status-flags help inside bzrlib/help_topics/__init__.py
>>
>> * add a NEWS item to the IMPROVEMENTS or BUG FIXES section (depending
>> on your perspective wrt whether this is an enhancement or the current
>> behaviour is wrong).
> 
> Okay, attached is a new bundle that does all the above.  It also behaves
> a bit differently from the original patch, thanks to some suggestions
> from Robert Collins and Andrew Bennetts.

bb:tweak

> +            for nonexistent in nonexistents:
> +                if short:
> +                    prefix = 'X  '
> +                else:
> +                    prefix = ' '
> +                to_file.write("%s %s\n" % (prefix, nonexistent))

The calculation of prefix should probably be done outside the loop.
In practice, this ought to happen *so* rarely that's it very minor though.

I'll make the necessary tweaks, including splitting the tests as Jelmer
suggested, and merge.

Ian C.



More information about the bazaar mailing list