15 files changed, 361 insertions, 444 deletions

diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script
index fd021399..028bdef1 100755
--- a/tests.as-root/build-with-external-strata.script
+++ b/tests.as-root/build-with-external-strata.script
@@ -30,20 +30,20 @@ cd "$DATADIR/workspace"
 cd "branch1"
 "$SRCDIR/scripts/test-morph" edit hello-system stratum2
 cd "test:external-strata"
-cat stratum2.morph | \
-    head -n $(expr $(wc -l < stratum2.morph) - 3) > stratum2.morph
-cat <<EOF >> stratum2.morph
-        },
-        {
-            "name": "linux",
-            "repo": "test:kernel-repo",
-            "ref": "master",
-            "build-mode": "test",
-            "build-depends": []
-        }
-    ]
-}
-EOF
+
+awk '
+    /^chunks:/ {
+        print $0
+        print "- name: linux"
+        print "  repo: test:kernel-repo"
+        print "  ref: master"
+        print "  build-mode: test"
+        print "  build-depends: []"
+        next
+    }
+    { print }
+' stratum2.morph > temp
+mv temp stratum2.morph
 
 # Ignore Morph's output for now because it gives us:
 # 2012-11-07 16:26:12 Overlaps in system artifact hello-system-rootfs detected
diff --git a/tests.branching/add-then-edit.script b/tests.branching/add-then-edit.script
index 40ee7161..d6a2270f 100755
--- a/tests.branching/add-then-edit.script
+++ b/tests.branching/add-then-edit.script
@@ -37,19 +37,17 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph
 index 3b7be17..c79a9af 100644
 --- a/hello-stratum.morph
 +++ b/hello-stratum.morph
-@@ -7,6 +7,12 @@
-             "repo": "test:hello",
-             "ref": "master",
-             "build-depends": []
-+        },
-+        {
-+            "name": "goodbye",
-+            "repo": "test:goodbye",
-+            "ref": "master",
-+            "build-depends": []
-         }
-     ]
- }
+@@ -5,6 +5,10 @@
+   name: hello
+   ref: master
+   repo: test:hello
++- build-depends: []
++  name: goodbye
++  ref: master
++  repo: test:goodbye
+ description: ''
+ kind: stratum
+ name: hello-stratum
 EOF
 
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye
diff --git a/tests.branching/add-then-edit.setup b/tests.branching/add-then-edit.setup
index 7dbe28c0..bb58d05a 100755
--- a/tests.branching/add-then-edit.setup
+++ b/tests.branching/add-then-edit.setup
@@ -27,13 +27,10 @@ EOF
 chmod +x goodbye
 
 cat >goodbye.morph <<'EOF'
-{
-    "name": "goodbye",
-    "kind": "chunk",
-    "install-commands": [
-        "install goodbye \"$DESTDIR$PREFIX/bin/goodbye\""
-    ]
-}
+name: goodbye
+kind: chunk
+install-commands:
+- install goodbye "$DESTDIR$PREFIX/bin/goodbye"
 EOF
 git init .
 git add goodbye.morph goodbye
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script
index cce7b52e..ed72f9e3 100755
--- a/tests.branching/ambiguous-refs.script
+++ b/tests.branching/ambiguous-refs.script
@@ -27,7 +27,7 @@ set -eu
 
 cd "$DATADIR/morphs"
 git mv hello-stratum.morph goodbye-stratum.morph
-sed -e 's/"morph": "hello-stratum"/"morph": "goodbye-stratum"/' \
+sed -e '/morph: hello-stratum/s/hello-stratum/goodbye-stratum/' \
     -i hello-system.morph
 
 git commit --quiet -am "Rename hello-system"
