Mercurial > public > mercurial-scm > hg
diff mercurial/exchange.py @ 48241:7d1e60244561
path: keep the path instance in the `pulloperation`
This will allow more pull code to use the path options. Ideally we would modify
the peer API to keep the path instance. However that is much more churn that I
can deal with for my current goal: adjusting a user facing API for a new
feature before we release it in the 6.0 changesets. So I am taking a shortcut
that seems reasonable.
Differential Revision: https://phab.mercurial-scm.org/D11674
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 15 Oct 2021 03:28:28 +0200 |
| parents | f03e9d30258e |
| children | 4d2ab365699e |
line wrap: on
line diff
--- a/mercurial/exchange.py Fri Oct 15 02:44:14 2021 +0200 +++ b/mercurial/exchange.py Fri Oct 15 03:28:28 2021 +0200 @@ -1378,6 +1378,7 @@ self, repo, remote, + path, heads=None, force=False, bookmarks=(), @@ -1391,6 +1392,10 @@ self.repo = repo # repo we pull from self.remote = remote + # path object used to build this remote + # + # Ideally, the remote peer would carry that directly. + self.remote_path = path # revision we try to pull (None is "all") self.heads = heads # bookmark pulled explicitly @@ -1556,6 +1561,7 @@ def pull( repo, remote, + path=None, heads=None, force=False, bookmarks=(), @@ -1611,8 +1617,9 @@ pullop = pulloperation( repo, remote, - heads, - force, + path=path, + heads=heads, + force=force, bookmarks=bookmarks, streamclonerequested=streamclonerequested, includepats=includepats,