/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/send.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/send.py
19
19
import os
20
20
import time
21
21
 
22
 
from bzrlib import (
 
22
from breezy import (
23
23
    controldir,
24
24
    errors,
25
25
    osutils,
26
26
    registry,
27
27
    trace,
28
28
    )
29
 
from bzrlib.i18n import gettext
30
 
from bzrlib.branch import (
 
29
from breezy.i18n import gettext
 
30
from breezy.branch import (
31
31
    Branch,
32
32
    )
33
 
from bzrlib.revision import (
 
33
from breezy.revision import (
34
34
    NULL_REVISION,
35
35
    )
36
36
 
165
165
def _send_4(branch, revision_id, target_branch, public_branch,
166
166
            no_patch, no_bundle, message,
167
167
            base_revision_id, local_target_branch=None):
168
 
    from bzrlib import merge_directive
 
168
    from breezy import merge_directive
169
169
    return merge_directive.MergeDirective2.from_objects(
170
170
        branch.repository, revision_id, time.time(),
171
171
        osutils.local_time_offset(), target_branch,
190
190
            patch_type = 'diff'
191
191
        else:
192
192
            patch_type = None
193
 
    from bzrlib import merge_directive
 
193
    from breezy import merge_directive
194
194
    return merge_directive.MergeDirective.from_objects(
195
195
        branch.repository, revision_id, time.time(),
196
196
        osutils.local_time_offset(), submit_branch,