Rev 6406: (jelmer) Fix the shell-complete command. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6406 [merge]
revision-id: pqm at pqm.ubuntu.com-20111229231547-vupamntx69hwp8dl
parent: pqm at pqm.ubuntu.com-20111224095902-kkoi2q9k7cc4elxt
parent: jelmer at samba.org-20111229210511-2hfcqpkn001cwzn1
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-12-29 23:15:47 +0000
message:
  (jelmer) Fix the shell-complete command. (Jelmer Vernooij)
added:
  bzrlib/tests/blackbox/test_shell_complete.py test_shell_complete.-20111229210323-67i5ce5zbdfgb81w-1
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/shellcomplete.py        shellcomplete.py-20050822153127-3be115ff5e70fc39
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2011-12-21 17:54:39 +0000
+++ b/bzrlib/builtins.py	2011-12-29 21:05:11 +0000
@@ -4721,7 +4721,7 @@
 
     @display_command
     def run(self, context=None):
-        import shellcomplete
+        from bzrlib import shellcomplete
         shellcomplete.shellcomplete(context)
 
 

=== modified file 'bzrlib/shellcomplete.py'
--- a/bzrlib/shellcomplete.py	2011-12-18 15:28:38 +0000
+++ b/bzrlib/shellcomplete.py	2011-12-29 21:05:11 +0000
@@ -59,8 +59,7 @@
 
 def shellcomplete_commands(outfile = None):
     """List all commands"""
-    import inspect
-    import commands
+    from bzrlib import commands
     from inspect import getdoc
 
     commands.install_bzr_command_hooks()

=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- a/bzrlib/tests/blackbox/__init__.py	2011-12-10 21:00:34 +0000
+++ b/bzrlib/tests/blackbox/__init__.py	2011-12-29 21:03:53 +0000
@@ -114,6 +114,7 @@
                      'test_send',
                      'test_serve',
                      'test_shared_repository',
+                     'test_shell_complete',
                      'test_shelve',
                      'test_sign_my_commits',
                      'test_split',

=== added file 'bzrlib/tests/blackbox/test_shell_complete.py'
--- a/bzrlib/tests/blackbox/test_shell_complete.py	1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/blackbox/test_shell_complete.py	2011-12-29 21:03:53 +0000
@@ -0,0 +1,27 @@
+# Copyright (C) 2011 Canonical Ltd
+# -*- coding: utf-8 -*-
+#
+# 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
+
+
+"""Black-box tests for 'bzr shell-complete'."""
+
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestShellComplete(TestCaseWithTransport):
+
+    def test_shell_complete(self):
+        self.run_bzr("shell-complete")