Show More
@@ -5120,6 +5120,7 b' def pull(ui, repo, source="default", **o' | |||
|
5120 | 5120 | opts.get('rev')) |
|
5121 | 5121 | |
|
5122 | 5122 | |
|
5123 | pullopargs = {} | |
|
5123 | 5124 | if opts.get('bookmark'): |
|
5124 | 5125 | if not revs: |
|
5125 | 5126 | revs = [] |
@@ -5152,7 +5153,8 b' def pull(ui, repo, source="default", **o' | |||
|
5152 | 5153 | |
|
5153 | 5154 | modheads = exchange.pull(repo, other, heads=revs, |
|
5154 | 5155 | force=opts.get('force'), |
|
5155 |
bookmarks=opts.get('bookmark', ()) |
|
|
5156 | bookmarks=opts.get('bookmark', ()), | |
|
5157 | opargs=pullopargs).cgresult | |
|
5156 | 5158 | if checkout: |
|
5157 | 5159 | checkout = str(repo.changelog.rev(checkout)) |
|
5158 | 5160 | repo._subtoppath = source |
@@ -886,8 +886,11 b' class transactionmanager(object):' | |||
|
886 | 886 | if self._tr is not None: |
|
887 | 887 | self._tr.release() |
|
888 | 888 | |
|
889 | def pull(repo, remote, heads=None, force=False, bookmarks=()): | |
|
890 | pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks) | |
|
889 | def pull(repo, remote, heads=None, force=False, bookmarks=(), opargs=None): | |
|
890 | if opargs is None: | |
|
891 | opargs = {} | |
|
892 | pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks, | |
|
893 | **opargs) | |
|
891 | 894 | if pullop.remote.local(): |
|
892 | 895 | missing = set(pullop.remote.requirements) - pullop.repo.supported |
|
893 | 896 | if missing: |
General Comments 0
You need to be logged in to leave comments.
Login now