Merge lp:~frankoid/bzr/status-shelve-message into lp:bzr
Status: | Superseded |
---|---|
Proposed branch: | lp:~frankoid/bzr/status-shelve-message |
Merge into: | lp:bzr |
Diff against target: |
164 lines (+34/-14) 4 files modified
bzrlib/status.py (+13/-5) bzrlib/tests/blackbox/test_status.py (+16/-7) bzrlib/tests/test_status.py (+2/-2) doc/en/release-notes/bzr-2.5.txt (+3/-0) |
To merge this branch: | bzr merge lp:~frankoid/bzr/status-shelve-message |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Review via email: mp+82728@code.launchpad.net |
This proposal has been superseded by a proposal from 2011-11-30.
Description of the change
Make "bzr status" only output the "x shelves exist" message when no files are specified.
If you run a plain "bzr status" then you are asking bzr about the status of the whole tree, so it is reasonable for it to report shelves, but if you run "bzr status myfile" then you are just asking it about the status of myfile, so it shouldn't tell you about shelves. Also, this change will prevent the annoying Emacs warnings that happen when you visit a file inside a branch with shelves.
If a file is specified and that file is in a shelve then the shelves message is still not output. This behaviour is to keep "bzr status" fast and to keep the logic simple (there has been some discussion about this on the <email address hidden>).
Hi Francis,
There seem to be two parts to this change:
1) passing the specified_files to all the post_status hooks
2) changing the behaviour of one of the post_status hooks, which reports shelve status
(1) seems like a good idea in any case.
Perhaps it would make sense to split this branch up into two. The hook changes should be able to land pretty quickly, the second (in whatever form) can land once we decide on the correct behaviour for status when a file is specified.
(personally, I would prefer to keep the existing behaviour of "bzr status FILE" reporting shelves, but let's keep that discussion on the mailing list - I'll follow up there)