Skip to content

Reduced noise in regex/git-args #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsewi merged 1 commit into from
Jun 4, 2026
+21 −27
Merged

Reduced noise in regex/git-args #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 21 additions & 27 deletions src/cfengine_cli/changelog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
REAPPLY_RE = r'^Reapply "Updated dependency \'([^\']+)\' from version (\S+) to (\S+)"'


def fetch_git_output(args):
def fetch_git_output(path, args):
return subprocess.run(
args,
["git", "-C", f"{path}"] + args,
stdout=subprocess.PIPE,
check=True,
).stdout.splitlines(keepends=True)
Expand All @@ -49,10 +49,8 @@ def collect_version_updates(repos, git_args):
dep_history: dict[str, list[tuple[str, str]]] = {}
for repo in repos:
for raw in fetch_git_output(
os.path.join(os.getcwd(), repo),
[
"git",
"-C",
f"{os.path.join(os.getcwd(), repo)}",
"log",
"--no-merges",
"--reverse",
Expand Down Expand Up @@ -104,16 +102,14 @@ def add_entry(sha, msg):
subject = "".join(
line.decode()
for line in fetch_git_output(
os.path.join(os.getcwd(), repo),
[
"git",
"-C",
f"{os.path.join(os.getcwd(), repo)}",
"log",
"--format=%B",
"-n",
"1",
sha,
]
],
)
)

Expand All @@ -126,13 +122,13 @@ def add_entry(sha, msg):
body = parts[1].strip() if len(parts) > 1 else ""

TOKEN_PATTERNS = [
r"^Changelog:",
r"^Signed-off-by:",
r"^Co-authored-by:",
r"^Ticket:",
r"^\(cherry picked from commit [0-9a-f]+\)",
r"^Cancel-Changelog:\s*[0-9a-f]+",
r"^This reverts commit [0-9a-f]+",
r"Changelog:",
r"Signed-off-by:",
r"Co-authored-by:",
r"Ticket:",
r"\(cherry picked from commit [0-9a-f]+\)",
r"Cancel-Changelog:\s*[0-9a-f]+",
r"This reverts commit [0-9a-f]+",
]
token_re = re.compile("|".join(TOKEN_PATTERNS), re.IGNORECASE)

Expand All @@ -146,27 +142,27 @@ def add_entry(sha, msg):
if current_token:
trailers[current_token] = "\n".join(collected_lines).strip()

if re.match(r"^Changelog:", stripped, re.IGNORECASE):
if re.match(r"Changelog:", stripped, re.IGNORECASE):
current_token = "Changelog"
first_val = re.sub(r"^Changelog:\s*", "", stripped, flags=re.IGNORECASE)
first_val = re.sub(r"Changelog:\s*", "", stripped, flags=re.IGNORECASE)
collected_lines = [first_val] if first_val else []

elif m := re.match(
r"^\(cherry picked from commit ([0-9a-f]+)\)", stripped, re.IGNORECASE
r"\(cherry picked from commit ([0-9a-f]+)\)", stripped, re.IGNORECASE
):
trailers["CherryPick"] = m and m.group(1)
current_token = None
collected_lines = []

elif m := re.match(
r"^Cancel-Changelog:\s*([0-9a-f]+)", stripped, re.IGNORECASE
r"Cancel-Changelog:\s*([0-9a-f]+)", stripped, re.IGNORECASE
):
trailers["Cancel"] = m and m.group(1)
current_token = None
collected_lines = []

elif m := re.match(
r"^This reverts commit ([0-9a-f]+)", stripped, re.IGNORECASE
r"This reverts commit ([0-9a-f]+)", stripped, re.IGNORECASE
):
trailers["Cancel"] = m and m.group(1)
current_token = None
Expand Down Expand Up @@ -204,11 +200,11 @@ def add_entry(sha, msg):

if "Changelog" in trailers:
changelog_val = trailers["Changelog"]
if re.match(r"^Title[ .]*$", changelog_val, re.IGNORECASE):
if re.match(r"Title[ .]*", changelog_val, re.IGNORECASE):
add_entry(sha, title)
elif re.match(r"^(Commit|Body)[ .]*$", changelog_val, re.IGNORECASE):
elif re.match(r"(Commit|Body)[ .]*", changelog_val, re.IGNORECASE):
add_entry(sha, clean_commit_body)
elif re.match(r"^None[ .]*$", changelog_val, re.IGNORECASE):
elif re.match(r"None[ .]*", changelog_val, re.IGNORECASE):
pass
else:
add_entry(sha, changelog_val)
Expand All @@ -224,10 +220,8 @@ def parse_git_log(repos, git_args):

for repo in repos:
for raw_sha in fetch_git_output(
os.path.join(os.getcwd(), repo),
[
"git",
"-C",
f"{os.path.join(os.getcwd(), repo)}",
"rev-list",
"--no-merges",
"--reverse",
Expand Down
Loading