lp://qastaging/~vila/bzr/525571-lock-bazaar-conf-files

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/bzr

Robert Collins (community): Needs Fixing on 2010-07-04

Diff: 893 lines (+410/-101) (has conflicts)

6 files modified

NEWS (+15/-0)
bzrlib/builtins.py (+27/-14)
bzrlib/config.py (+130/-29)
bzrlib/tests/blackbox/test_break_lock.py (+44/-20)
bzrlib/tests/test_commands.py (+1/-1)
bzrlib/tests/test_config.py (+193/-37)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #525571: No locking when updating files in ~/.bazaar

High

Fix Released

Link a bug report

Related blueprints

5335. By Vincent Ladeuil on 2010-07-02

Use --config instead of --conf for break-lock.

5334. By Vincent Ladeuil on 2010-07-02

Clarify lock scope.

5333. By Vincent Ladeuil on 2010-06-30

Final cleanup.

5332. By Vincent Ladeuil on 2010-06-30

Implement the --conf option for break-lock as per lifeless suggestion.

* bzrlib/errors.py:
(NoLockDir): Useless, deleted.

* bzrlib/config.py:
(LockableConfig.unlock): NoLockDir is useless, break_lock()
silenty succeeds if the directory doesn't exist.

* bzrlib/tests/blackbox/test_break_lock.py:
Tweak the tests.

* bzrlib/builtins.py:
(cmd_break_lock): Fix docstring, add a --conf option to deal with
config files.

5331. By Vincent Ladeuil on 2010-06-30

Add a test to help LockableConfig daughter classes identify methods that needs to be decorated.

5330. By Vincent Ladeuil on 2010-06-30

Further clarify NEWS entry.

5329. By Vincent Ladeuil on 2010-06-30

Fix docstring.

5328. By Vincent Ladeuil on 2010-06-30

Fix wrong bug number and clarify NEWS entries.

5327. By Vincent Ladeuil on 2010-06-30

Revert the lock scope to a sane value.

* bzrlib/tests/test_config.py:
(TestLockableConfig.test_writes_are_serialized)
(TestLockableConfig.test_read_while_writing): Fix the fallouts.

* bzrlib/config.py:
(LockableConfig): Wrong idea, the lock needs to be taken arond the
whole value update call, reducing the lock scope to
_write_config_file exclude the config file re-read.
(GlobalConfig.set_user_option, GlobalConfig.set_alias)
(GlobalConfig.unset_alias, LocationConfig.set_user_option): These
methods needs to be decorated with needs_write_lock to enforce the
design constraints (lock, re-read config, set new value, write
config, unlock).

5326. By Vincent Ladeuil on 2010-06-29

Add some comments.