Merge lp:~jelmer/brz/lp-logout into lp:brz

[Jelmer Vernooij]

Add a lp-logout command.

Add a lp-logout command.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/plugins/launchpad/__init__.py'
--- breezy/plugins/launchpad/__init__.py	2017-06-02 01:01:21 +0000
+++ breezy/plugins/launchpad/__init__.py	2018-02-09 23:26:43 +0000
@@ -58,6 +58,7 @@
 for klsname, aliases in [
     ("cmd_launchpad_open", ["lp-open"]),
     ("cmd_launchpad_login", ["lp-login"]),
+    ("cmd_launchpad_logout", ["lp-logout"]),
     ("cmd_launchpad_mirror", ["lp-mirror"]),
     ("cmd_lp_propose_merge", ["lp-submit", "lp-propose"]),
     ("cmd_lp_find_proposal", [])]:

=== modified file 'breezy/plugins/launchpad/account.py'
--- breezy/plugins/launchpad/account.py	2017-07-30 16:59:50 +0000
+++ breezy/plugins/launchpad/account.py	2018-02-09 23:26:43 +0000
@@ -73,13 +73,17 @@
 def _set_global_option(username, _config=None):
     if _config is None:
         _config = GlobalStack()
-    _config.set('launchpad_username', username)
+    if username is None:
+        _config.remove('launchpad_username')
+    else:
+        _config.set('launchpad_username', username)
 
 
 def set_lp_login(username, _config=None):
     """Set the user's Launchpad username"""
     _set_global_option(username, _config)
-    _set_auth_user(username)
+    if username is not None:
+        _set_auth_user(username)
 
 
 def _get_auth_user(auth=None):

=== modified file 'breezy/plugins/launchpad/cmds.py'
--- breezy/plugins/launchpad/cmds.py	2017-08-26 15:17:57 +0000
+++ breezy/plugins/launchpad/cmds.py	2018-02-09 23:26:43 +0000
@@ -143,6 +143,30 @@
                                                                         (name,))
 
 
+class cmd_launchpad_logout(Command):
+    __doc__ = """Unset the Launchpad user ID.
+
+    When communicating with Launchpad, some commands need to know your
+    Launchpad user ID.  This command will log you out from Launchpad.
+    This means that communication with Launchpad will happen over
+    HTTPS, and will not require one of your SSH keys to be available.
+    """
+    aliases = ['lp-logout']
+    takes_options = ['verbose']
+
+    def run(self, verbose=False):
+        from . import account
+        old_username = account.get_lp_login()
+        if old_username is None:
+            self.outf.write(gettext('Not logged into Launchpad.\n'))
+            return 1
+        account.set_lp_login(None)
+        if verbose:
+            self.outf.write(gettext(
+                "Launchpad user ID %s logged out.\n") %
+                old_username)
+
+
 # XXX: cmd_launchpad_mirror is untested
 class cmd_launchpad_mirror(Command):
     __doc__ = """Ask Launchpad to mirror a branch now."""

=== modified file 'breezy/plugins/launchpad/test_lp_login.py'
--- breezy/plugins/launchpad/test_lp_login.py	2017-05-22 00:56:52 +0000
+++ breezy/plugins/launchpad/test_lp_login.py	2018-02-09 23:26:43 +0000
@@ -56,3 +56,18 @@
             ['launchpad-login', '-v', '--no-check', 'foo'])
         self.assertEqual("Launchpad user ID set to 'foo'.\n", out)
         self.assertEqual('', err)
+
+    def test_logout(self):
+        out, err = self.run_bzr(
+            ['launchpad-login', '-v', '--no-check', 'foo'])
+        self.assertEqual("Launchpad user ID set to 'foo'.\n", out)
+        self.assertEqual('', err)
+
+        out, err = self.run_bzr(['launchpad-logout', '-v'])
+        self.assertEqual("Launchpad user ID foo logged out.\n", out)
+        self.assertEqual('', err)
+
+    def test_logout_not_logged_in(self):
+        out, err = self.run_bzr(['launchpad-logout', '-v'], retcode=1)
+        self.assertEqual('Not logged into Launchpad.\n', out)
+        self.assertEqual("", err)

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2018-02-03 13:10:53 +0000
+++ doc/en/release-notes/brz-3.0.txt	2018-02-09 23:26:43 +0000
@@ -106,6 +106,9 @@
  * Support the creation of colocated branches in ``brz fast-import``.
    (Jelmer Vernooij, #1744626)
 
+ * New ``lp-logout`` command to unset launchpad username.
+   (Jelmer Vernooij, #349143)
+
 Improvements
 ************