[merge] show .bzr.log location in version output

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool пишет:
> mbp at grace% ./bzr --version
> Bazaar (bzr) 0.18.0dev0
>  from bzr checkout /home/mbp/bzr/trivial
>    revision: 2567
>    revid: mbp at sourcefrog.net-20070702044841-bhqv1470tepruga0
>    branch nick: trivial
> Using python interpreter: /usr/bin/python
> Using python standard library: /usr/lib/python2.5
> Using bzrlib: /home/mbp/bzr/trivial/bzrlib
> Using bazaar configuration: /home/mbp/.bazaar
> Logging to: /home/mbp/.bzr.log
> ^^^^^^^^^^^^^^^^^^^^^
> 
> like this.

I proposed this last time when 'Using bazaar configuration' was added.
Thanks for doing this.
+1 conditional, see below.

> On unix it's easy to do 'less ~/.bzr.log', but many people who need
> debugging help on windows first need to dig around to find the log
> file, and this will save some hassle.

That was my reason to show this location then and now.


> === modified file NEWS
> --- NEWS
> +++ NEWS
> @@ -57,6 +57,9 @@
>        library users and plugins. See the ``bzrlib.api`` module for details.
>        (Robert Collins)
>  
> +    * ``bzrtracefilename --version`` now shows the location of the bzr log file, which
> +      is especially useful on Windows.  (Martin Pool)
> +


^-- ``bzrtracefilename --version`` -- I think it should be ``bzr --version``

>    INTERNALS:
>  
>      * New SMTPConnection class to unify email handling.  (Adeodato Simó)
> 
> === modified file bzrlib/tests/blackbox/test_version.py
> --- bzrlib/tests/blackbox/test_version.py
> +++ bzrlib/tests/blackbox/test_version.py
> @@ -30,3 +30,4 @@
>          self.assertEquals(1, out.count("Using python standard library:"))
>          self.assertEquals(1, out.count("Using bzrlib:"))
>          self.assertEquals(1, out.count("Using bazaar configuration:"))
> +        self.assertContainsRe(out, r'(?m)^Logging to:.*bzr\.log')

^-- even on win32 we create .bzr.log file, may be it worth to check exact name:

+        self.assertContainsRe(out, r'(?m)^Logging to:.*\.bzr\.log')

?

[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGiJ76zYr338mxwCURAhOAAJ0V+MVp4ew25wqFGMK3ShOpL8uiAgCgguqa
vOatcWLoYYokaLSv8QNiNXI=
=xHcU
-----END PGP SIGNATURE-----