patch_from_svn 3.13 KB
Newer Older
1 2
#!/bin/bash
if [ -z "$1" ]; then
3 4
    echo "Usage1: patch_from_svn PATCHFILE (generated by 'svn diff -c REVISION')"
    echo "Usage2: patch_from_svn SVN_DIR REVISION"
5 6
    exit 1
fi
7 8 9 10 11 12
PATCHFILE=$1
if [ -d "$1/.svn" ]; then
    if [ -z "$2" ]; then
        echo "Second argument must be a SVN revision"
        exit 1
    fi
13
    CURRENT_DIR=`pwd`
14 15
    SVN_DIR=$1
    REV=$2
gejun's avatar
gejun committed
16
    PATCHFILE=$CURRENT_DIR/$REV.patch
17
    echo "*** Generating diff of $SVN_DIR@$REV"
gejun's avatar
gejun committed
18 19
    cd $SVN_DIR && svn diff . -c $REV > $PATCHFILE
    cd $CURRENT_DIR
20 21
fi

22
MODIFIED_PATCHFILE=$(basename $(basename $PATCHFILE .patch) .diff).brpc_os.patch
23 24 25 26 27 28 29 30 31 32 33

# guess prefix of test files
TEST_PREFIX="test_"
TEST_SUFFIX=
if fgrep -q " bthread/" $PATCHFILE; then
    TEST_PREFIX="bthread_"
    TEST_SUFFIX="_unittest"
elif fgrep -q " bvar/" $PATCHFILE; then
    TEST_PREFIX="bvar_"
    TEST_SUFFIX="_unittest"
fi
34

35
cat $PATCHFILE | sed -e 's/src\/baidu\/rpc\//src\/brpc\//g' \
36
            -e 's/\<baidu\/rpc\//brpc\//g' \
37
            -e 's/\<baidu\-rpc\([^-]\)/brpc\1/g' \
38
            -e 's/\<src\/brpc\/test\/test_\(.*\)\.cpp/test\/brpc_\1_unittest.cpp/g' \
gejun's avatar
gejun committed
39 40 41
            -e 's/\<test\/test_bthread\.cpp/test\/bthread_unittest.cpp/g' \
            -e 's/\<test\/test_object_pool\.cpp/test\/object_pool_unittest.cpp/g' \
            -e 's/\<test\/test_resource_pool\.cpp/test\/resource_pool_unittest.cpp/g' \
42
            -e "s/\<test\/test_\(.*\)\.cpp/test\/${TEST_PREFIX}\1${TEST_SUFFIX}.cpp/g" \
43 44 45 46 47 48
            -e 's/\<namespace \+baidu *{/namespace brpc {/g' \
            -e 's/\<namespace \+rpc *{//g' \
            -e 's/} *\/\/ \+namespace \+baidu/} \/\/ namespace brpc/g' \
            -e 's/} *\/\/ \+namespace \+rpc\>//g' \
            -e 's/\<baidu::rpc::/brpc::/g' \
            -e 's/\<rpc::/brpc::/g' \
49
            -e 's/\<base::/butil::/g' \
50
            -e 's/\<BAIDU_RPC_/BRPC_/g' \
51
            -e 's/\<protocol\/\(.*\)\.proto/src\/\1.proto/g' \
52 53
            -e 's/TEST_F(HttpMessageTest/TEST(HttpMessageTest/g' \
            -e 's/TEST_F(URITest/TEST(URITest/g' \
54 55 56 57
            -e 's/ bthread_cond\.cpp/ src\/bthread\/condition_variable.cpp/g' \
            -e 's/ bthread_\([^.]*\)\.cpp/ src\/bthread\/\1.cpp/g' \
            -e 's/ bthread_\([^.]*\)\.h/ src\/bthread\/\1.h/g' \
            -e 's/ bthread\.\(h\|cpp\)/ src\/bthread\/bthread.\1/g' \
58
            -e 's/<\(brpc\/[^>]*\)>/"\1"/g' \
gejun's avatar
gejun committed
59
            -e 's/<\(bvar\/[^>]*\)>/"\1"/g' \
60
            -e 's/<base\/\([^>]*\)>/"butil\/\1"/g' \
gejun's avatar
gejun committed
61 62
            -e 's/<\(bthread\/[^>]*\)>/"\1"/g' \
            -e 's/<\(mcpack2pb\/[^>]*\)>/"\1"/g' \
zhujiashun's avatar
zhujiashun committed
63 64 65 66
            -e 's/\<protobuf_json\>/json2pb/g' \
            -e 's/src\/json_to_pb/src\/json2pb\/json_to_pb/g' \
            -e 's/src\/pb_to_json/src\/json2pb\/pb_to_json/g' \
            -e 's/test\/test_protobuf_json/test\/brpc_protobuf_json_unittest/g' \
67
            -e 's/ base\// src\/butil\//g' \
68 69
            -e 's/ bthread\// src\/bthread\//g' \
            -e 's/ bvar\// src\/bvar\//g' \
70
            > $MODIFIED_PATCHFILE
71 72 73 74 75
EXTRA_ARGS=
if [ -z "$DO_RUN" ]; then
    EXTRA_ARGS="--dry-run $EXTRA_ARGS"
    echo "*** This is a dry-run. To really apply, run: DO_RUN=1 tools/patch_from_svn $1"
fi
76
patch -p0 -u $EXTRA_ARGS < $MODIFIED_PATCHFILE