--- testing/library.yarn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testing/library.yarn b/testing/library.yarn index 2ce4436..4d61251 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -75,8 +75,11 @@ Repository access $GTT clone $MATCH_1 $MATCH_2 "$MATCH_3" "$MATCH_4" ${MATCH_5:+ --no-local --depth="$MATCH_6"} \ - IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? pushes ([^ ]+) to ([^ ]+) - $GTT push $MATCH_1 $MATCH_2 "$MATCH_3" "$MATCH_4" + IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? (expecting failure,? )?pushes ([^ ]+) to ([^ ]+) + if $GTT push $MATCH_1 $MATCH_2 "$MATCH_4" "$MATCH_5" \ + >$DATADIR/stdout 2>$DATADIR/stderr; then + test "$MATCH_3" = "" + fi IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? (expecting failure,? )?destroys ([^ ]+) using the (.+) token if $GTT runcommand $MATCH_1 $MATCH_2 \ -- 2.1.4

--- testing/library.yarn | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testing/library.yarn b/testing/library.yarn index 4d61251..7db33de 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -161,11 +161,20 @@ Admin repo manipulation $GTT runcommand $MATCH_1 $MATCH_2 user del $MATCH_3 $TOKEN IMPLEMENTS GIVEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? has patched gitano-admin with ([^ ]+) - $GTT clone $MATCH_1 $MATCH_2 gitano-admin.git tmp-adminpatch - $GTT rungit $MATCH_1 tmp-adminpatch apply --cached - <"testing/admin-patches/$MATCH_3" - $GTT rungit $MATCH_1 tmp-adminpatch commit --allow-empty -m "Apply $MATCH_3 rules change" - $GTT push $MATCH_1 $MATCH_2 tmp-adminpatch gitano-admin.git - rm -r "$($GTT clonelocation $MATCH_1 tmp-adminpatch)" + $GTT clone $MATCH_1 $MATCH_2 gitano-admin.git tmp-adminpatch \ + >$DATADIR/stdout 2>$DATADIR/stderr + $GTT rungit $MATCH_1 tmp-adminpatch apply -v --cached - <"testing/admin-patches/$MATCH_3" \ + >>$DATADIR/stdout 2>>$DATADIR/stderr + $GTT rungit $MATCH_1 tmp-adminpatch diff --cached \ + >>$DATADIR/stdout 2>>$DATADIR/stderr + $GTT rungit $MATCH_1 tmp-adminpatch commit --allow-empty -m "Apply $MATCH_3 rules change" \ + >>$DATADIR/stdout 2>>$DATADIR/stderr + $GTT rungit $MATCH_1 tmp-adminpatch show HEAD \ + >>$DATADIR/stdout 2>>$DATADIR/stderr + $GTT push $MATCH_1 $MATCH_2 tmp-adminpatch gitano-admin.git \ + >>$DATADIR/stdout 2>>$DATADIR/stderr + rm -r "$($GTT clonelocation $MATCH_1 tmp-adminpatch)" \ + >>$DATADIR/stdout 2>>$DATADIR/stderr IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? pushes an empty commit in ([^ ]+) $GTT rungit $MATCH_1 $MATCH_3 commit --allow-empty -m "Make an empty commit" -- 2.1.4

--- testing/library.yarn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testing/library.yarn b/testing/library.yarn index 7db33de..b277777 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -180,6 +180,13 @@ Admin repo manipulation $GTT rungit $MATCH_1 $MATCH_3 commit --allow-empty -m "Make an empty commit" $GTT push $MATCH_1 $MATCH_2 $MATCH_3 gitano-admin.git > $DATADIR/stdout 2>$DATADIR/stderr + IMPLEMENTS WHEN ([a-z][a-z0-9]*) applies ([^ ]+) in ([^ ]+) + $GTT rungit $MATCH_1 $MATCH_3 apply --cached - <"testing/content-patches/$MATCH_2" \ + >$DATADIR/stdout 2>$DATADIR/stderr + $GTT rungit $MATCH_1 $MATCH_3 commit --allow-empty -m "Apply $MATCH_2 content change" \ + >>$DATADIR/stdout 2>>$DATADIR/stderr + + Specific commands ----------------- -- 2.1.4

