Bazaar

Merge lp:~mbp/bzr/lazy-commands into lp:bzr/2.2

Proposed by Martin Pool on 2010-08-13

Status:

Merged

Approved by:

Martin Pool on 2010-08-13

Approved revision:

no longer in the source branch.

Merged at revision:

5076

Proposed branch:

Merge into:

Diff against target:

2 files modified

bzrlib/commands.py (+1/-0)
bzrlib/tests/test_commands.py (+1/-0)

To merge this branch:

bzr merge lp:~mbp/bzr/lazy-commands

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
bzr-core		2010-08-13	Pending
Review via email: mp+32563@code.launchpad.net

fix user reference generation

Most of this was reviewed already in <https://code.launchpad.net/~ian-clatworthy/bzr/cmds-in-userref-585667/+merge/26004> and it just needed a small fix to land, so I'm going to manually check it has actually fixed the bug, then send it in.

Revision history for this message

Martin Pool (mbp) wrote on 2010-08-13:

I checked the user reference built by "make docs-sphinx" and it is indeed ok now.

Revision history for this message

Martin Pool (mbp) wrote on 2010-08-13:

sent to pqm by email

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'bzrlib/commands.py'
2	--- bzrlib/commands.py 2010-06-18 11:07:07 +0000
3	+++ bzrlib/commands.py 2010-08-13 08:20:57 +0000
4	@@ -222,6 +222,7 @@
5	Use of all_command_names() is encouraged rather than builtin_command_names
6	and/or plugin_command_names.
7	"""
8	+ _register_builtin_commands()
9	return builtin_command_registry.keys()
10
11
12
13	=== modified file 'bzrlib/tests/test_commands.py'
14	--- bzrlib/tests/test_commands.py 2010-05-27 21:16:48 +0000
15	+++ bzrlib/tests/test_commands.py 2010-08-13 08:20:57 +0000
16	@@ -346,6 +346,7 @@
17	self.assertEqual(['called'], hook_calls)
18	self.assertSubset(['foo', 'bar'], cmds)
19
20	+
21	class TestDeprecations(tests.TestCase):
22
23	def test_shlex_split_unicode_deprecation(self):