mergiraf/mergiraf v0.13.0

Mergiraf 0.13.0

on Codeberg

🚀 Features

• (verilog) Switch to tree-sitter-systemverilog (#514) by @come_744
• (Python) Merge decorated methods and inner classes (#522) by @wetneb
• (Haskell) More commutative parents and signatures (#488) by @maralorn
• Add support for GNU Make (#510) by @twz123

🐛 Bug Fixes

• (rust) Add signature to self in use_declaration (#505) by @ada4a
• Improve detection of Jujutsu usage (#513) by @senekor
• (tests) Correct python/working/all case (#524) by @wetneb

💼 Other

• Add cargo shortcuts for the subcommands of mergiraf and mgf_dev (#499) by @ada4a

🚜 Refactor

• Add submodules to merged_tree.rs (#497) by @ada4a
• (MergedTree) Take &Leader in methods to avoid derefs (#498) by @ada4a
• (RevisionNESet) Use impl Deref<Target=RevisionSet> instead of forwarding methods (#501) by @ada4a
• (RevisionSet) Misc changes to iter and any (#502) by @ada4a
• (mgf_dev) Only match on args.command once (#517) by @ada4a
• (fallback_to_git_merge_file) Some minor clean-up (#518) by @ada4a
• Simplify ParsedMerge::rev_range_to_merged_range (#525) by @wetneb

📚 Documentation

• Update rotten link (#504) by @ada4a
• Use XDG paths for git directories (#508) by @jadeprime

⚡ Performance

• (ParsedMerge::is_empty) Don't render the whole merge just to see if it's empty (#526) by @ada4a

🧪 Testing

• (lang_profile) Introduce helper to reduce (some) boilerplate (#506) by @ada4a
• Minimal environment when invoking git (#512) by @twz123

⚙️ Miscellaneous Tasks

• (lints) Also enable in mgf_dev (#500) by @ada4a
• (flake) Update (#515) by @ada4a

🎉 New contributors

• @twz123 made their first contribution in #510
• @jadeprime made their first contribution in #508

Download

Consider installing Mergiraf via a package manager to benefit from automatic updates. Otherwise, binaries are available for your convenience below. Binaries for MacOS can be obtained from Homebrew.