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

[Neil Martinsen-Burrell]

Add tag information to the output of bzr missing.

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.

[Jelmer Vernooij (jelmer)]

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?

[Neil Martinsen-Burrell (nmb)]

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.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

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

[Neil Martinsen-Burrell (nmb)]

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.

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2012-03-25 13:36:53 +0000
+++ bzrlib/builtins.py	2012-04-16 02:03:17 +0000
@@ -5002,9 +5002,13 @@
                              "You have %d extra revisions:\n", 
                              len(local_extra)) %
                 len(local_extra))
+            rev_tag_dict = {}
+            if local_branch.supports_tags():
+                rev_tag_dict = local_branch.tags.get_reverse_tag_dict()
             for revision in iter_log_revisions(local_extra,
                                 local_branch.repository,
-                                verbose):
+                                verbose,
+                                rev_tag_dict):
                 lf.log_revision(revision)
             printed_local = True
             status_code = 1
@@ -5018,9 +5022,12 @@
                              "You are missing %d revisions:\n",
                              len(remote_extra)) %
                 len(remote_extra))
+            if remote_branch.supports_tags():
+                rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
             for revision in iter_log_revisions(remote_extra,
                                 remote_branch.repository,
-                                verbose):
+                                verbose,
+                                rev_tag_dict):
                 lf.log_revision(revision)
             status_code = 1
 

=== modified file 'bzrlib/missing.py'
--- bzrlib/missing.py	2011-12-19 13:23:58 +0000
+++ bzrlib/missing.py	2012-04-16 02:03:17 +0000
@@ -25,9 +25,12 @@
 import bzrlib.revision as _mod_revision
 
 
-def iter_log_revisions(revisions, revision_source, verbose):
+def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
     last_tree = revision_source.revision_tree(_mod_revision.NULL_REVISION)
     last_rev_id = None
+
+    if rev_tag_dict is None:
+        rev_tag_dict = {}
     for rev in revisions:
         # We need the following for backward compatibilty (hopefully
         # this will be deprecated soon :-/) -- vila 080911
@@ -41,7 +44,8 @@
             delta = revision_source.get_revision_delta(rev_id)
         else:
             delta = None
-        yield log.LogRevision(rev, revno, merge_depth, delta=delta)
+        yield log.LogRevision(rev, revno, merge_depth, delta=delta,
+                              tags=rev_tag_dict.get(rev_id))
 
 
 def find_unmerged(local_branch, remote_branch, restrict='all',

=== modified file 'bzrlib/tests/blackbox/test_missing.py'
--- bzrlib/tests/blackbox/test_missing.py	2012-01-05 13:02:31 +0000
+++ bzrlib/tests/blackbox/test_missing.py	2012-04-16 02:03:17 +0000
@@ -234,3 +234,29 @@
         out1, err1 = self.run_bzr('missing ../b', retcode=1, working_dir='a')
         self.assertEqualDiff(out1, out2)
         self.assertEqualDiff(err1, err2)
+
+    def test_missing_tags(self):
+        """Test showing tags"""
+
+        # create a source branch
+        a_tree = self.make_branch_and_tree('a')
+        self.build_tree_contents([('a/a', 'initial\n')])
+        a_tree.add('a')
+        a_tree.commit(message='initial')
+
+        # clone and add a differing revision
+        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
+        self.build_tree_contents([('b/a', 'initial\nmore\n')])
+        b_tree.commit(message='more')
+        b_tree.branch.tags.set_tag('a-tag', b_tree.last_revision())
+
+        for log_format in ['long', 'short', 'line']:
+            out, err = self.run_bzr(
+                'missing --log-format={0} ../a'.format(log_format),
+                working_dir='b', retcode=1)
+            self.assertContainsString(out, 'a-tag')
+
+            out, err = self.run_bzr(
+                'missing --log-format={0} ../b'.format(log_format),
+                working_dir='a', retcode=1)
+            self.assertContainsString(out, 'a-tag')

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-04-06 11:38:05 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-04-16 02:03:17 +0000
@@ -35,6 +35,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* "bzr missing" now shows tag names when displaying revision information.
+  (#559072, Neil Martinsen-Burrell)
+
 * Implement ``ResponseFile.readline`` and ``ReponseFile.tell``,
   fixing some clones over HTTP. (Jelmer Vernooij, #963769)