Rev 2847: Trivial fix for 'bzr reconfigure' (Rob Weir) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2847
revision-id: pqm at pqm.ubuntu.com-20070922162518-jn1nr11x32ep32mv
parent: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
parent: bialix at ukr.net-20070922154348-dte2o3le0f8n30iq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-09-22 17:25:18 +0100
message:
  Trivial fix for 'bzr reconfigure' (Rob Weir)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
    ------------------------------------------------------------
    revno: 2846.1.4
    merged: bialix at ukr.net-20070922154348-dte2o3le0f8n30iq
    parent: rweir at ertius.org-20070922060835-kg519btg6kiyuf4y
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: rob.weir
    timestamp: Sat 2007-09-22 18:43:48 +0300
    message:
      NEWS
    ------------------------------------------------------------
    revno: 2846.1.3
    merged: rweir at ertius.org-20070922060835-kg519btg6kiyuf4y
    parent: rweir at ertius.org-20070922004044-0s4vv2q6e7bdovms
    committer: Rob Weir <rweir at ertius.org>
    branch nick: bzr-reconfigure-with-no-args
    timestamp: Sat 2007-09-22 16:08:35 +1000
    message:
      add check of error text.
    ------------------------------------------------------------
    revno: 2846.1.2
    merged: rweir at ertius.org-20070922004044-0s4vv2q6e7bdovms
    parent: rweir at ertius.org-20070921234816-ixwjcntu98m0t1vb
    committer: Rob Weir <rweir at ertius.org>
    branch nick: bzr-reconfigure-with-no-args
    timestamp: Sat 2007-09-22 10:40:44 +1000
    message:
      use BzrCommandError from imported name 'errors'.
    ------------------------------------------------------------
    revno: 2846.1.1
    merged: rweir at ertius.org-20070921234816-ixwjcntu98m0t1vb
    parent: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
    committer: Rob Weir <rweir at ertius.org>
    branch nick: bzr-reconfigure-with-no-args
    timestamp: Sat 2007-09-22 09:48:16 +1000
    message:
      add blackbox test for 'bzr reconfigure', which now fails.
=== modified file 'NEWS'
--- a/NEWS	2007-09-21 08:17:43 +0000
+++ b/NEWS	2007-09-22 15:43:48 +0000
@@ -83,6 +83,9 @@
    * Fix selftest semi-random noise during http related tests.
      (Vincent Ladeuil, #140614)
 
+   * Trivial fix for invoking command ``reconfigure`` without arguments.
+     (Rob Weir, #141629)
+
    * ``WorkingTree.rename_one`` will now raise an error if normalisation of the
      new path causes bzr to be unable to access the file. (Robert Collins)
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-09-17 12:46:56 +0000
+++ b/bzrlib/builtins.py	2007-09-22 00:40:44 +0000
@@ -4185,7 +4185,7 @@
     def run(self, location=None, target_type=None, bind_to=None, force=False):
         directory = bzrdir.BzrDir.open(location)
         if target_type is None:
-            raise BzrCommandError('No target configuration specified')
+            raise errors.BzrCommandError('No target configuration specified')
         elif target_type == 'branch':
             reconfiguration = reconfigure.Reconfigure.to_branch(directory)
         elif target_type == 'tree':

=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
--- a/bzrlib/tests/blackbox/test_reconfigure.py	2007-09-17 12:45:54 +0000
+++ b/bzrlib/tests/blackbox/test_reconfigure.py	2007-09-22 06:08:35 +0000
@@ -56,3 +56,8 @@
         branch = self.make_branch('branch')
         checkout = branch.create_checkout('checkout', lightweight=True)
         self.run_bzr('reconfigure --checkout checkout')
+
+    def test_no_args(self):
+        branch = self.make_branch('branch')
+        self.run_bzr_error(['No target configuration specified'],
+                           'reconfigure', working_dir='branch')