Bazaar

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

  1. bug-626687
  2. Merge into bzr.dev
Proposed by Andrea Corbellini
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: 5416
Proposed branch: lp:~andrea.corbellini/bzr/bug-626687
Merge into: lp:bzr
Diff against target: 54 lines (+14/-1)
3 files modified
NEWS (+4/-0)
bzrlib/ignores.py (+1/-0)
doc/en/whats-new/whats-new-in-2.3.txt (+9/-1)
To merge this branch: bzr merge lp:~andrea.corbellini/bzr/bug-626687
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+34287@code.launchpad.net

Commit message

ignore __pycache__ by default

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

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.

Revision history for this message
Andrea Corbellini (andrea.corbellini) wrote :

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?

Revision history for this message
Martin Pool (mbp) wrote :

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>?

Revision history for this message
Martin Pool (mbp) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-09-03 02:53:10 +0000
3+++ NEWS 2010-09-08 08:52:42 +0000
4@@ -200,6 +200,10 @@
5 content faster than seeking and reading content from another tree,
6 especially in cold-cache situations. (John Arbash Meinel, #607298)
7
8+* Add ``__pycache__`` to the default ``ignores`` file. Future releases of
9+ Python will use this directory to store bytecodes.
10+ (Andrea Corbellini, #626687)
11+
12 Documentation
13 *************
14
15
16=== modified file 'bzrlib/ignores.py'
17--- bzrlib/ignores.py 2010-08-25 10:20:41 +0000
18+++ bzrlib/ignores.py 2010-09-08 08:52:42 +0000
19@@ -41,6 +41,7 @@
20 '*~',
21 '.#*',
22 '[#]*#',
23+ '__pycache__',
24 ]
25
26
27
28=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
29--- doc/en/whats-new/whats-new-in-2.3.txt 2010-08-31 07:12:18 +0000
30+++ doc/en/whats-new/whats-new-in-2.3.txt 2010-09-08 08:52:42 +0000
31@@ -17,6 +17,14 @@
32 2.1, and 2.2, and can read and write repositories generated by all
33 previous versions.
34
35+Changed Behaviour
36+*****************
37+
38+* The default ``ignore`` file created by Bazaar will contain ``__pycache__``,
39+ which is the name of the directory that will be used by Python to store
40+ bytecode files.
41+ (Andrea Corbellini, #626687)
42+
43 Launchpad integration
44 *********************
45
46@@ -32,7 +40,7 @@
47 with many changes by not repeatedly building a list of all file-ids.
48 (Andrew Bennetts)
49
50-* ``bzr send`` uses less memory.
51+* ``bzr send`` uses less memory.
52 (John Arbash Meinel, #614576)
53
54 * Inventory entries now consume less memory (on 32-bit Ubuntu file entries