diff --git a/tests.branching/edit-updates-stratum-build-depends.script b/tests.branching/edit-updates-stratum-build-depends.script
index 83d5e2a4..a108ce8a 100755
--- a/tests.branching/edit-updates-stratum-build-depends.script
+++ b/tests.branching/edit-updates-stratum-build-depends.script
@@ -25,39 +25,34 @@ set -eu
 cd "$DATADIR/morphs"
 
 cat <<EOF > xyzzy-stratum.morph
-{
-    "name": "xyzzy-stratum",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "hello-stratum",
-            "repo": "test:morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "hello",
-            "repo": "test:hello",
-            "ref": "master",
-            "build-depends": []
-        }
-    ]
-}
+build-depends:
+- morph: hello-stratum
+  ref: master
+  repo: test:morphs
+chunks:
+- build-depends: []
+  name: hello
+  ref: master
+  repo: test:hello
+kind: stratum
+name: xyzzy-stratum
 EOF
 
-cat hello-system.morph | head -n $(expr $(wc -l < hello-system.morph) - 3) \
-    > hello-system.morph
-cat <<EOF >> hello-system.morph
-         },
-         {
-            "morph": "xyzzy-stratum",
-            "repo": "test:morphs",
-            "ref": "master"
-         }
-    ]
+
+# Add the xyzzy-stratum to hello-system.
+awk '
+flag == 0 { print }
+/^strata:/ { flag=1; next }
+flag == 1 && /^[ -]/ { print; next }
+flag == 1 {
+    print "- morph: xyzzy-stratum"
+    print "  ref: master"
+    print "  repo: test:morphs"
+    print $0
+    flag = 0
 }
-EOF
+' hello-system.morph > temp
+mv temp hello-system.morph
 
 git add xyzzy-stratum.morph hello-system.morph
 git commit -q -m "Add 2nd stratum with a build dependency"
diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout
index 2e34da9a..c6dec93f 100644
--- a/tests.branching/edit-updates-stratum-build-depends.stdout
+++ b/tests.branching/edit-updates-stratum-build-depends.stdout
@@ -1,48 +1,54 @@
 diff --git a/hello-stratum.morph b/hello-stratum.morph
-index 3b7be17..febfa60 100644
+index 53e76f3..8417659 100644
 --- a/hello-stratum.morph
 +++ b/hello-stratum.morph
-@@ -5,7 +5,7 @@
-         {
-             "name": "hello",
-             "repo": "test:hello",
--            "ref": "master",
-+            "ref": "newbranch",
-             "build-depends": []
-         }
-     ]
+@@ -1,7 +1,10 @@
++build-depends: []
+ chunks:
+ - build-depends: []
++  morph: hello
+   name: hello
+-  ref: master
++  ref: newbranch
+   repo: test:hello
++description: ''
+ kind: stratum
+ name: hello-stratum
 diff --git a/hello-system.morph b/hello-system.morph
-index de2fd94..fe9cdc8 100644
+index 721473c..a4c5640 100644
 --- a/hello-system.morph
 +++ b/hello-system.morph
-@@ -8,12 +8,12 @@
-         {
-             "morph": "hello-stratum",
-             "repo": "test:morphs",
--            "ref": "master"
--         },
--         {
-+            "ref": "newbranch"
-+        },
-+        {
-             "morph": "xyzzy-stratum",
-             "repo": "test:morphs",
--            "ref": "master"
--         }
-+            "ref": "newbranch"
-+        }
-     ]
- }
+@@ -1,9 +1,12 @@
+ arch: x86_64
++configuration-extensions: []
++description: ''
++disk-size: 1G
+ kind: system
+ name: hello-system
+ strata:
+ - morph: hello-stratum
+-  ref: master
++  ref: newbranch
+   repo: test:morphs
+ - morph: xyzzy-stratum
+   ref: master
 diff --git a/xyzzy-stratum.morph b/xyzzy-stratum.morph
-index 8f83beb..e0a895a 100644
+index e302037..71e7651 100644
 --- a/xyzzy-stratum.morph
 +++ b/xyzzy-stratum.morph
