diff options
| -rwxr-xr-x | tests.as-root/build-handles-stratum-build-depends.script | 2 | ||||
| -rwxr-xr-x | tests.as-root/build-with-external-strata.script | 2 | ||||
| -rwxr-xr-x | tests.branching/add-then-edit.script | 4 | ||||
| -rwxr-xr-x | tests.branching/edit-checkouts-existing-chunk.script | 4 | ||||
| -rwxr-xr-x | tests.branching/edit-clones-chunk.script | 4 | ||||
| -rwxr-xr-x | tests.branching/edit-handles-submodules.script | 4 | ||||
| -rwxr-xr-x | tests.branching/edit-updates-stratum-build-depends.script | 2 | ||||
| -rwxr-xr-x | tests.branching/edit-updates-stratum.script | 2 | ||||
| -rwxr-xr-x | tests.branching/edit-works-after-branch-root-was-renamed.script | 2 | ||||
| -rwxr-xr-x | tests.branching/petrify.script | 2 | ||||
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 4 | ||||
| -rwxr-xr-x | tests.merging/rename-stratum.script | 2 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 4 |
13 files changed, 19 insertions, 19 deletions
diff --git a/tests.as-root/build-handles-stratum-build-depends.script b/tests.as-root/build-handles-stratum-build-depends.script index 22d07c72..fd6a0544 100755 --- a/tests.as-root/build-handles-stratum-build-depends.script +++ b/tests.as-root/build-handles-stratum-build-depends.script @@ -39,7 +39,7 @@ cd test/stratum-build-depends/test:morphs # be updated here. Any build-depends of any altered strata also need to # be altered, such as the 'tools-stratum' which depends on linux-stratum # If they are not updated, the build command will fail. -"$SRCDIR/scripts/test-morph" edit linux-system hello-stratum +"$SRCDIR/scripts/test-morph" new-edit linux-system hello-stratum # Likewise, this command must update build-depends or the 'repo' field will # not be changed in the temporary build branch, leading to: diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script index f5d86dfe..d722f907 100755 --- a/tests.as-root/build-with-external-strata.script +++ b/tests.as-root/build-with-external-strata.script @@ -34,7 +34,7 @@ cd "$DATADIR/workspace" # don't commit it, in one of the external strata, as a challenge for # 'morph build'. cd "branch1" -"$SRCDIR/scripts/test-morph" edit hello-system stratum2 +"$SRCDIR/scripts/test-morph" new-edit hello-system stratum2 cd "test:external-strata" awk ' diff --git a/tests.branching/add-then-edit.script b/tests.branching/add-then-edit.script index d6a2270f..cdb28fd2 100755 --- a/tests.branching/add-then-edit.script +++ b/tests.branching/add-then-edit.script @@ -30,7 +30,7 @@ cd "me/add-then-edit" cd test:morphs ## Sub-optimally, to alter the stratum, you have to `morph edit` it first -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum git apply <<'EOF' diff --git a/hello-stratum.morph b/hello-stratum.morph @@ -50,7 +50,7 @@ index 3b7be17..c79a9af 100644 name: hello-stratum EOF -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum goodbye # check whether the stratum still contains the goodbye chunk grep -qFe goodbye hello-stratum.morph diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index a10a72d1..9584d1a3 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -1,6 +1,6 @@ #!/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 @@ -27,7 +27,7 @@ cd "$DATADIR/workspace" # Edit the hello chunk in alfred. cd "alfred" -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello echo "Current branches:" "$SRCDIR/scripts/test-morph" foreach git branch diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index 1b6b8a04..ecc2c55e 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -1,6 +1,6 @@ #!/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 @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Edit chunk. -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello echo "Current branches:" "$SRCDIR/scripts/test-morph" foreach git branch diff --git a/tests.branching/edit-handles-submodules.script b/tests.branching/edit-handles-submodules.script index d164facc..389784ed 100755 --- a/tests.branching/edit-handles-submodules.script +++ b/tests.branching/edit-handles-submodules.script @@ -1,6 +1,6 @@ #!/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 @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Submodules should be set up automatically -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello cd "$DATADIR/workspace/newbranch/test:hello" [ -e foolib/README ] diff --git a/tests.branching/edit-updates-stratum-build-depends.script b/tests.branching/edit-updates-stratum-build-depends.script index a108ce8a..ed11b584 100755 --- a/tests.branching/edit-updates-stratum-build-depends.script +++ b/tests.branching/edit-updates-stratum-build-depends.script @@ -63,7 +63,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Edit chunk. -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-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.script b/tests.branching/edit-updates-stratum.script index bfe16c8b..84974765 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Edit chunk. -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-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-works-after-branch-root-was-renamed.script b/tests.branching/edit-works-after-branch-root-was-renamed.script index c7043e27..9591b587 100755 --- a/tests.branching/edit-works-after-branch-root-was-renamed.script +++ b/tests.branching/edit-works-after-branch-root-was-renamed.script @@ -35,7 +35,7 @@ cd "$DATADIR/workspace" cd "$DATADIR/workspace/master" mv test:morphs my-renamed-morphs -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index fed8e965..9a276d71 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -29,7 +29,7 @@ cd "$DATADIR/workspace" cd test/petrify/test:morphs git push --quiet origin HEAD -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum goodbye (cd ../test:goodbye && git push --quiet origin HEAD) "$SRCDIR/scripts/test-morph" petrify diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index 3a00015b..40f3cc4a 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello # Chunk moves to a new location (we manually update the ref back to master # here, so 'morph edit' can create a system branch in the new repo from it). @@ -38,7 +38,7 @@ sed -e 's/"repo": "test:hello"/"repo": "test:hello-lorried"/' \ git commit -q --all -m "'hello' repository has moved" # Now we further edit the chunk, just for fun. -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello cd "$DATADIR/workspace/baserock/newbranch/test:hello-lorried" touch newfile.txt git add newfile.txt diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index ba759fa3..5fa13130 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-stratum.script @@ -31,7 +31,7 @@ cd "$DATADIR/workspace" # associate hello-stratum and goodbye-stratum at all. # Rename the stratum -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum +"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum cd baserock/newbranch/test:morphs sed -e 's/"morph": "hello-stratum"/"morph": "goodbye-stratum"/'\ diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index cfb744f7..cc3ef3e5 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -226,11 +226,11 @@ Editing morphologies with `morph edit`. IMPLEMENTS WHEN editing stratum (\S+) in system (\S+) in branch (\S+) cd "$DATADIR/workspace/$MATCH_3/test:morphs" - run_morph edit "$MATCH_2" "$MATCH_1" + run_morph new-edit "$MATCH_2" "$MATCH_1" IMPLEMENTS WHEN editing chunk (\S+) in (\S+) in (\S+) in branch (\S+) cd "$DATADIR/workspace/$MATCH_4/test:morphs" - run_morph edit "$MATCH_3" "$MATCH_2" "$MATCH_1" + run_morph new-edit "$MATCH_3" "$MATCH_2" "$MATCH_1" IMPLEMENTS THEN edited chunk (\S+) has git branch (\S+) ls -l "$DATADIR/workspace/$MATCH_2" |