Commit952e5e9

committed

Add support from squash on pull request merge

1 parent1a7455c commit952e5e9Copy full SHA for 952e5e9

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -313,14 +313,18 @@ def issue_comments(self, number=-1, etag=None):`
`313`	`313`	`returnself._iter(int(number),url,IssueComment,etag=etag)`
`314`	`314`
`315`	`315`	`@requires_auth`
`316`		`-defmerge(self,commit_message='',sha=None):`
	`316`	`+defmerge(self,commit_message='',sha=None,squash=False):`
`317`	`317`	`"""Merge this pull request.`
`318`	`318`
`319`	`319`	`:param str commit_message: (optional), message to be used for the`
`320`	`320`	`merge commit`
	`321`	`+ :param str sha: (optional), SHA that pull request head must match`
	`322`	`+ to merge.`
	`323`	`+ :param bool squash: (optional), commit a single commit to the`
	`324`	`+ head branch.`
`321`	`325`	`:returns: bool`
`322`	`326`	`"""`
`323`		`-parameters= {'commit_message':commit_message}`
	`327`	`+parameters= {'commit_message':commit_message,'squash':squash}`
`324`	`328`	`ifsha:`
`325`	`329`	`parameters['sha']=sha`
`326`	`330`	`url=self._build_url('merge',base_url=self._api)`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,18 @@ def test_merge(self):`
`93`	`93`	`"""Show that a user can merge a Pull Request."""`
`94`	`94`	`self.instance.merge()`
`95`	`95`
`96`		`-self.session.put.assert_called_once_with(`
	`96`	`+self.put_called_with(`
`97`	`97`	`url_for('merge'),`
`98`		`-data='{"commit_message": ""}'`
	`98`	`+data={"squash":False,"commit_message":""}`
	`99`	`+ )`
	`100`	`+`
	`101`	`+deftest_merge_squash_message(self):`
	`102`	`+"""Show that a user can merge a Pull Request."""`
	`103`	`+self.instance.merge('commit message',squash=True)`
	`104`	`+`
	`105`	`+self.put_called_with(`
	`106`	`+url_for('merge'),`
	`107`	`+data={"squash":True,"commit_message":"commit message"}`
`99`	`108`	`)`
`100`	`109`
`101`	`110`	`deftest_patch(self):`

Comments

(0)