-@@ -5,7 +5,7 @@
-         {
-             "morph": "hello-stratum",
-             "repo": "test:morphs",
--            "ref": "master"
-+            "ref": "newbranch"
-         }
-     ],
-     "chunks": [
+@@ -1,11 +1,13 @@
+ build-depends:
+ - morph: hello-stratum
+-  ref: master
++  ref: newbranch
+   repo: test:morphs
+ chunks:
+ - build-depends: []
++  morph: hello
+   name: hello
+-  ref: master
++  ref: newbranch
+   repo: test:hello
++description: ''
+ kind: stratum
+ name: xyzzy-stratum
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout
index e53588b4..2a4f3fd1 100644
--- a/tests.branching/edit-updates-stratum.stdout
+++ b/tests.branching/edit-updates-stratum.stdout
@@ -1,26 +1,33 @@
 diff --git a/hello-stratum.morph b/hello-stratum.morph
-index 3b7be17..febfa60 100644
+index 53e76f3..8417659 100644
 --- a/hello-stratum.morph
 +++ b/hello-stratum.morph
-@@ -5,7 +5,7 @@
-         {
-             "name": "hello",
-             "repo": "test:hello",
--            "ref": "master",
-+            "ref": "newbranch",
-             "build-depends": []
-         }
-     ]
+@@ -1,7 +1,10 @@
++build-depends: []
+ chunks:
+ - build-depends: []
++  morph: hello
+   name: hello
+-  ref: master
++  ref: newbranch
+   repo: test:hello
++description: ''
+ kind: stratum
+ name: hello-stratum
 diff --git a/hello-system.morph b/hello-system.morph
-index 20e7b5b..a259572 100644
+index b0fed3b..b1417ce 100644
 --- a/hello-system.morph
 +++ b/hello-system.morph
-@@ -8,7 +8,7 @@
-         {
-             "morph": "hello-stratum",
-             "repo": "test:morphs",
--            "ref": "master"
-+            "ref": "newbranch"
-         }
-     ]
- }
+@@ -1,8 +1,11 @@
+ arch: x86_64
++configuration-extensions: []
++description: ''
++disk-size: 1G
+ kind: system
+ name: hello-system
+ strata:
+ - morph: hello-stratum
+-  ref: master
++  ref: newbranch
+   repo: test:morphs
+ system-kind: rootfs-tarball
diff --git a/tests.branching/petrify-no-double-petrify.stdout b/tests.branching/petrify-no-double-petrify.stdout
index 87561c14..d060579d 100644
--- a/tests.branching/petrify-no-double-petrify.stdout
+++ b/tests.branching/petrify-no-double-petrify.stdout
@@ -1,13 +1,8 @@
-{
-    "name": "hello-stratum",
-    "kind": "stratum",
-    "chunks": [
-        {
-            "name": "hello",
-            "repo": "test:hello",
-            "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7",
-            "build-depends": [],
-            "unpetrify-ref": "master"
-        }
-    ]
-}
+chunks:
+- build-depends: []
+  name: hello
+  ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
+  repo: test:hello
+  unpetrify-ref: master
+kind: stratum
+name: hello-stratum
diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout
index acc08f68..96c73f43 100644
--- a/tests.branching/petrify.stdout
+++ b/tests.branching/petrify.stdout
@@ -1,41 +1,35 @@
 Petrified:
-{
-    "name": "hello-stratum",
-    "kind": "stratum",
-    "chunks": [
-        {
-            "name": "hello",
-            "repo": "test:hello",
-            "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7",
-            "build-depends": [],
-            "unpetrify-ref": "master"
-        },
-        {
-            "name": "goodbye",
-            "repo": "test:goodbye",
-            "ref": "f4730636e429149bb923fa16be3aa9802d484b23",
-            "build-depends": [],
-            "unpetrify-ref": "test/petrify"
-        }
-    ]
-}
+build-depends: []
+chunks:
+- build-depends: []
+  morph: hello
+  name: hello
+  ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
+  repo: test:hello
+  unpetrify-ref: master
+- build-depends: []
+  morph: goodbye
+  name: goodbye
+  ref: d34c96a9f07c2efd1faabc3b44f77c25580a276e
+  repo: test:goodbye
+  unpetrify-ref: test/petrify
+description: ''
+kind: stratum
+name: hello-stratum
 
 Unpetrified:
