Rev 3454: Raise the right exception in make_mpdiffs (bug #235687) in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/mpdiffs_235687

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/mpdiffs_235687

------------------------------------------------------------
revno: 3454
revision-id: john at arbash-meinel.com-20080529143933-io78t2jvdpgtxyk4
parent: pqm at pqm.ubuntu.com-20080527013230-8qjaju10duxpy3e2
author: Daniel Fischer <df at mysql.com>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mpdiffs_235687
timestamp: Thu 2008-05-29 09:39:33 -0500
message:
  Raise the right exception in make_mpdiffs (bug #235687)
modified:
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
-------------- next part --------------
=== modified file 'bzrlib/versionedfile.py'
--- a/bzrlib/versionedfile.py	2008-05-12 02:40:40 +0000
+++ b/bzrlib/versionedfile.py	2008-05-29 14:39:33 +0000
@@ -254,7 +254,7 @@
             try:
                 knit_versions.update(parent_map[version_id])
             except KeyError:
-                raise RevisionNotPresent(version_id, self)
+                raise errors.RevisionNotPresent(version_id, self)
         # We need to filter out ghosts, because we can't diff against them.
         knit_versions = set(self.get_parent_map(knit_versions).keys())
         lines = dict(zip(knit_versions,
@@ -266,7 +266,7 @@
                 parents = [lines[p] for p in parent_map[version_id] if p in
                     knit_versions]
             except KeyError:
-                raise RevisionNotPresent(version_id, self)
+                raise errors.RevisionNotPresent(version_id, self)
             if len(parents) > 0:
                 left_parent_blocks = self._extract_blocks(version_id,
                                                           parents[0], target)