← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2013-08-20 03:02:43 UTC
  • Revision ID: aaron@aaronbentley.com-20130820030243-r8v1xfbcnd8f10p4
Fix zap command for 2.6/7

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
19
19
"""
20
20
 
21
21
from bzrlib import ignores, option
22
 
from bzrlib.commands import plugin_cmds
 
22
from bzrlib.commands import (
 
23
    builtin_command_names,
 
24
    plugin_cmds,
 
25
    )
23
26
from version import version_info, __version__
24
27
 
25
28
 
27
30
 
28
31
 
29
32
commands = {
30
 
    'cmd_branches': [],
31
33
    'cmd_branch_history': [],
32
34
    'cmd_cbranch': [],
33
35
    'cmd_cdiff': [],
 
36
    'cmd_conflict_diff': [],
 
37
    'cmd_create_mirror': [],
34
38
    'cmd_fetch_ghosts': ['fetch-missing'],
35
39
    'cmd_graph_ancestry': [],
36
40
    'cmd_import': [],
40
44
    'cmd_rspush': [],
41
45
    'cmd_shelf1': [],
42
46
    'cmd_shell': [],
43
 
    'cmd_shelve1': ['shelve'],
 
47
    'cmd_shelve1': [],
44
48
    'cmd_trees': [],
45
 
    'cmd_unshelve1': ['unshelve'],
 
49
    'cmd_unshelve1': [],
46
50
    'cmd_zap': [],
47
51
}
48
52
 
51
55
    plugin_cmds.register_lazy(cmd_name, aliases,
52
56
                              'bzrlib.plugins.bzrtools.command_classes')
53
57
 
 
58
list_branches_aliases = (['branches'] if 'branches' not in
 
59
                         builtin_command_names() else [])
 
60
 
 
61
plugin_cmds.register_lazy('cmd_list_branches', list_branches_aliases,
 
62
                          'bzrlib.plugins.bzrtools.command_classes')
54
63
 
55
64
plugin_cmds.register_lazy('cmd_heads', [], 'bzrlib.plugins.bzrtools.heads')
56
65
 
73
82
    from unittest import TestSuite
74
83
    import bzrtools
75
84
    import tests.test_dotgraph
76
 
    import tests.is_clean
77
85
    import tests.test_cbranch
 
86
    import tests.test_conflict_diff
 
87
    from bzrlib.plugins.bzrtools.tests import test_fetch_ghosts
 
88
    import tests.test_graph
78
89
    import tests.test_link_tree
79
90
    import tests.test_patch
80
 
    import tests.test_rspush
 
91
    import tests.test_mirror
81
92
    import tests.upstream_import
82
93
    import zap
83
94
    import tests.blackbox
87
98
    result.addTest(tests.test_suite())
88
99
    result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
89
100
    result.addTest(tests.blackbox.test_suite())
90
 
    result.addTest(tests.upstream_import.test_suite())
 
101
    result.addTest(TestLoader().loadTestsFromModule(tests.upstream_import))
91
102
    result.addTest(zap.test_suite())
92
103
    result.addTest(TestLoader().loadTestsFromModule(tests.test_dotgraph))
93
 
    result.addTest(TestLoader().loadTestsFromModule(tests.is_clean))
 
104
    result.addTest(TestLoader().loadTestsFromModule(test_fetch_ghosts))
 
105
    result.addTest(TestLoader().loadTestsFromModule(tests.test_graph))
94
106
    result.addTest(TestLoader().loadTestsFromModule(tests.test_link_tree))
95
107
    result.addTest(TestLoader().loadTestsFromModule(tests.test_patch))
96
 
    result.addTest(TestLoader().loadTestsFromModule(tests.test_rspush))
97
108
    result.addTest(TestLoader().loadTestsFromModule(tests.test_cbranch))
 
109
    result.addTest(TestLoader().loadTestsFromModule(tests.test_conflict_diff))
 
110
    result.addTest(TestLoader().loadTestsFromModule(tests.test_mirror))
98
111
    return result