-{
-    "name": "hello-stratum",
-    "kind": "stratum",
-    "chunks": [
-        {
-            "name": "hello",
-            "repo": "test:hello",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "goodbye",
-            "repo": "test:goodbye",
-            "ref": "test/petrify",
-            "build-depends": []
-        }
-    ]
-}
+build-depends: []
+chunks:
+- build-depends: []
+  morph: hello
+  name: hello
+  ref: master
+  repo: test:hello
+- build-depends: []
+  morph: goodbye
+  name: goodbye
+  ref: test/petrify
+  repo: test:goodbye
+description: ''
+kind: stratum
+name: hello-stratum
diff --git a/tests.branching/setup b/tests.branching/setup
index 11fdf0f1..89fb392b 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -48,35 +48,24 @@ mkdir "$DATADIR/morphs"
 ln -s "$DATADIR/morphs" "$DATADIR/morphs.git"
 
 cat <<EOF > "$DATADIR/morphs/hello-system.morph"
-{
-    "name": "hello-system",
-    "kind": "system",
-    "system-kind": "rootfs-tarball",
-    "arch": "$(uname -m)",
-    "disk-size": "1G",
-    "strata": [
-        {
-            "morph": "hello-stratum",
-            "repo": "test:morphs",
-            "ref": "master"
-        }
-    ]
-}
+arch: $(uname -m)
+kind: system
+name: hello-system
+strata:
+- morph: hello-stratum
+  ref: master
+  repo: test:morphs
+system-kind: rootfs-tarball
 EOF
 
 cat <<EOF > "$DATADIR/morphs/hello-stratum.morph"
-{
-    "name": "hello-stratum",
-    "kind": "stratum",
-    "chunks": [
-        {
-            "name": "hello",
-            "repo": "test:hello",
-            "ref": "master",
-            "build-depends": []
-        }
-    ]
-}
+chunks:
+- build-depends: []
+  name: hello
+  ref: master
+  repo: test:hello
+kind: stratum
+name: hello-stratum
 EOF
 
 scripts/run-git-in "$DATADIR/morphs" init
@@ -96,11 +85,9 @@ scripts/run-git-in "$DATADIR/morphs" checkout master
 mkdir "$DATADIR/hello"
 
 cat <<EOF > "$DATADIR/hello/hello.morph"
-{
-    "name": "hello",
-    "kind": "chunk",
-    "build-system": "dummy"
-}
+build-system: dummy
+kind: chunk
+name: hello
 EOF
 
 scripts/run-git-in "$DATADIR/hello" init
diff --git a/tests.branching/setup-second-chunk b/tests.branching/setup-second-chunk
index 0bbb0e27..985db1dc 100755
--- a/tests.branching/setup-second-chunk
+++ b/tests.branching/setup-second-chunk
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2012  Codethink Limited
+# Copyright (C) 2012-2013  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,11 +28,9 @@ create_chunk() {
     cd "$1"
 
     cat <<EOF > "$1/$2.morph"
-{
-    "name": "$2",
-    "kind": "chunk",
-    "build-system": "dummy"
-}
+build-system: dummy
+kind: chunk
+name: $2
 EOF
 
     git init --quiet
@@ -44,24 +42,17 @@ create_chunk "$DATADIR/goodbye" "hello"
 
 cd "$DATADIR/morphs"
 cat <<EOF > hello-stratum.morph
