diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-18 17:12:10 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-07 12:30:16 +0000 |
| commit | 956f5204ec7f69db8a276a4e10313fd282a235a6 (patch) | |
| tree | 226f1b0a39e73f9b2e31a68a2b76c361593cb721 /yarns | |
| parent | d2a58462e6b2ffab0d636b1575c46a58099a82b7 (diff) | |
| download | morph-956f5204ec7f69db8a276a4e10313fd282a235a6.tar.gz | |
Exorcise some old and unused commands
`morph merge` only worked for a small subset of cases, and has been left
to bit-rot, since we don't use it.
`morph tag` is just a `git tag` when we have petrified definitions
repository. We don't use it, nor do we need it, so it can go away rather
than take up valuable development time fixing it when requirements
change.
`old-foo` have all been superceded by newer versions and are no-longer
used.
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/branches-workspaces.yarn | 21 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 32 |
2 files changed, 0 insertions, 53 deletions
diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn index b6881fa6..4c5d0efe 100644 --- a/yarns/branches-workspaces.yarn +++ b/yarns/branches-workspaces.yarn @@ -272,27 +272,6 @@ ref fields when referring to strata, when it didn't before. AND in branch foo, system test-system refers to test-stratum without repo AND in branch foo, system test-system refers to test-stratum without ref -Tagging system branches ------------------------ - -`morph tag` creates a git tag in the system branch's root repository, -and a petrified commit the tag refers to. It does not petrify the -system branch itself, only the tag. - - SCENARIO morph tags a system branch - GIVEN a workspace - AND a git server - WHEN the user creates a system branch called foo - AND the user tags the system branch called foo as test123 - THEN morph tag test123 in foo is an annotated git tag - AND morph tag test123 in foo refers to a petrified commit - AND foo is not petrified - -Creating a tag twice should fail. - - WHEN the user attempts to tag the system branch called foo as test123 - THEN morph failed - Generating a manifest works SCENARIO morph generates a manifest diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index b5b6a253..b3e3ae79 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -553,38 +553,6 @@ Petrification and unpetrification: cd "$DATADIR/workspace/$MATCH_1/test/morphs" assert_morphologies_are_petrified "$MATCH_1" *.morph - IMPLEMENTS THEN (\S+) is not petrified - cd "$DATADIR/workspace/$MATCH_1/test/morphs" - ! assert_morphologies_are_petrified "$MATCH_1" *.morph - -Tagging. - - IMPLEMENTS WHEN the user tags the system branch called (\S+) as (\S+) - cd "$DATADIR/workspace/$MATCH_1/test/morphs" - set tag "$MATCH_2" -- -m "testing morph tagging" - run_morph tag "$MATCH_2" -- -m "testing morph tagging" - - IMPLEMENTS WHEN the user attempts to tag the system branch called (\S+) as (\S+) - cd "$DATADIR/workspace/$MATCH_1/test/morphs" - attempt_morph tag "$MATCH_2" -- -m "testing morph tagging" - - IMPLEMENTS THEN morph tag (\S+) in (\S+) is an annotated git tag - cd "$DATADIR/workspace/$MATCH_2/test/morphs" - if git show "$MATCH_1" | head -n1 | grep -v '^tag ' - then - die "git tag $MATCH_1 is not an annotated tag" - fi - - IMPLEMENTS THEN morph tag (\S+) in (\S+) refers to a petrified commit - cd "$DATADIR/workspace/$MATCH_2/test/morphs" - git ls-tree "$MATCH_1" | - awk '$NF ~ /\.morph$/ { print $NF }' | - while read x - do - git cat-file blob "$MATCH_1:$x" > temptemptemp - assert_morphologies_are_petrified "$MATCH_1" temptemptemp - done - Generating a manifest. IMPLEMENTS GIVEN a system artifact |