[MERGE] use apport to get richer detail in bug reports.

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> On Wed, 2006-11-08 at 15:22 +1100, Martin Pool wrote:
> 
>> Ok, +1.
> 
> Thanks. If its ok as-is, I'll merge it with a bug report to do more
> later - mid-sprint is not a good time for extensive hacking.

This patch breaks the Derror test case.  I guess PQM doesn't have apport
installed.  Could you please fix it sooner rather than later?

By the way, this seems like a rather developer-hostile patch.  I *want*
to see the traceback and this is making it more difficult to see.

Here's my test failure:
FAIL: test_dash_derror (bzrlib.tests.blackbox.test_debug.TestDebugOption)

vvvv[log from
bzrlib.tests.blackbox.test_debug.TestDebugOption.test_dash_derror]
run bzr: ('-Derror', 'branch', 'nonexistent-location')
encoding stdout as sys.stdout encoding 'UTF-8'
Traceback (most recent call last):
  File "/home/abentley/bzr/tree-compare/bzrlib/commands.py", line 626,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/abentley/bzr/tree-compare/bzrlib/commands.py", line 588,
in run_bzr
    ret = run(*run_argv)
  File "/home/abentley/bzr/tree-compare/bzrlib/commands.py", line 292,
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/abentley/bzr/tree-compare/bzrlib/builtins.py", line 718,
in run
    br_from = Branch.open(from_location)
  File "/home/abentley/bzr/tree-compare/bzrlib/branch.py", line 118, in open
    control = bzrdir.BzrDir.open(base, _unsupported)
  File "/home/abentley/bzr/tree-compare/bzrlib/bzrdir.py", line 495, in open
    return BzrDir.open_from_transport(t, _unsupported=_unsupported)
  File "/home/abentley/bzr/tree-compare/bzrlib/bzrdir.py", line 504, in
open_from_transport
    format = BzrDirFormat.find_format(transport)
  File "/home/abentley/bzr/tree-compare/bzrlib/bzrdir.py", line 1058, in
find_format
    raise errors.NotBranchError(path=transport.base)
NotBranchError: Not a branch:
/home/abentley/bzr/tree-compare/nonexistent-location/

errors:
'bzr: ERROR: bzrlib.errors.NotBranchError: Not a branch:
/home/abentley/bzr/tree-compare/nonexistent-location/\nThis is an
unexpected error within bzr and we would appreciate a bug report.\n\nbzr
has written a crash report file that will assist our debugging of
this\nin the file /tmp/bzr-crash-WemiFF.txt\n\nThis is a plain text
file, whose contents you can check if you have privacy\nconcerns. We
gather the package data about bzr, your command line, plugins\nAnd the
backtrace from within bzr. If you had a password in the URL
you\nprovided to bzr, you should edit that file to remove the
password.\n\n** To file a bug for this please visit our bugtracker at
the URL \n"https://launchpad.net/products/bzr/+filebug" and report a bug
describing\nwhat you were attempting and attach the bzr-crash file
mentioned above.\nAlternatively you can email
bazaar-ng at lists.canonical.com with the same\ndescription and attach the
bzr-crash file to the email.\n'

^^^^[log from
bzrlib.tests.blackbox.test_debug.TestDebugOption.test_dash_derror]
- ----------------------------------------------------------------------
Traceback (most recent call last):
  File
"/home/abentley/bzr/tree-compare/bzrlib/tests/blackbox/test_debug.py",
line 30, in test_dash_derror
    self.assertContainsRe(err, "    raise errors\.NotBranchError")
  File "/home/abentley/bzr/tree-compare/bzrlib/tests/__init__.py", line
621, in assertContainsRe
    raise AssertionError('pattern "%s" not found in "%s"'
AssertionError: pattern "    raise errors\.NotBranchError" not found in
"bzr: ERROR: bzrlib.errors.NotBranchError: Not a branch:
/home/abentley/bzr/tree-compare/nonexistent-location/
This is an unexpected error within bzr and we would appreciate a bug report.

bzr has written a crash report file that will assist our debugging of this
in the file /tmp/bzr-crash-WemiFF.txt

This is a plain text file, whose contents you can check if you have privacy
concerns. We gather the package data about bzr, your command line, plugins
And the backtrace from within bzr. If you had a password in the URL you
provided to bzr, you should edit that file to remove the password.

** To file a bug for this please visit our bugtracker at the URL
"https://launchpad.net/products/bzr/+filebug" and report a bug describing
what you were attempting and attach the bzr-crash file mentioned above.
Alternatively you can email bazaar-ng at lists.canonical.com with the same
description and attach the bzr-crash file to the email.
"

- ----------------------------------------------------------------------
Ran 4200 tests in 573.742s

FAILED (failures=1)
tests failed

abentley at lappy:~/bzr/tree-compare$
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFXUpl0F+nu1YWqI0RAkAvAJsFwyomecXAG831bIVWR0AZybJTKACfW70t
TL3DwkHH8Gc+QKfUkY5sosc=
=7G3A
-----END PGP SIGNATURE-----