Commit92180e4

Gauvain Pocentek

committed

Implement merge requests diff support

1 parentc970a22 commit92180e4Copy full SHA for 92180e4

File tree

+41

-4

lines changed

+41

-4

lines changed

Lines changed: 8 additions & 0 deletions

Lines changed: 18 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,12 @@`
`2`	`2`	`Merge requests`
`3`	`3`	`##############`
`4`	`4`
`5`		-Use:class:`~gitlab.objects.ProjectMergeRequest` objects to manipulate MRs for
`6`		-projects. The:attr:`gitlab.Gitlab.project_mergerequests` and
`7`		-:attr:`Project.mergerequests <gitlab.objects.Project.mergerequests>` manager
`8`		`-objects provide helper functions.`
	`5`	`+You can use merge requests to notify a project that a branch is ready for`
	`6`	`+merging. The owner of the target projet can accept the merge request.`
	`7`	`+`
	`8`	+* Object class::class:`~gitlab.objects.ProjectMergeRequest`
	`9`	+* Manager objects::attr:`gitlab.Gitlab.project_mergerequests`,
	`10`	+:attr:`Project.mergerequests <gitlab.objects.Project.mergerequests>`
`9`	`11`
`10`	`12`	`Examples`
`11`	`13`	`--------`
`@@ -89,3 +91,15 @@ Mark a MR as todo:`
`89`	`91`	`..literalinclude::mrs.py`
`90`	`92`	`:start-after: # todo`
`91`	`93`	`:end-before: # end todo`
	`94`	`+`
	`95`	`+List the diffs for a merge request:`
	`96`	`+`
	`97`	`+..literalinclude::mrs.py`
	`98`	`+:start-after: # diff list`
	`99`	`+:end-before: # end diff list`
	`100`	`+`
	`101`	`+Get a diff for a merge request:`
	`102`	`+`
	`103`	`+..literalinclude::mrs.py`
	`104`	`+:start-after: # diff get`
	`105`	`+:end-before: # end diff get`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1512,6 +1512,19 @@ class ProjectTagManager(BaseManager):`
`1512`	`1512`	`obj_cls=ProjectTag`
`1513`	`1513`
`1514`	`1514`
	`1515`	`+classProjectMergeRequestDiff(GitlabObject):`
	`1516`	`+_url= ('/projects/%(project_id)s/merge_requests/'`
	`1517`	`+'%(merge_request_id)s/versions')`
	`1518`	`+canCreate=False`
	`1519`	`+canUpdate=False`
	`1520`	`+canDelete=False`
	`1521`	`+requiredUrlAttrs= ['project_id','merge_request_id']`
	`1522`	`+`
	`1523`	`+`
	`1524`	`+classProjectMergeRequestDiffManager(BaseManager):`
	`1525`	`+obj_cls=ProjectMergeRequestDiff`
	`1526`	`+`
	`1527`	`+`
`1515`	`1528`	`classProjectMergeRequestNote(GitlabObject):`
`1516`	`1529`	`_url='/projects/%(project_id)s/merge_requests/%(merge_request_id)s/notes'`
`1517`	`1530`	`_constructorTypes= {'author':'User'}`
`@@ -1539,6 +1552,8 @@ class ProjectMergeRequest(GitlabObject):`
`1539`	`1552`	`managers= (`
`1540`	`1553`	`('notes',ProjectMergeRequestNoteManager,`
`1541`	`1554`	`[('project_id','project_id'), ('merge_request_id','id')]),`
	`1555`	`+ ('diffs',ProjectMergeRequestDiffManager,`
	`1556`	`+ [('project_id','project_id'), ('merge_request_id','id')]),`
`1542`	`1557`	`)`
`1543`	`1558`
`1544`	`1559`	`def_data_for_gitlab(self,extra_parameters={},update=False,`

Comments

(0)