/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: Gustav Hartvigsson
  • Date: 2021-01-09 21:36:27 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20210109213627-h1xwcutzy9m7a99b
Added 'Case Preserving Working Tree Use Cases' from Canonical Wiki

* Addod a page from the Canonical Bazaar wiki
  with information on the scmeatics of case
  perserving filesystems an a case insensitive
  filesystem works.
  
  * Needs re-work, but this will do as it is the
    same inforamoton as what was on the linked
    page in the currint documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/send.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
 
18
17
import os
19
18
import time
20
19
 
21
 
from bzrlib import (
22
 
    bzrdir,
 
20
from . import (
 
21
    controldir,
23
22
    errors,
24
23
    osutils,
25
24
    registry,
26
25
    trace,
27
26
    )
28
 
from bzrlib.branch import (
 
27
from .i18n import gettext
 
28
from .branch import (
29
29
    Branch,
30
30
    )
31
 
from bzrlib.revision import (
 
31
from .revision import (
32
32
    NULL_REVISION,
33
33
    )
34
34
 
36
36
format_registry = registry.Registry()
37
37
 
38
38
 
39
 
def send(submit_branch, revision, public_branch, remember, format,
40
 
         no_bundle, no_patch, output, from_, mail_to, message, body,
 
39
def send(target_branch, revision, public_branch, remember,
 
40
         format, no_bundle, no_patch, output, from_, mail_to, message, body,
41
41
         to_file, strict=None):
42
 
    tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
 
42
    possible_transports = []
 
43
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
 
44
        from_, possible_transports=possible_transports)[:2]
43
45
    # we may need to write data into branch's repository to calculate
44
46
    # the data to send.
45
 
    branch.lock_write()
46
 
    try:
 
47
    with branch.lock_write():
47
48
        if output is None:
48
 
            config = branch.get_config()
 
49
            config_stack = branch.get_config_stack()
49
50
            if mail_to is None:
50
 
                mail_to = config.get_user_option('submit_to')
51
 
            mail_client = config.get_mail_client()
 
51
                mail_to = config_stack.get('submit_to')
 
52
            mail_client = config_stack.get('mail_client')(config_stack)
52
53
            if (not getattr(mail_client, 'supports_body', False)
53
 
                and body is not None):
54
 
                raise errors.BzrCommandError(
55
 
                    'Mail client "%s" does not support specifying body' %
 
54
                    and body is not None):
 
55
                raise errors.CommandError(gettext(
 
56
                    'Mail client "%s" does not support specifying body') %
56
57
                    mail_client.__class__.__name__)
57
 
        if remember and submit_branch is None:
58
 
            raise errors.BzrCommandError(
59
 
                '--remember requires a branch to be specified.')
60
 
        stored_submit_branch = branch.get_submit_branch()
61
 
        remembered_submit_branch = None
62
 
        if submit_branch is None:
63
 
            submit_branch = stored_submit_branch
64
 
            remembered_submit_branch = "submit"
 
58
        if remember and target_branch is None:
 
59
            raise errors.CommandError(gettext(
 
60
                '--remember requires a branch to be specified.'))
 
61
        stored_target_branch = branch.get_submit_branch()
 
62
        remembered_target_branch = None
 
63
        if target_branch is None:
 
64
            target_branch = stored_target_branch
 
65
            remembered_target_branch = "submit"
65
66
        else:
66
 
            if stored_submit_branch is None or remember:
67
 
                branch.set_submit_branch(submit_branch)
68
 
        if submit_branch is None:
69
 
            submit_branch = branch.get_parent()
70
 
            remembered_submit_branch = "parent"
71
 
        if submit_branch is None:
72
 
            raise errors.BzrCommandError('No submit branch known or'
73
 
                                         ' specified')
74
 
        if remembered_submit_branch is not None:
75
 
            trace.note('Using saved %s location "%s" to determine what '
76
 
                       'changes to submit.', remembered_submit_branch,
77
 
                       submit_branch)
 
67
            # Remembers if asked explicitly or no previous location is set
 
68
            if remember or (
 
69
                    remember is None and stored_target_branch is None):
 
70
                branch.set_submit_branch(target_branch)
 
71
        if target_branch is None:
 
72
            target_branch = branch.get_parent()
 
73
            remembered_target_branch = "parent"
 
74
        if target_branch is None:
 
75
            raise errors.CommandError(gettext('No submit branch known or'
 
76
                                                 ' specified'))
 
77
        if remembered_target_branch is not None:
 
78
            trace.note(gettext('Using saved {0} location "{1}" to determine '
 
79
                               'what changes to submit.').format(
 
80
                remembered_target_branch,
 
81
                target_branch))
78
82
 
 
83
        submit_branch = Branch.open(target_branch,
 
84
                                    possible_transports=possible_transports)
 
85
        possible_transports.append(submit_branch.controldir.root_transport)
79
86
        if mail_to is None or format is None:
80
 
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
81
 
            #       pass it down into the format creation, so it will have to
82
 
            #       open it again
83
 
            submit_br = Branch.open(submit_branch)
84
 
            submit_config = submit_br.get_config()
85
87
            if mail_to is None:
86
 
                mail_to = submit_config.get_user_option("child_submit_to")
 
88
                mail_to = submit_branch.get_config_stack().get(
 
89
                    'child_submit_to')
87
90
            if format is None:
88
 
                formatname = submit_br.get_child_submit_format()
 
91
                formatname = submit_branch.get_child_submit_format()
89
92
                try:
90
93
                    format = format_registry.get(formatname)
91
94
                except KeyError:
92
 
                    raise errors.BzrCommandError("No such send format '%s'." % 
93
 
                                                 formatname)
 
95
                    raise errors.CommandError(
 
96
                        gettext("No such send format '%s'.") % formatname)
94
97
 
95
98
        stored_public_branch = branch.get_public_branch()
96
99
        if public_branch is None:
97
100
            public_branch = stored_public_branch
98
 
        elif stored_public_branch is None or remember:
 
101
        # Remembers if asked explicitly or no previous location is set
 
102
        elif (remember
 
103
              or (remember is None and stored_public_branch is None)):
99
104
            branch.set_public_branch(public_branch)
100
105
        if no_bundle and public_branch is None:
101
 
            raise errors.BzrCommandError('No public branch specified or'
102
 
                                         ' known')
 
106
            raise errors.CommandError(gettext('No public branch specified or'
 
107
                                                 ' known'))
103
108
        base_revision_id = None
104
109
        revision_id = None
105
110
        if revision is not None:
106
111
            if len(revision) > 2:
107
 
                raise errors.BzrCommandError('bzr send takes '
108
 
                    'at most two one revision identifiers')
 
112
                raise errors.CommandError(gettext('bzr send takes '
 
113
                                                     'at most two one revision identifiers'))
109
114
            revision_id = revision[-1].as_revision_id(branch)
110
115
            if len(revision) == 2:
111
116
                base_revision_id = revision[0].as_revision_id(branch)
117
122
                    more_warning='Uncommitted changes will not be sent.')
118
123
            revision_id = branch.last_revision()
119
124
        if revision_id == NULL_REVISION:
120
 
            raise errors.BzrCommandError('No revisions to submit.')
 
125
            raise errors.CommandError(gettext('No revisions to submit.'))
121
126
        if format is None:
122
127
            format = format_registry.get()
123
 
        directive = format(branch, revision_id, submit_branch,
124
 
            public_branch, no_patch, no_bundle, message, base_revision_id)
 
128
        directive = format(branch, revision_id, target_branch,
 
129
                           public_branch, no_patch, no_bundle, message, base_revision_id,
 
130
                           submit_branch)
125
131
        if output is None:
126
132
            directive.compose_merge_request(mail_client, mail_to, body,
127
133
                                            branch, tree)
128
134
        else:
129
135
            if directive.multiple_output_files:
130
136
                if output == '-':
131
 
                    raise errors.BzrCommandError('- not supported for '
132
 
                        'merge directives that use more than one output file.')
 
137
                    raise errors.CommandError(gettext('- not supported for '
 
138
                                                         'merge directives that use more than one output file.'))
133
139
                if not os.path.exists(output):
134
 
                    os.mkdir(output, 0755)
 
140
                    os.mkdir(output, 0o755)
135
141
                for (filename, lines) in directive.to_files():
136
142
                    path = os.path.join(output, filename)
137
 
                    outfile = open(path, 'wb')
138
 
                    try:
 
143
                    with open(path, 'wb') as outfile:
139
144
                        outfile.writelines(lines)
140
 
                    finally:
141
 
                        outfile.close()
142
145
            else:
143
146
                if output == '-':
144
147
                    outfile = to_file
149
152
                finally:
150
153
                    if outfile is not to_file:
151
154
                        outfile.close()
152
 
    finally:
153
 
        branch.unlock()
154
 
 
155
 
 
156
 
def _send_4(branch, revision_id, submit_branch, public_branch,
157
 
            no_patch, no_bundle, message, base_revision_id):
158
 
    from bzrlib import merge_directive
 
155
 
 
156
 
 
157
def _send_4(branch, revision_id, target_branch, public_branch,
 
158
            no_patch, no_bundle, message,
 
159
            base_revision_id, local_target_branch=None):
 
160
    from breezy import merge_directive
159
161
    return merge_directive.MergeDirective2.from_objects(
160
162
        branch.repository, revision_id, time.time(),
161
 
        osutils.local_time_offset(), submit_branch,
162
 
        public_branch=public_branch, include_patch=not no_patch,
 
163
        osutils.local_time_offset(), target_branch,
 
164
        public_branch=public_branch,
 
165
        include_patch=not no_patch,
163
166
        include_bundle=not no_bundle, message=message,
164
 
        base_revision_id=base_revision_id)
 
167
        base_revision_id=base_revision_id,
 
168
        local_target_branch=local_target_branch)
165
169
 
166
170
 
167
171
def _send_0_9(branch, revision_id, submit_branch, public_branch,
168
 
              no_patch, no_bundle, message, base_revision_id):
 
172
              no_patch, no_bundle, message,
 
173
              base_revision_id, local_target_branch=None):
