morph edit: Update build-depends that refer to the edited stratum

The code took some refactoring. The core functionality is now all inside
one function with make_available() separate, as this is used other places.
The code is still far from perfect, but will hopefully be rewritten to
use the new abstractions of system branches etc. soon

2 files changed, 125 insertions, 0 deletions

diff --git a/tests.branching/edit-updates-stratum-build-depends.script b/tests.branching/edit-updates-stratum-build-depends.script
new file mode 100755
index 00000000..525822c9
--- /dev/null
+++ b/tests.branching/edit-updates-stratum-build-depends.script
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Copyright (C) 2012  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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+## Verify that "morph edit" clones a chunk repository into a system branch.
+
+set -eu
+
+# Disable test on versions of Python before 2.7.
+. "$SRCDIR/scripts/python-check"
+
+# Add a second stratum that build-depends on the first. We can ignore the fact
+# that both strata contain the same chunk for this test.
+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": []
+        }
+    ]
+}
+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"
+         }
+    ]
+}
+EOF
+
+git add xyzzy-stratum.morph hello-system.morph
+git commit -q -m "Add 2nd stratum with a build dependency"
+
+# Create system branch.
+cd "$DATADIR/workspace"
+"$SRCDIR/scripts/test-morph" init
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
+
+# Edit chunk.
+"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
+
+# See what effect the editing had.
+"$SRCDIR/scripts/run-git-in" "newbranch/test:morphs" diff
diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout
new file mode 100644
index 00000000..00010f17
--- /dev/null
+++ b/tests.branching/edit-updates-stratum-build-depends.stdout
@@ -0,0 +1,48 @@
+diff --git a/hello-stratum.morph b/hello-stratum.morph
+index 3b7be17..febfa60 100644
+--- a/hello-stratum.morph
++++ b/hello-stratum.morph
+@@ -5,7 +5,7 @@
+         {
+             "name": "hello",
+             "repo": "test:hello",
+-            "ref": "master",
++            "ref": "newbranch",
+             "build-depends": []
+         }
+     ]
+diff --git a/hello-system.morph b/hello-system.morph
+index 87a47f0..75b0f90 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"
++        }
+     ]
+ }
+diff --git a/xyzzy-stratum.morph b/xyzzy-stratum.morph
+index 8f83beb..e0a895a 100644
+--- a/xyzzy-stratum.morph
++++ b/xyzzy-stratum.morph
+@@ -5,7 +5,7 @@
+         {
+             "morph": "hello-stratum",
+             "repo": "test:morphs",
+-            "ref": "master"
++            "ref": "newbranch"
+         }
+     ],
+     "chunks": [