diff --git a/gerrit_client.py b/gerrit_client.py index 11ddd5d26..2291df01b 100755 --- a/gerrit_client.py +++ b/gerrit_client.py @@ -241,15 +241,9 @@ def CMDpublishchangeedit(parser, args): def CMDsubmitchange(parser, args): """Submit a Gerrit change.""" parser.add_option('-c', '--change', type=int, help='change number') - parser.add_option('--wait-for-merge', - action="store_true", - default=False, - help='whether to wait for the merge') - (opt, args) = parser.parse_args(args) - result = gerrit_util.SubmitChange(urlparse.urlparse(opt.host).netloc, - opt.change, - wait_for_merge=opt.wait_for_merge) + result = gerrit_util.SubmitChange( + urlparse.urlparse(opt.host).netloc, opt.change) logging.info(result) write_result(result, opt) diff --git a/gerrit_util.py b/gerrit_util.py index 0518debef..9a8a2db41 100644 --- a/gerrit_util.py +++ b/gerrit_util.py @@ -736,11 +736,10 @@ def RestoreChange(host, change, msg=''): return ReadHttpJsonResponse(conn) -def SubmitChange(host, change, wait_for_merge=True): +def SubmitChange(host, change): """Submits a Gerrit change via Gerrit.""" path = 'changes/%s/submit' % change - body = {'wait_for_merge': wait_for_merge} - conn = CreateHttpConn(host, path, reqtype='POST', body=body) + conn = CreateHttpConn(host, path, reqtype='POST') return ReadHttpJsonResponse(conn) diff --git a/git_cl.py b/git_cl.py index 53409627a..5edf4407b 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1963,10 +1963,9 @@ class Changelist(object): gerrit_util.AbandonChange( self.GetGerritHost(), self._GerritChangeIdentifier(), msg='') - def SubmitIssue(self, wait_for_merge=True): + def SubmitIssue(self): gerrit_util.SubmitChange( - self.GetGerritHost(), self._GerritChangeIdentifier(), - wait_for_merge=wait_for_merge) + self.GetGerritHost(), self._GerritChangeIdentifier()) def _GetChangeDetail(self, options=None): """Returns details of associated Gerrit change and caching results.""" @@ -2061,7 +2060,7 @@ class Changelist(object): resultdb=resultdb, realm=realm) - self.SubmitIssue(wait_for_merge=True) + self.SubmitIssue() print('Issue %s has been submitted.' % self.GetIssueURL()) links = self._GetChangeCommit().get('web_links', []) for link in links: diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index 552de6a94..653b940c4 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -2444,7 +2444,7 @@ class TestGitCl(unittest.TestCase): 'web_links': [{'name': 'gitiles', 'url': 'https://git.googlesource.com/test/+/deadbeef'}], } - cl.SubmitIssue = lambda wait_for_merge: None + cl.SubmitIssue = lambda: None self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True,