/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/plugins/propose/cmds.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/plugins/propose/cmds.py
49
49
def _check_already_merged(branch, target):
50
50
    # TODO(jelmer): Check entire ancestry rather than just last revision?
51
51
    if branch.last_revision() == target.last_revision():
52
 
        raise errors.BzrCommandError(gettext(
 
52
        raise errors.CommandError(gettext(
53
53
            'All local changes are already present in target.'))
54
54
 
55
55
 
177
177
        if submit_branch is None:
178
178
            submit_branch = branch.get_parent()
179
179
        if submit_branch is None:
180
 
            raise errors.BzrCommandError(
 
180
            raise errors.CommandError(
181
181
                gettext("No target location specified or remembered"))
182
182
        target = _mod_branch.Branch.open(submit_branch)
183
183
        if not allow_empty:
237
237
        if submit_branch is None:
238
238
            submit_branch = branch.get_parent()
239
239
        if submit_branch is None:
240
 
            raise errors.BzrCommandError(
 
240
            raise errors.CommandError(
241
241
                gettext("No target location specified or remembered"))
242
242
        else:
243
243
            target = _mod_branch.Branch.open(submit_branch)