Skip to content

Commit 38e704c

Browse files
committed
fix page issue
1 parent 64fb00f commit 38e704c

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

gitlab_release_notes/generate.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ def generate_release_notes(project_id, endstr = ' <br>', **config):
4141
log = f"Changelog since release {last_release.name} of {project.name}:{endstr}"
4242
last_date = last_release.released_at
4343

44-
page = 0
44+
page = 1
4545
list_mrs = project.mergerequests.list(state='merged',
4646
order_by='updated_at',
4747
updated_after=last_date,
4848
page=page)
4949
if not list_mrs:
50-
raise ValueError(f"There is no merged merge request after the last release {last_release.name}")
50+
log += f"There is no merged merge request after {last_date}"
51+
return log
5152

5253
while list_mrs:
5354
for mr in list_mrs:
@@ -75,10 +76,16 @@ def main():
7576
parser.add_argument("--url", default="https://gitlab.com", required=False)
7677
parser.add_argument("--private_token", type=str, required=False, default=None)
7778
parser.add_argument('--version', action='version', version=__version__)
79+
parser.add_argument('--html', action='store_true')
7880

7981
args = parser.parse_args()
8082

81-
notes = generate_release_notes(args.project_id, url=args.url, private_token=args.private_token)
83+
if args.html:
84+
endstr = ' <br>'
85+
else:
86+
endstr = '\n'
87+
notes = generate_release_notes(args.project_id, url=args.url, endstr=endstr, private_token=args.private_token)
88+
print(notes)
8289

8390

8491
if __name__ == "__main__":

0 commit comments

Comments
 (0)