Skip to content

tools: patchoulene: walk: Find subject matches #19

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
RevySR merged 2 commits into from
Sep 2, 2026
Merged

tools: patchoulene: walk: Find subject matches #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6fa48f
tools: patchoulene: record: Extract helper db_by_subject()
dramforever Aug 18, 2026
01a60ae
tools: patchoulene: walk: Find subject matches
dramforever Aug 18, 2026
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
108 changes: 65 additions & 43 deletions patchoulene/src/patchoulene/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,19 @@ def prompt_yn(default: bool = False):
return False


def db_by_subject(db: dict) -> dict[str, list[str]]:
by_subject = {}

for pid, data in db.items():
if "subject" not in data:
continue
if data["subject"] not in by_subject:
by_subject[data["subject"]] = []
by_subject[data["subject"]].append(pid)

return by_subject


def do_record(repo: GitRepo, db: dict, rev1: str, rev2: str):
def msg_possible_match_header(commit: GitCommit, primary: str) -> str:
clean = clean_subject(commit.message)
Expand Down Expand Up @@ -146,14 +159,7 @@ def msg_merged(commit: GitCommit, primary: str) -> str:

is_mainline = parse_base(rev2)[2] == 0

by_subject = {}

for pid, data in db.items():
if "subject" not in data:
continue
if data["subject"] not in by_subject:
by_subject[data["subject"]] = []
by_subject[data["subject"]].append(pid)
by_subject = db_by_subject(db)

for c in repo.commit_list([f"^{rev1}", rev2]):
upstream = []
Expand Down Expand Up @@ -226,6 +232,26 @@ def dim(msg: str) -> str:
return color_sel(f"\x1b[90m{msg}\x1b[m", msg)


def walk_replacements(db: dict, pid: str) -> set[str]:
replacements = set()
todo = {pid}

while todo:
pid = todo.pop()

if pid not in db or not db[pid].get("replacement", None):
replacements.add(pid)
continue

repl = db[pid]["replacement"]
if not isinstance(repl, list):
repl = [repl]

todo.update(repl)

return replacements


def do_status(db: dict, commits: list[GitCommit], rev: str):
def msg_unrecorded(commit: GitCommit) -> str:
clean = clean_subject(commit.message)
Expand Down Expand Up @@ -274,23 +300,7 @@ def msg_replacement(
print(msg_unrecorded(c), file=sys.stderr)
continue

# Walk the replacment graph to find the set of patches that replaces c

replacements = set()
todo = {primary}

while todo:
pid = todo.pop()

if pid not in db or not db[pid].get("replacement", None):
replacements.add(pid)
continue

repl = db[pid]["replacement"]
if not isinstance(repl, list):
repl = [repl]

todo.update(repl)
replacements = walk_replacements(db, primary)

if replacements != {primary}:
print(msg_replacement_header(c))
Expand Down Expand Up @@ -727,35 +737,47 @@ def main():
base = guess_base(repo, ref)
print(f"Base for {ref} is {base}", file=sys.stderr)
db = read_patch_db()
by_subject = db_by_subject(db)

for c in repo.commit_list([f"^refs/tags/{base}", ref]):
guess = guess_id(c.message)
if not guess:
continue
primary = guess[0]
replacements = walk_replacements(db, primary)

clean = clean_subject(c.message)
if primary not in db:
db[primary] = {
"subject": clean,
}

for secondary in guess[1:]:
if secondary in db:
if db[secondary].get("replacement", None):
continue
old_subject = db[secondary].get("subject", "(Unknown)")
is_identical = (
" (identical subject)" if old_subject == clean else ""
)
print(f"Is new patch {primary}", file=sys.stderr)
print(f' "{clean}"', file=sys.stderr)
print(
f"... the replacement of patch {secondary}?",
file=sys.stderr,
)
print(f" (Identifier matches)", file=sys.stderr)
print(f' "{old_subject}"{is_identical}', file=sys.stderr)
if prompt_yn():
db[secondary]["replacement"] = primary
id_matches = set(pid for pid in guess[1:] if pid in db)
possible_matches = id_matches | set(by_subject.get(clean, []))
possible_matches -= {primary}

possible_matches = {
pid
for pid in possible_matches
if pid in db
and pid not in replacements
and not db[pid].get("replacement", None)
}

for possible in possible_matches:
old_subject = db[possible].get("subject", "(Unknown)")
is_identical = (
" (identical subject)" if old_subject == clean else ""
)
print(f"Is new patch {primary}", file=sys.stderr)
print(f' "{clean}"', file=sys.stderr)
print(f"... the replacement of patch {possible}?", file=sys.stderr)
if possible not in id_matches:
print(f"* (weak match)", file=sys.stderr)
print(f' "{old_subject}"{is_identical}', file=sys.stderr)
if prompt_yn():
db[possible]["replacement"] = primary

write_patch_db(db)

case ["record", rev1, rev2]:
Expand Down