Merge lp:~toonn/bzr/log-bzr-version into lp:bzr

[Toon Nolten]

[Toon Nolten (toonn)]

**Why**
    Solution to https://bugs.launchpad.net/bzr/+bug/257170

**How**
    I added one line to commands.py, the first line after the docstring of run_bzr:
    trace.mutter("bazaar version: " + bzrlib.__version__)

**Anything else you may have fixed in passing**
    I corrected two (supposed) typos in HACKING.txt.

[Andrew Bennetts (spiv)]

Thanks for the patch! It looks good. My only comment on it is: don't add a blank line after the trace.mutter, we generally don't use much vertical whitespace within functions. The typo fixes look good too.

Have you already executed the Canonical contribution agreement? If not, could you please do so according to <http://www.canonical.com/contributors> — thanks.

review: Needs Fixing

[Toon Nolten (toonn)]

I removed the vertical whitespace, thank you for the quick review.

I didn't know about the contribution agreement yet, thank you for the information.

review: Needs Resubmitting

[Andrew Bennetts (spiv)]

Thanks for taking care of the agreement and tidying that whitespace. It all looks good to me now.

Ordinarily we get two committers to review patches before landing them, but this is sufficiently small and safe that I'm happy to send this to PQM without further review. I just realised it lacks a NEWS entry (you deserve credit for your effort, after all!), but I'll happily take care of that now then land it.

review: Approve

=== modified file 'bzrlib/commands.py'
--- bzrlib/commands.py	2009-12-09 05:47:32 +0000
+++ bzrlib/commands.py	2010-01-04 18:21:15 +0000
@@ -927,6 +927,7 @@
     --concurrency
         Specify the number of processes that can be run concurrently (selftest).
     """
+    trace.mutter("bazaar version: " + bzrlib.__version__)
     argv = list(argv)
     trace.mutter("bzr arguments: %r", argv)
 

=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt	2009-12-02 20:34:07 +0000
+++ doc/developers/HACKING.txt	2010-01-04 18:21:15 +0000
@@ -62,7 +62,7 @@
 to involving the community before you spend much time on a change.
 These include:
 
-* you get to build on the wisdom on others, saving time
+* you get to build on the wisdom of others, saving time
 
 * if others can direct you to similar code, it minimises the work to be done
 
@@ -680,7 +680,7 @@
 ``only_raises`` decorator (from ``bzrlib.decorators``) for methods that
 are typically called in ``finally`` blocks, such as ``unlock`` methods.
 For example, ``@only_raises(LockNotHeld, LockBroken)``.  All errors that
-are unlikely to be a knock-on failure from an previous failure should be
+are unlikely to be a knock-on failure from a previous failure should be
 allowed.