Bazaar

Merge lp://staging/~nmb/bzr/559072-missing-tag into lp://staging/bzr

  1. 559072-missing-tag
  2. Merge into bzr.dev
Proposed by Neil Martinsen-Burrell
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 6521
Proposed branch: lp://staging/~nmb/bzr/559072-missing-tag
Merge into: lp://staging/bzr
Diff against target: 107 lines (+44/-4)
4 files modified
bzrlib/builtins.py (+9/-2)
bzrlib/missing.py (+6/-2)
bzrlib/tests/blackbox/test_missing.py (+26/-0)
doc/en/release-notes/bzr-2.6.txt (+3/-0)
To merge this branch: bzr merge lp://staging/~nmb/bzr/559072-missing-tag
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) Approve
Review via email: mp+101220@code.staging.launchpad.net

Commit message

Add tag information to the output of bzr missing.

Description of the change

This fixes bug 559072 by adding tag information to the output of the "bzr missing" command. The signature of bzrlib/missing.py:iter_log_revisions() was changed, but only by adding a keyword argument to the end, so I didn't think that it warranted mention as a compatibility change. This had to be done to get tag information from the appropriate branch.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks for working on this, looks good.

It might be nicer to pass in the reverse tags dictionary rather than the actual branch; that seems more consistent with the other parameters that are being passed in (revisions). What do you think?

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

I think that is indeed better. Change made in the branch. I also fixed it to print and test tags for the remote branch as well.

Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This has a conflict in the release notes; any chance you can fix that?

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

Fixed on lp:~nmb/bzr/559072-missing-tag.

On Sun, Apr 15, 2012 at 11:40, Jelmer Vernooij
<email address hidden> wrote:
> This has a conflict in the release notes; any chance you can fix that?
> --
> https://code.launchpad.net/~nmb/bzr/559072-missing-tag/+merge/101220
> You are the owner of lp:~nmb/bzr/559072-missing-tag.

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.