Skip to content

Spork v0.3.0

Compare
Choose a tag to compare
@slarse slarse released this 12 May 17:49
· 193 commits to master since this release

Spork v0.3.0 release notes

This is an exciting release with tons of new features, stability fixes and general tuning made to Spork. It now actually works pretty well!

Features

  • 4ef433e Add line-based fallback and --exit-on-error option, fix #120
    • By default, Spork will now fall back on a line-based merge if it encounters a critical error when merging structurally. Such cases are rare, but they do occur, especially in the presence of complicated move conflicts. --exit-on-error disables the line-based fallback, which is useful for research work but not recommended otherwise.
  • 14f733b Make Spork comply with git merge-file, fix #113
    • Now returns the amount of conflicts. Roughly.
  • 0643d74 Dynamically get version from pom.properties, fix #118
    • --version now actually shows the version number!
  • ca05291 Remove the compare command, fix #117
    • The compare command no longer served a purpose. Merging is now invoked with just spork, as opposed to spork merge.
  • 79517d7 Add --logging option that enables logging, fix #104
    • The --logging option enables logging, which is otherwise disabled. It lets you know roughly what Spork is doing!
  • fee080a Improve indentation size guessing: choose 1, 2 or 4 #100
  • 6f11494 fee080a Guess indentation of source files, fix #100
    • Will guess the indentation level and type (tabs or spaces) of the source files and apply that to the output file.
  • 4d5ffb6 Use original source for methods and fields (#97)
    • Spork will now reuse the original source code for methods and fields that have not been merged internally. This dramatically improves the formatting accuracy of Spork.

Bugfixes

  • 56491be Add leaf node PCS child lists, fix #116
  • 3b035ab Avoid using original source for multi-declarations, fix #111
  • c95b20e Fix non-deterministic move conflict detection, fix #101
  • 1934a10 Fix incorrect indentation bug when writing raw source
  • f54dced Fix off-by-one bugs in SourceExtractor
  • 590ddb7 Extract source code fragments from strings instead of bytes, fix #99

Refactorings