From 3a8ee82f912399739b44688b0f71b04daa8c5c68 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Thu, 20 Sep 2012 17:19:54 +0100
Subject: Add 'morph unpetrify'

Tested in the petrify test, to avoid duplication.
---
 morphlib/plugins/branch_and_merge_plugin.py | 44 +++++++++++++++++++++++++++++
 tests.branching/petrify.script              |  6 ++++
 tests.branching/petrify.stdout              | 15 ++++++++++
 3 files changed, 65 insertions(+)

diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 9594436b..66109747 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -53,6 +53,7 @@ class BranchAndMergePlugin(cliapp.Plugin):
         self.app.add_subcommand('edit', self.edit,
                                 arg_synopsis='SYSTEM STRATUM [CHUNK]')
         self.app.add_subcommand('petrify', self.petrify)
+        self.app.add_subcommand('unpetrify', self.unpetrify)
         self.app.add_subcommand('build', self.build,
                                 arg_synopsis='SYSTEM')
         self.app.add_subcommand('foreach', self.foreach,
@@ -606,6 +607,49 @@ class BranchAndMergePlugin(cliapp.Plugin):
         self.print_changelog('The following changes were made but have not '
                              'been comitted')
 
+    def unpetrify(self, args):
+        '''Reverse the process of petrification
+
+        Unpetrifies all chunk refs in a branch that were previously petrified.
+        Makes no attempt to 'unedit' strata that were branched solely so they
+        could be petrified.
+
+        If a branch is petrified and then branched from, the child branch can
+        be unpetrified independently of the parent.
+
+        '''
+
+        if len(args) != 0:
+            raise cliapp.AppException('morph unpetrify takes no arguments')
+
+        workspace = self.deduce_workspace()
+        branch, branch_path = self.deduce_system_branch()
+        root_repo = self.get_branch_config(branch_path, 'branch.root')
+        root_repo_dir = self.find_repository(branch_path, root_repo)
+
+        for f in glob.glob(os.path.join(root_repo_dir, '*.morph')):
+            name = os.path.basename(f)[:-len('.morph')]
+            morphology = self.load_morphology(root_repo_dir, name)
+            if morphology['kind'] != 'system':
+                continue
+
+            for stratum_info in morphology['strata']:
+                repo_dir = self.edit_stratum(
+                    branch, branch_path, root_repo_dir, stratum_info)
+
+                stratum = self.load_morphology(repo_dir, stratum_info['morph'])
+
+                for chunk_info in stratum['chunks']:
+                    if 'unpetrify-ref' in chunk_info:
+                        chunk_info['ref'] = chunk_info['unpetrify-ref']
+                        del chunk_info['unpetrify-ref']
+                self.save_morphology(repo_dir, stratum_info['morph'], stratum)
+
+            self.save_morphology(root_repo_dir, name, morphology)
+
+        self.print_changelog('The following changes were made but have not '
+                             'been comitted')
+
     def load_morphology_pair(self, repo_dir, ref, name):
         '''Load two versions of a morphology and check for major conflicts
 
diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script
index fe516ffb..0b5ff018 100755
--- a/tests.branching/petrify.script
+++ b/tests.branching/petrify.script
@@ -34,4 +34,10 @@ cd "$DATADIR/workspace"
 
 cd master/baserock:morphs
 "$SRCDIR/scripts/test-morph" petrify
+echo "Petrified:"
+cat hello-stratum.morph
+
+"$SRCDIR/scripts/test-morph" unpetrify
+echo
+echo "Unpetrified:"
 cat hello-stratum.morph
diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout
index 4aa2b2ea..249a8f59 100644
--- a/tests.branching/petrify.stdout
+++ b/tests.branching/petrify.stdout
@@ -1,3 +1,4 @@
+Petrified:
 {
     "name": "hello-stratum",
     "kind": "stratum",
@@ -11,3 +12,17 @@
         }
     ]
 }
+
+Unpetrified:
+{
+    "name": "hello-stratum",
+    "kind": "stratum",
+    "chunks": [
+        {
+            "name": "hello",
+            "repo": "baserock:hello",
+            "ref": "master",
+            "build-depends": []
+        }
+    ]
+}
-- 
cgit v1.2.1