Intermediate changes

commit_hash:8ceff1e2daa0d2a28f7a6f7e138c6051d47b2912

1 files changed, 35 insertions, 29 deletions

diff --git a/yql/essentials/docs/scripts/doc_upgrade_git.sh b/yql/essentials/docs/scripts/doc_upgrade_git.sh
index 75573c5b63a..86ab33bcb92 100755
--- a/yql/essentials/docs/scripts/doc_upgrade_git.sh
+++ b/yql/essentials/docs/scripts/doc_upgrade_git.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eux
+set -eu
 
 TARGET_INFO_FILE="$(realpath $1)"
 
@@ -20,23 +20,25 @@ if [ ! -f $TARGET_INFO_FILE ]; then
     GIT_ROOT=$(cd $FROM; git rev-parse --show-toplevel)
     HEAD=$(cd $FROM; git rev-parse HEAD)
     # Normalize FROM relativly to the git root
-    FROM=${FROM#$GIT_ROOT/}
-    echo "$HEAD;$FROM" > $TARGET_INFO_FILE
+    GIT_FROM=${FROM#$GIT_ROOT/}
+    echo "$HEAD;$GIT_FROM" > $TARGET_INFO_FILE
     echo "Filled in $TARGET_INFO_FILE"
     exit
 fi
 
-IFS=';' read -r BASE_REV INFO_FROM < "$TARGET_INFO_FILE"
+IFS=';' read -r BASE_REV GIT_FROM < "$TARGET_INFO_FILE"
 TO=$(dirname $(realpath "$TARGET_INFO_FILE"))
 HEAD_REV=$(cd $TO; git rev-parse HEAD)
 GIT_ROOT=$(cd $TO; git rev-parse --show-toplevel)
-FROM="$GIT_ROOT/$INFO_FROM"
+FROM="$GIT_ROOT/$GIT_FROM"
+GIT_TO=${TO#$GIT_ROOT/}
+DATETIME=$(date '+%Y-%m-%d-%H-%M-%S')
 
 echo "Base revision: $BASE_REV"
 echo "Head revision: $HEAD_REV"
 echo "Git root: $GIT_ROOT"
-echo "Source: $FROM"
-echo "Target: $TO"
+echo "Source: $GIT_FROM"
+echo "Target: $GIT_TO"
 
 if [ "$(cd $TO; git status -s -u | wc -l)" != "0" ]; then
     echo "Target $TO has uncommited changes" >&2
@@ -45,43 +47,47 @@ fi
 
 cd $GIT_ROOT
 
-CURRENT_BRANCH=$(git branch --show-current)
 PATCH_FILE=$(mktemp)
-BRANCH=upgrade-$(date '+%Y-%m-%d-%H-%M-%S')
-
-clean_up () {
-    ARG=$?
-    echo "Deleting patch file"
-    rm $PATCH_FILE
-    exit $ARG
-}
-trap clean_up EXIT
-
-echo "Use $BRANCH temporary branch, $PATCH_FILE patch file"
-git checkout -b $BRANCH $BASE_REV
-rsync -r --delete --filter='. -' -v $TO/ $FROM << EOF
+EXPORT_DIR=$(mktemp -d)
+
+echo "Use $EXPORT_DIR export dir"
+git clone --no-hardlinks "$GIT_ROOT/.git" "$EXPORT_DIR"
+(cd $EXPORT_DIR; git reset --hard $BASE_REV)
+
+rsync -r --delete --filter='. -' "$EXPORT_DIR/$GIT_FROM/" "$TO" << EOF
 + /*/
 + *.md
 + toc_*.yaml
 - /*
 EOF
 
-git add -A $INFO_FROM
+rm -rf "$EXPORT_DIR" || true
 
-git diff --cached --binary --relative=$INFO_FROM > $PATCH_FILE
+git add -A $GIT_TO
+
+git diff --cached --binary -R --relative=$GIT_TO > $PATCH_FILE
 git reset --hard
 git clean -d -f
 git status
-git checkout "$CURRENT_BRANCH"
-git branch -D $BRANCH
-rsync -r --delete --filter='. -' -v $FROM/ $TO << EOF
+
+rsync -r --delete --filter='. -' "$FROM/" "$TO" << EOF
 + /*/
 + *.md
 + toc_*.yaml
+P _assets/*
 - /*
 EOF
 
-patch -d $TO -p1 -N -E --no-backup-if-mismatch --merge -i $PATCH_FILE -t
-#git apply --whitespace=nowarn --directory=$TO --reject $PATCH_FILE
+patch -d "$TO" -p1 -N -E --no-backup-if-mismatch --merge -i $PATCH_FILE -t || echo "Patch has conflicts. Consider to review them before commit"
 
-echo "$HEAD_REV;$INFO_FROM" > $TARGET_INFO_FILE
+if [ "$(cd $TO; git status -s -u | wc -l)" != "0" ]; then
+    echo "$HEAD_REV;$GIT_FROM" > $TARGET_INFO_FILE
+else
+    echo "Nothing changed"
+fi
+
+if [ -v KEEP_PATCH ]; then
+    mv "$PATCH_FILE" "$TO/$DATETIME.patch"
+else
+    rm "$PATCH_FILE"
+fi