Merge lp://staging/~mnordhoff/bzr-loom/revspec_registration_module into lp://staging/bzr-loom

Proposed by Matt Nordhoff
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~mnordhoff/bzr-loom/revspec_registration_module
Merge into: lp://staging/bzr-loom
Diff against target: 12 lines (+1/-1)
1 file modified
__init__.py (+1/-1)
To merge this branch: bzr merge lp://staging/~mnordhoff/bzr-loom/revspec_registration_module
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+17199@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Matt Nordhoff (mnordhoff) wrote :

RevisionSpecThread was being registered in the revspec registry under the wrong name, so revspec_registry.get('thread:') bombed out with an ImportError.

...Since I'm bad at describing things, here's a diff:

- revspec_registry.register_lazy('thread:', 'bzrlib.plugins.loom',
+ revspec_registry.register_lazy('thread:', 'bzrlib.plugins.loom.revspec',
                                    'RevisionSpecThread')

So yeah.

Revision history for this message
Robert Collins (lifeless) wrote :

 review: approve

please land this.

-Rob

review: Approve

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2009-02-12 13:15:03 +0000
3+++ __init__.py 2010-01-12 05:57:13 +0000
4@@ -88,7 +88,7 @@
5
6 revspec_registry = getattr(bzrlib.revisionspec, 'revspec_registry', None)
7 if revspec_registry is not None:
8- revspec_registry.register_lazy('thread:', 'bzrlib.plugins.loom',
9+ revspec_registry.register_lazy('thread:', 'bzrlib.plugins.loom.revspec',
10 'RevisionSpecThread')
11 else:
12 import revspec

Subscribers

People subscribed via source and target branches