/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 breezy/tests/test_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2019-07-25 23:22:30 UTC
  • mfrom: (7374 work)
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190725232230-9b4x1nn0m19j1oh0
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
32
32
    bzrdir,
33
33
    inventory,
34
34
    )
35
 
from ..bundle.apply_bundle import install_bundle, merge_bundle
36
 
from ..bundle.bundle_data import BundleTree
37
 
from ..bundle.serializer import write_bundle, read_bundle, v09, v4
38
 
from ..bundle.serializer.v08 import BundleSerializerV08
39
 
from ..bundle.serializer.v09 import BundleSerializerV09
40
 
from ..bundle.serializer.v4 import BundleSerializerV4
 
35
from ..bzr.bundle.apply_bundle import install_bundle, merge_bundle
 
36
from ..bzr.bundle.bundle_data import BundleTree
 
37
from ..bzr.bundle.serializer import write_bundle, read_bundle, v09, v4
 
38
from ..bzr.bundle.serializer.v08 import BundleSerializerV08
 
39
from ..bzr.bundle.serializer.v09 import BundleSerializerV09
 
40
from ..bzr.bundle.serializer.v4 import BundleSerializerV4
41
41
from ..bzr import knitrepo
42
42
from . import (
43
43
    features,
1355
1355
 
1356
1356
        :return: The in-memory bundle
1357
1357
        """
1358
 
        from ..bundle import serializer
 
1358
        from ..bzr.bundle import serializer
1359
1359
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1360
1360
        new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1361
1361
        new_text = new_text.replace(b'<file file_id="exe-1"',
1482
1482
 
1483
1483
        :return: The in-memory bundle
1484
1484
        """
1485
 
        from ..bundle import serializer
 
1485
        from ..bzr.bundle import serializer
1486
1486
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1487
1487
        new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1488
1488
        # We are going to be replacing some text to set the executable bit on a