← 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: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v08.py
17
17
"""Serializer factory for reading and writing bundles.
18
18
"""
19
19
 
20
 
from __future__ import absolute_import
 
20
import os
21
21
 
22
22
from bzrlib import (
23
23
    errors,
27
27
                                      _get_bundle_header,
28
28
                                     )
29
29
from bzrlib.bundle.serializer import binary_diff
30
 
from bzrlib.bundle.bundle_data import (RevisionInfo, BundleInfo)
 
30
from bzrlib.bundle.bundle_data import (RevisionInfo, BundleInfo, BundleTree)
31
31
from bzrlib.diff import internal_diff
 
32
from bzrlib.osutils import pathjoin
32
33
from bzrlib.revision import NULL_REVISION
33
34
from bzrlib.testament import StrictTestament
34
35
from bzrlib.timestamp import (
35
36
    format_highres_date,
36
 
    )
 
37
    unpack_highres_date,
 
38
)
37
39
from bzrlib.textfile import text_file
38
40
from bzrlib.trace import mutter
39
41
 
261
263
 
262
264
        def do_diff(file_id, old_path, new_path, action, force_binary):
263
265
            def tree_lines(tree, require_text=False):
264
 
                if tree.has_id(file_id):
 
266
                if file_id in tree:
265
267
                    tree_file = tree.get_file(file_id)
266
268
                    if require_text is True:
267
269
                        tree_file = text_file(tree_file)
551
553
        testament = StrictTestament.from_revision(repository, revision_id)
552
554
        return testament.as_sha1()
553
555
 
554
 
    def _testament_sha1(self, revision, tree):
555
 
        return StrictTestament(revision, tree).as_sha1()
 
556
    def _testament_sha1(self, revision, inventory):
 
557
        return StrictTestament(revision, inventory).as_sha1()