-{
-    "name": "hello-stratum",
-    "kind": "stratum",
-    "chunks": [
-        {
-            "name": "hello",
-            "repo": "test:hello",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "goodbye",
-            "repo": "test:goodbye",
-            "ref": "master",
-            "build-depends": []
-        }
-    ]
-}
+name: hello-stratum
+kind: stratum
+chunks:
+- build-depends: []
+  name: hello
+  ref: master
+  repo: test:hello
+- build-depends: []
+  name: goodbye
+  ref: master
+  repo: test:goodbye
 EOF
 
 git commit -q --all -m "Add goodbye to hello-stratum"
diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout
index 95a5c34d..cc4efccb 100644
--- a/tests.branching/tag-creates-commit-and-tag.stdout
+++ b/tests.branching/tag-creates-commit-and-tag.stdout
@@ -5,44 +5,41 @@ Date:   Tue Jul 31 16:51:54 2012 +0000
 
 Message
 
-commit e5c9758e3a30321ef2b49f09043e020d0c6f5da6
+commit 30b54ed7d893f5cafff0313e276b393e35ebfb36
 Author: developer <developer@example.com>
 Date:   Tue Jul 31 16:51:54 2012 +0000
 
     Message
 
 diff --git a/hello-stratum.morph b/hello-stratum.morph
-index 3b7be17..87561c1 100644
+index 53e76f3..d060579 100644
 --- a/hello-stratum.morph
 +++ b/hello-stratum.morph
-@@ -5,8 +5,9 @@
-         {
-             "name": "hello",
-             "repo": "test:hello",
--            "ref": "master",
--            "build-depends": []
-+            "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7",
-+            "build-depends": [],
-+            "unpetrify-ref": "master"
-         }
-     ]
- }
+@@ -1,7 +1,8 @@
+ chunks:
+ - build-depends: []
+   name: hello
+-  ref: master
++  ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
+   repo: test:hello
++  unpetrify-ref: master
+ kind: stratum
+ name: hello-stratum
 diff --git a/hello-system.morph b/hello-system.morph
-index 20e7b5b..388dbcf 100644
+index b0fed3b..4c4ee3e 100644
 --- a/hello-system.morph
 +++ b/hello-system.morph
-@@ -8,7 +8,8 @@
-         {
-             "morph": "hello-stratum",
-             "repo": "test:morphs",
--            "ref": "master"
-+            "ref": "example-tag",
-+            "unpetrify-ref": "master"
-         }
-     ]
- }
+@@ -3,6 +3,7 @@ kind: system
+ name: hello-system
+ strata:
+ - morph: hello-stratum
+-  ref: master
++  ref: example-tag
+   repo: test:morphs
++  unpetrify-ref: master
+ system-kind: rootfs-tarball
 test:morphs
-commit e5c9758e3a30321ef2b49f09043e020d0c6f5da6
+commit 30b54ed7d893f5cafff0313e276b393e35ebfb36
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
@@ -50,7 +47,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000
 
     Message
 
-commit 9d4b0981d6a2118cbd3d045cc1704b224d38296f
+commit 0d291d7caa82fb6535172189f579435471ad6dc6
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout
index 4848ee6e..8969cf30 100644
--- a/tests.branching/tag-tag-works-as-expected.stdout
+++ b/tests.branching/tag-tag-works-as-expected.stdout
@@ -8,44 +8,41 @@ Date:   Tue Jul 31 16:51:54 2012 +0000
 
 Second
 
-commit fec3744adf30c1014775dce1668b1b0a0e2b1dcf
+commit 6f4900b857108ae696ef90d09417cdf6040353e4
 Author: developer <developer@example.com>
 Date:   Tue Jul 31 16:51:54 2012 +0000
 
     Second
 
 diff --git a/hello-stratum.morph b/hello-stratum.morph
-index 3b7be17..87561c1 100644
+index 53e76f3..d060579 100644
 --- a/hello-stratum.morph
 +++ b/hello-stratum.morph
