Skip to content

Commit bf50271

Browse files
authored
Merge pull request #18 from peat-psuwit/target_branch
gitlab_release_notes/generate.py: add --target_branch cmdline option
2 parents f5ab1f5 + f742275 commit bf50271

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

gitlab_release_notes/generate.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import sys
55
from .version import __version__
66

7-
def generate_release_notes(project_id, endstr = ' <br>', since=None, quiet=False, **config):
7+
def generate_release_notes(project_id, endstr = ' <br>', since=None, quiet=False, target_branch=None, **config):
88
"""
99
Generate the release notes of a gitlab project from the last release
1010
@@ -33,7 +33,7 @@ def generate_release_notes(project_id, endstr = ' <br>', since=None, quiet=Fals
3333
gl = gitlab.Gitlab(**config)
3434
project = gl.projects.get(project_id)
3535

36-
if not project.mergerequests.list(get_all=False,state='merged'):
36+
if not project.mergerequests.list(get_all=False,state='merged', target_branch=target_branch):
3737
raise ValueError(f"There is no merged merge request for project {project_id} {project.name}")
3838

3939
log = ""
@@ -54,6 +54,7 @@ def generate_release_notes(project_id, endstr = ' <br>', since=None, quiet=Fals
5454
get_all=False,
5555
order_by='updated_at',
5656
updated_after=last_date,
57+
target_branch=target_branch,
5758
page=page)
5859
if not list_mrs:
5960
if not quiet:
@@ -72,6 +73,7 @@ def generate_release_notes(project_id, endstr = ' <br>', since=None, quiet=Fals
7273
get_all=False,
7374
order_by='updated_at',
7475
updated_after=last_date,
76+
target_branch=target_branch,
7577
page=page
7678
)
7779

@@ -92,6 +94,7 @@ def main():
9294
parser.add_argument('--version', action='version', version=__version__)
9395
parser.add_argument('--html', action='store_true')
9496
parser.add_argument('--since', type=datetime.date.fromisoformat, required=False, default=None)
97+
parser.add_argument('--target_branch', type=str, required=False, default=None)
9598
parser.add_argument('--quiet', action='store_true')
9699

97100
args = parser.parse_args()
@@ -104,6 +107,7 @@ def main():
104107
url=args.url,
105108
endstr=endstr,
106109
since=args.since,
110+
target_branch=args.target_branch,
107111
quiet=args.quiet,
108112
private_token=args.private_token,
109113
)

0 commit comments

Comments
 (0)