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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
19
19
import os
20
20
import time
21
21
 
22
 
from . import (
 
22
from bzrlib import (
23
23
    controldir,
24
24
    errors,
25
25
    osutils,
26
26
    registry,
27
27
    trace,
28
28
    )
29
 
from .i18n import gettext
30
 
from .branch import (
 
29
from bzrlib.i18n import gettext
 
30
from bzrlib.branch import (
31
31
    Branch,
32
32
    )
33
 
from .revision import (
 
33
from bzrlib.revision import (
34
34
    NULL_REVISION,
35
35
    )
36
36
 
85
85
 
86
86
        submit_branch = Branch.open(target_branch,
87
87
            possible_transports=possible_transports)
88
 
        possible_transports.append(submit_branch.controldir.root_transport)
 
88
        possible_transports.append(submit_branch.bzrdir.root_transport)
89
89
        if mail_to is None or format is None:
90
90
            if mail_to is None:
91
91
                mail_to = submit_branch.get_config_stack().get(
140
140
                    raise errors.BzrCommandError(gettext('- not supported for '
141
141
                        'merge directives that use more than one output file.'))
142
142
                if not os.path.exists(output):
143
 
                    os.mkdir(output, 0o755)
 
143
                    os.mkdir(output, 0755)
144
144
                for (filename, lines) in directive.to_files():
145
145
                    path = os.path.join(output, filename)
146
146
                    outfile = open(path, 'wb')
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 breezy import merge_directive
 
168
    from bzrlib 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 breezy import merge_directive
 
193
    from bzrlib 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,