Skip to content

Commit 70cf36a

Browse files
authored
fix(cli): limit commit message length when there is too many files (#3375)
1 parent 3ad4ac3 commit 70cf36a

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

renku/command/save.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#
2-
# Copyright 2017-2023 - Swiss Data Science Center (SDSC)
3-
# A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
1+
# Copyright Swiss Data Science Center (SDSC). A partnership between
2+
# École Polytechnique Fédérale de Lausanne (EPFL) and
43
# Eidgenössische Technische Hochschule Zürich (ETHZ).
54
#
65
# Licensed under the Apache License, Version 2.0 (the "License");

renku/core/util/git.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,8 @@ def commit_changes(*paths: Union[Path, str], repository: "Repository", message=N
490490
if saved_paths:
491491
if not message:
492492
# Show saved files in message
493-
max_len = 100
493+
max_line_len = 100
494+
max_total_len = 100000
494495
message = "Saved changes to: "
495496
paths_with_lens = cast(
496497
List[Tuple[str, int]],
@@ -501,7 +502,10 @@ def commit_changes(*paths: Union[Path, str], repository: "Repository", message=N
501502
)[1:],
502503
)
503504
# limit first line to max_len characters
504-
message += " ".join(p if l < max_len else "\n\t" + p for p, l in paths_with_lens)
505+
message += " ".join(p if l < max_line_len else "\n\t" + p for p, l in paths_with_lens)
506+
507+
if len(message) > max_total_len:
508+
message = message[: max_total_len - 3] + "..."
505509

506510
repository.commit(message)
507511
except errors.GitCommandError as e:

renku/infrastructure/repository.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#
2-
# Copyright 2018-2023- Swiss Data Science Center (SDSC)
3-
# A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
1+
# Copyright Swiss Data Science Center (SDSC). A partnership between
2+
# École Polytechnique Fédérale de Lausanne (EPFL) and
43
# Eidgenössische Technische Hochschule Zürich (ETHZ).
54
#
65
# Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)