← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v08.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-15 13:49:38 UTC
  • mfrom: (6060.3.1 fix-last-revno-args)
  • Revision ID: pqm@pqm.ubuntu.com-20110815134938-4fuo63g4v2hj8jdt
(jelmer) Cope with the localhost having the name 'localhost' when running
 the test suite. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v08.py
263
263
 
264
264
        def do_diff(file_id, old_path, new_path, action, force_binary):
265
265
            def tree_lines(tree, require_text=False):
266
 
                if file_id in tree:
 
266
                if tree.has_id(file_id):
267
267
                    tree_file = tree.get_file(file_id)
268
268
                    if require_text is True:
269
269
                        tree_file = text_file(tree_file)