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

Raise about impossible arguments in send --format=git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
send.py
25
25
from bzrlib import (
26
26
    branch as _mod_branch,
27
27
    diff as _mod_diff,
 
28
    errors,
28
29
    merge_directive,
29
30
    osutils,
30
31
    revision as _mod_revision,
148
149
            None, public_branch, message)
149
150
 
150
151
 
151
 
def send_git(branch, revision_id, submit_branch, public_branch,
152
 
              no_patch, no_bundle, message, base_revision_id):
 
152
def send_git(branch, revision_id, submit_branch, public_branch, no_patch, 
 
153
             no_bundle, message, base_revision_id):
 
154
    if no_patch:
 
155
        raise errors.BzrCommandError("no patch not supported for git-am style patches")
 
156
    if no_bundle:
 
157
        raise errors.BzrCommandError("no bundle not supported for git-am style patches")
153
158
    return GitMergeDirective.from_objects(
154
159
        branch.repository, revision_id, time.time(),
155
160
        osutils.local_time_offset(), submit_branch,