From 3646fbc2e5203e8260017f7b5d3767546a1379ed Mon Sep 17 00:00:00 2001 From: Joshua Blum Date: Fri, 10 Jul 2026 13:57:01 -0400 Subject: [PATCH] go-git v5 --- go/go.mod | 37 ++++++---- go/go.sum | 68 ++++++++++++------- go/kbfs/kbfsgit/runner.go | 29 ++++---- go/kbfs/kbfsgit/runner_test.go | 4 +- go/kbfs/libfs/dummy_fs_read_only.go | 2 +- go/kbfs/libfs/file.go | 2 +- go/kbfs/libfs/fs.go | 2 +- go/kbfs/libfs/fs_test.go | 2 +- go/kbfs/libfs/httprootfs.go | 2 +- go/kbfs/libfs/leveldb_storage.go | 2 +- go/kbfs/libfs/node_wrappers.go | 2 +- go/kbfs/libfs/profilelist.go | 2 +- go/kbfs/libfs/root_fs.go | 2 +- go/kbfs/libfs/util.go | 2 +- go/kbfs/libfs/wrapped_read_file.go | 2 +- go/kbfs/libgit/autogit_manager.go | 2 +- go/kbfs/libgit/autogit_manager_test.go | 8 +-- go/kbfs/libgit/autogit_node_wrappers.go | 4 +- go/kbfs/libgit/autogit_node_wrappers_test.go | 4 +- go/kbfs/libgit/browser.go | 10 +-- go/kbfs/libgit/browser_file.go | 4 +- go/kbfs/libgit/browser_file_info.go | 2 +- go/kbfs/libgit/browser_test.go | 6 +- go/kbfs/libgit/diff_file.go | 4 +- ...meral_git_config_with_fixed_pack_window.go | 8 +-- .../git_config_without_remotes_storer.go | 16 ++--- go/kbfs/libgit/on_demand_delta_object.go | 4 +- go/kbfs/libgit/on_demand_object.go | 4 +- go/kbfs/libgit/on_demand_storer.go | 6 +- go/kbfs/libgit/repo.go | 20 +++--- go/kbfs/libgit/shared_browser_cache.go | 2 +- go/kbfs/libgit/submodule_file.go | 4 +- go/kbfs/libkbfs/interfaces.go | 2 +- go/kbfs/libkbfs/kbfs_ops_test.go | 4 +- go/kbfs/libkbfs/libkbfs_mocks_test.go | 2 +- go/kbfs/libkbfs/node.go | 2 +- go/kbfs/search/bleve_leveldb_store.go | 2 +- go/kbfs/search/doc_db.go | 2 +- go/kbfs/search/indexer.go | 2 +- go/kbfs/simplefs/archive.go | 2 +- go/kbfs/simplefs/simplefs.go | 4 +- go/kbfs/simplefs/simplefs_test.go | 2 +- 42 files changed, 155 insertions(+), 137 deletions(-) diff --git a/go/go.mod b/go/go.mod index ec1d3b0a4d63..b7c734ea9b71 100644 --- a/go/go.mod +++ b/go/go.mod @@ -24,6 +24,8 @@ require ( github.com/eapache/channels v1.1.0 github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92 github.com/go-errors/errors v1.4.2 + github.com/go-git/go-billy/v5 v5.9.0 + github.com/go-git/go-git/v5 v5.19.1 github.com/go-sql-driver/mysql v1.9.3 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 github.com/golang/mock v1.6.0 @@ -79,8 +81,6 @@ require ( golang.org/x/sys v0.47.0 golang.org/x/text v0.40.0 golang.org/x/time v0.14.0 - gopkg.in/src-d/go-billy.v4 v4.3.2 - gopkg.in/src-d/go-git.v4 v4.13.1 mvdan.cc/xurls/v2 v2.0.0-00010101000000-000000000000 rsc.io/qr v0.2.0 stathat.com/c/ramcache v1.0.0 @@ -98,14 +98,15 @@ require ( ) require ( + dario.cat/mergo v1.0.0 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/ProtonMail/go-crypto v1.1.6 // indirect github.com/RoaringBitmap/roaring v0.4.22-0.20191112221735-4d53b29a8f7d // indirect github.com/StackExchange/wmi v1.2.1 // indirect - github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect github.com/andybalholm/cascadia v1.3.3 // indirect - github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect github.com/antchfx/htmlquery v1.3.6 // indirect github.com/antchfx/xmlquery v1.5.0 // indirect github.com/antchfx/xpath v1.3.6 // indirect @@ -129,17 +130,19 @@ require ( github.com/blevesearch/blevex v0.0.0-20190916190636-152f0fe5c040 // indirect github.com/blevesearch/go-porterstemmer v1.0.3 // indirect github.com/blevesearch/segment v0.8.0 // indirect + github.com/cloudflare/circl v1.6.3 // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect github.com/couchbase/vellum v1.0.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect + github.com/cyphar/filepath-securejoin v0.6.1 // indirect github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect github.com/eapache/queue v1.1.1-0.20180227141424-093482f3f8ce // indirect github.com/edsrzf/mmap-go v1.0.1-0.20190108065903-904c4ced31cd // indirect - github.com/emirpasic/gods v1.12.1-0.20181020102604-7c131f671417 // indirect + github.com/emirpasic/gods v1.18.1 // indirect github.com/etcd-io/bbolt v1.3.3 // indirect github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4 // indirect - github.com/gliderlabs/ssh v0.3.0 // indirect github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/gobwas/glob v0.2.4-0.20181002190808-e7a84e9525fe // indirect github.com/golang/protobuf v1.5.4 // indirect @@ -148,18 +151,18 @@ require ( github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/kennygrant/sanitize v1.2.4 // indirect - github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/keybase/msgpackzip v0.0.0-20251211192551-92e2da32c96f // indirect github.com/keybase/vcr v0.0.0-20191017153547-a32d93056205 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739 // indirect - github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect github.com/nf/cr2 v0.0.0-20140528043846-05d46fef4f2f // indirect github.com/nlnwa/whatwg-url v0.6.2 // indirect github.com/onsi/gomega v1.36.2 // indirect - github.com/pelletier/go-buffruneio v0.3.0 // indirect github.com/philhofer/fwd v1.0.0 // indirect + github.com/pjbgf/sha1cd v0.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/rwcarlsen/goexif v0.0.0-20150520140647-709fab3d192d // indirect @@ -168,7 +171,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/simplereach/timeutils v1.2.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/src-d/gcfg v1.3.0 // indirect + github.com/skeema/knownhosts v1.3.1 // indirect github.com/stellar/go-xdr v0.0.0-20211103144802-8017fc4bdfee // indirect github.com/steveyen/gtreap v0.0.0-20150807155958-0abe01ef9be2 // indirect github.com/stretchr/objx v0.5.2 // indirect @@ -177,7 +180,7 @@ require ( github.com/temoto/robotstxt v1.1.2 // indirect github.com/tinylib/msgp v1.1.0 // indirect github.com/willf/bitset v1.1.11-0.20190404145324-77892cd8d53f // indirect - github.com/xanzy/ssh-agent v0.2.0 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect @@ -188,9 +191,7 @@ require ( golang.org/x/vuln v1.1.4 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.36.11 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect - gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect mvdan.cc/gofumpt v0.9.2 // indirect @@ -199,10 +200,16 @@ require ( // keybase maintained forks replace ( bazil.org/fuse => github.com/keybase/fuse v0.0.0-20210104232444-d36009698767 + // Keybase fork of go-git/v5 with two patches not yet upstreamed: + // 1. plumbing.StatusChan: structured packfile-level progress channel + // threaded through FetchOptions, PushOptions, revlist.Objects, + // and storer.PackfileWriter. + // 2. dotgit setref recovery: restore original ref file on lock/close + // failure, hardening for KBFS networked filesystem (KBFS-3703). + // Fork also preserves FetchOptions.PackRefs from the v4 Keybase fork. + github.com/go-git/go-git/v5 => github.com/keybase/go-git/v5 v5.19.1-keybase.1 github.com/stellar/go => github.com/keybase/stellar-org v0.0.0-20191010205648-0fc3bfe3dfa7 github.com/syndtr/goleveldb => github.com/keybase/goleveldb v1.0.1-0.20221007195407-9881c0c26e65 - gopkg.in/src-d/go-billy.v4 => github.com/keybase/go-billy v3.1.1-0.20180828145748-b5a7b7bc2074+incompatible - gopkg.in/src-d/go-git.v4 => github.com/keybase/go-git v4.0.0-rc9.0.20190209005256-3a78daa8ce8e+incompatible mvdan.cc/xurls/v2 => github.com/keybase/xurls/v2 v2.0.1-0.20190725180013-1e015cacd06c ) diff --git a/go/go.sum b/go/go.sum index bc5b220c7553..27c5fd99ad53 100644 --- a/go/go.sum +++ b/go/go.sum @@ -1,3 +1,5 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v0.2.1-0.20160717150709-99064174e013/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -5,6 +7,11 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/Masterminds/squirrel v0.0.0-20161115235646-20f192218cf5/go.mod h1:xnKTFzjGUiZtiOagBsfnvomW+nJg2usB1ZpordQWqNM= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw= +github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/PuerkitoBio/goquery v1.12.0 h1:pAcL4g3WRXekcB9AU/y1mbKez2dbY2AajVhtkO8RIBo= github.com/PuerkitoBio/goquery v1.12.0/go.mod h1:802ej+gV2y7bbIhOIoPY5sT183ZW0YFofScC4q/hIpQ= github.com/RoaringBitmap/roaring v0.4.22-0.20191112221735-4d53b29a8f7d h1:AaTEP55Sj0H3etCU0/Hr4uJNh42T5jRlU/r1dteKH8I= @@ -16,16 +23,14 @@ github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f h1:zvClvFQwU++UpIUBGC8YmD github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/akavel/rsrc v0.2.1-0.20151103204339-ba14da1f8271 h1:TBMmV9OIKIixAuZ/C5yQ3MR9jF6it3DhYziWRjTmu9s= github.com/akavel/rsrc v0.2.1-0.20151103204339-ba14da1f8271/go.mod h1:2+aQMrY0hBFBaIr2xxnZ/ctfwnYmMRMbTczYLAC34v4= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antchfx/htmlquery v1.3.6 h1:RNHHL7YehO5XdO8IM8CynwLKONwRHWkrghbYhQIk9ag= github.com/antchfx/htmlquery v1.3.6/go.mod h1:kcVUqancxPygm26X2rceEcagZFFVkLEE7xgLkGSDl/4= github.com/antchfx/xmlquery v1.5.0 h1:uAi+mO40ZWfyU6mlUBxRVvL6uBNZ6LMU4M3+mQIBV4c= @@ -36,6 +41,8 @@ github.com/antchfx/xpath v1.3.6/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwq github.com/araddon/dateparse v0.0.0-20180729174819-cfd92a431d0e h1:s05JG2GwtJMHaPcXDpo4V35TFgyYZzNsmBlSkHPEbeg= github.com/araddon/dateparse v0.0.0-20180729174819-cfd92a431d0e/go.mod h1:SLqhdZcd+dF3TEVL2RMoob5bBP5R1P1qkox+HtCBgGI= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20180319081651-7d2e70ef918f h1:/8NcnxL60YFll4ehCwibKotx0BR9v2ND40fomga8qDs= github.com/asaskevich/govalidator v0.0.0-20180319081651-7d2e70ef918f/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.6.11-0.20170104181648-8649d278323e/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= @@ -97,6 +104,8 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8= +github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -111,6 +120,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE= +github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -130,8 +141,10 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB github.com/edsrzf/mmap-go v1.0.1-0.20190108065903-904c4ced31cd h1:5YaQigFlQK50yop9LoQwxVAic19OCuAygbETTgB/n0Q= github.com/edsrzf/mmap-go v1.0.1-0.20190108065903-904c4ced31cd/go.mod h1:W3m91qexYIu40kcj8TLXNUSTCKprH8UQ3GgH5/Xyfc0= github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= -github.com/emirpasic/gods v1.12.1-0.20181020102604-7c131f671417 h1:YxPhcuk2uFv51gUaZnDTK4za30/5kY6IJJ2GSR7e/LY= -github.com/emirpasic/gods v1.12.1-0.20181020102604-7c131f671417/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o= +github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/inject v0.0.0-20161006174721-cc1aa653e50f/go.mod h1:oO8UHw+fDHjDsk4CTy/E96WDzFUYozAtBAaGNoVL0+c= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= @@ -150,8 +163,8 @@ github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92/go.mod h1:w9R github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955 h1:gmtGRvSexPU4B1T/yYo0sLOKzER1YT+b4kPxPpm0Ty4= github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955/go.mod h1:vmp8DIyckQMXOPl0AQVHt+7n5h7Gb7hS6CUydiV8QeA= github.com/getsentry/raven-go v0.0.0-20160805001729-c9d3cc542ad1/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/gliderlabs/ssh v0.3.0 h1:7GcKy4erEljCE/QeQ2jTVpu+3f3zkpZOxOJjFYkMqYU= -github.com/gliderlabs/ssh v0.3.0/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c= +github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= @@ -160,6 +173,12 @@ github.com/go-chi/chi v3.1.5+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxm github.com/go-errors/errors v0.0.0-20150906023321-a41850380601/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmmBPA= +github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= github.com/go-ini/ini v1.23.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -243,8 +262,8 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o= github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak= -github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8= -github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/keybase/backoff v1.0.1-0.20160517061000-726b63b835ec h1:D6qL2WCnAuxucGbmL+mDW8IKRK1pex+R1fw5rKa9nXc= github.com/keybase/backoff v1.0.1-0.20160517061000-726b63b835ec/go.mod h1:jeBKj+20GIDry3doFsAMYH9n7Y3l7ajE3xJrKvVB23s= github.com/keybase/cli v1.2.1-0.20191217150554-9323fd7ddfab h1:+X8jBYdoCU0W0xXIZNHzXCkYRwmJBYRuZa6AGr55W/0= @@ -255,16 +274,14 @@ github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a h1:K0EAzgzEQHW4Y5lxrm github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a/go.mod h1:YPNKjjE7Ubp9dTbnWvsP3HT+hYnY6TfXzubYTBeUxc8= github.com/keybase/fuse v0.0.0-20210104232444-d36009698767 h1:/Uj9mWIW4Jz4pft2y9E0HdtWG6GmhdF6HZoBuKozmdQ= github.com/keybase/fuse v0.0.0-20210104232444-d36009698767/go.mod h1:cjPaptLUKOKyHi9SzTNvBjeUcwATSI+54jtxSA8h1Nc= -github.com/keybase/go-billy v3.1.1-0.20180828145748-b5a7b7bc2074+incompatible h1:HpmQ1ozzHbMaeBSMbE1C5dLpHKf5fi51j6mp5O1yVjo= -github.com/keybase/go-billy v3.1.1-0.20180828145748-b5a7b7bc2074+incompatible/go.mod h1:z2/mXx1Zx7CjPRwrFv3//e/NkQaHdfhjUYESkRITU0I= github.com/keybase/go-codec v0.0.0-20180928230036-164397562123 h1:yg56lYPqh9suJepqxOMd/liFgU/x+maRPiB30JNYykM= github.com/keybase/go-codec v0.0.0-20180928230036-164397562123/go.mod h1:r/eVVWCngg6TsFV/3HuS9sWhDkAzGG8mXhiuYA+Z/20= github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4 h1:cTxwSmnaqLoo+4tLukHoB9iqHOu3LmLhRmgUxZo6Vp4= github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= github.com/keybase/go-framed-msgpack-rpc v0.0.0-20260106202536-6fa26d73bebe h1:mRTYEeU5q0A50JOD96wiEoMa5PV4pgxXUY0wfyZtkYA= github.com/keybase/go-framed-msgpack-rpc v0.0.0-20260106202536-6fa26d73bebe/go.mod h1:igAKryvRYOzFLczzsJayMErJr76ZljHMsiaib9DW2Y8= -github.com/keybase/go-git v4.0.0-rc9.0.20190209005256-3a78daa8ce8e+incompatible h1:vGk0ZpLiX9X58raUx86zSlmvmJmEEoUBz/Wr0aIYHIs= -github.com/keybase/go-git v4.0.0-rc9.0.20190209005256-3a78daa8ce8e+incompatible/go.mod h1:UXHGv5gdZq3WKJwTqUz51rTso8HiW4pPAq6h8bCBGUY= +github.com/keybase/go-git/v5 v5.19.1-keybase.1 h1:jWq57IVdB7oQERAFR8VsNi3L4GaoG68d6i1BwrKJiQI= +github.com/keybase/go-git/v5 v5.19.1-keybase.1/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ= github.com/keybase/go-jsonw v0.0.0-20200325173637-df90f282c233 h1:zLk+cB/0ShMCBcgBOXYgellLZiZahXFicJleKyrlqiM= github.com/keybase/go-jsonw v0.0.0-20200325173637-df90f282c233/go.mod h1:lofKQwj13L0/7ji5VYaY0257JDlQE2BRRf+rI2Vk1rU= github.com/keybase/go-kext v0.0.0-20251211195321-cdcb1aed632b h1:it7gUfUrDrx3WQ65IbDcO4PD8tSUw51bT1Qd4i2OoFk= @@ -311,11 +328,12 @@ github.com/klauspost/compress v0.0.0-20161106143436-e3b7981a12dd h1:vQ0EEfHpdFUt github.com/klauspost/compress v0.0.0-20161106143436-e3b7981a12dd/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/cpuid v0.0.0-20160302075316-09cded8978dc h1:WW8B7p7QBnFlqRVv/k6ro/S8Z7tCnYjJHcQNScx9YVs= github.com/klauspost/cpuid v0.0.0-20160302075316-09cded8978dc/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 h1:KAZ1BW2TCmT6PRihDPpocIy1QTtsAsrx6TneU/4+CMg= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/kr/pretty v0.0.0-20150520163514-e6ac2fc51e89/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -341,7 +359,6 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/miekg/dns v1.1.69 h1:Kb7Y/1Jo+SG+a2GtfoFUfDkG//csdRPwRLkCsxDG9Sc= github.com/miekg/dns v1.1.69/go.mod h1:7OyjD9nEba5OkqQ/hB4fy3PIoxafSZJtducccIelz3g= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -376,11 +393,11 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/pelletier/go-buffruneio v0.3.0 h1:eC9/s3XFaInXX/k6ltVSP274xZHZ0zL7I8u6mpzd8jw= -github.com/pelletier/go-buffruneio v0.3.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU= +github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -425,8 +442,11 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/simplereach/timeutils v1.2.0 h1:btgOAlu9RW6de2r2qQiONhjgxdAG7BL6je0G6J/yPnA= github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8= github.com/sirupsen/logrus v1.0.6-0.20180530095059-070c81def33f/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= +github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -440,8 +460,6 @@ github.com/spf13/pflag v0.0.0-20161005214240-4bd69631f475/go.mod h1:DYY7MBk1bdzu github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v0.0.0-20150621231900-db7ff930a189/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/src-d/gcfg v1.3.0 h1:2BEDr8r0I0b8h/fOqwtxCEiq2HJu8n2JGZJQFGXWLjg= -github.com/src-d/gcfg v1.3.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stathat/go v1.0.0 h1:HFIS5YkyaI6tXu7JXIRRZBLRvYstdNZm034zcCeaybI= github.com/stathat/go v1.0.0/go.mod h1:+9Eg2szqkcOGWv6gfheJmBBsmq9Qf5KDbzy8/aYYR0c= github.com/stellar/go-xdr v0.0.0-20180917104419-0bc96f33a18e/go.mod h1:gpOLVzy6TVYTQ3LvHSN9RJC700FkhFCpSE82u37aNRM= @@ -482,8 +500,8 @@ github.com/vividcortex/ewma v1.1.2-0.20170804035156-43880d236f69/go.mod h1:a/aQM github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11-0.20190404145324-77892cd8d53f h1:Ts2DHJgcVP4EA9oBKV64rfwJojTFyuIuQQ7gxv7wInA= github.com/willf/bitset v1.1.11-0.20190404145324-77892cd8d53f/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro= -github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xeipuuv/gojsonpointer v0.0.0-20151027082146-e0fe6f683076 h1:KM4T3G70MiR+JtqplcYkNVoNz7pDwYaBxWBXQK804So= github.com/xeipuuv/gojsonpointer v0.0.0-20151027082146-e0fe6f683076/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20150808065054-e02fc20de94c h1:XZWnr3bsDQWAZg4Ne+cPoXRPILrNlPNQfxBuwLl43is= @@ -523,6 +541,7 @@ golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= @@ -555,6 +574,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -590,6 +610,7 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -597,6 +618,7 @@ golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -698,8 +720,6 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKW gopkg.in/gorp.v1 v1.7.1/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tylerb/graceful.v1 v1.2.13/go.mod h1:yBhekWvR20ACXVObSSdD3u6S9DeSylanL2PAbAC/uJ8= diff --git a/go/kbfs/kbfsgit/runner.go b/go/kbfs/kbfsgit/runner.go index f1fa23d8867c..d76fb61059ed 100644 --- a/go/kbfs/kbfsgit/runner.go +++ b/go/kbfs/kbfsgit/runner.go @@ -31,15 +31,16 @@ import ( "github.com/keybase/client/go/logger" "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/osfs" - gogit "gopkg.in/src-d/go-git.v4" - gogitcfg "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - gogitobj "gopkg.in/src-d/go-git.v4/plumbing/object" - gogitstor "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + billy "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/osfs" + gogit "github.com/go-git/go-git/v5" + gogitcfg "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + gogitobj "github.com/go-git/go-git/v5/plumbing/object" + gogitstor "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" ) const ( @@ -1515,10 +1516,7 @@ func (r *runner) canPushAll( } localGit := osfs.New(r.gitDir) - localStorer, err := filesystem.NewStorage(localGit) - if err != nil { - return false, false, err - } + localStorer := filesystem.NewStorage(localGit, cache.NewObjectLRUDefault()) localRefs, err := localStorer.IterReferences() if err != nil { return false, false, err @@ -1845,10 +1843,7 @@ func (r *runner) handlePushBatch(ctx context.Context, args [][]string) ( } localGit := osfs.New(r.gitDir) - localStorer, err := filesystem.NewStorage(localGit) - if err != nil { - return nil, err - } + localStorer := filesystem.NewStorage(localGit, cache.NewObjectLRUDefault()) refspecs := make(map[gogitcfg.RefSpec]bool, len(args)) for _, push := range args { diff --git a/go/kbfs/kbfsgit/runner_test.go b/go/kbfs/kbfsgit/runner_test.go index 8c99797e7ecb..71305b339f1f 100644 --- a/go/kbfs/kbfsgit/runner_test.go +++ b/go/kbfs/kbfsgit/runner_test.go @@ -26,8 +26,8 @@ import ( "github.com/keybase/client/go/kbfs/tlfhandle" "github.com/keybase/client/go/protocol/keybase1" "github.com/stretchr/testify/require" - gogitcfg "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" + gogitcfg "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" ) type testErrput struct { diff --git a/go/kbfs/libfs/dummy_fs_read_only.go b/go/kbfs/libfs/dummy_fs_read_only.go index 147f78d16c6b..e923ce37a49b 100644 --- a/go/kbfs/libfs/dummy_fs_read_only.go +++ b/go/kbfs/libfs/dummy_fs_read_only.go @@ -10,7 +10,7 @@ import ( "github.com/keybase/client/go/kbfs/libkbfs" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) // dummyFSReadOnly is a wrapper struct that extends a `libkbfs.NodeFSReadOnly` diff --git a/go/kbfs/libfs/file.go b/go/kbfs/libfs/file.go index 5e035823b56c..f6e898fc515f 100644 --- a/go/kbfs/libfs/file.go +++ b/go/kbfs/libfs/file.go @@ -15,7 +15,7 @@ import ( "github.com/keybase/client/go/kbfs/libkbfs" "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) // File is a wrapper around a libkbfs.Node that implements the diff --git a/go/kbfs/libfs/fs.go b/go/kbfs/libfs/fs.go index d29cd4ec0841..2d18d8ecc430 100644 --- a/go/kbfs/libfs/fs.go +++ b/go/kbfs/libfs/fs.go @@ -24,7 +24,7 @@ import ( "github.com/keybase/client/go/logger" "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) // FSEventType is FS event type. diff --git a/go/kbfs/libfs/fs_test.go b/go/kbfs/libfs/fs_test.go index ac81ebb3a240..2fc8e89748d8 100644 --- a/go/kbfs/libfs/fs_test.go +++ b/go/kbfs/libfs/fs_test.go @@ -23,7 +23,7 @@ import ( "github.com/keybase/client/go/protocol/keybase1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) func makeFSWithBranch(t *testing.T, branch data.BranchName, subdir string) ( diff --git a/go/kbfs/libfs/httprootfs.go b/go/kbfs/libfs/httprootfs.go index e20187f3d7b6..0b70271c2a43 100644 --- a/go/kbfs/libfs/httprootfs.go +++ b/go/kbfs/libfs/httprootfs.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) type httpRootFileSystem struct { diff --git a/go/kbfs/libfs/leveldb_storage.go b/go/kbfs/libfs/leveldb_storage.go index eefbf7d386cb..2ebf3a5ad5d2 100644 --- a/go/kbfs/libfs/leveldb_storage.go +++ b/go/kbfs/libfs/leveldb_storage.go @@ -26,7 +26,7 @@ import ( "time" "github.com/syndtr/goleveldb/leveldb/storage" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) var errReadOnly = errors.New("leveldb/storage: storage is read-only") diff --git a/go/kbfs/libfs/node_wrappers.go b/go/kbfs/libfs/node_wrappers.go index df54c8e24636..69061514994f 100644 --- a/go/kbfs/libfs/node_wrappers.go +++ b/go/kbfs/libfs/node_wrappers.go @@ -21,7 +21,7 @@ import ( "github.com/keybase/client/go/logger" "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) type namedFileNode struct { diff --git a/go/kbfs/libfs/profilelist.go b/go/kbfs/libfs/profilelist.go index acd86f18aaeb..5e4c224b23de 100644 --- a/go/kbfs/libfs/profilelist.go +++ b/go/kbfs/libfs/profilelist.go @@ -17,7 +17,7 @@ import ( "github.com/keybase/client/go/kbfs/libkbfs" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) const ( diff --git a/go/kbfs/libfs/root_fs.go b/go/kbfs/libfs/root_fs.go index 150fbef1e227..629e4c766057 100644 --- a/go/kbfs/libfs/root_fs.go +++ b/go/kbfs/libfs/root_fs.go @@ -15,7 +15,7 @@ import ( "github.com/keybase/client/go/kbfs/libkbfs" "github.com/keybase/client/go/logger" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) func newStatusFileNode( diff --git a/go/kbfs/libfs/util.go b/go/kbfs/libfs/util.go index 1e43c064a0a1..cd129b348518 100644 --- a/go/kbfs/libfs/util.go +++ b/go/kbfs/libfs/util.go @@ -12,7 +12,7 @@ import ( "regexp" "strings" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) // RecursiveDelete deletes the given entry from the given filesystem. diff --git a/go/kbfs/libfs/wrapped_read_file.go b/go/kbfs/libfs/wrapped_read_file.go index 98a06517605b..d3fa5ef437cc 100644 --- a/go/kbfs/libfs/wrapped_read_file.go +++ b/go/kbfs/libfs/wrapped_read_file.go @@ -12,7 +12,7 @@ import ( "github.com/keybase/client/go/kbfs/libkbfs" "github.com/keybase/client/go/logger" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) const ( diff --git a/go/kbfs/libgit/autogit_manager.go b/go/kbfs/libgit/autogit_manager.go index 68dddf403482..e9340ea48ead 100644 --- a/go/kbfs/libgit/autogit_manager.go +++ b/go/kbfs/libgit/autogit_manager.go @@ -19,7 +19,7 @@ import ( "github.com/keybase/client/go/logger" "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) const ( diff --git a/go/kbfs/libgit/autogit_manager_test.go b/go/kbfs/libgit/autogit_manager_test.go index 5e56fe084f3d..60cf4acd02cf 100644 --- a/go/kbfs/libgit/autogit_manager_test.go +++ b/go/kbfs/libgit/autogit_manager_test.go @@ -18,10 +18,10 @@ import ( "github.com/keybase/client/go/kbfs/tlfhandle" "github.com/keybase/client/go/protocol/keybase1" "github.com/stretchr/testify/require" - billy "gopkg.in/src-d/go-billy.v4" - gogit "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" + billy "github.com/go-git/go-billy/v5" + gogit "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" ) func initConfigForAutogit(t *testing.T) ( diff --git a/go/kbfs/libgit/autogit_node_wrappers.go b/go/kbfs/libgit/autogit_node_wrappers.go index 312decb9c01d..aa7afe7d4761 100644 --- a/go/kbfs/libgit/autogit_node_wrappers.go +++ b/go/kbfs/libgit/autogit_node_wrappers.go @@ -15,8 +15,8 @@ import ( "github.com/keybase/client/go/kbfs/libfs" "github.com/keybase/client/go/kbfs/libkbfs" "github.com/keybase/client/go/protocol/keybase1" - billy "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing" + billy "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing" ) // This file contains libkbfs.Node wrappers for implementing the diff --git a/go/kbfs/libgit/autogit_node_wrappers_test.go b/go/kbfs/libgit/autogit_node_wrappers_test.go index 0668b02e224e..d0d8932c8155 100644 --- a/go/kbfs/libgit/autogit_node_wrappers_test.go +++ b/go/kbfs/libgit/autogit_node_wrappers_test.go @@ -19,8 +19,8 @@ import ( "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" "github.com/stretchr/testify/require" - gogit "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing/object" + gogit "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing/object" ) func TestAutogitNodeWrappersNoRepos(t *testing.T) { diff --git a/go/kbfs/libgit/browser.go b/go/kbfs/libgit/browser.go index 2905acf290b7..501e0635b5a5 100644 --- a/go/kbfs/libgit/browser.go +++ b/go/kbfs/libgit/browser.go @@ -15,11 +15,11 @@ import ( "github.com/keybase/client/go/kbfs/libfs" "github.com/keybase/client/go/kbfs/libkbfs" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" - gogit "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/storage" + billy "github.com/go-git/go-billy/v5" + gogit "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/storage" ) const ( diff --git a/go/kbfs/libgit/browser_file.go b/go/kbfs/libgit/browser_file.go index 7b03ea3a27bb..6f3d64087b1c 100644 --- a/go/kbfs/libgit/browser_file.go +++ b/go/kbfs/libgit/browser_file.go @@ -8,8 +8,8 @@ import ( "io" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing/object" + billy "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing/object" ) const ( diff --git a/go/kbfs/libgit/browser_file_info.go b/go/kbfs/libgit/browser_file_info.go index 3b81db7e7179..f880b3abbbe4 100644 --- a/go/kbfs/libgit/browser_file_info.go +++ b/go/kbfs/libgit/browser_file_info.go @@ -8,7 +8,7 @@ import ( "os" "time" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/object" ) type browserFileInfo struct { diff --git a/go/kbfs/libgit/browser_test.go b/go/kbfs/libgit/browser_test.go index 5c2120f1333d..5aec9ed54f97 100644 --- a/go/kbfs/libgit/browser_test.go +++ b/go/kbfs/libgit/browser_test.go @@ -18,9 +18,9 @@ import ( "github.com/keybase/client/go/kbfs/tlfhandle" "github.com/keybase/client/go/protocol/keybase1" "github.com/stretchr/testify/require" - gogit "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" + gogit "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" ) func testBrowser(t *testing.T, sharedCache sharedInBrowserCache) { diff --git a/go/kbfs/libgit/diff_file.go b/go/kbfs/libgit/diff_file.go index 8baa7208d55f..e59860d3b39e 100644 --- a/go/kbfs/libgit/diff_file.go +++ b/go/kbfs/libgit/diff_file.go @@ -11,8 +11,8 @@ import ( "time" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing/object" + billy "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing/object" ) const ( diff --git a/go/kbfs/libgit/ephemeral_git_config_with_fixed_pack_window.go b/go/kbfs/libgit/ephemeral_git_config_with_fixed_pack_window.go index ab451e53a024..265b54057712 100644 --- a/go/kbfs/libgit/ephemeral_git_config_with_fixed_pack_window.go +++ b/go/kbfs/libgit/ephemeral_git_config_with_fixed_pack_window.go @@ -8,10 +8,10 @@ import ( "io" "time" - gogitcfg "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + gogitcfg "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" ) // ephemeralGitConfigWithFixedPackWindow always returns a fixed pack diff --git a/go/kbfs/libgit/git_config_without_remotes_storer.go b/go/kbfs/libgit/git_config_without_remotes_storer.go index 1286d92ba7f6..323fdfaa7aea 100644 --- a/go/kbfs/libgit/git_config_without_remotes_storer.go +++ b/go/kbfs/libgit/git_config_without_remotes_storer.go @@ -6,11 +6,12 @@ package libgit import ( "github.com/keybase/client/go/kbfs/libfs" - gogitcfg "gopkg.in/src-d/go-git.v4/config" - format "gopkg.in/src-d/go-git.v4/plumbing/format/config" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + gogitcfg "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing/cache" + format "github.com/go-git/go-git/v5/plumbing/format/config" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" ) // GitConfigWithoutRemotesStorer strips remotes from the config before @@ -29,10 +30,7 @@ type GitConfigWithoutRemotesStorer struct { func NewGitConfigWithoutRemotesStorer(fs *libfs.FS) ( *GitConfigWithoutRemotesStorer, error, ) { - fsStorer, err := filesystem.NewStorage(fs) - if err != nil { - return nil, err - } + fsStorer := filesystem.NewStorage(fs, cache.NewObjectLRUDefault()) cfg, err := fsStorer.Config() if err != nil { return nil, err diff --git a/go/kbfs/libgit/on_demand_delta_object.go b/go/kbfs/libgit/on_demand_delta_object.go index d376d835f81a..13e721d3c4f6 100644 --- a/go/kbfs/libgit/on_demand_delta_object.go +++ b/go/kbfs/libgit/on_demand_delta_object.go @@ -9,8 +9,8 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) type onDemandDeltaObject struct { diff --git a/go/kbfs/libgit/on_demand_object.go b/go/kbfs/libgit/on_demand_object.go index 8e3e31462a22..b2c32803ec86 100644 --- a/go/kbfs/libgit/on_demand_object.go +++ b/go/kbfs/libgit/on_demand_object.go @@ -9,8 +9,8 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) type onDemandObject struct { diff --git a/go/kbfs/libgit/on_demand_storer.go b/go/kbfs/libgit/on_demand_storer.go index 58b113bee6ef..32ca837b1db8 100644 --- a/go/kbfs/libgit/on_demand_storer.go +++ b/go/kbfs/libgit/on_demand_storer.go @@ -7,9 +7,9 @@ package libgit import ( lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" ) // OnDemandStorer is a wrapper around a storage.Storer that reads diff --git a/go/kbfs/libgit/repo.go b/go/kbfs/libgit/repo.go index d505a5ec3811..d6de7d214962 100644 --- a/go/kbfs/libgit/repo.go +++ b/go/kbfs/libgit/repo.go @@ -26,13 +26,14 @@ import ( "github.com/keybase/client/go/logger" "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" - gogit "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + billy "github.com/go-git/go-billy/v5" + gogit "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" ) const ( @@ -1004,10 +1005,7 @@ func GCRepo( } }() - fsStorer, err := filesystem.NewStorage(fs) - if err != nil { - return err - } + fsStorer := filesystem.NewStorage(fs, cache.NewObjectLRUDefault()) var fsStorage storage.Storer = fsStorer // Wrap it in an on-demand storer, so we don't try to read all the diff --git a/go/kbfs/libgit/shared_browser_cache.go b/go/kbfs/libgit/shared_browser_cache.go index e0d4631008f0..5e6c8455207e 100644 --- a/go/kbfs/libgit/shared_browser_cache.go +++ b/go/kbfs/libgit/shared_browser_cache.go @@ -8,7 +8,7 @@ import ( "os" lru "github.com/hashicorp/golang-lru" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type browserCacheEntryType int diff --git a/go/kbfs/libgit/submodule_file.go b/go/kbfs/libgit/submodule_file.go index 236420edd1ee..e32afd2fd58d 100644 --- a/go/kbfs/libgit/submodule_file.go +++ b/go/kbfs/libgit/submodule_file.go @@ -9,8 +9,8 @@ import ( "time" "github.com/pkg/errors" - billy "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing" + billy "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing" ) type submoduleFile struct { diff --git a/go/kbfs/libkbfs/interfaces.go b/go/kbfs/libkbfs/interfaces.go index f2e00a08949b..75449ffe153b 100644 --- a/go/kbfs/libkbfs/interfaces.go +++ b/go/kbfs/libkbfs/interfaces.go @@ -27,7 +27,7 @@ import ( "github.com/keybase/client/go/protocol/keybase1" "github.com/keybase/go-framed-msgpack-rpc/rpc" metrics "github.com/rcrowley/go-metrics" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) type logMaker interface { diff --git a/go/kbfs/libkbfs/kbfs_ops_test.go b/go/kbfs/libkbfs/kbfs_ops_test.go index 259de56772ad..a403889caae0 100644 --- a/go/kbfs/libkbfs/kbfs_ops_test.go +++ b/go/kbfs/libkbfs/kbfs_ops_test.go @@ -39,8 +39,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" - billy "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/memfs" + billy "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/memfs" ) type CheckBlockOps struct { diff --git a/go/kbfs/libkbfs/libkbfs_mocks_test.go b/go/kbfs/libkbfs/libkbfs_mocks_test.go index 4e72cec954a8..a50c9053c58a 100644 --- a/go/kbfs/libkbfs/libkbfs_mocks_test.go +++ b/go/kbfs/libkbfs/libkbfs_mocks_test.go @@ -24,7 +24,7 @@ import ( chat1 "github.com/keybase/client/go/protocol/chat1" keybase1 "github.com/keybase/client/go/protocol/keybase1" rpc "github.com/keybase/go-framed-msgpack-rpc/rpc" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) // MockBlockOps is a mock of BlockOps interface. diff --git a/go/kbfs/libkbfs/node.go b/go/kbfs/libkbfs/node.go index 50639400fd80..5e4189e38fa2 100644 --- a/go/kbfs/libkbfs/node.go +++ b/go/kbfs/libkbfs/node.go @@ -13,7 +13,7 @@ import ( "github.com/keybase/client/go/kbfs/data" "github.com/keybase/client/go/kbfs/kbfsblock" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) // nodeCore holds info shared among one or more nodeStandard objects. diff --git a/go/kbfs/search/bleve_leveldb_store.go b/go/kbfs/search/bleve_leveldb_store.go index 42312c520be7..7ea7ce92840e 100644 --- a/go/kbfs/search/bleve_leveldb_store.go +++ b/go/kbfs/search/bleve_leveldb_store.go @@ -13,7 +13,7 @@ import ( "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) type bleveLevelDBIterator struct { diff --git a/go/kbfs/search/doc_db.go b/go/kbfs/search/doc_db.go index 1c43ce30f610..85d779249d6b 100644 --- a/go/kbfs/search/doc_db.go +++ b/go/kbfs/search/doc_db.go @@ -15,7 +15,7 @@ import ( "github.com/keybase/client/go/logger" "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb/storage" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) // DocDb is a database that holds metadata about indexed documents. diff --git a/go/kbfs/search/indexer.go b/go/kbfs/search/indexer.go index 6adbc80f1aa6..e38a3be5bc37 100644 --- a/go/kbfs/search/indexer.go +++ b/go/kbfs/search/indexer.go @@ -32,7 +32,7 @@ import ( "github.com/pkg/errors" "github.com/shirou/gopsutil/mem" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) const ( diff --git a/go/kbfs/simplefs/archive.go b/go/kbfs/simplefs/archive.go index f80ab2ac7739..fce277917ad0 100644 --- a/go/kbfs/simplefs/archive.go +++ b/go/kbfs/simplefs/archive.go @@ -28,7 +28,7 @@ import ( "github.com/keybase/client/go/libkb" "github.com/keybase/client/go/protocol/keybase1" "github.com/pkg/errors" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) func loadArchiveStateFromJsonGz(ctx context.Context, simpleFS *SimpleFS, filePath string) (state *keybase1.SimpleFSArchiveState, err error) { diff --git a/go/kbfs/simplefs/simplefs.go b/go/kbfs/simplefs/simplefs.go index 0f54a3f173be..1d05b71b04dd 100644 --- a/go/kbfs/simplefs/simplefs.go +++ b/go/kbfs/simplefs/simplefs.go @@ -42,8 +42,8 @@ import ( "github.com/keybase/client/go/runtimestats" "github.com/pkg/errors" "golang.org/x/sync/errgroup" - billy "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/osfs" + billy "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/osfs" ) const ( diff --git a/go/kbfs/simplefs/simplefs_test.go b/go/kbfs/simplefs/simplefs_test.go index c7d354aaeb14..ee2d95d4cd74 100644 --- a/go/kbfs/simplefs/simplefs_test.go +++ b/go/kbfs/simplefs/simplefs_test.go @@ -28,7 +28,7 @@ import ( "github.com/keybase/client/go/libkb" "github.com/keybase/client/go/protocol/keybase1" "github.com/stretchr/testify/require" - billy "gopkg.in/src-d/go-billy.v4" + billy "github.com/go-git/go-billy/v5" ) const TempDirBase = "."