-@@ -5,8 +5,9 @@
-         {
-             "name": "hello",
-             "repo": "test:hello",
--            "ref": "master",
--            "build-depends": []
-+            "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7",
-+            "build-depends": [],
-+            "unpetrify-ref": "master"
-         }
-     ]
- }
+@@ -1,7 +1,8 @@
+ chunks:
+ - build-depends: []
+   name: hello
+-  ref: master
++  ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
+   repo: test:hello
++  unpetrify-ref: master
+ kind: stratum
+ name: hello-stratum
 diff --git a/hello-system.morph b/hello-system.morph
-index 20e7b5b..f1dc834 100644
+index b0fed3b..875d73a 100644
 --- a/hello-system.morph
 +++ b/hello-system.morph
-@@ -8,7 +8,8 @@
-         {
-             "morph": "hello-stratum",
-             "repo": "test:morphs",
--            "ref": "master"
-+            "ref": "tagged-tag",
-+            "unpetrify-ref": "master"
-         }
-     ]
- }
+@@ -3,6 +3,7 @@ kind: system
+ name: hello-system
+ strata:
+ - morph: hello-stratum
+-  ref: master
++  ref: tagged-tag
+   repo: test:morphs
++  unpetrify-ref: master
+ system-kind: rootfs-tarball
 test:morphs
-commit fec3744adf30c1014775dce1668b1b0a0e2b1dcf
+commit 6f4900b857108ae696ef90d09417cdf6040353e4
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
@@ -53,7 +50,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000
 
     Second
 
-commit 9d4b0981d6a2118cbd3d045cc1704b224d38296f
+commit 0d291d7caa82fb6535172189f579435471ad6dc6
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script
index 5259b4c1..87c72d8e 100755
--- a/tests.branching/tag-works-with-multiple-morphs-repos.script
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.script
@@ -33,40 +33,28 @@ mkdir "$DATADIR/repos/morphs1"
 
 # Create system morphology in first morphs repository.
 cat <<EOF > "$DATADIR/repos/morphs1/test-system.morph"
-{
-    "name": "test-system",
-    "kind": "system",
-    "system-kind": "rootfs-tarball",
-    "arch": "$(uname -m)",
-    "disk-size": "1G",
-    "strata": [
-        {
-            "morph": "stratum1",
-            "repo": "repos:morphs1",
-            "ref": "master"
-        },
-        {
-            "morph": "stratum2",
-            "repo": "repos:morphs2",
-            "ref": "master"
-        }
-    ]
-}
+name: test-system
+kind: system
+system-kind: rootfs-tarball
+arch: $(uname -m)
+disk-size: 1G
+strata:
+- morph: stratum1
+  ref: master
+  repo: repos:morphs1
+- morph: stratum2
+  ref: master
+  repo: repos:morphs2
 EOF
 
 # Create stratum that depends on another stratum.
 cat <<EOF > "$DATADIR/repos/morphs1/stratum1.morph"
-{
-    "name": "stratum1",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "stratum3",
-            "repo": "repos:morphs2",
-            "ref": "master"
-        }
-    ]
-}
+name: stratum1
+kind: stratum
+build-depends:
+- morph: stratum3
+  ref: master
+  repo: repos:morphs2
 EOF
 
 # Commit all files to the first repository.
@@ -79,23 +67,16 @@ mkdir "$DATADIR/repos/morphs2"
 
 # Create two strata in the second repository.
 cat <<EOF > "$DATADIR/repos/morphs2/stratum2.morph"
-{
-    "name": "stratum2",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "stratum3",
-            "repo": "repos:morphs2",
-            "ref": "master"
-        }
-    ]
-}
+name: stratum2
+kind: stratum
+build-depends:
+- morph: stratum3
+  repo: repos:morphs2
+  ref: master
 EOF
 cat <<EOF > "$DATADIR/repos/morphs2/stratum3.morph"
