Merge lp:~jelmer/brz/tags-suggest-command into lp:brz/3.0

[Jelmer Vernooij]

Suggest full command to run when tags are unsupported.

Suggest full command to run when tags are unsupported.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2019-02-15 18:57:38 +0000
+++ breezy/errors.py	2019-06-15 19:07:38 +0000
@@ -2138,10 +2138,11 @@
 class TagsNotSupported(BzrError):
 
     _fmt = ("Tags not supported by %(branch)s;"
-            " you may be able to use brz upgrade.")
+            " you may be able to use 'brz upgrade %(branch_url)s'.")
 
     def __init__(self, branch):
         self.branch = branch
+        self.branch_url = branch.user_url
 
 
 class TagAlreadyExists(BzrError):

=== modified file 'breezy/tests/blackbox/test_tags.py'
--- breezy/tests/blackbox/test_tags.py	2019-01-08 21:29:21 +0000
+++ breezy/tests/blackbox/test_tags.py	2019-06-15 19:07:38 +0000
@@ -443,6 +443,15 @@
                          'unknown              ?\n')
         self.assertEqual('', err)
 
+    def test_tag_unsupported(self):
+        tree = self.make_branch_and_tree('tree', format='dirstate')
+        out, err = self.run_bzr('tag -d tree blah', retcode=3)
+        self.assertEqual(out, '')
+        self.assertContainsRe(
+            err,
+            'brz: ERROR: Tags not supported by BzrBranch5\\(.*\\/tree\\/\\); '
+            'you may be able to use \'brz upgrade file:\\/\\/.*\\/tree\\/\'.')
+
 
 class TestSmartServerCat(TestCaseWithTransport):
 

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-05-29 03:30:03 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-06-15 19:07:38 +0000
@@ -42,6 +42,9 @@
   ``Repository.get_revid_for_revno`` when the revision
   number is invalid. (Jelmer Vernooij, #701953)
 
+* Print full upgrade command to run when complaining about lack of
+  support for tags. (Jelmer Vernooij, #163908)
+
 Documentation
 *************