laumann/pijul-conflicts - Change UD2FCJ4WC2SI5HF4WE5SZ75KU6YA7MXKULQTILVX5YQ5FZJ5AS5AC

rework test.sh, showcase zombie conflict

Created by laumann on June 15, 2023

UD2FCJ4WC2SI5HF4WE5SZ75KU6YA7MXKULQTILVX5YQ5FZJ5AS5AC

Dependencies

In channels

main

Change contents

Insertion in test.sh at line 2 [3.32]
[3.45]
[3.45]
```
set -euo pipefail
```
Deletion in test.sh at line 5 [3.32]
B:BD[3.100] → [3.100:118]
```
REPO=$(mktemp -d)
```

Replacement in test.sh at line 6 [3.32]

B:BD[3.119] → [3.119:178]

pijul init "${REPO}"
pushd "${REPO}"
cat <<EOF > file.txt

[3.119]

[3.178]

initrepo() {
    local repo=$(mktemp -d -q)
    pijul init "${repo}" 2> /dev/null
    pushd "${repo}" > /dev/null
    cat <<EOF > file.txt

Insertion in test.sh at line 15 [3.32]

[3.188]


    pijul add file.txt 2> /dev/null
    pijul record --all --message "initial change" > /dev/null

Replacement in test.sh at line 19 [3.32]

B:BD[3.189] → [3.189:254]

pijul add file.txt
pijul record --all --message "initial change"

[3.189]

[3.254]

    echo "${repo}"
}
cleanup() {
    rm -rf "${1}"
}

Replacement in test.sh at line 26 [3.32]

B:BD[3.255] → [3.255:374]

pijul fork alice
pijul channel switch alice
sed -i -e 's/B/X/g' file.txt
pijul record --all --message "alice wuz here"

[3.255]

[3.374]

runtest() {
    repo="$(initrepo)"
    pushd "${repo}" > /dev/null

Replacement in test.sh at line 30 [3.32]

B:BD[3.375] → [3.375:468]

pijul channel switch main
sed -i -e 's/B/Y/g' file.txt
pijul record --all --message "bobdor"

[3.375]

[3.468]

    echo "test: ${1} in repo ${repo}"

Replacement in test.sh at line 32 [3.32]

B:BD[3.469] → [2.0:78]

pijul apply "$(pijul log --channel alice --hash-only --limit 1)" 2> /dev/null

[3.469]

[3.534]

    "${1}"

Replacement in test.sh at line 34 [3.32]
B:BD[3.535] → [3.535:556]
```
"${PIJUL_CONFLICTS}"
```
[3.535]
[3.556]
```
    "${PIJUL_CONFLICTS}"
```
Replacement in test.sh at line 36 [3.32]
B:BD[3.557] → [3.557:562]
```
popd
```
[3.557]
[2.79]
```
    popd >/dev/null
    cleanup "${repo}"
}
```

Replacement in test.sh at line 40 [3.32]

B:BD[2.80] → [2.80:97]

rm -rf "${REPO}"

[2.80]

# Some utilities
pijul_switch() {
    pijul fork "${1}"
    pijul channel switch "${1}" 2> /dev/null
}
pijul_rec() {
    pijul record --all --message "${1}" >/dev/null
}
# Alice and Bob modify the same line in the same file
order_conflict() {
    pijul_switch alice
    sed -i -e 's/B/X/g' file.txt
    pijul_rec "alice wuz here"
    pijul channel switch main 2>/dev/null
    sed -i -e 's/B/Y/g' file.txt
    pijul_rec "bobdor"
    pijul apply "$(pijul log --channel alice --hash-only --limit 1)" 2> /dev/null
}
# Showcase a zombie line conflict - Alice inserts a line above a line
# that Bob removes
zombies() {
    pijul_switch alice
    sed -i -e 's/B/X\nB/g' file.txt
    pijul_rec "alice does stuff"
    pijul channel switch main 2>/dev/null
    sed -i -e '/B/d' file.txt
    pijul_rec "bob deletes"
    pijul apply "$(pijul log --channel alice --hash-only --limit 1)" 2> /dev/null
}
TESTS=(
    "order_conflict"
    "zombies"
)
for t in "${TESTS[@]}"; do
    runtest "${t}"
done