-{
-    "name": "stratum3",
-    "kind": "stratum"
-}
+kind: stratum
+name: stratum3
 EOF
 
 # Commit all files to the second repository.
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
index 192aca56..38328c6d 100644
--- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
@@ -4,82 +4,68 @@ Date:   Tue Jul 31 16:51:54 2012 +0000
 
 create tag
 
-commit f629bea191ba12b1d85e5b41e1adc6d1c73715c9
+commit ede2d4bc8b9a806720d195cb5611c576a055adfd
 Author: developer <developer@example.com>
 Date:   Tue Jul 31 16:51:54 2012 +0000
 
     create tag
 
 diff --git a/stratum1.morph b/stratum1.morph
-index 93a2d04..bf622db 100644
+index c1ef125..3c18ae5 100644
 --- a/stratum1.morph
 +++ b/stratum1.morph
-@@ -4,8 +4,10 @@
-     "build-depends": [
-         {
-             "morph": "stratum3",
--            "repo": "repos:morphs2",
--            "ref": "master"
-+            "repo": "repos:morphs1",
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master",
-+            "unpetrify-repo": "repos:morphs2"
-         }
-     ]
- }
+@@ -2,5 +2,7 @@ name: stratum1
+ kind: stratum
+ build-depends:
+ - morph: stratum3
+-  ref: master
+-  repo: repos:morphs2
++  ref: tag-across-multiple-repos
++  repo: repos:morphs1
++  unpetrify-ref: master
++  unpetrify-repo: repos:morphs2
 diff --git a/stratum2.morph b/stratum2.morph
 new file mode 100644
-index 0000000..d27599c
+index 0000000..2546465
 --- /dev/null
 +++ b/stratum2.morph
-@@ -0,0 +1,13 @@
-+{
-+    "name": "stratum2",
-+    "kind": "stratum",
-+    "build-depends": [
-+        {
-+            "morph": "stratum3",
-+            "repo": "repos:morphs1",
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master",
-+            "unpetrify-repo": "repos:morphs2"
-+        }
-+    ]
-+}
+@@ -0,0 +1,8 @@
++name: stratum2
++kind: stratum
++build-depends:
++- morph: stratum3
++  repo: repos:morphs1
++  ref: tag-across-multiple-repos
++  unpetrify-ref: master
++  unpetrify-repo: repos:morphs2
 diff --git a/stratum3.morph b/stratum3.morph
 new file mode 100644
-index 0000000..a735127
+index 0000000..d510d1b
 --- /dev/null
 +++ b/stratum3.morph
-@@ -0,0 +1,4 @@
-+{
-+    "name": "stratum3",
-+    "kind": "stratum"
-+}
+@@ -0,0 +1,2 @@
++kind: stratum
++name: stratum3
 diff --git a/test-system.morph b/test-system.morph
-index 340fbb9..aec2397 100644
+index cdd8d64..b86854a 100644
 --- a/test-system.morph
 +++ b/test-system.morph
-@@ -8,12 +8,15 @@
-         {
-             "morph": "stratum1",
-             "repo": "repos:morphs1",
--            "ref": "master"
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master"
-         },
-         {
-             "morph": "stratum2",
--            "repo": "repos:morphs2",
--            "ref": "master"
-+            "repo": "repos:morphs1",
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master",
-+            "unpetrify-repo": "repos:morphs2"
-         }
-     ]
- }
-commit f629bea191ba12b1d85e5b41e1adc6d1c73715c9
+@@ -5,8 +5,11 @@ arch: x86_64
+ disk-size: 1G
+ strata:
+ - morph: stratum1
+-  ref: master
++  ref: tag-across-multiple-repos
+   repo: repos:morphs1
++  unpetrify-ref: master
+ - morph: stratum2
+-  ref: master
+-  repo: repos:morphs2
++  ref: tag-across-multiple-repos
++  repo: repos:morphs1
++  unpetrify-ref: master
++  unpetrify-repo: repos:morphs2
+commit ede2d4bc8b9a806720d195cb5611c576a055adfd
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
@@ -88,77 +74,63 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000
     create tag
 ---
  stratum1.morph    |    6 ++++--
