summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_plugin.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-05 15:40:15 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-06 16:28:18 +0100
commit54f558d657131278baaecc02b60f9d05d88dc89d (patch)
tree6bc6741b7534ac4946ae577efa15df1d6d4a7c07 /morphlib/plugins/branch_and_merge_plugin.py
parentfaac98c8ae8773defbf2b7ba104c6e56d67e3c31 (diff)
downloadmorph-54f558d657131278baaecc02b60f9d05d88dc89d.tar.gz
Re-implement "morph show-system-branch" using new infrastructure
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 0485f317..6da5b09a 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -85,8 +85,6 @@ class BranchAndMergePlugin(cliapp.Plugin):
arg_synopsis='-- COMMAND [ARGS...]')
# Plumbing commands (FIXME: should be hidden from --help by default)
- self.app.add_subcommand('show-system-branch', self.show_system_branch,
- arg_synopsis='')
self.app.add_subcommand('show-branch-root', self.show_branch_root,
arg_synopsis='')
@@ -1960,12 +1958,6 @@ class BranchAndMergePlugin(cliapp.Plugin):
raise cliapp.AppException(
'Command failed at repo %s: %s' % (repo, ' '.join(args)))
- def show_system_branch(self, args):
- '''Show the name of the current system branch.'''
-
- branch, dirname = self.deduce_system_branch()
- self.app.output.write('%s\n' % branch)
-
def show_branch_root(self, args):
'''Show the name of the repository holding the system morphologies.