Skip to content

tools: patchoulene: Handle reverts semi-automatically #21

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 3 commits into from
Sep 2, 2026
+17 −10
Merged

tools: patchoulene: Handle reverts semi-automatically #21

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bf1b0c
tools: patchoulene: record: Ignore commits with replacement
dramforever Aug 26, 2026
63b5dab
tools: patchoulene: diff: Mark intra-series replacements
dramforever Aug 26, 2026
175aee0
tools: patchoulene: diff: Ignore merged if has replacement
dramforever Aug 28, 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
27 changes: 17 additions & 10 deletions patchoulene/src/patchoulene/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,16 @@ def do_diff_commits(
if p not in db:
break

merged_bases = [
m for m in db[p].get("merged", []) if base_is_contained_in(m, base2)
]
if merged_bases:
merged.add((p, merged_bases[0]))
continue

if db[p].get("replacement", None) is None:
break
# Only consider merged if no replacements
merged_bases = [
m for m in db[p].get("merged", []) if base_is_contained_in(m, base2)
]
if merged_bases:
merged.add((p, merged_bases[0]))
continue
else:
break
elif isinstance(db[p]["replacement"], list):
remaining.update(db[p]["replacement"])
else:
Expand Down Expand Up @@ -205,7 +206,8 @@ def do_diff_commits(
print(f' {prefix} "{clean_subject(c.message)}"')
print(f" - {primary}")
for g in gs:
print(f" + [{patch_num[g]}] {g}")
kind = "~" if g in cs1 else "+"
print(f" {kind} [{patch_num[g]}] {g}")
for m, base in ms:
print(f" in {base} ({m})")
else:
Expand All @@ -226,7 +228,8 @@ def do_diff_commits(
continue
if primary in replaces:
print(f' [{patch_num[primary]}] Replacement "{clean_subject(c.message)}"')
print(f" + {primary}")
kind = "~" if primary in cs1 else "+"
print(f" {kind} {primary}")
for r in sorted(replaces[primary], key=lambda r: patch_num[r]):
print(f" - [{patch_num[r]}] {r}")
else:
Expand Down Expand Up @@ -295,6 +298,10 @@ def msg_merged(commit: GitCommit, primary: str) -> str:
primary = upstream[0]
clean = clean_subject(c.message)

# Don't bother if upstream commit has replacement, to avoid cycles.
if db.get(primary, {}).get("replacement", None) is not None:
continue

possible_matches = set(pid for pid in upstream[1:] if pid in db)
possible_matches |= set(by_subject.get(clean, []))
possible_matches -= {primary}
Expand Down