← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-03-02 05:00:16 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: aaron.bentley@utoronto.ca-20070302050016-m6m8kh6f6ev6sby4
Pull directive registry into command class

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3167
3167
        server.serve()
3168
3168
 
3169
3169
 
3170
 
_directive_patch_type = registry.Registry()
3171
 
_directive_patch_type.register('bundle', 'bundle', 'Bazaar revision bundle')
3172
 
_directive_patch_type.register('diff', 'diff', 'Normal unified diff')
3173
 
_directive_patch_type.register('plain', None, 'No patch, just directive')
3174
 
 
3175
 
 
3176
3170
class cmd_merge_directive(Command):
3177
3171
    """Generate a merge directive auto-merge tools."""
3178
3172
 
 
3173
    _directive_patch_type = registry.Registry()
 
3174
    _directive_patch_type.register('bundle', 'bundle',
 
3175
                                   'Bazaar revision bundle')
 
3176
    _directive_patch_type.register('diff', 'diff', 'Normal unified diff')
 
3177
    _directive_patch_type.register('plain', None, 'No patch, just directive')
 
3178
 
3179
3179
    takes_args = ['submit_branch?', 'public_branch?']
3180
3180
 
3181
3181
    takes_options = [RegistryOption('patch-type',