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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/send.py
173
173
def send_git(branch, revision_id, submit_branch, public_branch, no_patch,
174
174
             no_bundle, message, base_revision_id, local_target_branch=None):
175
175
    if no_patch:
176
 
        raise errors.BzrCommandError(
 
176
        raise errors.CommandError(
177
177
            "no patch not supported for git-am style patches")
178
178
    if no_bundle:
179
 
        raise errors.BzrCommandError(
 
179
        raise errors.CommandError(
180
180
            "no bundle not supported for git-am style patches")
181
181
    return GitMergeDirective.from_objects(
182
182
        branch.repository, revision_id, time.time(),