aboutsummaryrefslogtreecommitdiffstats
path: root/utils/merkletrie
diff options
context:
space:
mode:
Diffstat (limited to 'utils/merkletrie')
-rw-r--r--utils/merkletrie/change.go2
-rw-r--r--utils/merkletrie/change_test.go6
-rw-r--r--utils/merkletrie/difftree.go2
-rw-r--r--utils/merkletrie/difftree_test.go4
-rw-r--r--utils/merkletrie/doubleiter.go2
-rw-r--r--utils/merkletrie/filesystem/node.go8
-rw-r--r--utils/merkletrie/filesystem/node_test.go10
-rw-r--r--utils/merkletrie/index/node.go4
-rw-r--r--utils/merkletrie/index/node_test.go8
-rw-r--r--utils/merkletrie/internal/frame/frame.go2
-rw-r--r--utils/merkletrie/internal/frame/frame_test.go4
-rw-r--r--utils/merkletrie/internal/fsnoder/dir.go2
-rw-r--r--utils/merkletrie/internal/fsnoder/dir_test.go2
-rw-r--r--utils/merkletrie/internal/fsnoder/file.go2
-rw-r--r--utils/merkletrie/internal/fsnoder/file_test.go2
-rw-r--r--utils/merkletrie/internal/fsnoder/new.go2
-rw-r--r--utils/merkletrie/internal/fsnoder/new_test.go2
-rw-r--r--utils/merkletrie/iter.go4
-rw-r--r--utils/merkletrie/iter_test.go6
19 files changed, 37 insertions, 37 deletions
diff --git a/utils/merkletrie/change.go b/utils/merkletrie/change.go
index 0b50ca7..cc6dc89 100644
--- a/utils/merkletrie/change.go
+++ b/utils/merkletrie/change.go
@@ -4,7 +4,7 @@ import (
"fmt"
"io"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// Action values represent the kind of things a Change can represent:
diff --git a/utils/merkletrie/change_test.go b/utils/merkletrie/change_test.go
index c849f5f..f73eb86 100644
--- a/utils/merkletrie/change_test.go
+++ b/utils/merkletrie/change_test.go
@@ -1,9 +1,9 @@
package merkletrie_test
import (
- "gopkg.in/src-d/go-git.v4/utils/merkletrie"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie"
+ "github.com/go-git/go-git/v5/utils/merkletrie/internal/fsnoder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
. "gopkg.in/check.v1"
)
diff --git a/utils/merkletrie/difftree.go b/utils/merkletrie/difftree.go
index 77ba5a8..90d9c95 100644
--- a/utils/merkletrie/difftree.go
+++ b/utils/merkletrie/difftree.go
@@ -252,7 +252,7 @@ import (
"errors"
"fmt"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
var (
diff --git a/utils/merkletrie/difftree_test.go b/utils/merkletrie/difftree_test.go
index f725bcf..c3937bf 100644
--- a/utils/merkletrie/difftree_test.go
+++ b/utils/merkletrie/difftree_test.go
@@ -10,8 +10,8 @@ import (
"testing"
"unicode"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder"
+ "github.com/go-git/go-git/v5/utils/merkletrie"
+ "github.com/go-git/go-git/v5/utils/merkletrie/internal/fsnoder"
. "gopkg.in/check.v1"
)
diff --git a/utils/merkletrie/doubleiter.go b/utils/merkletrie/doubleiter.go
index e56dee7..4a4341b 100644
--- a/utils/merkletrie/doubleiter.go
+++ b/utils/merkletrie/doubleiter.go
@@ -4,7 +4,7 @@ import (
"fmt"
"io"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// A doubleIter is a convenience type to keep track of the current
diff --git a/utils/merkletrie/filesystem/node.go b/utils/merkletrie/filesystem/node.go
index 12d0018..165bd42 100644
--- a/utils/merkletrie/filesystem/node.go
+++ b/utils/merkletrie/filesystem/node.go
@@ -5,11 +5,11 @@ import (
"os"
"path"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/filemode"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/filemode"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
- "gopkg.in/src-d/go-billy.v4"
+ "github.com/go-git/go-billy/v5"
)
var ignore = map[string]bool{
diff --git a/utils/merkletrie/filesystem/node_test.go b/utils/merkletrie/filesystem/node_test.go
index 12f3412..0f6ebe0 100644
--- a/utils/merkletrie/filesystem/node_test.go
+++ b/utils/merkletrie/filesystem/node_test.go
@@ -7,12 +7,12 @@ import (
"path"
"testing"
+ "github.com/go-git/go-billy/v5"
+ "github.com/go-git/go-billy/v5/memfs"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v4"
- "gopkg.in/src-d/go-billy.v4/memfs"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/utils/merkletrie"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
func Test(t *testing.T) { TestingT(t) }
diff --git a/utils/merkletrie/index/node.go b/utils/merkletrie/index/node.go
index 9622622..d05b0c6 100644
--- a/utils/merkletrie/index/node.go
+++ b/utils/merkletrie/index/node.go
@@ -4,8 +4,8 @@ import (
"path"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing/format/index"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/plumbing/format/index"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// The node represents a index.Entry or a directory inferred from the path
diff --git a/utils/merkletrie/index/node_test.go b/utils/merkletrie/index/node_test.go
index 283ca74..4fa6c63 100644
--- a/utils/merkletrie/index/node_test.go
+++ b/utils/merkletrie/index/node_test.go
@@ -6,10 +6,10 @@ import (
"testing"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/format/index"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/format/index"
+ "github.com/go-git/go-git/v5/utils/merkletrie"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
func Test(t *testing.T) { TestingT(t) }
diff --git a/utils/merkletrie/internal/frame/frame.go b/utils/merkletrie/internal/frame/frame.go
index 77a3de4..131878a 100644
--- a/utils/merkletrie/internal/frame/frame.go
+++ b/utils/merkletrie/internal/frame/frame.go
@@ -6,7 +6,7 @@ import (
"sort"
"strings"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// A Frame is a collection of siblings in a trie, sorted alphabetically
diff --git a/utils/merkletrie/internal/frame/frame_test.go b/utils/merkletrie/internal/frame/frame_test.go
index 7d74b1e..0544c8b 100644
--- a/utils/merkletrie/internal/frame/frame_test.go
+++ b/utils/merkletrie/internal/frame/frame_test.go
@@ -4,8 +4,8 @@ import (
"fmt"
"testing"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/internal/fsnoder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
. "gopkg.in/check.v1"
)
diff --git a/utils/merkletrie/internal/fsnoder/dir.go b/utils/merkletrie/internal/fsnoder/dir.go
index 1811de9..20a2aee 100644
--- a/utils/merkletrie/internal/fsnoder/dir.go
+++ b/utils/merkletrie/internal/fsnoder/dir.go
@@ -7,7 +7,7 @@ import (
"sort"
"strings"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// Dir values implement directory-like noders.
diff --git a/utils/merkletrie/internal/fsnoder/dir_test.go b/utils/merkletrie/internal/fsnoder/dir_test.go
index df5aacc..1a6ea03 100644
--- a/utils/merkletrie/internal/fsnoder/dir_test.go
+++ b/utils/merkletrie/internal/fsnoder/dir_test.go
@@ -4,7 +4,7 @@ import (
"reflect"
"sort"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
. "gopkg.in/check.v1"
)
diff --git a/utils/merkletrie/internal/fsnoder/file.go b/utils/merkletrie/internal/fsnoder/file.go
index 686a675..d53643f 100644
--- a/utils/merkletrie/internal/fsnoder/file.go
+++ b/utils/merkletrie/internal/fsnoder/file.go
@@ -5,7 +5,7 @@ import (
"fmt"
"hash/fnv"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// file values represent file-like noders in a merkle trie.
diff --git a/utils/merkletrie/internal/fsnoder/file_test.go b/utils/merkletrie/internal/fsnoder/file_test.go
index 730ae7c..b949b53 100644
--- a/utils/merkletrie/internal/fsnoder/file_test.go
+++ b/utils/merkletrie/internal/fsnoder/file_test.go
@@ -3,7 +3,7 @@ package fsnoder
import (
"testing"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
. "gopkg.in/check.v1"
)
diff --git a/utils/merkletrie/internal/fsnoder/new.go b/utils/merkletrie/internal/fsnoder/new.go
index ab749fd..b5389c7 100644
--- a/utils/merkletrie/internal/fsnoder/new.go
+++ b/utils/merkletrie/internal/fsnoder/new.go
@@ -5,7 +5,7 @@ import (
"fmt"
"io"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// New function creates a full merkle trie from the string description of
diff --git a/utils/merkletrie/internal/fsnoder/new_test.go b/utils/merkletrie/internal/fsnoder/new_test.go
index a2c474a..ad069c7 100644
--- a/utils/merkletrie/internal/fsnoder/new_test.go
+++ b/utils/merkletrie/internal/fsnoder/new_test.go
@@ -1,7 +1,7 @@
package fsnoder
import (
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
. "gopkg.in/check.v1"
)
diff --git a/utils/merkletrie/iter.go b/utils/merkletrie/iter.go
index b4d4c99..d75afec 100644
--- a/utils/merkletrie/iter.go
+++ b/utils/merkletrie/iter.go
@@ -4,8 +4,8 @@ import (
"fmt"
"io"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/frame"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/internal/frame"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
)
// Iter is an iterator for merkletries (only the trie part of the
diff --git a/utils/merkletrie/iter_test.go b/utils/merkletrie/iter_test.go
index 3b24043..ad6639b 100644
--- a/utils/merkletrie/iter_test.go
+++ b/utils/merkletrie/iter_test.go
@@ -5,9 +5,9 @@ import (
"io"
"strings"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder"
- "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
+ "github.com/go-git/go-git/v5/utils/merkletrie"
+ "github.com/go-git/go-git/v5/utils/merkletrie/internal/fsnoder"
+ "github.com/go-git/go-git/v5/utils/merkletrie/noder"
. "gopkg.in/check.v1"
)
generated by cgit (git 2.34.1) at 2024-11-10 11:03:12 +0000