Merge lp:~jelmer/brz/propose-overwrite into lp:brz/3.1

[Jelmer Vernooij]

Add --overwrite argument to 'brz propose'.

Add --overwrite argument to 'brz propose'.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2020-07-30 21:37:51 +0000
+++ breezy/plugins/propose/cmds.py	2020-08-28 00:02:38 +0000
@@ -164,6 +164,7 @@
                help='Allow collaboration from target branch maintainer(s)'),
         Option('allow-empty',
                help='Do not prevent empty merge proposals.'),
+        Option('overwrite', help="Overwrite existing commits."),
         ]
     takes_args = ['submit_branch?']
 
@@ -172,7 +173,7 @@
     def run(self, submit_branch=None, directory='.', hoster=None,
             reviewers=None, name=None, no_allow_lossy=False, description=None,
             labels=None, prerequisite=None, commit_message=None, wip=False,
-            allow_collaboration=False, allow_empty=False):
+            allow_collaboration=False, allow_empty=False, overwrite=False):
         tree, branch, relpath = (
             controldir.ControlDir.open_containing_tree_or_branch(directory))
         if submit_branch is None:
@@ -192,7 +193,8 @@
         if name is None:
             name = branch_name(branch)
         remote_branch, public_branch_url = hoster.publish_derived(
-            branch, target, name=name, allow_lossy=not no_allow_lossy)
+            branch, target, name=name, allow_lossy=not no_allow_lossy,
+            overwrite=overwrite)
         branch.set_push_location(remote_branch.user_url)
         branch.set_submit_branch(target.user_url)
         note(gettext('Published branch to %s') % public_branch_url)