blob: a165d4ad29a4ba0807df2acbd9f53a35fd9b19e9 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
#!/bin/bash
set -eu
TARGET_INFO_FILE="$(realpath $1)"
if [ ! -f $TARGET_INFO_FILE ]; then
echo "File $TARGET_INFO_FILE doesn't exist. Creating new one"
if [ "$2" == "" ]; then
echo "Expected source folder as the second argument" >&2
exit
fi
if [ ! -d "$2" ]; then
echo "Expected $2 to be a directory" >&2
exit
fi
FROM=$(realpath $2)
ARC_ROOT=$(cd $FROM; arc root)
HEAD=$(cd $FROM; arc rev-parse HEAD)
# Normalize FROM relativly to the arc root
FROM=${FROM#$ARC_ROOT/}
echo "$HEAD;$FROM" > $TARGET_INFO_FILE
echo "Filled in $TARGET_INFO_FILE"
exit
fi
IFS=';' read -r BASE_REV INFO_FROM < "$TARGET_INFO_FILE"
TO=$(dirname $(realpath "$TARGET_INFO_FILE"))
HEAD_REV=$(cd $TO; arc rev-parse HEAD)
ARC_ROOT=$(cd $TO; arc root)
FROM="$ARC_ROOT/$INFO_FROM"
echo "Base revision: $BASE_REV"
echo "Head revision: $HEAD_REV"
echo "Arc root: $ARC_ROOT"
echo "Source: $FROM"
echo "Target: $TO"
if [ "$(cd $TO; arc status -s -u all | wc -l)" != "0" ]; then
echo "Target $TO has uncommited changes" >&2
exit
fi
cd $ARC_ROOT
CURRENT_BRANCH=$(arc info | grep 'branch:')
CURRENT_BRANCH=${CURRENT_BRANCH#branch: }
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"
arc co $BASE_REV -b $BRANCH
rsync -r --delete --filter='. -' -v $TO/ $FROM << EOF
+ /*/
+ *.md
+ toc_*.yaml
- /*
EOF
arc add -A $INFO_FROM
arc diff --cached --relative=$INFO_FROM > $PATCH_FILE
arc reset
arc co $INFO_FROM
arc clean -d
arc st
arc co "$CURRENT_BRANCH"
arc br -D $BRANCH
rsync -r --delete --filter='. -' -v $FROM/ $TO << EOF
+ /*/
+ *.md
+ toc_*.yaml
- /*
EOF
patch -d $TO -p0 -N -E --no-backup-if-mismatch --merge -i $PATCH_FILE -t
echo "$HEAD_REV;$INFO_FROM" > $TARGET_INFO_FILE
|
