Merge lp:~andrea.corbellini/bzr/bug-626687 into lp:bzr

[Andrea Corbellini]

ignore __pycache__ by default

[Martin Pool (mbp)]

To judge from the comment there, this will only affect people who have no existing ~/.bazaar/ignores file. That may be fine.

We should probably also mention this in NEWS and whatsnew-2.3.

[Andrea Corbellini (andrea.corbellini)]

Hi,

I've updated the NEWS file (rev 5406), but I have some troubles updating whats-new-in-2.3: which section should I use? Creating a new section for such a small change is too much, in my opinion. Any clues?

[Martin Pool (mbp)]

I'd probably add a new "changed behaviour" section and put it in there. It's a small change but I think things that change the default are worth mentioning.

Could you please execute the contributor agreement at <http://www.canonical.com/contributors>?

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-09-03 02:53:10 +0000
+++ NEWS	2010-09-08 08:52:42 +0000
@@ -200,6 +200,10 @@
   content faster than seeking and reading content from another tree,
   especially in cold-cache situations. (John Arbash Meinel, #607298)
 
+* Add ``__pycache__`` to the default ``ignores`` file. Future releases of
+  Python will use this directory to store bytecodes.
+  (Andrea Corbellini, #626687)
+
 Documentation
 *************
 
 
=== modified file 'bzrlib/ignores.py'
--- bzrlib/ignores.py	2010-08-25 10:20:41 +0000
+++ bzrlib/ignores.py	2010-09-08 08:52:42 +0000
@@ -41,6 +41,7 @@
     '*~',
     '.#*',
     '[#]*#',
+    '__pycache__',
 ]
 
 
 
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- doc/en/whats-new/whats-new-in-2.3.txt	2010-08-31 07:12:18 +0000
+++ doc/en/whats-new/whats-new-in-2.3.txt	2010-09-08 08:52:42 +0000
@@ -17,6 +17,14 @@
 2.1, and 2.2, and can read and write repositories generated by all
 previous versions.
 
+Changed Behaviour
+*****************
+
+* The default ``ignore`` file created by Bazaar will contain ``__pycache__``,
+  which is the name of the directory that will be used by Python to store
+  bytecode files.
+  (Andrea Corbellini, #626687)
+
 Launchpad integration
 *********************
 
@@ -32,7 +40,7 @@
   with many changes by not repeatedly building a list of all file-ids.
   (Andrew Bennetts)
 
-* ``bzr send`` uses less memory.  
+* ``bzr send`` uses less memory.
   (John Arbash Meinel, #614576)
 
 * Inventory entries now consume less memory (on 32-bit Ubuntu file entries