From: Matt Joiner <anacrolix@gmail.com>
Date: Fri, 20 Mar 2015 05:37:44 +0000 (+1100)
Subject: Rewrite import paths for migration from Bitbucket
X-Git-Tag: v1.0.0~1260
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=842a32ae0c2c81211e253576884715fe2e317f6b;p=btrtrc.git
Rewrite import paths for migration from Bitbucket
---
diff --git a/client.go b/client.go
index 2bca18fb..37feaacc 100644
--- a/client.go
+++ b/client.go
@@ -39,20 +39,20 @@ import (
"github.com/bradfitz/iter"
- "bitbucket.org/anacrolix/go.torrent/mse"
-
- "bitbucket.org/anacrolix/go.torrent/data"
- filePkg "bitbucket.org/anacrolix/go.torrent/data/file"
- "bitbucket.org/anacrolix/go.torrent/dht"
- "bitbucket.org/anacrolix/go.torrent/internal/pieceordering"
- "bitbucket.org/anacrolix/go.torrent/iplist"
- "bitbucket.org/anacrolix/go.torrent/logonce"
- pp "bitbucket.org/anacrolix/go.torrent/peer_protocol"
- "bitbucket.org/anacrolix/go.torrent/tracker"
- _ "bitbucket.org/anacrolix/go.torrent/tracker/udp"
- . "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent/mse"
+
+ "github.com/anacrolix/torrent/data"
+ filePkg "github.com/anacrolix/torrent/data/file"
+ "github.com/anacrolix/torrent/dht"
+ "github.com/anacrolix/torrent/internal/pieceordering"
+ "github.com/anacrolix/torrent/iplist"
+ "github.com/anacrolix/torrent/logonce"
+ pp "github.com/anacrolix/torrent/peer_protocol"
+ "github.com/anacrolix/torrent/tracker"
+ _ "github.com/anacrolix/torrent/tracker/udp"
+ . "github.com/anacrolix/torrent/util"
"bitbucket.org/anacrolix/sync"
- "bitbucket.org/anacrolix/utp"
+ "github.com/anacrolix/utp"
"github.com/anacrolix/libtorgo/bencode"
"github.com/anacrolix/libtorgo/metainfo"
)
diff --git a/client_test.go b/client_test.go
index 8d0caf06..a3f1fda2 100644
--- a/client_test.go
+++ b/client_test.go
@@ -11,13 +11,13 @@ import (
"testing"
"time"
- "bitbucket.org/anacrolix/go.torrent/data/blob"
+ "github.com/anacrolix/torrent/data/blob"
"github.com/bradfitz/iter"
- "bitbucket.org/anacrolix/go.torrent/internal/testutil"
- "bitbucket.org/anacrolix/go.torrent/util"
- "bitbucket.org/anacrolix/utp"
+ "github.com/anacrolix/torrent/internal/testutil"
+ "github.com/anacrolix/torrent/util"
+ "github.com/anacrolix/utp"
"github.com/anacrolix/libtorgo/bencode"
)
diff --git a/cmd/dht-get-peers/main.go b/cmd/dht-get-peers/main.go
index 40adb32e..edea0f46 100644
--- a/cmd/dht-get-peers/main.go
+++ b/cmd/dht-get-peers/main.go
@@ -11,9 +11,9 @@ import (
_ "github.com/anacrolix/envpprof"
- "bitbucket.org/anacrolix/go.torrent/dht"
- "bitbucket.org/anacrolix/go.torrent/util"
- _ "bitbucket.org/anacrolix/go.torrent/util/profile"
+ "github.com/anacrolix/torrent/dht"
+ "github.com/anacrolix/torrent/util"
+ _ "github.com/anacrolix/torrent/util/profile"
)
type pingResponse struct {
diff --git a/cmd/dht-ping/main.go b/cmd/dht-ping/main.go
index d1d98ad7..bdb3fa65 100644
--- a/cmd/dht-ping/main.go
+++ b/cmd/dht-ping/main.go
@@ -8,7 +8,7 @@ import (
"os"
"time"
- "bitbucket.org/anacrolix/go.torrent/dht"
+ "github.com/anacrolix/torrent/dht"
)
type pingResponse struct {
diff --git a/cmd/dht-server/main.go b/cmd/dht-server/main.go
index 7f3bc1ca..3bcf5b03 100644
--- a/cmd/dht-server/main.go
+++ b/cmd/dht-server/main.go
@@ -8,7 +8,7 @@ import (
"os"
"os/signal"
- "bitbucket.org/anacrolix/go.torrent/dht"
+ "github.com/anacrolix/torrent/dht"
)
type pingResponse struct {
diff --git a/cmd/magnet-metainfo/main.go b/cmd/magnet-metainfo/main.go
index fb2a5cec..e7f643fe 100644
--- a/cmd/magnet-metainfo/main.go
+++ b/cmd/magnet-metainfo/main.go
@@ -9,7 +9,7 @@ import (
"github.com/anacrolix/libtorgo/bencode"
- "bitbucket.org/anacrolix/go.torrent"
+ "github.com/anacrolix/torrent"
)
func main() {
diff --git a/cmd/scrape/main.go b/cmd/scrape/main.go
index e2f4cf7c..15060f5d 100644
--- a/cmd/scrape/main.go
+++ b/cmd/scrape/main.go
@@ -5,9 +5,9 @@ import (
"log"
"os"
- "bitbucket.org/anacrolix/go.torrent/tracker"
- _ "bitbucket.org/anacrolix/go.torrent/tracker/udp"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent/tracker"
+ _ "github.com/anacrolix/torrent/tracker/udp"
+ "github.com/anacrolix/torrent/util"
metainfo "github.com/anacrolix/libtorgo/metainfo"
)
diff --git a/cmd/torrent-verify/main.go b/cmd/torrent-verify/main.go
index 4206756a..4101c1d9 100644
--- a/cmd/torrent-verify/main.go
+++ b/cmd/torrent-verify/main.go
@@ -9,7 +9,7 @@ import (
"os"
"path/filepath"
- "bitbucket.org/anacrolix/go.torrent/mmap_span"
+ "github.com/anacrolix/torrent/mmap_span"
"github.com/anacrolix/libtorgo/metainfo"
"launchpad.net/gommap"
)
diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index 46e103a1..0c927255 100644
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -14,7 +14,7 @@ import (
"github.com/anacrolix/libtorgo/metainfo"
- "bitbucket.org/anacrolix/go.torrent"
+ "github.com/anacrolix/torrent"
)
var (
diff --git a/cmd/torrentfs/main.go b/cmd/torrentfs/main.go
index a93b94d0..58cc8fd2 100644
--- a/cmd/torrentfs/main.go
+++ b/cmd/torrentfs/main.go
@@ -15,12 +15,12 @@ import (
_ "github.com/anacrolix/envpprof"
- "bitbucket.org/anacrolix/go.torrent/util/dirwatch"
+ "github.com/anacrolix/torrent/util/dirwatch"
"bazil.org/fuse"
fusefs "bazil.org/fuse/fs"
- "bitbucket.org/anacrolix/go.torrent"
- "bitbucket.org/anacrolix/go.torrent/fs"
+ "github.com/anacrolix/torrent"
+ "github.com/anacrolix/torrent/fs"
)
var (
diff --git a/config.go b/config.go
index 99d625fc..74985e27 100644
--- a/config.go
+++ b/config.go
@@ -1,7 +1,7 @@
package torrent
import (
- "bitbucket.org/anacrolix/go.torrent/dht"
+ "github.com/anacrolix/torrent/dht"
)
// Override Client defaults.
diff --git a/connection.go b/connection.go
index 675ba57a..aecc61f2 100644
--- a/connection.go
+++ b/connection.go
@@ -12,8 +12,8 @@ import (
"sync"
"time"
- "bitbucket.org/anacrolix/go.torrent/internal/pieceordering"
- pp "bitbucket.org/anacrolix/go.torrent/peer_protocol"
+ "github.com/anacrolix/torrent/internal/pieceordering"
+ pp "github.com/anacrolix/torrent/peer_protocol"
)
var optimizedCancels = expvar.NewInt("optimizedCancels")
diff --git a/connection_test.go b/connection_test.go
index ed26edec..d55186ad 100644
--- a/connection_test.go
+++ b/connection_test.go
@@ -8,9 +8,9 @@ import (
"github.com/bradfitz/iter"
- "bitbucket.org/anacrolix/go.torrent/internal/pieceordering"
+ "github.com/anacrolix/torrent/internal/pieceordering"
- "bitbucket.org/anacrolix/go.torrent/peer_protocol"
+ "github.com/anacrolix/torrent/peer_protocol"
)
func TestCancelRequestOptimized(t *testing.T) {
diff --git a/data/blob/store.go b/data/blob/store.go
index 6bb411e4..874aa719 100644
--- a/data/blob/store.go
+++ b/data/blob/store.go
@@ -12,7 +12,7 @@ import (
"sort"
"time"
- dataPkg "bitbucket.org/anacrolix/go.torrent/data"
+ dataPkg "github.com/anacrolix/torrent/data"
"github.com/anacrolix/libtorgo/metainfo"
)
diff --git a/data/mmap/mmap.go b/data/mmap/mmap.go
index 423cf34c..d071bade 100644
--- a/data/mmap/mmap.go
+++ b/data/mmap/mmap.go
@@ -5,7 +5,7 @@ import (
"os"
"path/filepath"
- "bitbucket.org/anacrolix/go.torrent/mmap_span"
+ "github.com/anacrolix/torrent/mmap_span"
"github.com/anacrolix/libtorgo/metainfo"
"launchpad.net/gommap"
)
diff --git a/dht/dht.go b/dht/dht.go
index 5b426045..ec6bca3c 100644
--- a/dht/dht.go
+++ b/dht/dht.go
@@ -14,9 +14,9 @@ import (
"os"
"time"
- "bitbucket.org/anacrolix/go.torrent/iplist"
- "bitbucket.org/anacrolix/go.torrent/logonce"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent/iplist"
+ "github.com/anacrolix/torrent/logonce"
+ "github.com/anacrolix/torrent/util"
"bitbucket.org/anacrolix/sync"
"github.com/anacrolix/libtorgo/bencode"
)
diff --git a/dht/getpeers.go b/dht/getpeers.go
index f25603b4..8f3e4fb6 100644
--- a/dht/getpeers.go
+++ b/dht/getpeers.go
@@ -6,9 +6,9 @@ import (
"log"
"time"
- "bitbucket.org/anacrolix/go.torrent/logonce"
+ "github.com/anacrolix/torrent/logonce"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent/util"
"bitbucket.org/anacrolix/sync"
"github.com/willf/bloom"
)
diff --git a/fs/torrentfs.go b/fs/torrentfs.go
index f17931e9..aaaf1569 100644
--- a/fs/torrentfs.go
+++ b/fs/torrentfs.go
@@ -14,7 +14,7 @@ import (
"bazil.org/fuse"
fusefs "bazil.org/fuse/fs"
- "bitbucket.org/anacrolix/go.torrent"
+ "github.com/anacrolix/torrent"
)
const (
diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
index 573982ed..7640dbb7 100644
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -14,14 +14,14 @@ import (
"testing"
"time"
- "bitbucket.org/anacrolix/go.torrent/data"
+ "github.com/anacrolix/torrent/data"
"golang.org/x/net/context"
- "bitbucket.org/anacrolix/go.torrent"
- "bitbucket.org/anacrolix/go.torrent/data/mmap"
- "bitbucket.org/anacrolix/go.torrent/internal/testutil"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent"
+ "github.com/anacrolix/torrent/data/mmap"
+ "github.com/anacrolix/torrent/internal/testutil"
+ "github.com/anacrolix/torrent/util"
"github.com/anacrolix/libtorgo/metainfo"
diff --git a/iplist/iplist_test.go b/iplist/iplist_test.go
index 6b8ff1f0..09d216fc 100644
--- a/iplist/iplist_test.go
+++ b/iplist/iplist_test.go
@@ -9,7 +9,7 @@ import (
"github.com/bradfitz/iter"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent/util"
)
var sample = `
diff --git a/misc.go b/misc.go
index c63fa6eb..70d8375e 100644
--- a/misc.go
+++ b/misc.go
@@ -8,7 +8,7 @@ import (
"sync"
"time"
- "bitbucket.org/anacrolix/go.torrent/peer_protocol"
+ "github.com/anacrolix/torrent/peer_protocol"
)
const (
diff --git a/mse/mse.go b/mse/mse.go
index 91f9fd88..17cd52f1 100644
--- a/mse/mse.go
+++ b/mse/mse.go
@@ -17,7 +17,7 @@ import (
"strconv"
"sync"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent/util"
"github.com/bradfitz/iter"
)
diff --git a/stateless.go b/stateless.go
index 3caa4957..99fc1e07 100644
--- a/stateless.go
+++ b/stateless.go
@@ -1,6 +1,6 @@
package torrent
-import "bitbucket.org/anacrolix/go.torrent/data"
+import "github.com/anacrolix/torrent/data"
type statelessDataWrapper struct {
data.Data
diff --git a/torrent.go b/torrent.go
index 5ee3376a..776c2cf3 100644
--- a/torrent.go
+++ b/torrent.go
@@ -14,10 +14,10 @@ import (
"github.com/bradfitz/iter"
- "bitbucket.org/anacrolix/go.torrent/data"
- pp "bitbucket.org/anacrolix/go.torrent/peer_protocol"
- "bitbucket.org/anacrolix/go.torrent/tracker"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent/data"
+ pp "github.com/anacrolix/torrent/peer_protocol"
+ "github.com/anacrolix/torrent/tracker"
+ "github.com/anacrolix/torrent/util"
"github.com/anacrolix/libtorgo/bencode"
"github.com/anacrolix/libtorgo/metainfo"
)
diff --git a/torrent_test.go b/torrent_test.go
index 33c40d6b..fdc96903 100644
--- a/torrent_test.go
+++ b/torrent_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "bitbucket.org/anacrolix/go.torrent/peer_protocol"
+ "github.com/anacrolix/torrent/peer_protocol"
)
func r(i, b, l peer_protocol.Integer) request {
diff --git a/tracker/udp/udp_tracker.go b/tracker/udp/udp_tracker.go
index 3ba30a84..857436b3 100644
--- a/tracker/udp/udp_tracker.go
+++ b/tracker/udp/udp_tracker.go
@@ -11,7 +11,7 @@ import (
"net/url"
"time"
- "bitbucket.org/anacrolix/go.torrent/tracker"
+ "github.com/anacrolix/torrent/tracker"
)
type Action int32
diff --git a/tracker/udp/udp_tracker_test.go b/tracker/udp/udp_tracker_test.go
index 488cd49a..216cff83 100644
--- a/tracker/udp/udp_tracker_test.go
+++ b/tracker/udp/udp_tracker_test.go
@@ -13,7 +13,7 @@ import (
"syscall"
"testing"
- "bitbucket.org/anacrolix/go.torrent/tracker"
+ "github.com/anacrolix/torrent/tracker"
)
// Ensure net.IPs are stored big-endian, to match the way they're read from
diff --git a/util/dirwatch/dirwatch.go b/util/dirwatch/dirwatch.go
index cbe2026a..220bb1b5 100644
--- a/util/dirwatch/dirwatch.go
+++ b/util/dirwatch/dirwatch.go
@@ -9,8 +9,8 @@ import (
"path/filepath"
"strings"
- "bitbucket.org/anacrolix/go.torrent"
- "bitbucket.org/anacrolix/go.torrent/util"
+ "github.com/anacrolix/torrent"
+ "github.com/anacrolix/torrent/util"
"github.com/anacrolix/libtorgo/metainfo"
"github.com/go-fsnotify/fsnotify"
)