summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_plugin.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-09-03 16:35:36 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-09-05 14:38:26 +0000
commit1bedfa7749300da167808b837d2a8968df43eeb3 (patch)
treecccad4d945e4be1e48c4c7738c266a9c1d01cdc5 /morphlib/plugins/branch_and_merge_plugin.py
parent4db444d0fc239eb74d11e8ebcfb50aa3e79ad500 (diff)
downloadmorph-1bedfa7749300da167808b837d2a8968df43eeb3.tar.gz
b&m: re-implement morph unpetrify
This also undoes the test suite change to keep it using the old petrify. Petrify and Unpetrify have the same structure: 1. Set up 2. Load all the morphologies 3. Make changes to the morphologies 4. Write back any changes This suggests some re-use in the form of passing a function callback to a morphology visitor.
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 4791989b..671071b6 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -62,7 +62,7 @@ class BranchAndMergePlugin(cliapp.Plugin):
# self.app.add_subcommand('edit', self.edit,
# arg_synopsis='SYSTEM STRATUM [CHUNK]')
self.app.add_subcommand('old-petrify', self.petrify)
- self.app.add_subcommand('unpetrify', self.unpetrify)
+ self.app.add_subcommand('old-unpetrify', self.unpetrify)
self.app.add_subcommand(
'tag', self.tag, arg_synopsis='TAG-NAME -- [GIT-COMMIT-ARG...]')
self.app.add_subcommand('build', self.build,