[Pkg-bazaar-commits] ./bzr/unstable r356: - pychecker fixes in bzrlib.diff

[Martin Pool]

------------------------------------------------------------
revno: 356
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-05-05 15:41:45 +1000
message:
  - pychecker fixes in bzrlib.diff
modified:
  bzrlib/diff.py
-------------- next part --------------
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py	2005-05-03 07:48:16 +0000
+++ b/bzrlib/diff.py	2005-05-05 05:41:45 +0000
@@ -18,7 +18,7 @@
 from sets import Set
 
 from trace import mutter
-
+from errors import BzrError
 
 
 def diff_trees(old_tree, new_tree):
@@ -141,7 +141,7 @@
 
 
 def show_diff(b, revision, file_list):
-    import difflib, sys
+    import difflib, sys, types
     
     if revision == None:
         old_tree = b.basis_tree()
@@ -245,6 +245,6 @@
                        fromfile=old_label + old_name + idlabel,
                        tofile=new_label + new_name)
         else:
-            bailout("can't represent state %s {%s}" % (file_state, fid))
+            raise BzrError("can't represent state %s {%s}" % (file_state, fid))