Merge lp:~jelmer/brz/resolve-location into lp:brz

[Jelmer Vernooij]

Add a 'brz resolve-location' command.

Add a 'brz resolve-location' command.

This command is mostly useful for debugging issues of various kinds, and therefore hidden.

[Martin Packman (gz)]

Make sense. Should perhaps go through `urlutils.unescape_for_display()` as well?

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/275/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/282/

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2019-03-03 23:05:11 +0000
+++ breezy/builtins.py	2019-05-26 22:29:00 +0000
@@ -7018,6 +7018,24 @@
             grep.versioned_grep(opts)
 
 
+class cmd_resolve_location(Command):
+    __doc__ = """Expand a location to a full URL.
+
+    :Examples:
+        Look up a Launchpad URL.
+
+            brz resolve-location lp:brz
+    """
+    takes_args = ['location']
+    hidden = True
+
+    def run(self, location):
+        from .location import location_to_url
+        url = location_to_url(location)
+        display_url = urlutils.unescape_for_display(url, self.outf.encoding)
+        self.outf.write('%s\n' % url)
+
+
 def _register_lazy_builtins():
     # register lazy builtins from other modules; called at startup and should
     # be only called once.

=== modified file 'breezy/tests/blackbox/__init__.py'
--- breezy/tests/blackbox/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/__init__.py	2019-05-26 22:29:00 +0000
@@ -106,6 +106,7 @@
         'test_remove_tree',
         'test_repair_workingtree',
         'test_resolve',
+        'test_resolve_location',
         'test_revert',
         'test_revno',
         'test_revision_history',

=== added file 'breezy/tests/blackbox/test_resolve_location.py'
--- breezy/tests/blackbox/test_resolve_location.py	1970-01-01 00:00:00 +0000
+++ breezy/tests/blackbox/test_resolve_location.py	2019-05-26 22:29:00 +0000
@@ -0,0 +1,42 @@
+# Copyright (C) 2019 Breezy Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+from breezy.tests import TestCaseWithTransport
+
+
+class TestCatRevision(TestCaseWithTransport):
+
+    def test_already_url(self):
+        wt = self.make_branch_and_tree('.')
+
+        out, err = self.run_bzr('resolve-location %s' % wt.branch.user_url)
+        self.assertEqual(out, '%s\n' % wt.branch.user_url)
+
+    def test_parent_missing(self):
+        wt = self.make_branch_and_tree('.')
+
+        out, err = self.run_bzr('resolve-location :parent', retcode=3)
+        self.assertEqual(out, '')
+        self.assertEqual(err, 'brz: ERROR: No parent location assigned.\n')
+
+    def test_parent(self):
+        wt = self.make_branch_and_tree('.')
+        wt.branch.set_parent('http://example.com/foo')
+
+        out, err = self.run_bzr('resolve-location :parent')
+        self.assertEqual(out, 'http://example.com/foo\n')
+        self.assertEqual(err, '')