/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2005-05-05 05:41:45 UTC
  • Revision ID: mbp@sourcefrog.net-20050505054145-4cfb2e4e8ec83689
- pychecker fixes in bzrlib.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
18
18
from sets import Set
19
19
 
20
20
from trace import mutter
21
 
 
 
21
from errors import BzrError
22
22
 
23
23
 
24
24
def diff_trees(old_tree, new_tree):
141
141
 
142
142
 
143
143
def show_diff(b, revision, file_list):
144
 
    import difflib, sys
 
144
    import difflib, sys, types
145
145
    
146
146
    if revision == None:
147
147
        old_tree = b.basis_tree()
245
245
                       fromfile=old_label + old_name + idlabel,
246
246
                       tofile=new_label + new_name)
247
247
        else:
248
 
            bailout("can't represent state %s {%s}" % (file_state, fid))
 
248
            raise BzrError("can't represent state %s {%s}" % (file_state, fid))
249
249
 
250
250