Rev 1723: Produce better errors for malformed bundles in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1723
revision-id: pqm at pqm.ubuntu.com-20060607164754-f5a93b47d5650c8c
parent: pqm at pqm.ubuntu.com-20060607101245-3e242a04b9bd23e9
parent: aaron.bentley at utoronto.ca-20060607162938-0bec699ddde0764a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-07 17:47:54 +0100
message:
  Produce better errors for malformed bundles
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/apply_bundle.py  apply_changeset.py-20050620044656-dba4eb8021a36f95
  bzrlib/bundle/read_bundle.py   read_changeset.py-20050619171944-c0d95aa685537640
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060607162938-0bec699ddde0764a
    parent: aaron.bentley at utoronto.ca-20060606181546-a5cc7d87cea71454
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: w-changeset
    timestamp: Wed 2006-06-07 17:29:38 +0100
    message:
      Update for review comments
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060606181546-a5cc7d87cea71454
    parent: aaron.bentley at utoronto.ca-20060606180345-57139c8826ab3ec1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: w-changeset
    timestamp: Tue 2006-06-06 19:15:46 +0100
    message:
      Ensure bzr works when you merge an already-merged bundle
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060606180345-57139c8826ab3ec1
    parent: aaron.bentley at utoronto.ca-20060606175639-92a20ee0a7f8b3b7
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: w-changeset
    timestamp: Tue 2006-06-06 19:03:45 +0100
    message:
      Check for NotABundle, not BadBundle, so we get errors for malformed bundles
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060606175639-92a20ee0a7f8b3b7
    parent: aaron.bentley at utoronto.ca-20060606171005-e2b50e39cd5056be
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: w-changeset
    timestamp: Tue 2006-06-06 18:56:39 +0100
    message:
      Raise NotABundle when a non-bundle is supplied
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060606171005-e2b50e39cd5056be
    parent: aaron.bentley at utoronto.ca-20060603201131-518d5e8364931300
    parent: pqm at pqm.ubuntu.com-20060606161247-44efd292c9de0005
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: w-changeset
    timestamp: Tue 2006-06-06 18:10:05 +0100
    message:
      Merge from bzr.dev