merge: sync upstream profanity-im/profanity
All checks were successful
CI Code / Check spelling (push) Successful in 18s
CI Code / Check coding style (push) Successful in 34s
CI Code / Code Coverage (push) Successful in 2m36s
CI Code / Linux (debian) (push) Successful in 4m41s
CI Code / Linux (ubuntu) (push) Successful in 4m52s
CI Code / Linux (arch) (push) Successful in 5m40s
All checks were successful
CI Code / Check spelling (push) Successful in 18s
CI Code / Check coding style (push) Successful in 34s
CI Code / Code Coverage (push) Successful in 2m36s
CI Code / Linux (debian) (push) Successful in 4m41s
CI Code / Linux (ubuntu) (push) Successful in 4m52s
CI Code / Linux (arch) (push) Successful in 5m40s
Sync with upstream profanity-im/profanity.
Major upstream changes incorporated:
Memory management
- Replace malloc+memset with g_new0 throughout codebase
- Adopt auto_gchar / auto_gcharv / auto_gerror / auto_jid cleanup macros
- Replace free() with g_free() for GAlloc'd memory
Editor rewrite
- Remove pthread-based async editor; use GChildWatch callback API
- New launch_editor(initial_content, callback, user_data) interface
- Proper signal handling (SIGINT, SIGTSTP, SIGPIPE reset in child)
- ui_suspend()/ui_resume() integration for TTY management
OMEMO improvements
- Dual backend support: libsignal-protocol-c and libomemo-c
- Proper pre-key removal after use (XEP-0384 compliance)
- Automatic pre-key regeneration when store drops below threshold
- New functions: omemo_is_device_active(), omemo_is_jid_trusted()
- omemo_get_jid_untrusted_fingerprints() for better error messages
- Fingerprint notifications on new device identity discovery
- Deterministic pre-key ID generation tracking max_pre_key_id
- omemo_trust_changed() UI updates on trust state changes
JID validation
- RFC 6122-compliant validation in jid_is_valid()
- Character-level checks (RFC 6122 forbidden chars: & ' / : < > @)
- Length limits: 1023 per component, 3071 total
- New jid_is_valid_user_jid() for user vs. service JID distinction
Database
- Schema migration v3: UNIQUE constraint on archive_id for deduplication
- Triggers for corrected message tracking (replaces_db_id / replaced_by_db_id)
- db_history_result_t return type, _truncate_datetime_suffix()
UI / console
- win_warn_needed() / win_warn_sent() warning deduplication hash table
- PAD_MIN_HEIGHT dynamic pad sizing with PAD_THRESHOLD auto-cleanup
- Spellcheck integration in input field with Unicode word detection
- cons_spellcheck_setting() for /settings ui output
- /[command]? shortcut for command help
Account config
- Account name sanitization for GKeyFile special chars ([ ] = # \n \r)
- Replace popen() with g_spawn_sync() for eval_password
- TLS policy: add "direct" option alongside legacy
Connection
- Port validation with g_assert (0–65535)
- SHA-256 certificate fingerprint support (XMPP_CERT_PUBKEY_FINGERPRINT_SHA256)
- "direct" TLS policy alias for legacy SSL
Common utilities
- str_xml_sanitize() for XML 1.0 illegal character removal
- string_matches_one_of() with formatted error messages
- valid_tls_policy_option() helper
- prof_date_time_format_iso8601() utility
- Improved strip_arg_quotes() with backslash unescaping
- prof_occurrences() uses g_slist_prepend + reverse for performance
PGP / OX
- Proper GPGME resource cleanup with goto-cleanup pattern
- g_string_free(xmppuri) leak fix in _ox_key_lookup
CSV export
- Use GString + g_file_set_contents instead of raw write() syscalls
Tests
- Restructured into subdirectories: command/, config/, xmpp/, ui/, omemo/, otr/, pgp/
- New test_cmd_ac.c for autocompleter unit tests
- Updated stubs for new UI suspend/resume functions
License headers
- Migrate to SPDX-3.0 identifiers (GPL-3.0-or-later WITH OpenSSL-exception)
────────────────────────────────────────────────────
cproof-specific preservations:
- XEP-0308 LMC: replace_id ?: id logic in message/stanza/omemo
- Force encryption: cmd_force_encryption, test_forced_encryption
- CWE-134: format string protection (cons_show("%s", ...))
- y_start_pos-based paging in window.c
- db_history_result_t return type, _truncate_datetime_suffix()
Merge-time fixes:
- common.c: format-security (-Werror) — cons_show(errmsg) → cons_show("%s", errmsg)
- database.c: null-deref guard — !msg->timestamp → msg && !msg->timestamp
- console.c: implicit size_t → int cast — (int)(maxlen + 1)
- tlscerts.c: %d for size_t — %zu
Build system:
- Kept autotools (Makefile.am, configure.ac); upstream uses Meson
- Restored deleted files: bootstrap.sh, autogen.sh, ax_valgrind_check.m4, configure-debug
- Updated Makefile.am test paths for subdirectory structure
- Added test_cmd_ac, test_forced_encryption to test sources
Functional tests:
- Use cproof version; upstream requires stbbr_for_xmlns from updated stabber
- Not yet available in devs/stabber fork
Closes #64
Merge author: jabber.developer2
Commits authors:
Michael Vetter <jubalh@iodoru.org>
& Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
165
scripts/changelog-helper.py
Executable file
165
scripts/changelog-helper.py
Executable file
@@ -0,0 +1,165 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Since we use Conventional Commits
|
||||
# we can now create our Changelog semi-automatically
|
||||
|
||||
import subprocess
|
||||
import sys
|
||||
import re
|
||||
import argparse
|
||||
from collections import defaultdict
|
||||
|
||||
# Configuration for sections and their order
|
||||
SECTION_CONFIG = [
|
||||
("fix", "Bug Fixes"),
|
||||
("feat", "Features"),
|
||||
("build", "Build System"),
|
||||
("ci", "CI"),
|
||||
("docs", "Documentation"),
|
||||
("perf", "Performance Improvements"),
|
||||
("refactor", "Refactorings"),
|
||||
("cleanup", "Cleanup"),
|
||||
("style", "Style"),
|
||||
("tests", "Tests"),
|
||||
("chore", "Chores"),
|
||||
]
|
||||
SECTIONS = dict(SECTION_CONFIG)
|
||||
TYPE_ORDER = [t for t, _ in SECTION_CONFIG]
|
||||
|
||||
CORRECTIONS = {
|
||||
"ests": "tests",
|
||||
"wleanup": "cleanup",
|
||||
}
|
||||
|
||||
def git_run(args):
|
||||
"""Run a git command and return stripped output lines."""
|
||||
try:
|
||||
result = subprocess.run(["git"] + args, capture_output=True, text=True, check=True)
|
||||
return [line for line in result.stdout.strip().split('\n') if line]
|
||||
except subprocess.CalledProcessError:
|
||||
return []
|
||||
|
||||
def get_last_tag():
|
||||
output = git_run(["describe", "--tags", "--abbrev=0"])
|
||||
return output[0] if output else None
|
||||
|
||||
def get_commits(revision_range):
|
||||
"""Get list of (hash, subject) tuples."""
|
||||
lines = git_run(["log", revision_range, "--format=%H %s"])
|
||||
commits = []
|
||||
for line in lines:
|
||||
parts = line.split(' ', 1)
|
||||
if len(parts) == 2:
|
||||
commits.append(parts)
|
||||
return commits
|
||||
|
||||
def get_pr_mappings(revision_range):
|
||||
"""Map commit hashes to PR numbers found in merge commits."""
|
||||
merge_commits = git_run(["log", revision_range, "--merges", "--format=%H %s"])
|
||||
pr_map = {}
|
||||
pr_re = re.compile(r'Merge pull request #(\d+)')
|
||||
|
||||
for line in merge_commits:
|
||||
parts = line.split(' ', 1)
|
||||
if len(parts) < 2:
|
||||
continue
|
||||
m_hash, m_subject = parts
|
||||
match = pr_re.search(m_subject)
|
||||
if match:
|
||||
pr_num = match.group(1)
|
||||
# Find all commits that are part of this merge branch
|
||||
branch_commits = git_run(["rev-list", f"{m_hash}^1..{m_hash}^2"])
|
||||
for b_hash in branch_commits:
|
||||
pr_map[b_hash] = pr_num
|
||||
return pr_map
|
||||
|
||||
def get_contributors(revision_range):
|
||||
"""Get sorted list of all unique contributors."""
|
||||
cmd = ["log", revision_range, "--format=%an%n%(trailers:key=Co-authored-by,valueonly=true)"]
|
||||
output = git_run(cmd)
|
||||
|
||||
contributors = set()
|
||||
for line in output:
|
||||
# Remove email part if present: "Name <email@example.com>" -> "Name"
|
||||
name = line.split('<')[0].strip()
|
||||
if name:
|
||||
contributors.add(name)
|
||||
|
||||
return sorted(list(contributors))
|
||||
|
||||
def format_description(description):
|
||||
"""Capitalize first letter of description."""
|
||||
description = description.strip()
|
||||
if description and description[0].islower():
|
||||
return description[0].upper() + description[1:]
|
||||
return description
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Generate a sorted changelog from git commits.")
|
||||
parser.add_argument("--pr", action="store_true", help="Append PR number to each commit.")
|
||||
args = parser.parse_args()
|
||||
|
||||
last_tag = get_last_tag()
|
||||
if not last_tag:
|
||||
print("No tags found in the repository.", file=sys.stderr)
|
||||
|
||||
revision_range = f"{last_tag}..HEAD" if last_tag else "HEAD"
|
||||
|
||||
commits = get_commits(revision_range)
|
||||
if not commits:
|
||||
print(f"No commits found since {last_tag if last_tag else 'the beginning'}.")
|
||||
return
|
||||
|
||||
pr_map = get_pr_mappings(revision_range) if args.pr else {}
|
||||
|
||||
# Conventional Commit regex: type(scope): description
|
||||
commit_re = re.compile(r'^(\w+)(?:\(([^)]+)\))?:\s*(.*)$')
|
||||
|
||||
grouped = defaultdict(list)
|
||||
others = []
|
||||
|
||||
for c_hash, c_subject in commits:
|
||||
# Skip merge commits in the output
|
||||
if c_subject.startswith(("Merge pull request", "Merge branch")):
|
||||
continue
|
||||
|
||||
pr_suffix = f" (#{pr_map[c_hash]})" if c_hash in pr_map else ""
|
||||
match = commit_re.match(c_subject)
|
||||
|
||||
if match:
|
||||
ctype = match.group(1).lower()
|
||||
ctype = CORRECTIONS.get(ctype, ctype)
|
||||
description = format_description(match.group(3))
|
||||
grouped[ctype].append(f"{description}{pr_suffix}")
|
||||
else:
|
||||
others.append(f"{c_subject}{pr_suffix}")
|
||||
|
||||
# Output sections in ordered priority
|
||||
all_types = TYPE_ORDER + sorted([t for t in grouped if t not in TYPE_ORDER])
|
||||
first = True
|
||||
for ctype in all_types:
|
||||
if ctype in grouped:
|
||||
if not first:
|
||||
print()
|
||||
section_name = SECTIONS.get(ctype, ctype.capitalize())
|
||||
print(f"{section_name}:")
|
||||
for msg in sorted(grouped[ctype]):
|
||||
print(f"- {msg}")
|
||||
first = False
|
||||
|
||||
if others:
|
||||
if not first:
|
||||
print()
|
||||
print("Others:")
|
||||
for msg in sorted(others):
|
||||
print(f"- {msg}")
|
||||
|
||||
# Contributors section
|
||||
contributors = get_contributors(revision_range)
|
||||
if contributors:
|
||||
print("\nContributors:")
|
||||
for i, name in enumerate(contributors, 1):
|
||||
print(f"{i}. {name}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user