--- Makefile | 2 +- testing/03-treedelta-rules.yarn | 34 +++++++++++++++++++++++++++++++ testing/admin-patches/no-create-FOO.patch | 13 ++++++++++++ testing/content-patches/add-a-FOO.patch | 7 +++++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 testing/03-treedelta-rules.yarn create mode 100644 testing/admin-patches/no-create-FOO.patch create mode 100644 testing/content-patches/add-a-FOO.patch diff --git a/Makefile b/Makefile index 10798b0..08ad6a5 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ TESTS := 01-basics 02-commands-as 02-commands-config 02-commands-copy \ 02-commands-keyring \ 02-commands-ls 02-commands-rename 02-commands-rsync \ 02-commands-sshkey 02-commands-user 02-commands-whoami 03-cgit-support \ - 03-shallow-push + 03-shallow-push 03-treedelta-rules MODS := gitano \ diff --git a/testing/03-treedelta-rules.yarn b/testing/03-treedelta-rules.yarn new file mode 100644 index 0000000..e7c0def --- /dev/null +++ b/testing/03-treedelta-rules.yarn @@ -0,0 +1,34 @@ +<!-- -*- markdown -*- --> + +Using the tree deltas in rules +============================== + +Gitano is able to use the tree deltas produced by changes in ref tips when +evaluating whether or not an update is permitted. Since the tree deltas can be +expensive to generate, we only trigger generation of them on demand. As such +they are an area of the code where errors could easily trickle in unless we +keep a close eye on things. + +Start and Target trees +---------------------- + +The first part of the treedelta support are the gitano/starttree and +gitano/targetttee lists. These contain the flattened entry names for +everything in the trees. + + SCENARIO may not create files called FOO + GIVEN a standard instance + AND testinstance using adminkey has patched gitano-admin with no-create-FOO.patch + GIVEN a unix user called alice + AND alice has keys called main + + WHEN testinstance, using adminkey, adds user alice, using alice main + AND testinstance adminkey runs create testrepo alice + AND alice, using main, clones testrepo as testrepo + THEN alice testrepo has no file called FOO + + WHEN alice applies add-a-FOO.patch in testrepo + AND alice, using main, expecting failure, pushes testrepo to testrepo.git + THEN stderr contains No FOOs allowed + + FINALLY the instance is torn down diff --git a/testing/admin-patches/no-create-FOO.patch b/testing/admin-patches/no-create-FOO.patch new file mode 100644 index 0000000..b5d79a4 --- /dev/null +++ b/testing/admin-patches/no-create-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "No FOOs allowed" op_is_normal [target_tree is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner diff --git a/testing/content-patches/add-a-FOO.patch b/testing/content-patches/add-a-FOO.patch new file mode 100644 index 0000000..bb7d8a8 --- /dev/null +++ b/testing/content-patches/add-a-FOO.patch @@ -0,0 +1,7 @@ +diff --git a/FOO b/FOO +new file mode 100644 +index 0000000..ee5a5f2 +--- /dev/null ++++ b/FOO +@@ -0,0 +1 @@ ++This is a FOO -- 2.1.4

--- testing/library.yarn | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testing/library.yarn b/testing/library.yarn index b277777..0ee658d 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -160,14 +160,19 @@ Admin repo manipulation TOKEN=$($GTT runcommand $MATCH_1 $MATCH_2 user del $MATCH_3 2>&1 | $GTT findtoken) $GTT runcommand $MATCH_1 $MATCH_2 user del $MATCH_3 $TOKEN - IMPLEMENTS GIVEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? has patched gitano-admin with ([^ ]+) + IMPLEMENTS GIVEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? has patched gitano-admin with (the reverse of )?([^ ]+) $GTT clone $MATCH_1 $MATCH_2 gitano-admin.git tmp-adminpatch \ - $GTT rungit $MATCH_1 tmp-adminpatch apply -v --cached - <"testing/admin-patches/$MATCH_3" \ - >>$DATADIR/stdout 2>>$DATADIR/stderr + if test "$MATCH_3" = ""; then + $GTT rungit $MATCH_1 tmp-adminpatch apply -v --cached - <"testing/admin-patches/$MATCH_4" \ + + else + $GTT rungit $MATCH_1 tmp-adminpatch apply -v --cached --reverse - <"testing/admin-patches/$MATCH_4" \ + + fi $GTT rungit $MATCH_1 tmp-adminpatch diff --cached \ - $GTT rungit $MATCH_1 tmp-adminpatch commit --allow-empty -m "Apply $MATCH_3 rules change" \ + $GTT rungit $MATCH_1 tmp-adminpatch commit --allow-empty -m "Apply $MATCH_4 rules change" \ $GTT rungit $MATCH_1 tmp-adminpatch show HEAD \ -- 2.1.4

--- testing/library.yarn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testing/library.yarn b/testing/library.yarn index 0ee658d..e6abaf5 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -181,9 +181,11 @@ Admin repo manipulation rm -r "$($GTT clonelocation $MATCH_1 tmp-adminpatch)" \ - IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? pushes an empty commit in ([^ ]+) - $GTT rungit $MATCH_1 $MATCH_3 commit --allow-empty -m "Make an empty commit" - $GTT push $MATCH_1 $MATCH_2 $MATCH_3 gitano-admin.git > $DATADIR/stdout 2>$DATADIR/stderr + IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? (expecting failure,? )?pushes an empty commit in ([^ ]+) + $GTT rungit $MATCH_1 $MATCH_4 commit --allow-empty -m "Make an empty commit" + if $GTT push $MATCH_1 $MATCH_2 $MATCH_4 $MATCH_4.git > $DATADIR/stdout 2>$DATADIR/stderr; then + test "$MATCH_3" = "" + fi IMPLEMENTS WHEN ([a-z][a-z0-9]*) applies ([^ ]+) in ([^ ]+) $GTT rungit $MATCH_1 $MATCH_3 apply --cached - <"testing/content-patches/$MATCH_2" \ -- 2.1.4

--- testing/03-treedelta-rules.yarn | 32 +++++++++++++++++++++++++ testing/admin-patches/must-start-with-FOO.patch | 13 ++++++++++ 2 files changed, 45 insertions(+) create mode 100644 testing/admin-patches/must-start-with-FOO.patch diff --git a/testing/03-treedelta-rules.yarn b/testing/03-treedelta-rules.yarn index e7c0def..a7ddfe3 100644 --- a/testing/03-treedelta-rules.yarn +++ b/testing/03-treedelta-rules.yarn @@ -16,6 +16,8 @@ The first part of the treedelta support are the gitano/starttree and gitano/targetttee lists. These contain the flattened entry names for everything in the trees. +First, let's look at what it takes to prevent the creation of files with FOO in. + SCENARIO may not create files called FOO GIVEN a standard instance AND testinstance using adminkey has patched gitano-admin with no-create-FOO.patch @@ -32,3 +34,33 @@ everything in the trees. THEN stderr contains No FOOs allowed FINALLY the instance is torn down + +Next, let's look at how we might require a FOO to be present... + + SCENARIO source must have a FOO + GIVEN a standard instance + AND a unix user called alice + AND alice has keys called main + + WHEN testinstance, using adminkey, adds user alice, using alice main + AND testinstance adminkey runs create testrepo alice + AND alice, using main, clones testrepo as testrepo + THEN alice testrepo has no file called FOO + + GIVEN testinstance using adminkey has patched gitano-admin with must-start-with-FOO.patch + + WHEN alice, using main, expecting failure, pushes an empty commit in testrepo + THEN stderr contains Needs a FOO + + GIVEN testinstance using adminkey has patched gitano-admin with the reverse of must-start-with-FOO.patch + + WHEN alice applies add-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains new branch + + GIVEN testinstance using adminkey has patched gitano-admin with must-start-with-FOO.patch + + WHEN alice, using main, pushes an empty commit in testrepo + THEN the output contains master -> master + + FINALLY the instance is torn down diff --git a/testing/admin-patches/must-start-with-FOO.patch b/testing/admin-patches/must-start-with-FOO.patch new file mode 100644 index 0000000..d206700 --- /dev/null +++ b/testing/admin-patches/must-start-with-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "Needs a FOO" op_is_normal ![start_tree is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner -- 2.1.4

--- testing/library.yarn | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testing/library.yarn b/testing/library.yarn index e6abaf5..b829ce6 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -187,10 +187,15 @@ Admin repo manipulation test "$MATCH_3" = "" fi - IMPLEMENTS WHEN ([a-z][a-z0-9]*) applies ([^ ]+) in ([^ ]+) - $GTT rungit $MATCH_1 $MATCH_3 apply --cached - <"testing/content-patches/$MATCH_2" \ - >$DATADIR/stdout 2>$DATADIR/stderr - $GTT rungit $MATCH_1 $MATCH_3 commit --allow-empty -m "Apply $MATCH_2 content change" \ + IMPLEMENTS WHEN ([a-z][a-z0-9]*) (applies|reverts) ([^ ]+) in ([^ ]+) + if test "$MATCH_2" = "applies"; then + $GTT rungit $MATCH_1 $MATCH_4 apply --cached - <"testing/content-patches/$MATCH_3" \ + >$DATADIR/stdout 2>$DATADIR/stderr + else + $GTT rungit $MATCH_1 $MATCH_4 apply --cached --reverse - <"testing/content-patches/$MATCH_3" \ + >$DATADIR/stdout 2>$DATADIR/stderr + fi + $GTT rungit $MATCH_1 $MATCH_4 commit --allow-empty -m "Apply $MATCH_3 content change" \ -- 2.1.4

--- testing/03-treedelta-rules.yarn | 78 +++++++++++++++++++++++++++++ testing/admin-patches/must-affect-FOO.patch | 13 +++++ testing/content-patches/change-a-FOO.patch | 6 +++ testing/content-patches/rename-a-FOO.patch | 10 ++++ 4 files changed, 107 insertions(+) create mode 100644 testing/admin-patches/must-affect-FOO.patch create mode 100644 testing/content-patches/change-a-FOO.patch create mode 100644 testing/content-patches/rename-a-FOO.patch diff --git a/testing/03-treedelta-rules.yarn b/testing/03-treedelta-rules.yarn index a7ddfe3..d004875 100644 --- a/testing/03-treedelta-rules.yarn +++ b/testing/03-treedelta-rules.yarn @@ -64,3 +64,81 @@ Next, let's look at how we might require a FOO to be present... THEN the output contains master -> master FINALLY the instance is torn down + +Tree deltas +----------- + +When there are trees in play, the `treediff/targets`, `treediff/added`, +`treediff/deleted`, `treediff/modified`, `treediff/renamed`, and +`treediff/renamedto` values end up set. + +The _targets_ are any name which shows up in any of _added_, _deleted_, +_modified_, _renamed_, or _renamedto_. The others are, respectively, the +names of new tree entries, removed tree entries, entries whose content has +changed, and then rename detection logic. + +> Sadly currently Gitano can't tell which rename from/to is matched with which. + +First up, let's ensure that `treediff/targets` works for the various kinds +of adding, modifying, removing, and renaming operations... + + SCENARIO any change must affect FOO + GIVEN a standard instance + AND a unix user called alice + AND alice has keys called main + + WHEN testinstance, using adminkey, adds user alice, using alice main + AND testinstance adminkey runs create testrepo alice + AND alice, using main, clones testrepo as testrepo + THEN alice testrepo has no file called FOO + + GIVEN testinstance using adminkey has patched gitano-admin with must-affect-FOO.patch + +First up, when we try an empty commit we can't push it... + + WHEN alice, using main, expecting failure, pushes an empty commit in testrepo + THEN stderr contains Needs a FOO + +Next, when a FOO is added, it should turn up in `treediff/targets` + + WHEN alice applies add-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains new branch + +But its mere presence in `start_tree` shouldn't allow empty commits... + + WHEN alice, using main, expecting failure, pushes an empty commit in testrepo + THEN stderr contains Needs a FOO + +Now we verify that altering the content turns up in `treediff/targets` + + WHEN alice applies change-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +Next, when the FOO gets removed, it should show in `treediff/targets` + + WHEN alice reverts change-a-FOO.patch in testrepo + AND alice reverts add-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +Next we need to rename a FOO, to do that, first add it back... + + WHEN alice applies add-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +and then check that renaming the FOO causes it to turn up in `treediff/targets` + + WHEN alice applies rename-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +and finally we ensure that renaming it *back* works too... + + WHEN alice reverts rename-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + + FINALLY the instance is torn down diff --git a/testing/admin-patches/must-affect-FOO.patch b/testing/admin-patches/must-affect-FOO.patch new file mode 100644 index 0000000..07c570e --- /dev/null +++ b/testing/admin-patches/must-affect-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "Needs a FOO" op_is_normal ![treediff/targets is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner diff --git a/testing/content-patches/change-a-FOO.patch b/testing/content-patches/change-a-FOO.patch new file mode 100644 index 0000000..8c23604 --- /dev/null +++ b/testing/content-patches/change-a-FOO.patch @@ -0,0 +1,6 @@ +diff -urN a/FOO b/FOO +--- a/FOO 2017-03-04 10:49:13.351217763 +0000 ++++ b/FOO 2017-03-04 10:49:36.467415444 +0000 +@@ -1 +1,2 @@ + This is a FOO ++FOO has changed diff --git a/testing/content-patches/rename-a-FOO.patch b/testing/content-patches/rename-a-FOO.patch new file mode 100644 index 0000000..1a8e1ae --- /dev/null +++ b/testing/content-patches/rename-a-FOO.patch @@ -0,0 +1,10 @@ +diff -urN a/BAR b/BAR +--- a/BAR 1970-01-01 01:00:00.000000000 +0100 ++++ b/BAR 2017-03-04 10:59:53.488578394 +0000 +@@ -0,0 +1 @@ ++This is a FOO +diff -urN a/FOO b/FOO +--- a/FOO 2017-03-04 10:59:53.488578394 +0000 ++++ b/FOO 1970-01-01 01:00:00.000000000 +0100 +@@ -1 +0,0 @@ +-This is a FOO -- 2.1.4

--- testing/03-treedelta-rules.yarn | 77 ++++++++++++++++++++++++ testing/admin-patches/must-add-FOO.patch | 13 ++++ testing/admin-patches/must-modify-FOO.patch | 13 ++++ testing/admin-patches/must-remove-FOO.patch | 13 ++++ testing/admin-patches/must-rename-from-FOO.patch | 13 ++++ testing/admin-patches/must-rename-to-FOO.patch | 13 ++++ 6 files changed, 142 insertions(+) create mode 100644 testing/admin-patches/must-add-FOO.patch create mode 100644 testing/admin-patches/must-modify-FOO.patch create mode 100644 testing/admin-patches/must-remove-FOO.patch create mode 100644 testing/admin-patches/must-rename-from-FOO.patch create mode 100644 testing/admin-patches/must-rename-to-FOO.patch diff --git a/testing/03-treedelta-rules.yarn b/testing/03-treedelta-rules.yarn index d004875..45b9139 100644 --- a/testing/03-treedelta-rules.yarn +++ b/testing/03-treedelta-rules.yarn @@ -142,3 +142,80 @@ and finally we ensure that renaming it *back* works too... THEN the output contains master -> master FINALLY the instance is torn down + +Now that we know that `treediff/targets` works in all cases, we ensure that +the particular `treediff/*` element is also populated for the given activity + + SCENARIO any change must affect FOO with specificity + GIVEN a standard instance + AND a unix user called alice + AND alice has keys called main + + WHEN testinstance, using adminkey, adds user alice, using alice main + AND testinstance adminkey runs create testrepo alice + AND alice, using main, clones testrepo as testrepo + THEN alice testrepo has no file called FOO + + GIVEN testinstance using adminkey has patched gitano-admin with must-add-FOO.patch + +First up, when we try an empty commit we can't push it... + + WHEN alice, using main, expecting failure, pushes an empty commit in testrepo + THEN stderr contains Needs a FOO + +Next, when a FOO is added, it should turn up in `treediff/added` + + WHEN alice applies add-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains new branch + +But its mere presence in `start_tree` shouldn't allow empty commits... + + WHEN alice, using main, expecting failure, pushes an empty commit in testrepo + THEN stderr contains Needs a FOO + +Now we verify that altering the content turns up in `treediff/modified` + + GIVEN testinstance using adminkey has patched gitano-admin with the reverse of must-add-FOO.patch + AND testinstance using adminkey has patched gitano-admin with must-modify-FOO.patch + + WHEN alice applies change-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +Next, when the FOO gets removed, it should show in `treediff/deleted` + + GIVEN testinstance using adminkey has patched gitano-admin with the reverse of must-modify-FOO.patch + AND testinstance using adminkey has patched gitano-admin with must-remove-FOO.patch + + WHEN alice reverts change-a-FOO.patch in testrepo + AND alice reverts add-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +Next we need to rename a FOO, to do that, first add it back... + + GIVEN testinstance using adminkey has patched gitano-admin with the reverse of must-remove-FOO.patch + + WHEN alice applies add-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +and then check that renaming the FOO causes it to turn up in `treediff/renamed` + + GIVEN testinstance using adminkey has patched gitano-admin with must-rename-from-FOO.patch + + WHEN alice applies rename-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + +and finally we ensure that renaming it *back* works too... + + GIVEN testinstance using adminkey has patched gitano-admin with the reverse of must-rename-from-FOO.patch + AND testinstance using adminkey has patched gitano-admin with must-rename-to-FOO.patch + + WHEN alice reverts rename-a-FOO.patch in testrepo + AND alice, using main, pushes testrepo to testrepo.git + THEN the output contains master -> master + + FINALLY the instance is torn down diff --git a/testing/admin-patches/must-add-FOO.patch b/testing/admin-patches/must-add-FOO.patch new file mode 100644 index 0000000..845f864 --- /dev/null +++ b/testing/admin-patches/must-add-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "Needs a FOO" op_is_normal ![treediff/added is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner diff --git a/testing/admin-patches/must-modify-FOO.patch b/testing/admin-patches/must-modify-FOO.patch new file mode 100644 index 0000000..4dd35b7 --- /dev/null +++ b/testing/admin-patches/must-modify-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "Needs a FOO" op_is_normal ![treediff/modified is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner diff --git a/testing/admin-patches/must-remove-FOO.patch b/testing/admin-patches/must-remove-FOO.patch new file mode 100644 index 0000000..e21aa73 --- /dev/null +++ b/testing/admin-patches/must-remove-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "Needs a FOO" op_is_normal ![treediff/deleted is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner diff --git a/testing/admin-patches/must-rename-from-FOO.patch b/testing/admin-patches/must-rename-from-FOO.patch new file mode 100644 index 0000000..121ebde --- /dev/null +++ b/testing/admin-patches/must-rename-from-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "Needs a FOO" op_is_normal ![treediff/renamed is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner diff --git a/testing/admin-patches/must-rename-to-FOO.patch b/testing/admin-patches/must-rename-to-FOO.patch new file mode 100644 index 0000000..5566474 --- /dev/null +++ b/testing/admin-patches/must-rename-to-FOO.patch @@ -0,0 +1,13 @@ +diff --git a/rules/project.lace b/rules/project.lace +index aafa17c..388766a 100644 +--- a/rules/project.lace ++++ b/rules/project.lace +@@ -43,6 +43,8 @@ include global:remoteconfigchecks op_is_config + # Okay, if we're altering the admin ref, in we go + include global:adminchecks is_admin_ref + ++deny "Needs a FOO" op_is_normal ![treediff/renamedto is FOO] ++ + # Now we're into branch operations. Owners can do any normal operation + # Normal ops are create/delete/fastforward on refs + allow "Owners can create refs" op_is_normal is_owner -- 2.1.4