Merge lp:~ian-clatworthy/bzr/better-eol-doc into lp:~bzr/bzr/trunk-old

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

This patch clarifies the dependencies and configuration of eol conversion. These changes were suggested/requested by Frits Jalvingh after he had trouble getting the feature running. See https://bugs.launchpad.net/bzr/+bug/362030/comments/2.

[John A Meinel (jameinel)]

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

Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/better-eol-doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> This patch clarifies the dependencies and configuration of eol conversion. These changes were suggested/requested by Frits Jalvingh after he had trouble getting the feature running. See https://bugs.launchpad.net/bzr/+bug/362030/comments/2.
>
>

I'm pretty sure you need:

bzr info -v

As plain 'bzr info' doesn't tell you the exact formats.

...

BZR_HOME/bazaar.conf

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkovwo8ACgkQJdeBCYSNAANlnACfUazYVeXaB7uJsm8mr1m59IVX
szUAoJvEGBZUm1ymcVf6WOOdCeYNw0TE
=hRwY
-----END PGP SIGNATURE-----

[John A Meinel (jameinel)]

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

Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/better-eol-doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> This patch clarifies the dependencies and configuration of eol conversion. These changes were suggested/requested by Frits Jalvingh after he had trouble getting the feature running. See https://bugs.launchpad.net/bzr/+bug/362030/comments/2.
>
>

Sorry I hit send to early:

+Currently, rules are only supported in BZR_HOME/bazaar.conf. (Branch
+specific rules will be supported in a future verison of Bazaar.)

^- I'm pretty sure it is $BZR_HOME/rules not 'bazaar.conf'.

If I'm wrong, then you can land it.

  review needs_fixing

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkovwrcACgkQJdeBCYSNAAPY5QCfeGm8iP4vPn5KpxwVckKWQwpm
ifgAoILG8EJExtTmdDRHaopVMjGMIhgM
=iF+E
-----END PGP SIGNATURE-----

review: Needs Fixing

[Ian Clatworthy (ian-clatworthy)]

John A Meinel wrote:
> Review: Needs Fixing
>
> Sorry I hit send to early:
>
> +Currently, rules are only supported in BZR_HOME/bazaar.conf. (Branch
> +specific rules will be supported in a future verison of Bazaar.)
>
> ^- I'm pretty sure it is $BZR_HOME/rules not 'bazaar.conf'.
>
Oops. Right you are. (BTW, we usually leave the $ off the front as it's
wrong on Windows.) I'll fix and resubmit.

Ian C.

[John A Meinel (jameinel)]

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

Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/better-eol-doc into lp:bzr.
>
>
>

Just to mention that if you look in config.py it is actually

$BZR_HOME/.bazaar/rules

and

%BZR_HOME%/bazaar/2.0/rules

(%BZR_HOME% defaults to %APPDATA%, while $BZR_HOME "defaults" to
expanduser('~'))

I prefer $BZR_HOME because it is slightly more obvious that it is a
variable to be expanded, but not a big deal. Slightly more important is
that $BZR_HOME/rules is wrong... But there isn't a simple value that
works for all platforms anyway.

Anyway, good enough. Use your own judgement on $BZR_HOME/.bazaar/rules

  review approve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkowh9YACgkQJdeBCYSNAANKPQCgy91OTA9x2RxoeFHL2nOxhmSn
658AoKDaAipla99Auij/58IjYxl9M0Y8
=858k
-----END PGP SIGNATURE-----

review: Approve

[Ian Clatworthy (ian-clatworthy)]

> Just to mention that if you look in config.py it is actually
>
> $BZR_HOME/.bazaar/rules
>
> and
>
> %BZR_HOME%/bazaar/2.0/rules
>
> (%BZR_HOME% defaults to %APPDATA%, while $BZR_HOME "defaults" to
> expanduser('~'))

Ah - good point. I've tweaked the text accordingly.

=== modified file 'NEWS'
--- NEWS	2009-06-15 15:20:24 +0000
+++ NEWS	2009-06-16 02:35:57 +0000
@@ -173,11 +173,17 @@
 Documentation
 *************
 
+<<<<<<< TREE
 * Added directory structure and started translation of docs in Russian.
   (Alexey Shtokalo, Alexander Iljin, Alexander Belchenko, Dmitry Vasiliev,
   Volodymyr Kotulskyi)
 
 
+=======
+* Minor clarifications to the help for End-Of-Line conversions.
+  (Ian Clatworthy)
+
+>>>>>>> MERGE-SOURCE
 API Changes
 ***********
 

=== modified file 'bzrlib/help_topics/en/eol.txt'
--- bzrlib/help_topics/en/eol.txt	2009-05-12 02:01:15 +0000
+++ bzrlib/help_topics/en/eol.txt	2009-06-16 02:35:57 +0000
@@ -6,10 +6,16 @@
 ``bzr help content-filters`` for general information about using these.
 
 Note: Content filtering is only supported in recently added formats,
-e.g. 1.14.
+e.g. 1.14. Be sure that both the repository *and* the branch are
+in a recent format. (Just setting the format on the repository
+is not enough.) If content filtering does not appear to be working, use
+'bzr info -v' to confirm that the branch is using "Working tree format 5"
+or later.
 
-EOL conversion needs to be enabled for selected branches and files using
+EOL conversion needs to be enabled for selected file patterns using
 rules. See ``bzr help rules`` for general information on defining rules.
+Currently, rules are only supported in BZR_HOME/rules. (Branch
+specific rules will be supported in a future verison of Bazaar.)
 
 To configure which files to filter, set ``eol`` to one of the values below.
 (If a value is not set, ``exact`` is the default.)