Show More
| @@ -1333,7 +1333,8 b' def pull(repo, remote, heads=None, force' | |||||
| 1333 | if opargs is None: |
|
1333 | if opargs is None: | |
| 1334 | opargs = {} |
|
1334 | opargs = {} | |
| 1335 | pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks, |
|
1335 | pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks, | |
| 1336 |
streamclonerequested=streamclonerequested, |
|
1336 | streamclonerequested=streamclonerequested, | |
|
|
1337 | **pycompat.strkwargs(opargs)) | |||
| 1337 |
|
1338 | |||
| 1338 | peerlocal = pullop.remote.local() |
|
1339 | peerlocal = pullop.remote.local() | |
| 1339 | if peerlocal: |
|
1340 | if peerlocal: | |
| @@ -1757,7 +1758,7 b' def _getbundlechangegrouppart(bundler, r' | |||||
| 1757 | b2caps=None, heads=None, common=None, **kwargs): |
|
1758 | b2caps=None, heads=None, common=None, **kwargs): | |
| 1758 | """add a changegroup part to the requested bundle""" |
|
1759 | """add a changegroup part to the requested bundle""" | |
| 1759 | cgstream = None |
|
1760 | cgstream = None | |
| 1760 | if kwargs.get('cg', True): |
|
1761 | if kwargs.get(r'cg', True): | |
| 1761 | # build changegroup bundle here. |
|
1762 | # build changegroup bundle here. | |
| 1762 | version = '01' |
|
1763 | version = '01' | |
| 1763 | cgversions = b2caps.get('changegroup') |
|
1764 | cgversions = b2caps.get('changegroup') | |
| @@ -1785,7 +1786,7 b' def _getbundlechangegrouppart(bundler, r' | |||||
| 1785 | def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None, |
|
1786 | def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None, | |
| 1786 | b2caps=None, **kwargs): |
|
1787 | b2caps=None, **kwargs): | |
| 1787 | """add a bookmark part to the requested bundle""" |
|
1788 | """add a bookmark part to the requested bundle""" | |
| 1788 | if not kwargs.get('bookmarks', False): |
|
1789 | if not kwargs.get(r'bookmarks', False): | |
| 1789 | return |
|
1790 | return | |
| 1790 | if 'bookmarks' not in b2caps: |
|
1791 | if 'bookmarks' not in b2caps: | |
| 1791 | raise ValueError(_('no common bookmarks exchange method')) |
|
1792 | raise ValueError(_('no common bookmarks exchange method')) | |
| @@ -1798,7 +1799,7 b' def _getbundlebookmarkpart(bundler, repo' | |||||
| 1798 | def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None, |
|
1799 | def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None, | |
| 1799 | b2caps=None, **kwargs): |
|
1800 | b2caps=None, **kwargs): | |
| 1800 | """add parts containing listkeys namespaces to the requested bundle""" |
|
1801 | """add parts containing listkeys namespaces to the requested bundle""" | |
| 1801 | listkeys = kwargs.get('listkeys', ()) |
|
1802 | listkeys = kwargs.get(r'listkeys', ()) | |
| 1802 | for namespace in listkeys: |
|
1803 | for namespace in listkeys: | |
| 1803 | part = bundler.newpart('listkeys') |
|
1804 | part = bundler.newpart('listkeys') | |
| 1804 | part.addparam('namespace', namespace) |
|
1805 | part.addparam('namespace', namespace) | |
| @@ -1809,7 +1810,7 b' def _getbundlelistkeysparts(bundler, rep' | |||||
| 1809 | def _getbundleobsmarkerpart(bundler, repo, source, bundlecaps=None, |
|
1810 | def _getbundleobsmarkerpart(bundler, repo, source, bundlecaps=None, | |
| 1810 | b2caps=None, heads=None, **kwargs): |
|
1811 | b2caps=None, heads=None, **kwargs): | |
| 1811 | """add an obsolescence markers part to the requested bundle""" |
|
1812 | """add an obsolescence markers part to the requested bundle""" | |
| 1812 | if kwargs.get('obsmarkers', False): |
|
1813 | if kwargs.get(r'obsmarkers', False): | |
| 1813 | if heads is None: |
|
1814 | if heads is None: | |
| 1814 | heads = repo.heads() |
|
1815 | heads = repo.heads() | |
| 1815 | subset = [c.node() for c in repo.set('::%ln', heads)] |
|
1816 | subset = [c.node() for c in repo.set('::%ln', heads)] | |
| @@ -1821,7 +1822,7 b' def _getbundleobsmarkerpart(bundler, rep' | |||||
| 1821 | def _getbundlephasespart(bundler, repo, source, bundlecaps=None, |
|
1822 | def _getbundlephasespart(bundler, repo, source, bundlecaps=None, | |
| 1822 | b2caps=None, heads=None, **kwargs): |
|
1823 | b2caps=None, heads=None, **kwargs): | |
| 1823 | """add phase heads part to the requested bundle""" |
|
1824 | """add phase heads part to the requested bundle""" | |
| 1824 | if kwargs.get('phases', False): |
|
1825 | if kwargs.get(r'phases', False): | |
| 1825 | if not 'heads' in b2caps.get('phases'): |
|
1826 | if not 'heads' in b2caps.get('phases'): | |
| 1826 | raise ValueError(_('no common phases exchange method')) |
|
1827 | raise ValueError(_('no common phases exchange method')) | |
| 1827 | if heads is None: |
|
1828 | if heads is None: | |
| @@ -1878,7 +1879,7 b' def _getbundletagsfnodes(bundler, repo, ' | |||||
| 1878 | # Don't send unless: |
|
1879 | # Don't send unless: | |
| 1879 | # - changeset are being exchanged, |
|
1880 | # - changeset are being exchanged, | |
| 1880 | # - the client supports it. |
|
1881 | # - the client supports it. | |
| 1881 | if not (kwargs.get('cg', True) and 'hgtagsfnodes' in b2caps): |
|
1882 | if not (kwargs.get(r'cg', True) and 'hgtagsfnodes' in b2caps): | |
| 1882 | return |
|
1883 | return | |
| 1883 |
|
1884 | |||
| 1884 | outgoing = _computeoutgoing(repo, heads, common) |
|
1885 | outgoing = _computeoutgoing(repo, heads, common) | |
General Comments 0
You need to be logged in to leave comments.
Login now