Merge lp://qastaging/~nmb/bzr/239523-quiet-tag into lp://qastaging/bzr

Proposed by Neil Martinsen-Burrell
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5482
Proposed branch: lp://qastaging/~nmb/bzr/239523-quiet-tag
Merge into: lp://qastaging/bzr
Diff against target: 75 lines (+21/-4)
3 files modified
NEWS (+3/-0)
bzrlib/builtins.py (+2/-2)
bzrlib/tests/blackbox/test_tags.py (+16/-2)
To merge this branch: bzr merge lp://qastaging/~nmb/bzr/239523-quiet-tag
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Martin Pool Needs Information
Review via email: mp+37555@code.qastaging.launchpad.net

Commit message

Make "bzr tag --quiet" really quiet

Description of the change

Having tried to fix this bug once 2.5 years ago, I believe that this branch really does it. Other drive-by fixes on supposedly quiet commands NOT included here. Ideally, self.outf.write would appear rarely in builtins.py but this patch doesn't attempt that. It just fixes a bug as it was reported: "bzr tag --quiet" is now quiet. (Is it a compatibility break if the chatty output of a command moves from stdout to stderr? Because the use of trace.note changes that here.)

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

Thanks for that fix.

This is a change in behaviour but I would say a tolerable one.

81 + def test_tag_delete_quiet(self):
82 + self.run_script("""
83 +$ bzr init
84 +$ bzr tag test1
85 +2>Created tag test1.
86 +$ bzr tag --delete --quiet test1
87 +2>

The check for a blank line is odd. I guess this is because the current scriptrunner, until lp:~mbp/bzr/scripts lands, matches expected blank == actual anything?

review: Needs Information
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

> The check for a blank line is odd. I guess this is because the current
> scriptrunner, until lp:~mbp/bzr/scripts lands, matches expected blank ==
> actual anything?

My intention was to test for empty output. I've switched it to use run_bzr and assertEqual('', out)

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Neil Martinsen-Burrell <email address hidden> writes:

    >> The check for a blank line is odd. I guess this is because the current
    >> scriptrunner, until lp:~mbp/bzr/scripts lands, matches expected blank ==
    >> actual anything?

    > My intention was to test for empty output. I've switched it to
    > use run_bzr and assertEqual('', out)

Hmm, I do think we need to support that in the scriptrunner...

Revision history for this message
John A Meinel (jameinel) wrote :

Martin's "scripts" branch does this, it just hasn't landed because of test failures.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Sounds fine, thanks !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.