I don’t know about you, but I like diff -p . Having used it for years, I can read these diffs like a text, while diffs without -p often need to have the original file opened side by side, just to get enough of the context.
Loving diff -p so much, I want to see it everywhere (evil laughter). Alas, in bzr only diff command can easily use -p, just run it as
bzr diff --diff-options=-p or store it as an alias in the
Actually, for an alias there is a better, although more verbose, alternative:
diff = "diff --diff-options='-F ^[[:alpha:]$_].*[^:]$'"
Unlike simple -p it will not think that a word ending with a semicolon (like a label or, say,
private:) is a “C function name”.
But the problem is — only
bzr diff can be tuned this way. Bzr email plugin still sends diffs without function names. And
bzr gdiff does not show them. And, of course, all other bzr commands —
bzr commit, for example, or
bzr unshelve --preview,
bzr log --show-diff and others — they are still as unfriendly as before.
I was solving it on a case by case basis — added a
post_commit_diffoptions configuration option to the bzr-email plugin, then a command line option to
bzr gdiff. But then it occurred to me that I can attack the problem at its core!
New Year is coming! And it brings us a new MySQL User Conference! As always, me and my colleagues will be attending — we have great talks to offer:
- Monty is giving a keynote State of MariaDB. Just like the last year, Monty will tell you how we are doing, what we have spent the last year on, what we are working on now.
- Colin presents A Beginner’s Guide to MariaDB talk. If you have heard of MariaDB, but don’t quite know what it is and why you should care — go and attend his talk.
- Sergei (that’s me) together with Andrew Hutchings will give a tutorial Mastering the MySQL Plugin Development. An interactive and updated version of the book that was recently published. Unlike the book, we will use MySQL 5.5 as a base, not 5.1. Most of the material will equally apply to MariaDB and Percona Server — they are all compatible on the Plugin API level.
See you at the conference! It’s going to be a great one!
P.S. Hopefully, Eyjafjallajökull will be quiet this time.
I’ve just pushed the last batch of changes into 5.2 tree. The most important change was renaming Maria engine to Aria (with old
maria* compatibility variables). Other — smaller — changes included adding all plugins to the windows
.zip distribution (sphinx and oqgraph too), building
mysqld.exe with federatedx, not old federated engine, refactoring of
mysql-test-run suite to support pluggable per-suite extensions, print the plugin configuration in the
./configure script, and other even smaller changes. Together with all bug fixes that 5.2 has accumulated over time it made the tree ready for the next release – 5.2.2!