diff --git a/.gitignore b/.gitignore index e165e44..cbf1b11 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ splitter-lite-tests/ +vendor/ +.idea/ \ No newline at end of file diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..742e0a0 --- /dev/null +++ b/go.mod @@ -0,0 +1,8 @@ +module lite + +go 1.16 + +require ( + github.com/boltdb/bolt v1.3.1 + github.com/libgit2/git2go/v31 v31.4.14 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..e7efcb9 --- /dev/null +++ b/go.sum @@ -0,0 +1,17 @@ +github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= +github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/libgit2/git2go/v31 v31.4.14 h1:6GOd3965D9e/+gjxCwZF4eQ+vB9kKB4yKFqdQr6XZ2E= +github.com/libgit2/git2go/v31 v31.4.14/go.mod h1:c/rkJcBcUFx6wHaT++UwNpKvIsmPNqCeQ/vzO4DrEec= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c h1:9HhBz5L/UjnK9XLtiZhYAdue5BVKep3PMmS2LuPDt8k= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88 h1:KmZPnMocC93w341XZp26yTJg8Za7lhb2KhkYmixoeso= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/main.go b/main.go index 842b7e0..1b98bae 100644 --- a/main.go +++ b/main.go @@ -3,11 +3,10 @@ package main import ( "flag" "fmt" + "lite/splitter" "os" "strings" "time" - - "github.com/splitsh/lite/splitter" ) var ( diff --git a/run-tests.sh b/run-tests.sh index 523d1ce..a6bed2d 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -63,8 +63,10 @@ echo "bb" > b/b git add b/ git commit -m"updated b" > /dev/null +go build -o $(pwd)/../split $(pwd)/../../main.go + GIT_SUBTREE_SPLIT_SHA1=`git subtree split --prefix=b/ -q` -GIT_SPLITSH_SHA1=`$GOPATH/src/github.com/splitsh/lite/lite --prefix=b/ --quiet` +GIT_SPLITSH_SHA1=`../split --prefix=b/` if [ "$GIT_SUBTREE_SPLIT_SHA1" == "$GIT_SUBTREE_SPLIT_SHA1" ]; then echo "OK ($GIT_SUBTREE_SPLIT_SHA1 == $GIT_SUBTREE_SPLIT_SHA1)" @@ -73,8 +75,8 @@ else exit 1 fi -GIT_SUBTREE_SPLIT_SHA1=`git subtree split --prefix=b/ -q bff8cdfaaf78a8842b8d9241ccfd8fb6e026f508...` -GIT_SPLITSH_SHA1=`$GOPATH/src/github.com/splitsh/lite/lite --prefix=b/ --quiet --commit=bff8cdfaaf78a8842b8d9241ccfd8fb6e026f508` +GIT_SUBTREE_SPLIT_SHA1=`git subtree split --prefix=b/ -q bff8cdfaaf78a8842b8d9241ccfd8fb6e026f508` +GIT_SPLITSH_SHA1=`../split --prefix=b/ --commit=bff8cdfaaf78a8842b8d9241ccfd8fb6e026f508` if [ "$GIT_SUBTREE_SPLIT_SHA1" == "$GIT_SUBTREE_SPLIT_SHA1" ]; then echo "OK ($GIT_SUBTREE_SPLIT_SHA1 == $GIT_SUBTREE_SPLIT_SHA1)" @@ -131,8 +133,8 @@ git merge branch2 --no-edit -s ours > /dev/null GIT_SUBTREE_SPLIT_SHA1_2="a2c4245703f8dac149ab666242a12e1d4b2510d9" GIT_SUBTREE_SPLIT_SHA1_3="ba0dab2c4e99d68d11088f2c556af92851e93b14" -GIT_SPLITSH_SHA1_2=`$GOPATH/src/github.com/splitsh/lite/lite --git="<2.8.0" --prefix=src/ --quiet` -GIT_SPLITSH_SHA1_3=`$GOPATH/src/github.com/splitsh/lite/lite --prefix=src/ --quiet` +GIT_SPLITSH_SHA1_2=`../split --git="<2.8.0" --prefix=src/ --quiet` +GIT_SPLITSH_SHA1_3=`../split --prefix=src/ --quiet` if [ "$GIT_SUBTREE_SPLIT_SHA1_2" == "$GIT_SUBTREE_SPLIT_SHA1_2" ]; then echo "OK ($GIT_SUBTREE_SPLIT_SHA1_2 == $GIT_SUBTREE_SPLIT_SHA1_2)" @@ -155,7 +157,7 @@ if [ ! -d Twig ]; then git clone https://github.com/twigphp/Twig > /dev/null fi GIT_SUBTREE_SPLIT_SHA1="ea449b0f2acba7d489a91f88154687250d2bdf42" -GIT_SPLITSH_SHA1=`$GOPATH/src/github.com/splitsh/lite/lite --prefix=lib/ --origin=refs/tags/v1.24.1 --path=Twig --quiet --scratch` +GIT_SPLITSH_SHA1=`./split --prefix=lib/ --origin=refs/tags/v1.24.1 --path=Twig --quiet --scratch` if [ "$GIT_SUBTREE_SPLIT_SHA1" == "$GIT_SUBTREE_SPLIT_SHA1" ]; then echo "OK ($GIT_SUBTREE_SPLIT_SHA1 == $GIT_SUBTREE_SPLIT_SHA1)" diff --git a/splitter/cache.go b/splitter/cache.go index ad53d94..9451452 100644 --- a/splitter/cache.go +++ b/splitter/cache.go @@ -9,7 +9,7 @@ import ( "time" "github.com/boltdb/bolt" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v31" ) type cache struct { diff --git a/splitter/config.go b/splitter/config.go index 72972db..34d92b7 100644 --- a/splitter/config.go +++ b/splitter/config.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/boltdb/bolt" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v31" ) // Prefix represents which paths to split diff --git a/splitter/result.go b/splitter/result.go index 9548c62..78e1d98 100644 --- a/splitter/result.go +++ b/splitter/result.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v31" ) // Result represents the outcome of a split diff --git a/splitter/state.go b/splitter/state.go index ed2eec8..879c3e6 100644 --- a/splitter/state.go +++ b/splitter/state.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v31" ) type state struct { diff --git a/splitter/utils.go b/splitter/utils.go index 651b747..270402c 100644 --- a/splitter/utils.go +++ b/splitter/utils.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v31" ) var messageNormalizer = regexp.MustCompile(`\s*\r?\n`)