Rev 3400: (robertc) Fix error reporting with bad revision parsing in weave in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3400
revision-id:pqm at pqm.ubuntu.com-20080502052056-i0fgnbrw89ueo423
parent: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
parent: robertc at robertcollins.net-20080502011532-otm7de2qewba7e30
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 06:20:56 +0100
message:
  (robertc) Fix error reporting with bad revision parsing in weave
  	repositories. (Robert Collins)
modified:
  bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
    ------------------------------------------------------------
    revno: 3399.1.1
    revision-id:robertc at robertcollins.net-20080502011532-otm7de2qewba7e30
    parent: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: misc-fixen
    timestamp: Fri 2008-05-02 11:15:32 +1000
    message:
      Fix error reporting with bad revision parsing in weave repositories.
    modified:
      bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
=== modified file 'bzrlib/store/revision/text.py'
--- a/bzrlib/store/revision/text.py	2007-09-25 08:14:12 +0000
+++ b/bzrlib/store/revision/text.py	2008-05-02 01:15:32 +0000
@@ -98,9 +98,8 @@
             try:
                 r = self._serializer.read_revision(xml_file)
             except SyntaxError, e:
-                raise errors.BzrError('failed to unpack revision_xml',
-                                   [revision_id,
-                                   str(e)])
+                raise errors.BzrError('failed to unpack revision_xml %s %s' % (
+                    revision_id, str(e)))
             xml_file.close()
             assert r.revision_id == revision_id
             revisions.append(r)