Show More
@@ -145,7 +145,7 b' class mercurial_sink(common.converter_si' | |||||
145 | _(b'pulling from %s into %s\n') % (pbranch, branch) |
|
145 | _(b'pulling from %s into %s\n') % (pbranch, branch) | |
146 | ) |
|
146 | ) | |
147 | exchange.pull( |
|
147 | exchange.pull( | |
148 | self.repo, prepo, [prepo.lookup(h) for h in heads] |
|
148 | self.repo, prepo, heads=[prepo.lookup(h) for h in heads] | |
149 | ) |
|
149 | ) | |
150 | self.before() |
|
150 | self.before() | |
151 |
|
151 |
@@ -699,7 +699,9 b' def getremotechanges(' | |||||
699 | }, |
|
699 | }, | |
700 | ).result() |
|
700 | ).result() | |
701 |
|
701 | |||
702 |
pullop = exchange.pulloperation( |
|
702 | pullop = exchange.pulloperation( | |
|
703 | bundlerepo, peer, path=None, heads=reponodes | |||
|
704 | ) | |||
703 | pullop.trmanager = bundletransactionmanager() |
|
705 | pullop.trmanager = bundletransactionmanager() | |
704 | exchange._pullapplyphases(pullop, remotephases) |
|
706 | exchange._pullapplyphases(pullop, remotephases) | |
705 |
|
707 |
@@ -5454,6 +5454,7 b' def pull(ui, repo, *sources, **opts):' | |||||
5454 | modheads = exchange.pull( |
|
5454 | modheads = exchange.pull( | |
5455 | repo, |
|
5455 | repo, | |
5456 | other, |
|
5456 | other, | |
|
5457 | path=path, | |||
5457 | heads=nodes, |
|
5458 | heads=nodes, | |
5458 | force=opts.get(b'force'), |
|
5459 | force=opts.get(b'force'), | |
5459 | bookmarks=opts.get(b'bookmark', ()), |
|
5460 | bookmarks=opts.get(b'bookmark', ()), |
@@ -1378,6 +1378,7 b' class pulloperation(object):' | |||||
1378 | self, |
|
1378 | self, | |
1379 | repo, |
|
1379 | repo, | |
1380 | remote, |
|
1380 | remote, | |
|
1381 | path, | |||
1381 | heads=None, |
|
1382 | heads=None, | |
1382 | force=False, |
|
1383 | force=False, | |
1383 | bookmarks=(), |
|
1384 | bookmarks=(), | |
@@ -1391,6 +1392,10 b' class pulloperation(object):' | |||||
1391 | self.repo = repo |
|
1392 | self.repo = repo | |
1392 | # repo we pull from |
|
1393 | # repo we pull from | |
1393 | self.remote = remote |
|
1394 | self.remote = remote | |
|
1395 | # path object used to build this remote | |||
|
1396 | # | |||
|
1397 | # Ideally, the remote peer would carry that directly. | |||
|
1398 | self.remote_path = path | |||
1394 | # revision we try to pull (None is "all") |
|
1399 | # revision we try to pull (None is "all") | |
1395 | self.heads = heads |
|
1400 | self.heads = heads | |
1396 | # bookmark pulled explicitly |
|
1401 | # bookmark pulled explicitly | |
@@ -1556,6 +1561,7 b' def add_confirm_callback(repo, pullop):' | |||||
1556 | def pull( |
|
1561 | def pull( | |
1557 | repo, |
|
1562 | repo, | |
1558 | remote, |
|
1563 | remote, | |
|
1564 | path=None, | |||
1559 | heads=None, |
|
1565 | heads=None, | |
1560 | force=False, |
|
1566 | force=False, | |
1561 | bookmarks=(), |
|
1567 | bookmarks=(), | |
@@ -1611,8 +1617,9 b' def pull(' | |||||
1611 | pullop = pulloperation( |
|
1617 | pullop = pulloperation( | |
1612 | repo, |
|
1618 | repo, | |
1613 | remote, |
|
1619 | remote, | |
1614 |
|
|
1620 | path=path, | |
1615 | force, |
|
1621 | heads=heads, | |
|
1622 | force=force, | |||
1616 | bookmarks=bookmarks, |
|
1623 | bookmarks=bookmarks, | |
1617 | streamclonerequested=streamclonerequested, |
|
1624 | streamclonerequested=streamclonerequested, | |
1618 | includepats=includepats, |
|
1625 | includepats=includepats, |
@@ -942,7 +942,7 b' def clone(' | |||||
942 | exchange.pull( |
|
942 | exchange.pull( | |
943 | local, |
|
943 | local, | |
944 | srcpeer, |
|
944 | srcpeer, | |
945 | revs, |
|
945 | heads=revs, | |
946 | streamclonerequested=stream, |
|
946 | streamclonerequested=stream, | |
947 | includepats=storeincludepats, |
|
947 | includepats=storeincludepats, | |
948 | excludepats=storeexcludepats, |
|
948 | excludepats=storeexcludepats, |
General Comments 0
You need to be logged in to leave comments.
Login now