/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/smart/request.py

  • Committer: Vincent Ladeuil
  • Date: 2008-10-02 06:18:42 UTC
  • mfrom: (3757 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3759.
  • Revision ID: v.ladeuil+lp@free.fr-20081002061842-4ctag1pkr7ua9gu2
Fix conflict. Related to moved lines, nice use case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
35
35
    revision,
36
36
    urlutils,
37
37
    )
38
 
from bzrlib.bundle.serializer import write_bundle
 
38
from bzrlib.lazy_import import lazy_import
 
39
lazy_import(globals(), """
 
40
from bzrlib.bundle import serializer
 
41
""")
39
42
 
40
43
 
41
44
class SmartServerRequest(object):
360
363
        repo = control.open_repository()
361
364
        tmpf = tempfile.TemporaryFile()
362
365
        base_revision = revision.NULL_REVISION
363
 
        write_bundle(repo, revision_id, base_revision, tmpf)
 
366
        serializer.write_bundle(repo, revision_id, base_revision, tmpf)
364
367
        tmpf.seek(0)
365
368
        return SuccessfulSmartServerResponse((), tmpf.read())
366
369