Increase default cost for p2p remotes from 200 to 1000. This makes git-annex prefer...

diff --git a/CHANGELOG b/CHANGELOG
index 07dd3d84e27a3499334f6d8fbbc05a9c0e0aaeee..a7a1d8ee8365af7485bede41e0f534ebbd36c17d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+git-annex (6.20170102) UNRELEASED; urgency=medium
+
+  * Increase default cost for p2p remotes from 200 to 1000.
+    This makes git-annex prefer transferring data from special
+    remotes when possible.
+
+ -- Joey Hess <id@joeyh.name>  Fri, 06 Jan 2017 15:22:06 -0400
+
 git-annex (6.20170101) unstable; urgency=medium
 
   * XMPP support has been removed from the assistant in this release.

diff --git a/Remote/P2P.hs b/Remote/P2P.hs
index f0848f83180da1eeaadd7c83fbf4cba88dbac8d3..ca555c30d2b3327923d0f663f8fd2748ef3d3fc1 100644 (file)
--- a/Remote/P2P.hs
+++ b/Remote/P2P.hs
@@ -45,7 +45,7 @@ remote = RemoteType {
 chainGen :: P2PAddress -> Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote)
 chainGen addr r u c gc = do
        connpool <- mkConnectionPool
-       cst <- remoteCost gc expensiveRemoteCost
+       cst <- remoteCost gc veryExpensiveRemoteCost
        let this = Remote 
                { uuid = u
                , cost = cst