- stratum2.morph    |   13 +++++++++++++
- stratum3.morph    |    4 ++++
+ stratum2.morph    |    8 ++++++++
+ stratum3.morph    |    2 ++
  test-system.morph |    9 ++++++---
- 4 files changed, 27 insertions(+), 5 deletions(-)
+ 4 files changed, 20 insertions(+), 5 deletions(-)
 
 diff --git a/stratum1.morph b/stratum1.morph
-index 93a2d04..bf622db 100644
+index c1ef125..3c18ae5 100644
 --- a/stratum1.morph
 +++ b/stratum1.morph
-@@ -4,8 +4,10 @@
-     "build-depends": [
-         {
-             "morph": "stratum3",
--            "repo": "repos:morphs2",
--            "ref": "master"
-+            "repo": "repos:morphs1",
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master",
-+            "unpetrify-repo": "repos:morphs2"
-         }
-     ]
- }
+@@ -2,5 +2,7 @@ name: stratum1
+ kind: stratum
+ build-depends:
+ - morph: stratum3
+-  ref: master
+-  repo: repos:morphs2
++  ref: tag-across-multiple-repos
++  repo: repos:morphs1
++  unpetrify-ref: master
++  unpetrify-repo: repos:morphs2
 diff --git a/stratum2.morph b/stratum2.morph
 new file mode 100644
-index 0000000..d27599c
+index 0000000..2546465
 --- /dev/null
 +++ b/stratum2.morph
-@@ -0,0 +1,13 @@
-+{
-+    "name": "stratum2",
-+    "kind": "stratum",
-+    "build-depends": [
-+        {
-+            "morph": "stratum3",
-+            "repo": "repos:morphs1",
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master",
-+            "unpetrify-repo": "repos:morphs2"
-+        }
-+    ]
-+}
+@@ -0,0 +1,8 @@
++name: stratum2
++kind: stratum
++build-depends:
++- morph: stratum3
++  repo: repos:morphs1
++  ref: tag-across-multiple-repos
++  unpetrify-ref: master
++  unpetrify-repo: repos:morphs2
 diff --git a/stratum3.morph b/stratum3.morph
 new file mode 100644
-index 0000000..a735127
+index 0000000..d510d1b
 --- /dev/null
 +++ b/stratum3.morph
-@@ -0,0 +1,4 @@
-+{
-+    "name": "stratum3",
-+    "kind": "stratum"
-+}
+@@ -0,0 +1,2 @@
++kind: stratum
++name: stratum3
 diff --git a/test-system.morph b/test-system.morph
-index 340fbb9..aec2397 100644
+index cdd8d64..b86854a 100644
 --- a/test-system.morph
 +++ b/test-system.morph
-@@ -8,12 +8,15 @@
-         {
-             "morph": "stratum1",
-             "repo": "repos:morphs1",
--            "ref": "master"
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master"
-         },
-         {
-             "morph": "stratum2",
--            "repo": "repos:morphs2",
--            "ref": "master"
-+            "repo": "repos:morphs1",
-+            "ref": "tag-across-multiple-repos",
-+            "unpetrify-ref": "master",
-+            "unpetrify-repo": "repos:morphs2"
-         }
-     ]
- }
+@@ -5,8 +5,11 @@ arch: x86_64
+ disk-size: 1G
+ strata:
+ - morph: stratum1
+-  ref: master
++  ref: tag-across-multiple-repos
+   repo: repos:morphs1
++  unpetrify-ref: master
+ - morph: stratum2
+-  ref: master
+-  repo: repos:morphs2
++  ref: tag-across-multiple-repos
++  repo: repos:morphs1
++  unpetrify-ref: master
++  unpetrify-repo: repos:morphs2