[PATCH 7/7] b&m: Use new-status as the default

The previous status is currently still available as old-status. --- morphlib/plugins/branch_and_merge_new_plugin.py | 2 +- morphlib/plugins/branch_and_merge_plugin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index ad1d414..7710f30 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -53,7 +53,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): 'show-branch-root', self.show_branch_root, arg_synopsis='') self.app.add_subcommand('foreach', self.foreach, arg_synopsis='-- COMMAND [ARGS...]') - self.app.add_subcommand('new-status', self.status, + self.app.add_subcommand('status', self.status, arg_synopsis='') def disable(self): diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 671071b..37d5e40 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -67,7 +67,7 @@ class BranchAndMergePlugin(cliapp.Plugin): 'tag', self.tag, arg_synopsis='TAG-NAME -- [GIT-COMMIT-ARG...]') self.app.add_subcommand('build', self.build, arg_synopsis='SYSTEM') - self.app.add_subcommand('status', self.status) + self.app.add_subcommand('old-status', self.status) self.app.add_subcommand('branch-from-image', self.branch_from_image, arg_synopsis='REPO BRANCH') group_branch = 'Branching Options' -- 1.7.10.4