allow Git LFS and System 7 leave in the same repo

.github/workflows/tests.yml

@@ -4,6 +4,10 @@ on:
   pull_request:
     branches: [ '*' ]
 
+concurrency:
+  group: ${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   integration_tests:
     name: Integration tests
@@ -31,5 +35,11 @@ jobs:
         uses: actions/checkout@v3
       - name: Test
         run: |
-          xcodebuild -scheme system7-tests -configuration Release test | xcpretty
-          exit ${PIPESTATUS[0]}
+          xcodebuild -scheme system7-tests -configuration Release -resultBundlePath UnitTests.xcresult test
+          exit $?
+      - name: Upload xcresult file
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() }}
+        with:
+          name: UnitTests-${{ github.run_number }}.xcresult
+          path: UnitTests.xcresult

.gitignore

@@ -13,4 +13,5 @@ usr
 *.xcworkspacedata
 system7-tests/integration/case7/*.actual
 system7-tests/integration/sandbox
+system7-tests/integration/templates
 .last-s7-update-check-date

system7-tests/bootstrapTests.m

@@ -60,7 +60,7 @@ - (void)testOnLFSRepo_WITH_NO_LFSHooksInstalled {
 
         [self runBootstrap];
 
-        XCTAssertFalse([self doesPostCheckoutHookContainInitCall]);
+        XCTAssertTrue([self doesPostCheckoutHookContainInitCall]);
 
         return S7ExitCodeSuccess;
     });

system7-tests/deinitTests.m

@@ -44,7 +44,9 @@ void assertRepoAtPWDIsFreeFromS7(void) {
 
     if ([fileManager fileExistsAtPath:@".git/config"]) {
         NSString *configContents = [NSString stringWithContentsOfFile:@".git/config" encoding:NSUTF8StringEncoding error:nil];
-        XCTAssertFalse([configContents containsString:@"s7"]);
+        XCTAssertFalse([configContents containsString:@"s7 merge-driver"],
+                       @"Git Config should not contain 's7' mentions. Actual config: %@",
+                       configContents);
     }
 
     NSArray<NSString *> *hookFileNames = @[

system7-tests/integration/case-cloneS7andLFSmixedRepo.sh

@@ -0,0 +1,73 @@
+#!/bin/sh
+
+git clone github/rd2 pastey/rd2
+
+cd pastey/rd2
+
+LARGE_FILE_CONTENT="MEGA-LONG-FILE-CONTENT"
+echo "$LARGE_FILE_CONTENT" > large-file
+assert git lfs track large-file
+
+assert git add large-file .gitattributes
+
+git commit -m"\"track large file with Git LFS\""
+
+assert s7 init
+assert git add .
+assert git commit -m "\"init s7\""
+
+assert s7 add --stage Dependencies/RDPDFKit '"$S7_ROOT/github/RDPDFKit"'
+git commit -m"add pdfkit subrepo"
+
+grep "s7" .git/hooks/pre-push
+assert test 0 -eq $?
+
+grep "lfs" .git/hooks/pre-push
+assert test 0 -eq $?
+
+assert test "2" = "$(grep -c '<"$REFS"' .git/hooks/pre-push)"
+
+git push
+
+cd "$S7_ROOT/nik"
+
+git clone "$S7_ROOT/github/rd2"
+assert test $? -eq 0
+
+cd rd2
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+grep -q "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+assert test "$(cat large-file)" = "$LARGE_FILE_CONTENT"
+assert test -f Dependencies/RDPDFKit/.gitignore
+
+
+mkdir etalon-lfs-repo
+pushd etalon-lfs-repo > /dev/null
+    git init
+    git lfs install
+popd > /dev/null
+
+for ETALON_HOOK in etalon-lfs-repo/.git/hooks/*; do
+    if grep -i "lfs" $ETALON_HOOK; then
+        HOOK_NAME="$(basename $ETALON_HOOK)"
+        NIKS_HOOK=".git/hooks/$HOOK_NAME"
+        if [ "$(sed -n 's/ <&0//; s/ <"$REFS"//; /lfs/p;1p' $NIKS_HOOK)" != "$(cat $ETALON_HOOK)" ]; then
+            echo "LFS hooks hardcoded in S7 code are outdated!"
+            echo "Expected format:"
+            echo
+            cat $ETALON_HOOK
+            echo
+            echo "Actual format:"
+            echo
+            sed -n '/lfs/p' $NIKS_HOOK
+            echo
+
+            assert false
+        fi
+    fi
+done

system7-tests/integration/case-pullLFSintoExistingS7Repo.sh

@@ -0,0 +1,82 @@
+#!/bin/sh
+
+git clone github/rd2 pastey/rd2
+
+cd pastey/rd2
+
+assert s7 init
+assert git add .
+assert git commit -m "\"init s7\""
+
+assert s7 add --stage Dependencies/RDPDFKit '"$S7_ROOT/github/RDPDFKit"'
+git commit -m"add pdfkit subrepo"
+
+git push
+
+cd "$S7_ROOT/nik"
+
+assert git clone "$S7_ROOT/github/rd2"
+
+cd rd2
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+assert test -f Dependencies/RDPDFKit/.gitignore
+
+
+cd "$S7_ROOT/pastey/rd2"
+
+LARGE_FILE_CONTENT="MEGA-LONG-FILE-CONTENT"
+echo "$LARGE_FILE_CONTENT" > large-file
+assert git lfs track large-file
+
+# re-initialize hooks for both: s7 and LFS
+assert s7 init
+
+assert git add large-file
+git add .
+git commit -m"\"track large file with Git LFS\""
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+grep "s7" .git/hooks/pre-push
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/pre-push
+assert test 0 -eq $?
+
+git push
+
+
+cd "$S7_ROOT/nik/rd2"
+
+PRE_LFS_COMMIT="$(git rev-parse HEAD)"
+
+assert git pull
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+assert test -f large-file
+assert test "$(cat large-file)" = "$LARGE_FILE_CONTENT"
+
+git checkout "$PRE_LFS_COMMIT"
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+git switch -
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+assert test -f large-file
+assert test "$(cat large-file)" = "$LARGE_FILE_CONTENT"

system7-tests/integration/case-pureLFS.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+git clone github/rd2 pastey/rd2
+
+cd pastey/rd2
+
+LARGE_FILE_CONTENT="MEGA-LONG-FILE-CONTENT"
+echo "$LARGE_FILE_CONTENT" > large-file
+assert git lfs track large-file
+
+assert git add large-file .gitattributes
+git commit -m"\"track large file with Git LFS\""
+
+git push
+
+
+cd "$S7_ROOT/nik/rd2"
+
+assert git pull
+
+assert test -f large-file
+assert test "$(cat large-file)" = "$LARGE_FILE_CONTENT"

system7-tests/integration/case-switchToLFSBranchInExistingS7Repo.sh

@@ -0,0 +1,84 @@
+#!/bin/sh
+
+git clone github/rd2 pastey/rd2
+
+cd pastey/rd2
+
+#COMMIT_WITHOUT_S7="$(git rev-parse HEAD)"
+
+assert s7 init
+assert git add .
+assert git commit -m "\"init s7\""
+
+assert s7 add --stage Dependencies/RDPDFKit '"$S7_ROOT/github/RDPDFKit"'
+git commit -m"add pdfkit subrepo"
+
+git push
+
+#COMMIT_WITH_S7="$(git rev-parse HEAD)"
+
+cd "$S7_ROOT/nik"
+
+assert git clone "$S7_ROOT/github/rd2"
+
+cd rd2
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+assert test -f Dependencies/RDPDFKit/.gitignore
+
+
+cd "$S7_ROOT/pastey/rd2"
+
+assert git checkout -b git-lfs
+
+LARGE_FILE_CONTENT="MEGA-LONG-FILE-CONTENT"
+echo "$LARGE_FILE_CONTENT" > large-file
+assert git lfs track large-file
+assert git add large-file .gitattributes
+
+# re-initialize hooks for both: s7 and LFS
+assert s7 init
+
+git commit -m"\"track large file with Git LFS\""
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+git push origin -u HEAD
+
+
+cd "$S7_ROOT/nik/rd2"
+
+PRE_LFS_COMMIT="$(git rev-parse HEAD)"
+
+assert git fetch
+
+assert git switch git-lfs
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+assert test -f large-file
+assert test "$(cat large-file)" = "$LARGE_FILE_CONTENT"
+
+git checkout "$PRE_LFS_COMMIT"
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+git switch -
+
+grep "s7" .git/hooks/post-checkout
+assert test 0 -eq $?
+grep -i "lfs" .git/hooks/post-checkout
+assert test 0 -eq $?
+
+assert test -f large-file
+assert test "$(cat large-file)" = "$LARGE_FILE_CONTENT"

system7-tests/integration/test.sh

@@ -80,6 +80,10 @@ red=$(tput setaf 1)
 green=$(tput setaf 2)
 normal=$(tput sgr0)
 
+TOTAL_NUMBER_OF_CASES=${#CASES_ARRAY[@]}
+
+CURRENT_CASE_NUMBER=0
+
 setupAndRunCase() {
     local CASE=$1
 
@@ -106,8 +110,9 @@ setupAndRunCase() {
         fi
     else
         echo
-        echo "$CASE"
-        echo "============="
+        echo "[$CURRENT_CASE_NUMBER / $TOTAL_NUMBER_OF_CASES] $CASE"
+        echo "======================================="
+        echo
         S7_ROOT="$TEST_ROOT" sh -x "$SCRIPT_SOURCE_DIR/$CASE" 2>&1
         echo
         if [ -f "$TEST_ROOT/FAIL" ]; then
@@ -130,6 +135,7 @@ do
     if [ 1 -eq $PARALLELIZE ]; then
         setupAndRunCase $CASE &
     else
+        CURRENT_CASE_NUMBER=$(( CURRENT_CASE_NUMBER + 1 ))
         setupAndRunCase $CASE
     fi
 done