169
174
    if not no_bundle:
170
175
        if not no_patch:
171
176
            patch_type = 'bundle'
172
177
        else:
173
 
            raise errors.BzrCommandError('Format 0.9 does not'
174
 
                ' permit bundle with no patch')
 
178
            raise errors.CommandError(gettext('Format 0.9 does not'
 
179
                                                 ' permit bundle with no patch'))
175
180
    else:
176
181
        if not no_patch:
177
182
            patch_type = 'diff'
178
183
        else:
179
184
            patch_type = None
180
 
    from bzrlib import merge_directive
 
185
    from breezy import merge_directive
181
186
    return merge_directive.MergeDirective.from_objects(
182
187
        branch.repository, revision_id, time.time(),
183
188
        osutils.local_time_offset(), submit_branch,
184
189
        public_branch=public_branch, patch_type=patch_type,
185
 
        message=message)
186
 
 
187
 
 
188
 
format_registry.register('4', 
189
 
    _send_4, 'Bundle format 4, Merge Directive 2 (default)')
 
190
        message=message, local_target_branch=local_target_branch)
 
191
 
 
192
 
 
193
format_registry.register('4',
 
194
                         _send_4, 'Bundle format 4, Merge Directive 2 (default)')
190
195
format_registry.register('0.9',
191
 
    _send_0_9, 'Bundle format 0.9, Merge Directive 1')
 
196
                         _send_0_9, 'Bundle format 0.9, Merge Directive 1')
192
197
format_registry.default_key = '4'