##// END OF EJS Templates
exchange: move stream clone logic into pull code path...
Gregory Szorc -
r26449:89b7a788 default
parent child Browse files
Show More
@@ -11,6 +11,7 b' import errno, urllib'
11 import util, scmutil, changegroup, base85, error
11 import util, scmutil, changegroup, base85, error
12 import discovery, phases, obsolete, bookmarks as bookmod, bundle2, pushkey
12 import discovery, phases, obsolete, bookmarks as bookmod, bundle2, pushkey
13 import lock as lockmod
13 import lock as lockmod
14 import streamclone
14 import tags
15 import tags
15
16
16 def readbundle(ui, fh, fname, vfs=None):
17 def readbundle(ui, fh, fname, vfs=None):
@@ -963,6 +964,9 b' def pull(repo, remote, heads=None, force'
963 lock = pullop.repo.lock()
964 lock = pullop.repo.lock()
964 try:
965 try:
965 pullop.trmanager = transactionmanager(repo, 'pull', remote.url())
966 pullop.trmanager = transactionmanager(repo, 'pull', remote.url())
967 streamclone.maybeperformstreamclone(pullop.repo, pullop.remote,
968 pullop.heads,
969 pullop.streamclonerequested)
966 _pulldiscovery(pullop)
970 _pulldiscovery(pullop)
967 if _canusebundle2(pullop):
971 if _canusebundle2(pullop):
968 _pullbundle2(pullop)
972 _pullbundle2(pullop)
@@ -19,7 +19,6 b' from lock import release'
19 import weakref, errno, os, time, inspect, random
19 import weakref, errno, os, time, inspect, random
20 import branchmap, pathutil
20 import branchmap, pathutil
21 import namespaces
21 import namespaces
22 import streamclone
23 propertycache = util.propertycache
22 propertycache = util.propertycache
24 filecache = scmutil.filecache
23 filecache = scmutil.filecache
25
24
@@ -1794,8 +1793,6 b' class localrepository(object):'
1794 keyword arguments:
1793 keyword arguments:
1795 heads: list of revs to clone (forces use of pull)
1794 heads: list of revs to clone (forces use of pull)
1796 stream: use streaming clone if possible'''
1795 stream: use streaming clone if possible'''
1797 streamclone.maybeperformstreamclone(self, remote, heads, stream)
1798
1799 # internal config: ui.quietbookmarkmove
1796 # internal config: ui.quietbookmarkmove
1800 quiet = self.ui.backupconfig('ui', 'quietbookmarkmove')
1797 quiet = self.ui.backupconfig('ui', 'quietbookmarkmove')
1801 try:
1798 try:
General Comments 0
You need to be logged in to leave comments. Login now